Merge branch 'main' into update-libver

Author: bshaffer

.github/CODEOWNERS

@@ -4,4 +4,4 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-*     @googleapis/yoshi-php
+*     @googleapis/cloud-sdk-php-team

.github/conventional-commit-lint.yaml

@@ -0,0 +1,2 @@
+always_check_pr_title: true
+

.github/sync-repo-settings.yaml

@@ -18,7 +18,5 @@ branchProtectionRules:
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: true
 permissionRules:
-  - team: yoshi-php-admins
-    permission: admin
-  - team: yoshi-php
+  - team: cloud-sdk-php-team
     permission: push

.github/workflows/asset-release.yml

@@ -1,30 +1,34 @@
 name: Add Release Assets
 
+permissions:
+    contents: write
+
 on:
     release:
         types: [published]
     workflow_dispatch:
-
+        inputs:
+              tag:
+                  description: 'Tag to generate documentation for'
+                  required: true
+              upload-on-workflow-dispatch:
+                  description: 'Upload assets?'
+                  required: false
+                  default: "false"
 jobs:
     asset:
         runs-on: ${{ matrix.operating-system }}
         strategy:
             matrix:
                 operating-system: [ ubuntu-latest ]
-                php: [ "8.0", "8.3" ]
+                php: [ "8.1", "8.3" ]
 
         name: Upload Release Assets
         steps:
             - id: getTag
               name: Get Tag
               run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
 
-            - name: Get release
-              id: get_release
-              uses: bruceadams/get-release@v1.2.2
-              env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
             - name: Checkout
               uses: actions/checkout@v2
 
@@ -51,14 +55,12 @@ jobs:
                 zip -d ${fileName} "tests*" || true &&
                 zip -d ${fileName} "examples*" || true
               env:
-                fileName: google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
+                fileName: google-api-php-client-${{ inputs.tag || steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
 
             - name: Upload Release Archive
-              uses: actions/upload-release-asset@v1
-              env:
-                GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+              uses: softprops/action-gh-release@v2
+              if: github.ref_type == 'tag' || inputs.upload-on-workflow-dispatch == 'true'
               with:
-                upload_url: ${{ steps.get_release.outputs.upload_url }}
-                asset_path: ./google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
-                asset_name: google-api-php-client-${{ steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip
-                asset_content_type: application/zip
+                tag_name: ${{ inputs.tag || steps.tagName.outputs.tag }}
+                files: |
+                  ./google-api-php-client-${{ inputs.tag || steps.tagName.outputs.tag }}-PHP${{ matrix.php }}.zip

.github/workflows/tests.yml

@@ -11,10 +11,10 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
+                php: [ "8.1", "8.2", "8.3", "8.4" ]
                 composer-flags: [""]
                 include:
-                  - php: "8.0"
+                  - php: "8.1"
                     composer-flags: "--prefer-lowest "
                   - php: "8.4"
                     composer-flags: "--prefer-lowest "

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [2.19.0](https://github.com/googleapis/google-api-php-client/compare/v2.18.4...v2.19.0) (2026-01-09)
+
+
+### Features
+
+* Support firebase/php-jwt version 6.0 and 7.0 ([#2696](https://github.com/googleapis/google-api-php-client/issues/2696)) ([70ea42a](https://github.com/googleapis/google-api-php-client/commit/70ea42a6aa29a1321825c3dcda39cf39174390ea))
+
+
+### Bug Fixes
+
+* Upload assets release job ([#2671](https://github.com/googleapis/google-api-php-client/issues/2671)) ([0f56ea7](https://github.com/googleapis/google-api-php-client/commit/0f56ea773cb51cc6131c442d112d7fd630b49b5c))
+
+## [2.18.4](https://github.com/googleapis/google-api-php-client/compare/v2.18.3...v2.18.4) (2025-09-29)
+
+
+### Bug Fixes
+
+* Ensure credentials can be of type FetchAuthTokenInterface ([#2684](https://github.com/googleapis/google-api-php-client/issues/2684)) ([ed70802](https://github.com/googleapis/google-api-php-client/commit/ed70802cc4886ef1f513a2c0b56a8a972db5e7ab))
+
 ## [2.18.3](https://github.com/googleapis/google-api-php-client/compare/v2.18.2...v2.18.3) (2025-04-08)
 
 

composer.json

@@ -6,12 +6,12 @@
     "homepage": "http://developers.google.com/api-client-library/php",
     "license": "Apache-2.0",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "google/auth": "^1.37",
         "google/apiclient-services": "~0.350",
-        "firebase/php-jwt": "^6.0",
+        "firebase/php-jwt": "^6.0||^7.0",
         "monolog/monolog": "^2.9||^3.0",
-        "phpseclib/phpseclib": "^3.0.36",
+        "phpseclib/phpseclib": "^3.0.50",
         "guzzlehttp/guzzle": "^7.4.5",
         "guzzlehttp/psr7": "^2.6"
     },
@@ -21,7 +21,7 @@
         "symfony/css-selector": "~2.1",
         "cache/filesystem-adapter": "^1.1",
         "phpcompatibility/php-compatibility": "^9.2",
-        "composer/composer": "^1.10.23",
+        "composer/composer": "^2.9",
         "phpspec/prophecy-phpunit": "^2.1",
         "phpunit/phpunit": "^9.6"
     },

docs/oauth-web.md

@@ -258,10 +258,10 @@ After completing the OAuth 2.0 flow, you should be redirected to `http://localho
 
 After the web server receives the authorization code, it can exchange the authorization code for an access token.
 
-To exchange an authorization code for an access token, use the `authenticate` method:
+To exchange an authorization code for an access token, use the `fetchAccessTokenWithAuthCode` method:
 
 ```php
-$client->authenticate($_GET['code']);
+$client->fetchAccessTokenWithAuthCode($_GET['code']);
 ```
 
 You can retrieve the access token with the `getAccessToken` method:
@@ -353,15 +353,15 @@ require_once __DIR__.'/vendor/autoload.php';
 session_start();
 
 $client = new Google\Client();
-$client->setAuthConfigFile('client_secrets.json');
+$client->setAuthConfig('client_secrets.json');
 $client->setRedirectUri('http://' . $_SERVER['HTTP_HOST'] . '/oauth2callback.php');
 $client->addScope(Google\Service\Drive::DRIVE_METADATA_READONLY);
 
 if (! isset($_GET['code'])) {
   $auth_url = $client->createAuthUrl();
   header('Location: ' . filter_var($auth_url, FILTER_SANITIZE_URL));
 } else {
-  $client->authenticate($_GET['code']);
+  $client->fetchAccessTokenWithAuthCode($_GET['code']);
   $_SESSION['access_token'] = $client->getAccessToken();
   $redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . '/';
   header('Location: ' . filter_var($redirect_uri, FILTER_SANITIZE_URL));
@@ -421,4 +421,4 @@ $client->revokeToken();
 
 **Note:** Following a successful revocation response, it might take some time before the revocation has full effect.
 
-Except as otherwise noted, the content of this page is licensed under the [Creative Commons Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/), and code samples are licensed under the [Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0). For details, see our [Site Policies](https://developers.google.com/terms/site-policies). Java is a registered trademark of Oracle and/or its affiliates.
+Except as otherwise noted, the content of this page is licensed under the [Creative Commons Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/), and code samples are licensed under the [Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0). For details, see our [Site Policies](https://developers.google.com/terms/site-policies). Java is a registered trademark of Oracle and/or its affiliates.

src/AuthHandler/Guzzle6AuthHandler.php

@@ -2,8 +2,8 @@
 
 namespace Google\AuthHandler;
 
-use Google\Auth\CredentialsLoader;
 use Google\Auth\FetchAuthTokenCache;
+use Google\Auth\FetchAuthTokenInterface;
 use Google\Auth\HttpHandler\HttpHandlerFactory;
 use Google\Auth\Middleware\AuthTokenMiddleware;
 use Google\Auth\Middleware\ScopedAccessTokenMiddleware;
@@ -28,7 +28,7 @@ public function __construct(?CacheItemPoolInterface $cache = null, array $cacheC
 
     public function attachCredentials(
         ClientInterface $http,
-        CredentialsLoader $credentials,
+        FetchAuthTokenInterface $credentials,
         ?callable $tokenCallback = null
     ) {
         // use the provided cache
@@ -40,13 +40,21 @@ public function attachCredentials(
             );
         }
 
-        return $this->attachCredentialsCache($http, $credentials, $tokenCallback);
+        return $this->attachToHttp($http, $credentials, $tokenCallback);
     }
 
     public function attachCredentialsCache(
         ClientInterface $http,
         FetchAuthTokenCache $credentials,
         ?callable $tokenCallback = null
+    ) {
+        return $this->attachToHttp($http, $credentials, $tokenCallback);
+    }
+
+    private function attachToHttp(
+        ClientInterface $http,
+        FetchAuthTokenInterface $credentials,
+        ?callable $tokenCallback = null
     ) {
         // if we end up needing to make an HTTP request to retrieve credentials, we
         // can use our existing one, but we need to throw exceptions so the error
@@ -63,9 +71,7 @@ public function attachCredentialsCache(
         $config['handler']->remove('google_auth');
         $config['handler']->push($middleware, 'google_auth');
         $config['auth'] = 'google_auth';
-        $http = new Client($config);
-
-        return $http;
+        return new Client($config);
     }
 
     public function attachToken(ClientInterface $http, array $token, array $scopes)

src/Client.php

@@ -27,6 +27,7 @@
 use Google\Auth\Credentials\UserRefreshCredentials;
 use Google\Auth\CredentialsLoader;
 use Google\Auth\FetchAuthTokenCache;
+use Google\Auth\FetchAuthTokenInterface;
 use Google\Auth\GetUniverseDomainInterface;
 use Google\Auth\HttpHandler\HttpHandlerFactory;
 use Google\Auth\OAuth2;
@@ -94,7 +95,7 @@ class Client
     private $logger;
 
     /**
-     * @var ?CredentialsLoader $credentials
+     * @var ?FetchAuthTokenInterface $credentials
      */
     private $credentials;
 
@@ -122,10 +123,10 @@ class Client
      *           Your Google Cloud client ID found in https://developers.google.com/console
      *     @type string $client_secret
      *           Your Google Cloud client secret found in https://developers.google.com/console
-     *     @type string|array|CredentialsLoader $credentials
+     *     @type string|array|FetchAuthTokenInterface $credentials
      *           Can be a path to JSON credentials or an array representing those
      *           credentials (@see Google\Client::setAuthConfig), or an instance of
-     *           {@see CredentialsLoader}.
+     *           {@see FetchAuthTokenInterface}.
      *     @type string|array $scopes
      *           {@see Google\Client::setScopes}
      *     @type string $quota_project
@@ -217,7 +218,7 @@ public function __construct(array $config = [])
         ], $config);
 
         if (!is_null($this->config['credentials'])) {
-            if ($this->config['credentials'] instanceof CredentialsLoader) {
+            if ($this->config['credentials'] instanceof FetchAuthTokenInterface) {
                 $this->credentials = $this->config['credentials'];
             } else {
                 $this->setAuthConfig($this->config['credentials']);
@@ -464,7 +465,8 @@ public function authorize(?ClientInterface $http = null)
         $authHandler = $this->getAuthHandler();
 
         // These conditionals represent the decision tree for authentication
-        //   1.  Check if a Google\Auth\CredentialsLoader instance has been supplied via the "credentials" option
+        //   1.  Check if an instance of Google\Auth\FetchAuthTokenInterface has
+        //       been supplied via the "credentials" option
         //   2.  Check for Application Default Credentials
         //   3a. Check for an Access Token
         //   3b. If access token exists but is expired, try to refresh it