From e2d0332669de4900b19027c15f0fb49fe8a093b6 Mon Sep 17 00:00:00 2001 From: Jean-Beru Date: Thu, 15 Oct 2026 09:44:05 +0200 Subject: [PATCH 1/5] chore: disable php-http/discovery composer plugin --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a337297..26dec17 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "config": { "allow-plugins": { - "php-http/discovery": true + "php-http/discovery": false } } } From 2cb7df682b69723ee3dfeecb723d7df00f6073c1 Mon Sep 17 00:00:00 2001 From: Jean-Beru Date: Thu, 15 Oct 2026 09:44:21 +0200 Subject: [PATCH 2/5] chore: declare directly used dependencies --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 26dec17..be2eb85 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,9 @@ "require": { "php": "^8.1", "async-aws/cloud-front": "^0.1.3 || ^1.0", - "friendsofsymfony/http-cache": "^2.15 || ^3.0" + "async-aws/core": "^1.9", + "friendsofsymfony/http-cache": "^2.15 || ^3.0", + "symfony/options-resolver": "^4.4 || ^5.4 || ^6.4 || ^7.0 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.14", From 60a714a295c7ca34faec465defcad8b36abec33b Mon Sep 17 00:00:00 2001 From: Jean-Beru Date: Thu, 15 Oct 2026 09:44:54 +0200 Subject: [PATCH 3/5] chore: update dev dependencies and PHPUnit configuration --- composer.json | 6 +++--- phpunit.xml.dist | 4 +--- tests/Proxy/CloudFrontTest.php | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index be2eb85..7a5262c 100644 --- a/composer.json +++ b/composer.json @@ -28,9 +28,9 @@ "symfony/options-resolver": "^4.4 || ^5.4 || ^6.4 || ^7.0 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.14", - "phpunit/phpunit": "^10.0", - "phpstan/phpstan": "^1.10" + "friendsofphp/php-cs-fixer": "^3.91.3", + "phpunit/phpunit": "^10.5.62 || ^11.5.50 || ^12.5.8 || ^13.0", + "phpstan/phpstan": "^2.0" }, "config": { "allow-plugins": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a80476f..9d60bff 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,10 +1,8 @@ - + - - diff --git a/tests/Proxy/CloudFrontTest.php b/tests/Proxy/CloudFrontTest.php index 1b130bf..27166e6 100644 --- a/tests/Proxy/CloudFrontTest.php +++ b/tests/Proxy/CloudFrontTest.php @@ -75,6 +75,7 @@ public function testPurgeWithoutFlush(): void public function testException(): void { $this->client + ->expects($this->once()) ->method('createInvalidation') ->willThrowException(new AccessDeniedException(new SimpleMockedResponse(content: 'Access denied.', statusCode: 403))) ; From ae4e89d0e277d58f2577aa99009bc8079c1b5138 Mon Sep 17 00:00:00 2001 From: Jean-Beru Date: Thu, 15 Oct 2026 09:44:58 +0200 Subject: [PATCH 4/5] chore: exclude dev files from package archive --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 7cce6df..38f684b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ /tests export-ignore /.gitattributes export-ignore /.gitignore export-ignore -/.php-cs-fixer.dist.php +/.php-cs-fixer.dist.php export-ignore /phpunit.xml.dist export-ignore /phpstan.neon.dist export-ignore +/.github export-ignore From 31168851fe9d515ae66e2b1d8fee4290cb60c8fa Mon Sep 17 00:00:00 2001 From: Jean-Beru Date: Thu, 15 Oct 2026 12:39:56 +0200 Subject: [PATCH 5/5] chore: drop support for friendsofsymfony/http-cache 2.x The 2.x branch receives no updates since 2.16.2 (August 2024). Align symfony/options-resolver with the versions that http-cache 3.x supports. --- UPGRADE-1.3.md | 7 +++++++ composer.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 UPGRADE-1.3.md diff --git a/UPGRADE-1.3.md b/UPGRADE-1.3.md new file mode 100644 index 0000000..d6604a7 --- /dev/null +++ b/UPGRADE-1.3.md @@ -0,0 +1,7 @@ +# Upgrade to 1.3 + +## Dependencies + +* Support for `friendsofsymfony/http-cache` 2.x is removed. Upgrade to `friendsofsymfony/http-cache` 3.x. + The 2.x branch does not receive updates since version 2.16.2 (August 2024). +* Support for `symfony/options-resolver` 4.4 and 5.4 is removed. Use version 6.4 or higher. diff --git a/composer.json b/composer.json index 7a5262c..02080a9 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,8 @@ "php": "^8.1", "async-aws/cloud-front": "^0.1.3 || ^1.0", "async-aws/core": "^1.9", - "friendsofsymfony/http-cache": "^2.15 || ^3.0", - "symfony/options-resolver": "^4.4 || ^5.4 || ^6.4 || ^7.0 || ^8.0" + "friendsofsymfony/http-cache": "^3.0", + "symfony/options-resolver": "^6.4 || ^7.0 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.91.3",