From f5f499bffd84c576bee26dace26a35e0130a1642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gamez?= Date: Fri, 1 Dec 2023 00:09:15 +0100 Subject: [PATCH] Add support for PHP 8.3 --- .github/workflows/emulator-tests.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/tests.yml | 1 + CHANGELOG.md | 4 ++++ README.md | 20 ++++++++++---------- composer.json | 14 +++++++------- docs/overview.rst | 2 +- tests/Unit/Http/MiddlewareTest.php | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/emulator-tests.yml b/.github/workflows/emulator-tests.yml index ef033d7b..a2917d1d 100644 --- a/.github/workflows/emulator-tests.yml +++ b/.github/workflows/emulator-tests.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest env: - php-version: '8.1' + php-version: '8.2' extensions: ctype, dom, grpc, json, mbstring, openssl, xml, zip, zlib key: cache-emulators-7x-${{ matrix.php }}-v1 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 4922b9d3..d86df8d7 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest env: - php-version: '8.1' + php-version: '8.2' extensions: ctype, dom, grpc, json, mbstring, openssl, xml, zip, zlib key: cache-integration-7x-${{ matrix.php }}-v1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8a9050ae..008fe7cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,7 @@ jobs: php: - "8.1" - "8.2" + - "8.3" env: extensions: ctype, dom, grpc, json, mbstring, openssl, xml, zip, zlib diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a1cf27..f49d0824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ Please read about the future of the Firebase Admin PHP SDK on the ## [Unreleased] +### Added + +* Added support for PHP 8.3 + ## [7.8.0] - 2023-11-25 ### Added diff --git a/README.md b/README.md index 423301a8..dae28cf0 100644 --- a/README.md +++ b/README.md @@ -68,16 +68,16 @@ composer require "kreait/firebase-php:^7.0" Earlier versions will receive security fixes as long as their **lowest** PHP requirement receives security fixes. For example, when a version supports PHP 7.4 and PHP 8.0, security support will end when security support for PHP 7.4 ends. -| Version | Initial Release | Supported PHP Versions | Status | -|---------|-----------------|------------------------|-------------| -| `7.x` | 20 Dec 2022 | `~8.1.0, ~8.2.0` | Active | -| `6.x` | 01 Jul 2022 | `^7.4, ^8.0` | End of life | -| `5.x` | 01 Apr 2020 | `^7.2` | End of life | -| `4.x` | 14 Feb 2018 | `^7.0` | End of life | -| `3.x` | 22 Apr 2017 | `^7.0` | End of life | -| `2.x` | 06 Nov 2016 | `^7.0` | End of life | -| `1.x` | 15 Jul 2016 | `^5.5, ^7.0` | End of life | -| `0.x` | 09 Jan 2015 | `>=5.4` | End of life | +| Version | Initial Release | Supported PHP Versions | Status | +|---------|-----------------|--------------------------|-------------| +| `7.x` | 20 Dec 2022 | `~8.1.0, ~8.2.0, ~8.3.0` | Active | +| `6.x` | 01 Jul 2022 | `^7.4, ^8.0` | End of life | +| `5.x` | 01 Apr 2020 | `^7.2` | End of life | +| `4.x` | 14 Feb 2018 | `^7.0` | End of life | +| `3.x` | 22 Apr 2017 | `^7.0` | End of life | +| `2.x` | 06 Nov 2016 | `^7.0` | End of life | +| `1.x` | 15 Jul 2016 | `^5.5, ^7.0` | End of life | +| `0.x` | 09 Jan 2015 | `>=5.4` | End of life | diff --git a/composer.json b/composer.json index bda86037..1a80f402 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ } ], "require": { - "php": "~8.1.0|~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-ctype": "*", "ext-filter": "*", "ext-json": "*", @@ -50,14 +50,14 @@ "psr/log": "^1.1|^2.0|^3.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.34.1", - "google/cloud-firestore": "^1.37.3", + "friendsofphp/php-cs-fixer": "^3.40.0", + "google/cloud-firestore": "^1.37.7", "phpstan/extension-installer": "^1.3.1", - "phpstan/phpstan": "^1.10.38", - "phpstan/phpstan-phpunit": "^1.3.14", - "phpunit/phpunit": "^10.4.1", + "phpstan/phpstan": "^1.10.46", + "phpstan/phpstan-phpunit": "^1.3.15", + "phpunit/phpunit": "^10.4.2", "rector/rector": "~0.17.13", - "symfony/var-dumper": "^6.3.5" + "symfony/var-dumper": "^6.3.5 || ^7.0" }, "suggest": { "google/cloud-firestore": "^1.0 to use the Firestore component" diff --git a/docs/overview.rst b/docs/overview.rst index 77b4881a..1857312f 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -6,7 +6,7 @@ Overview Requirements ************ -* PHP 8.1.x or 8.2.x +* PHP 8.1, 8.2, or 8.3 * The `mbstring PHP extension `_ * A Firebase project - create a new project in the `Firebase console `_, if you don't already have one. diff --git a/tests/Unit/Http/MiddlewareTest.php b/tests/Unit/Http/MiddlewareTest.php index 179559f1..8d17e241 100644 --- a/tests/Unit/Http/MiddlewareTest.php +++ b/tests/Unit/Http/MiddlewareTest.php @@ -22,7 +22,7 @@ final class MiddlewareTest extends UnitTestCase protected function setUp(): void { $this->request = new Request('GET', 'http://domain.example'); - $this->handler = static fn (RequestInterface $request) => $request; + $this->handler = static fn(RequestInterface $request) => $request; } #[Test]