From 4b304900925ee5d7f285e91103e9f0ed7546b37a Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 28 Jan 2023 17:49:00 +0100 Subject: [PATCH 1/4] feat: drop support of symfony < 5.4, migrate phpunit config-format for v9 --- .github/workflows/static.yml | 4 ++-- .github/workflows/tests.yml | 8 ++++---- CHANGELOG.md | 2 ++ composer.json | 14 +++++++------- phpunit.xml.dist | 27 ++++++++++++++++----------- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 5d28c145..3937c831 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@master - name: PHPStan - uses: docker://jakzal/phpqa:php8.0 + uses: docker://jakzal/phpqa:php8.2 with: args: phpstan analyze --no-progress @@ -17,6 +17,6 @@ jobs: steps: - uses: actions/checkout@master - name: PHP-CS-Fixer - uses: docker://jakzal/phpqa:php8.0 + uses: docker://jakzal/phpqa:php8.2 with: args: php-cs-fixer fix --config=.php_cs.dist.php --dry-run diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ddc5d574..c00b4208 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,18 +14,18 @@ jobs: matrix: include: - php: '7.4' - symfony-require: 4.4.* + symfony-require: 5.4.* - php: '8.0' - symfony-require: 5.3.* + symfony-require: 5.4.* - php: '8.0' symfony-require: 6.0.* - stability: dev - php: '8.1' + - php: '8.2' fail-fast: false steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index a64dd371..19274b3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Remove support of symfony < 5.4 (5.4 is new LTS) + ## [3.9.1] - 2023-01-16 ### Fixed diff --git a/composer.json b/composer.json index 0d4200f2..9a7f689d 100644 --- a/composer.json +++ b/composer.json @@ -14,18 +14,18 @@ "require": { "php": ">=7.4", "giggsey/libphonenumber-for-php": "^8.0", - "symfony/framework-bundle": "^4.4|^5.3|^6.0", - "symfony/intl": "^4.4|^5.3|^6.0" + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/intl": "^5.4|^6.0" }, "require-dev": { "doctrine/doctrine-bundle": "^1.12|^2.0", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "symfony/form": "^4.4|^5.3|^6.0", - "symfony/property-access": "^4.4|^5.3|^6.0", - "symfony/serializer": "^4.4|^5.3|^6.0.1", - "symfony/twig-bundle": "^4.4|^5.3|^6.0", - "symfony/validator": "^4.4|^5.3|^6.0" + "symfony/form": "^5.4|^6.0", + "symfony/property-access": "^5.4|^6.0", + "symfony/serializer": "^5.4|^6.0.1", + "symfony/twig-bundle": "^5.4|^6.0", + "symfony/validator": "^5.4|^6.0" }, "suggest": { "doctrine/doctrine-bundle": "Add a DBAL mapping type", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6bb3cb6f..1f6a01ba 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,14 +1,19 @@ + + + + + src + + + + + + tests + + - - - - tests - - - - - src - - From 928f095d2c2e97eca8e348f652215b538d09bc94 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 28 Jan 2023 20:53:53 +0100 Subject: [PATCH 2/4] Update CHANGELOG.md Co-authored-by: Oskar Stark --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19274b3f..cf6eb112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Remove support of symfony < 5.4 (5.4 is new LTS) +- Remove support for Symfony 4.4 ## [3.9.1] - 2023-01-16 From cab3c909507421cba4c530e49c143eaf8fae6c85 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 28 Jan 2023 21:03:54 +0100 Subject: [PATCH 3/4] feat: drop support of symfony < 5.4, migrate phpunit config-format for v9 --- phpunit.xml.dist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1f6a01ba..77ad57d7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,8 +1,8 @@ + bootstrap="./vendor/autoload.php" + colors="true" + xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"> From acbc1b5142f43175316daac4e4f7a1a72bd31a77 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sun, 29 Jan 2023 10:42:19 +0100 Subject: [PATCH 4/4] feat: drop support of symfony < 5.4, migrate phpunit config-format for v9 --- .github/workflows/static.yml | 3 ++- .gitignore | 1 + phpstan.neon.dist | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 3937c831..5e3d1ba2 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -17,6 +17,7 @@ jobs: steps: - uses: actions/checkout@master - name: PHP-CS-Fixer - uses: docker://jakzal/phpqa:php8.2 + uses: docker://jakzal/phpqa:php8.0 + # TODO change to php 8.2, after PHP-CS-Fixer support is implemented with: args: php-cs-fixer fix --config=.php_cs.dist.php --dry-run diff --git a/.gitignore b/.gitignore index d4e9ee90..65648777 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /.idea/ /.php_cs.cache +/.php-cs-fixer.cache /.phpunit.result.cache /composer.lock /composer.phar diff --git a/phpstan.neon.dist b/phpstan.neon.dist index e34a993a..f5d1335a 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -9,3 +9,4 @@ parameters: message: "#^Attribute class Symfony\\\\Component\\\\Validator\\\\Attribute\\\\HasNamedArguments does not exist\\.$#" count: 1 path: src/Validator/Constraints/PhoneNumber.php + reportUnmatched: false