From 8142a3e523299b999aa4833235a07f0f5fe24c82 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 4 Dec 2024 09:23:09 -0600 Subject: [PATCH 1/3] chore: add php 8.4 to test matrix (#2643) --- .github/sync-repo-settings.yaml | 3 ++- .github/workflows/tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index c4543198e0..a4444366a8 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,8 @@ branchProtectionRules: - 'PHP 8.1 Unit Test' - 'PHP 8.2 Unit Test' - 'PHP 8.3 Unit Test' - - 'PHP 8.3 --prefer-lowest Unit Test' + - 'PHP 8.4' + - 'PHP 8.4 --prefer-lowest Unit Test' - 'PHP Style Check' - 'cla/google' requiredApprovingReviewCount: 1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8f833c134f..9f86e493a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,12 +11,12 @@ jobs: strategy: fail-fast: false matrix: - php: [ "8.0", "8.1", "8.2", "8.3" ] + php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ] composer-flags: [""] include: - php: "8.0" composer-flags: "--prefer-lowest " - - php: "8.3" + - php: "8.4" composer-flags: "--prefer-lowest " name: PHP ${{ matrix.php }} ${{ matrix.composer-flags }}Unit Test steps: From 31a9861af02a8e9070b395f05caed7ffce0ef8be Mon Sep 17 00:00:00 2001 From: Jose Ochoa Date: Mon, 16 Dec 2024 16:50:30 -0600 Subject: [PATCH 2/3] fix: correct type for jwt constructor arg (#2648) Co-authored-by: Brent Shaffer --- src/AccessToken/Verify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AccessToken/Verify.php b/src/AccessToken/Verify.php index 714b5d12d4..5529450e5b 100644 --- a/src/AccessToken/Verify.php +++ b/src/AccessToken/Verify.php @@ -69,7 +69,7 @@ class Verify public function __construct( ?ClientInterface $http = null, ?CacheItemPoolInterface $cache = null, - ?string $jwt = null + ?JWT $jwt = null ) { if (null === $http) { $http = new Client(); From d8d201ba8a189a3cd7fb34e4da569f2ed440eee7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:52:40 -0800 Subject: [PATCH 3/3] chore(main): release 2.18.2 (#2649) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecb2406b2d..00f046fb54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.18.2](https://github.com/googleapis/google-api-php-client/compare/v2.18.1...v2.18.2) (2024-12-16) + + +### Bug Fixes + +* Correct type for jwt constructor arg ([#2648](https://github.com/googleapis/google-api-php-client/issues/2648)) ([31a9861](https://github.com/googleapis/google-api-php-client/commit/31a9861af02a8e9070b395f05caed7ffce0ef8be)) + ## [2.18.1](https://github.com/googleapis/google-api-php-client/compare/v2.18.0...v2.18.1) (2024-11-24)