chore: updates from new cs rules (#577)

Author: bshaffer

.github/workflows/lint.yml

@@ -0,0 +1,18 @@
+name: Lint
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+permissions:
+  contents: read
+jobs:
+    style:
+      name: PHP Style Check
+      uses: GoogleCloudPlatform/php-tools/.github/workflows/code-standards.yml@main
+
+    staticanalysis:
+      name: PHPStan Static Analysis
+      uses: GoogleCloudPlatform/php-tools/.github/workflows/static-analysis.yml@main
+      with:
+        autoload-file: tests/phpstan-autoload.php

.github/workflows/tests.yml

@@ -49,13 +49,3 @@ jobs:
                 command: composer update --prefer-lowest
             - name: Run Script
               run: vendor/bin/phpunit
-
-    style:
-      name: PHP Style Check
-      uses: GoogleCloudPlatform/php-tools/.github/workflows/code-standards.yml@main
-
-    staticanalysis:
-      name: PHPStan Static Analysis
-      uses: GoogleCloudPlatform/php-tools/.github/workflows/static-analysis.yml@main
-      with:
-        autoload-file: tests/phpstan-autoload.php

src/CredentialSource/AwsNativeSource.php

@@ -103,7 +103,7 @@ public function fetchSubjectToken(callable $httpHandler = null): string
         $headers['x-goog-cloud-target-resource'] = $this->audience;
 
         // Format headers as they're expected in the subject token
-        $formattedHeaders= array_map(
+        $formattedHeaders = array_map(
             fn ($k, $v) => ['key' => $k, 'value' => $v],
             array_keys($headers),
             $headers,

src/Credentials/GCECredentials.php

@@ -426,12 +426,12 @@ private static function detectResidencyWindows(string $registryProductKey): bool
 
         try {
             $productName = $shell->regRead($registryProductKey);
-        } catch(com_exception) {
+        } catch (com_exception) {
             // This means that we tried to read a key that doesn't exist on the registry
             // which might mean that it is a windows instance that is not on GCE
             return false;
         }
-        
+
         return 0 === strpos($productName, self::PRODUCT_NAME);
     }
 

src/Middleware/AuthTokenMiddleware.php

@@ -132,7 +132,8 @@ private function addAuthHeaders(RequestInterface $request)
         ) {
             $token = $this->fetcher->fetchAuthToken();
             $request = $request->withHeader(
-                'authorization', 'Bearer ' . ($token['access_token'] ?? $token['id_token'] ?? '')
+                'authorization',
+                'Bearer ' . ($token['access_token'] ?? $token['id_token'] ?? '')
             );
         } else {
             $headers = $this->fetcher->updateMetadata($request->getHeaders(), null, $this->httpHandler);

src/OAuth2.php

@@ -724,7 +724,7 @@ public function getSubjectTokenFetcher(): ?ExternalAccountCredentialSourceInterf
      */
     public function parseTokenResponse(ResponseInterface $resp)
     {
-        $body = (string)$resp->getBody();
+        $body = (string) $resp->getBody();
         if ($resp->hasHeader('Content-Type') &&
             $resp->getHeaderLine('Content-Type') == 'application/x-www-form-urlencoded'
         ) {
@@ -1009,13 +1009,13 @@ public function setRedirectUri($uri)
         if (!$this->isAbsoluteUri($uri)) {
             // "postmessage" is a reserved URI string in Google-land
             // @see https://developers.google.com/identity/sign-in/web/server-side-flow
-            if ('postmessage' !== (string)$uri) {
+            if ('postmessage' !== (string) $uri) {
                 throw new InvalidArgumentException(
                     'Redirect URI must be absolute'
                 );
             }
         }
-        $this->redirectUri = (string)$uri;
+        $this->redirectUri = (string) $uri;
     }
 
     /**
@@ -1127,7 +1127,7 @@ public function setGrantType($grantType)
                     'invalid grant type'
                 );
             }
-            $this->grantType = (string)$grantType;
+            $this->grantType = (string) $grantType;
         }
     }
 
@@ -1460,7 +1460,7 @@ public function setExpiresIn($expiresIn)
             $this->issuedAt = null;
         } else {
             $this->issuedAt = time();
-            $this->expiresIn = (int)$expiresIn;
+            $this->expiresIn = (int) $expiresIn;
         }
     }
 
@@ -1768,7 +1768,8 @@ private function getFirebaseJwtKeys($publicKey, $allowedAlgs)
                 throw new \InvalidArgumentException(
                     'To have multiple allowed algorithms, You must provide an'
                     . ' array of Firebase\JWT\Key objects.'
-                    . ' See https://github.com/firebase/php-jwt for more information.');
+                    . ' See https://github.com/firebase/php-jwt for more information.'
+                );
             }
             $allowedAlg = array_pop($allowedAlgs);
         } else {

tests/ApplicationDefaultCredentialsTest.php

@@ -168,7 +168,8 @@ public function testImpersonatedServiceAccountCredentials()
         );
         $this->assertInstanceOf(
             'Google\Auth\Credentials\ImpersonatedServiceAccountCredentials',
-            $creds);
+            $creds
+        );
 
         $this->assertEquals('service_account_name@namespace.iam.gserviceaccount.com', $creds->getClientName());
 
@@ -179,7 +180,8 @@ public function testImpersonatedServiceAccountCredentials()
         $sourceCredentials = $sourceCredentialsProperty->getValue($creds);
         $this->assertInstanceOf(
             'Google\Auth\Credentials\UserRefreshCredentials',
-            $sourceCredentials);
+            $sourceCredentials
+        );
     }
 
     public function testUserRefreshCredentials()

tests/Cache/FileSystemCacheItemPoolTest.php

@@ -43,7 +43,7 @@ public function tearDown(): void
     {
         $files = scandir($this->defaultCacheDirectory);
 
-        foreach($files as $fileName) {
+        foreach ($files as $fileName) {
             if ($fileName === '.' || $fileName === '..') {
                 continue;
             }

tests/CredentialSource/FileSourceTest.php

@@ -45,7 +45,6 @@ public function provideFetchSubjectToken()
         $file1 = tempnam(sys_get_temp_dir(), 'test1');
         file_put_contents($file1, 'abc');
 
-
         $file2 = tempnam(sys_get_temp_dir(), 'test2');
         file_put_contents($file2, json_encode(['token' => 'def']));
 

tests/Credentials/ExternalAccountCredentialsTest.php

@@ -561,7 +561,7 @@ public function testUrlSourceCacheKey()
         $expectedKey = 'fakeUrl.scope1...';
         $this->assertEquals($expectedKey, $cacheKey);
     }
-    
+
     public function testExecutableSourceCacheKey()
     {
         $this->baseCreds['credential_source'] = [