Merge branch 'main' into user-refresh-id-tokens

.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

@@ -10,7 +10,7 @@ jobs:
     test:
         strategy:
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                php: [ "8.1", "8.2", "8.3" ]
                 os: [ ubuntu-latest ]
                 include:
                   - os: windows-latest
@@ -40,7 +40,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                php-version: "8.0"
+                php-version: "8.1"
             - name: Install Dependencies
               uses: nick-invision/retry@v3
               with:
@@ -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

composer.json

@@ -9,7 +9,7 @@
     "docs": "https://googleapis.github.io/google-auth-library-php/main/"
   },
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "firebase/php-jwt": "^6.0",
     "guzzlehttp/guzzle": "^7.4.5",
     "guzzlehttp/psr7": "^2.4.5",

tests/ApplicationDefaultCredentialsTest.php

@@ -167,8 +167,8 @@ public function testImpersonatedServiceAccountCredentials()
             null,
             'a default scope'
         );
+
         $this->assertInstanceOf(ImpersonatedServiceAccountCredentials::class, $creds);
-
         $this->assertEquals('[email protected]', $creds->getClientName());
 
         $sourceCredentialsProperty = (new ReflectionClass($creds))->getProperty('sourceCredentials');