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 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 a337297..02080a9 100644 --- a/composer.json +++ b/composer.json @@ -23,16 +23,18 @@ "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": "^3.0", + "symfony/options-resolver": "^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": { - "php-http/discovery": true + "php-http/discovery": false } } } 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))) ;