chore(styles): php-cs-fixer upgrade and fix (GoogleCloudPlatform#89)

lucasmichot · web-flow · commit 809210800b3f · 2021-05-19T12:09:59.000-07:00
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -12,4 +12,4 @@ jobs:
     - name: PHP-CS-Fixer
       uses: docker://oskarstark/php-cs-fixer-ga
       with:
-        args: --diff --dry-run
+        args: . --diff --dry-run
diff --git a/.php_cs.dist.php b/.php_cs.dist.php
diff --git a/examples/hello/index.php b/examples/hello/index.php
@@ -25,8 +25,10 @@
 
 function helloHttp(ServerRequestInterface $request)
 {
-    return sprintf("Hello %s from PHP HTTP function!" . PHP_EOL,
-        $request->getQueryParams()['name'] ?? 'World');
+    return sprintf(
+        "Hello %s from PHP HTTP function!" . PHP_EOL,
+        $request->getQueryParams()['name'] ?? 'World'
+    );
 }
 
 /**
diff --git a/router.php b/router.php
@@ -51,7 +51,9 @@
     }
     if (!is_callable($target)) {
         throw new InvalidArgumentException(sprintf(
-            'Function target is not callable: "%s"', $target));
+            'Function target is not callable: "%s"',
+            $target
+        ));
     }
 
     $signatureType = getenv('FUNCTION_SIGNATURE_TYPE', true) ?: 'http';
diff --git a/src/FunctionWrapper.php b/src/FunctionWrapper.php
@@ -27,7 +27,7 @@
 
 abstract class FunctionWrapper
 {
-    const FUNCTION_STATUS_HEADER = 'X-Google-Status';
+    public const FUNCTION_STATUS_HEADER = 'X-Google-Status';
 
     protected $function;
 
diff --git a/src/Invoker.php b/src/Invoker.php
@@ -44,7 +44,9 @@ public function __construct(callable $target, string $signatureType)
             $this->function = new CloudEventFunctionWrapper($target);
         } else {
             throw new InvalidArgumentException(sprintf(
-                'Invalid signature type: "%s"', $signatureType));
+                'Invalid signature type: "%s"',
+                $signatureType
+            ));
         }
         $this->errorLogFunc = function (string $error) {
             fwrite(fopen('php://stderr', 'wb'), json_encode([
@@ -56,7 +58,7 @@ public function __construct(callable $target, string $signatureType)
 
     public function handle(
         ServerRequestInterface $request = null
-    ) : ResponseInterface {
+    ): ResponseInterface {
         if ($request === null) {
             $request = ServerRequest::fromGlobals();
         }
diff --git a/tests/LegacyEventMapperTest.php b/tests/LegacyEventMapperTest.php
@@ -184,7 +184,7 @@ public function testFirebaseAuth()
           ],
           'eventId' => 'aaaaaa-1111-bbbb-2222-cccccccccccc',
           'eventType' => 'providers/firebase.auth/eventTypes/user.create',
-          'notSupported' => new \stdClass,
+          'notSupported' => new \stdClass(),
           'resource' => 'projects/my-project-id',
           'timestamp' => '2020-09-29T11:32:00.000Z',
         ];
diff --git a/tests/conformance/index.php b/tests/conformance/index.php
@@ -42,7 +42,7 @@ function fixCloudEventData(CloudEvent $cloudevent): CloudEvent
     $fields = ['oldValue', 'updateMask'];
     foreach ($fields as $f) {
         if (array_key_exists($f, $data) && empty($data[$f])) {
-            $data[$f] = new stdClass;
+            $data[$f] = new stdClass();
             $dataModified = true;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,10 @@`
`25`	`25`
`26`	`26`	`function helloHttp(ServerRequestInterface $request)`
`27`	`27`	`{`
`28`		`- return sprintf("Hello %s from PHP HTTP function!" . PHP_EOL,`
`29`		`- $request->getQueryParams()['name'] ?? 'World');`
	`28`	`+ return sprintf(`
	`29`	`+ "Hello %s from PHP HTTP function!" . PHP_EOL,`
	`30`	`+ $request->getQueryParams()['name'] ?? 'World'`
	`31`	`+ );`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@`
`51`	`51`	`}`
`52`	`52`	`if (!is_callable($target)) {`
`53`	`53`	`throw new InvalidArgumentException(sprintf(`
`54`		`- 'Function target is not callable: "%s"', $target));`
	`54`	`+ 'Function target is not callable: "%s"',`
	`55`	`+ $target`
	`56`	`+ ));`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`$signatureType = getenv('FUNCTION_SIGNATURE_TYPE', true) ?: 'http';`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`abstract class FunctionWrapper`
`29`	`29`	`{`
`30`		`- const FUNCTION_STATUS_HEADER = 'X-Google-Status';`
	`30`	`+ public const FUNCTION_STATUS_HEADER = 'X-Google-Status';`
`31`	`31`
`32`	`32`	`protected $function;`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function fixCloudEventData(CloudEvent $cloudevent): CloudEvent`
`42`	`42`	`$fields = ['oldValue', 'updateMask'];`
`43`	`43`	`foreach ($fields as $f) {`
`44`	`44`	`if (array_key_exists($f, $data) && empty($data[$f])) {`
`45`		`- $data[$f] = new stdClass;`
	`45`	`+ $data[$f] = new stdClass();`
`46`	`46`	`$dataModified = true;`
`47`	`47`	`}`
`48`	`48`	`}`