From 0a97f13cb12864c820e047d91924919bbb39847c Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 13:33:20 +0100 Subject: [PATCH 01/10] Fixes #10 * upgrade composer.json * Dockerfile (opcache is part of php now) * upgrade versions in github actions --- .docker/php/Dockerfile | 5 ++--- .github/workflows/quality.yml | 12 ++++++------ composer.json | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.docker/php/Dockerfile b/.docker/php/Dockerfile index 33dd796..4eda7e2 100644 --- a/.docker/php/Dockerfile +++ b/.docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.4-fpm-alpine +FROM php:8.5-fpm-alpine ARG UID ARG GID @@ -13,8 +13,7 @@ RUN apk update && apk add \ bash \ icu-dev \ && docker-php-ext-configure intl \ - && docker-php-ext-install intl opcache \ - && docker-php-ext-enable opcache + && docker-php-ext-install intl \ RUN ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \ && sed -i "s/^;date.timezone =.*/date.timezone = Europe\/Paris/" $PHP_INI_DIR/php.ini diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index a07ce8b..f4e4f5b 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) @@ -32,11 +32,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) @@ -49,11 +49,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) diff --git a/composer.json b/composer.json index c288960..575fd76 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "require": { "php": ">=8.1", "cleverage/process-bundle": "^4.0", - "symfony/cache": "^6.4|^7.3" + "symfony/cache": "^6.4|^7.4|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "*", From 5585b5a2b8b7d53a4dbc4f8d78c2f9f9f884e750 Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 14:29:14 +0100 Subject: [PATCH 02/10] Fixes #10 * upgrade test.yml * upgrade minimum php version in composer.json * add parallel run in phpcsfixer * remove @PHP71Migration in phpcsfixer * upgrade php version in rector --- .github/workflows/test.yml | 42 +++++++++++++++----------------------- .php-cs-fixer.dist.php | 2 +- composer.json | 4 ++-- rector.php | 9 ++++---- 4 files changed, 25 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e07db0..c2c7e5d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,50 +23,42 @@ jobs: - '8.2' - '8.3' - '8.4' + - '8.5' dependencies: [highest] allowed-to-fail: [false] symfony-require: [''] variant: [normal] include: - - php-version: '8.1' - dependencies: highest - allowed-to-fail: false - symfony-require: 6.4.* - variant: symfony/symfony:"6.4.*" - php-version: '8.2' - dependencies: highest - allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.2' - dependencies: highest - allowed-to-fail: false - symfony-require: 7.3.* - variant: symfony/symfony:"7.3.*" + symfony-require: 7.4.* + variant: symfony/symfony:"7.4.*" - php-version: '8.3' - dependencies: highest - allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.3' - dependencies: highest - allowed-to-fail: false - symfony-require: 7.3.* - variant: symfony/symfony:"7.3.*" + symfony-require: 7.4.* + variant: symfony/symfony:"7.4.*" - php-version: '8.4' - dependencies: highest - allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.4' - dependencies: highest - allowed-to-fail: false - symfony-require: 7.3.* - variant: symfony/symfony:"7.3.*" - + symfony-require: 7.4.* + variant: symfony/symfony:"7.4.*" + - php-version: '8.4' + symfony-require: 8.0.* + variant: symfony/symfony:"8.0.*" + - php-version: '8.5' + symfony-require: 7.4.* + variant: symfony/symfony:"7.4.*" + - php-version: '8.5' + symfony-require: 8.0.* + variant: symfony/symfony:"8.0.*" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 68f8bcf..f8779c7 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -23,8 +23,8 @@ EOF; return (new PhpCsFixer\Config()) + ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()) ->setRules([ - '@PHP71Migration' => true, '@PHP82Migration' => true, '@PHPUnit75Migration:risky' => true, '@Symfony' => true, diff --git a/composer.json b/composer.json index 575fd76..91a21c8 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.2", "cleverage/process-bundle": "^4.0", "symfony/cache": "^6.4|^7.4|^8.0" }, @@ -40,7 +40,7 @@ "phpstan/extension-installer": "*", "phpstan/phpstan": "*", "phpstan/phpstan-symfony": "*", - "phpunit/phpunit": "<10.0", + "phpunit/phpunit": "*", "rector/rector": "*", "roave/security-advisories": "dev-latest", "symfony/test-pack": "^1.1" diff --git a/rector.php b/rector.php index b19c112..07149e0 100644 --- a/rector.php +++ b/rector.php @@ -8,17 +8,18 @@ use Rector\ValueObject\PhpVersion; return RectorConfig::configure() - ->withPhpVersion(PhpVersion::PHP_84) + ->withPhpVersion(PhpVersion::PHP_85) ->withPaths([ __DIR__.'/src', __DIR__.'/tests', ]) - ->withPhpSets(php81: true) - // here we can define, what prepared sets of rules will be applied + ->withPhpSets(php82: true) + // here we can define what prepared sets of rules will be applied ->withPreparedSets(deadCode: true, codeQuality: true, symfonyCodeQuality: true) ->withAttributesSets(symfony: true) + ->withComposerBased(symfony: true) ->withSets([ - LevelSetList::UP_TO_PHP_81, + LevelSetList::UP_TO_PHP_82, SymfonySetList::SYMFONY_64, SymfonySetList::SYMFONY_CODE_QUALITY, SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION, From 7fdd0d8dc65d047eded5811b29cf87ce5fc44b9e Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 14:30:36 +0100 Subject: [PATCH 03/10] Fixes #10 * fix test.yml --- .github/workflows/test.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2c7e5d..0eece43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,30 +30,48 @@ jobs: variant: [normal] include: - php-version: '8.2' + dependencies: highest + allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.2' + dependencies: highest + allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - php-version: '8.3' + dependencies: highest + allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.3' + dependencies: highest + allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - php-version: '8.4' + dependencies: highest + allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - php-version: '8.4' + dependencies: highest + allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - php-version: '8.4' + dependencies: highest + allowed-to-fail: false symfony-require: 8.0.* variant: symfony/symfony:"8.0.*" - php-version: '8.5' + dependencies: highest + allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - php-version: '8.5' + dependencies: highest + allowed-to-fail: false symfony-require: 8.0.* variant: symfony/symfony:"8.0.*" steps: From 43102fe365c9e1d27e672a02304082ced0a00559 Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 14:36:37 +0100 Subject: [PATCH 04/10] Fixes #10 * remove php8.5 --- .github/workflows/test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0eece43..6cf78ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,21 +59,21 @@ jobs: allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - - php-version: '8.4' - dependencies: highest - allowed-to-fail: false - symfony-require: 8.0.* - variant: symfony/symfony:"8.0.*" +# - php-version: '8.4' +# dependencies: highest +# allowed-to-fail: false +# symfony-require: 8.0.* +# variant: symfony/symfony:"8.0.*" - php-version: '8.5' dependencies: highest allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" - - php-version: '8.5' - dependencies: highest - allowed-to-fail: false - symfony-require: 8.0.* - variant: symfony/symfony:"8.0.*" +# - php-version: '8.5' +# dependencies: highest +# allowed-to-fail: false +# symfony-require: 8.0.* +# variant: symfony/symfony:"8.0.*" steps: - name: Checkout uses: actions/checkout@v6 From 81ec44f9ffbdb77029c225cb3d8aa2c15a07d5cc Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 14:41:12 +0100 Subject: [PATCH 05/10] Fixes #10 * upgrade phpunit configuration file --- phpunit.xml.dist | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 766495c..d701bea 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,27 @@ + failOnWarning="true"> + tests - + src + + + - + \ No newline at end of file From 586c8c71a5a1a5cb6af3b19e501e0a25d028ece3 Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Mon, 8 Dec 2025 14:49:30 +0100 Subject: [PATCH 06/10] Fixes #10 * upgrade phpunit configuration file --- phpunit.xml.dist | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d701bea..c3e7947 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,19 +9,14 @@ beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true"> - tests - src - - - \ No newline at end of file From 67204096e8983ba23002d0ac203290d1f717c24c Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Tue, 9 Dec 2025 11:32:15 +0100 Subject: [PATCH 07/10] #10 * Remove `withComposerBased` from Rector config * Simplify `.php-cs-fixer.dist.php` by removing `setParallelConfig` * Update `symfony/cache` constraint in `composer.json` * Revise GitHub Actions workflow to add support for PHP 8.4 and 8.5 * Update CHANGELOG for v2.0 release --- .github/workflows/test.yml | 25 +++++++++++++++---------- .php-cs-fixer.dist.php | 1 - CHANGELOG.md | 9 +++++++++ composer.json | 2 +- rector.php | 1 - 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6cf78ff..27a5a54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,21 +59,26 @@ jobs: allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" -# - php-version: '8.4' -# dependencies: highest -# allowed-to-fail: false -# symfony-require: 8.0.* -# variant: symfony/symfony:"8.0.*" + - php-version: '8.4' + dependencies: highest + allowed-to-fail: false + symfony-require: 8.* + variant: symfony/symfony:"8.*" + - php-version: '8.5' + dependencies: highest + allowed-to-fail: false + symfony-require: 6.4.* + variant: symfony/symfony:"6.4.*" - php-version: '8.5' dependencies: highest allowed-to-fail: false symfony-require: 7.4.* variant: symfony/symfony:"7.4.*" -# - php-version: '8.5' -# dependencies: highest -# allowed-to-fail: false -# symfony-require: 8.0.* -# variant: symfony/symfony:"8.0.*" + - php-version: '8.5' + dependencies: highest + allowed-to-fail: false + symfony-require: 8.* + variant: symfony/symfony:"8.*" steps: - name: Checkout uses: actions/checkout@v6 diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index f8779c7..4c25cb0 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -23,7 +23,6 @@ EOF; return (new PhpCsFixer\Config()) - ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()) ->setRules([ '@PHP82Migration' => true, '@PHPUnit75Migration:risky' => true, diff --git a/CHANGELOG.md b/CHANGELOG.md index 30af9f8..4f86838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +v2.0 +------ + +### Changes +* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Add support for PHP 8.5 and Symfony 8.* Update phpunit/phpunit to version >10.0 + +### BC breaks +* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Remove support for PHP 8.1 and Symfony 7.3 + v1.1 ------ diff --git a/composer.json b/composer.json index 91a21c8..cc732e2 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "require": { "php": ">=8.2", "cleverage/process-bundle": "^4.0", - "symfony/cache": "^6.4|^7.4|^8.0" + "symfony/cache": "^6.4|^7.4|^8" }, "require-dev": { "friendsofphp/php-cs-fixer": "*", diff --git a/rector.php b/rector.php index 07149e0..0c85e04 100644 --- a/rector.php +++ b/rector.php @@ -17,7 +17,6 @@ // here we can define what prepared sets of rules will be applied ->withPreparedSets(deadCode: true, codeQuality: true, symfonyCodeQuality: true) ->withAttributesSets(symfony: true) - ->withComposerBased(symfony: true) ->withSets([ LevelSetList::UP_TO_PHP_82, SymfonySetList::SYMFONY_64, From 847b16f9d815192baafef9e362ddde73a3173c14 Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Tue, 9 Dec 2025 11:35:22 +0100 Subject: [PATCH 08/10] #10 Add support for `cleverage/process-bundle` ^5.0 in `composer.json` and update CHANGELOG --- CHANGELOG.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f86838..891ac32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ v2.0 ------ ### Changes -* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Add support for PHP 8.5 and Symfony 8.* Update phpunit/phpunit to version >10.0 +* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Add support for PHP 8.5 and Symfony 8.* Update phpunit/phpunit to version >10.0 Add support for cleverage/process-bundle ^5.0 ### BC breaks * [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Remove support for PHP 8.1 and Symfony 7.3 diff --git a/composer.json b/composer.json index cc732e2..8f771ea 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "require": { "php": ">=8.2", - "cleverage/process-bundle": "^4.0", + "cleverage/process-bundle": "^4.0|^5.0", "symfony/cache": "^6.4|^7.4|^8" }, "require-dev": { From 749bc02489925d7b08b9c7281d3e643952a902fd Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Tue, 9 Dec 2025 11:47:34 +0100 Subject: [PATCH 09/10] #10 Update `composer.json` to require `cleverage/process-bundle ^5.0` only and adjust CHANGELOG accordingly --- CHANGELOG.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 891ac32..b268fb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ v2.0 ------ ### Changes -* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Add support for PHP 8.5 and Symfony 8.* Update phpunit/phpunit to version >10.0 Add support for cleverage/process-bundle ^5.0 +* [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Add support for PHP 8.5 and Symfony 8.* Update phpunit/phpunit to version >10.0 Bump version to cleverage/process-bundle ^5.0 ### BC breaks * [#10](https://github.com/cleverage/cache-process-bundle/issues/10) Remove support for PHP 8.1 and Symfony 7.3 diff --git a/composer.json b/composer.json index 8f771ea..b903981 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "require": { "php": ">=8.2", - "cleverage/process-bundle": "^4.0|^5.0", + "cleverage/process-bundle": "^5.0", "symfony/cache": "^6.4|^7.4|^8" }, "require-dev": { From f07924aeea282e892110663e9acfdaa4b7f53a49 Mon Sep 17 00:00:00 2001 From: Xavier Marchegay Date: Tue, 9 Dec 2025 14:01:30 +0100 Subject: [PATCH 10/10] #10 Update `symfony/cache` constraint syntax in `composer.json` to improve readability --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b903981..418f2d6 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "require": { "php": ">=8.2", "cleverage/process-bundle": "^5.0", - "symfony/cache": "^6.4|^7.4|^8" + "symfony/cache": "^6.4 || ^7.4 || ^8" }, "require-dev": { "friendsofphp/php-cs-fixer": "*",