From 9b75a2e24608dc268027e572995c92097334c276 Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Fri, 8 Aug 2025 17:41:45 +0200 Subject: [PATCH 1/5] #38 Set symfony require to 7.3.* on composer.json --- composer.json | 10 +++++----- config/packages/property_info.yaml | 4 ++++ symfony.lock | 12 ++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 config/packages/property_info.yaml diff --git a/composer.json b/composer.json index 26143c2..008b3a6 100644 --- a/composer.json +++ b/composer.json @@ -29,11 +29,11 @@ "phpunit/phpunit": "<10.0", "rector/rector": "*", "roave/security-advisories": "dev-latest", - "symfony/browser-kit": "^6.4|^7.1", - "symfony/css-selector": "^6.4|^7.1", - "symfony/debug-bundle": "^6.4|^7.1", + "symfony/browser-kit": "^6.4|^7.3", + "symfony/css-selector": "^6.4|^7.3", + "symfony/debug-bundle": "^6.4|^7.3", "symfony/maker-bundle": "^1.31", - "symfony/web-profiler-bundle": "^6.4|^7.1" + "symfony/web-profiler-bundle": "^6.4|^7.3" }, "scripts": { "auto-scripts": { @@ -58,7 +58,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "7.2.*" + "require": "7.3.*" } } } diff --git a/config/packages/property_info.yaml b/config/packages/property_info.yaml new file mode 100644 index 0000000..6ebe343 --- /dev/null +++ b/config/packages/property_info.yaml @@ -0,0 +1,4 @@ +# Uncomment following if you are using Symfony 7.3 or higher +#framework: +# property_info: +# with_constructor_extractor: true diff --git a/symfony.lock b/symfony.lock index af2e798..a946689 100644 --- a/symfony.lock +++ b/symfony.lock @@ -244,6 +244,18 @@ "config/packages/monolog.yaml" ] }, + "symfony/property-info": { + "version": "7.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "7.3", + "ref": "dae70df71978ae9226ae915ffd5fad817f5ca1f7" + }, + "files": [ + "config/packages/property_info.yaml" + ] + }, "symfony/routing": { "version": "7.2", "recipe": { From 22846150cdfa3d867705d2608863cc7be26ca8d9 Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Fri, 8 Aug 2025 17:42:38 +0200 Subject: [PATCH 2/5] #38 Update docker configuration with PHP 8.4 --- .docker/compose.yaml | 4 ++-- .docker/php/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker/compose.yaml b/.docker/compose.yaml index 96cc5a0..63c4247 100644 --- a/.docker/compose.yaml +++ b/.docker/compose.yaml @@ -4,8 +4,8 @@ x-base-php: &base-php args: UID: ${UID:-1000} GID: ${GID:-1000} - PHP_VERSION: ${PHP_VERSION:-8.2} - XDEBUG_VERSION: ${XDEBUG_VERSION:-3.2.0} + PHP_VERSION: ${PHP_VERSION:-8.4} + XDEBUG_VERSION: ${XDEBUG_VERSION:-3.4.5} env_file: .env volumes: - ../:/var/www diff --git a/.docker/php/Dockerfile b/.docker/php/Dockerfile index 11c8710..ae81cde 100644 --- a/.docker/php/Dockerfile +++ b/.docker/php/Dockerfile @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.2 +ARG PHP_VERSION=8.1 FROM php:${PHP_VERSION}-fpm-alpine AS php ARG XDEBUG_VERSION=3.1.4 From 3c8e1863655a3b3ba6fdb5fd9dca600ebe527218 Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Fri, 8 Aug 2025 17:43:03 +0200 Subject: [PATCH 3/5] #38 Update github workflows with PHP 8.1 to 8.4 and Symfony ^6.4|^7.3 --- .github/workflows/quality.yml | 6 +++--- .github/workflows/test.yml | 30 ++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 0d9af99..ccca519 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -19,7 +19,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.4' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) @@ -38,7 +38,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.4' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) @@ -55,7 +55,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.2' + php-version: '8.4' coverage: none tools: composer:v2 - name: Install Composer dependencies (locked) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d7e7a4..cf986ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,13 +20,25 @@ jobs: strategy: matrix: php-version: + - '8.1' - '8.2' - '8.3' + - '8.4' 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.1' + dependencies: highest + allowed-to-fail: false + symfony-require: 7.3.* + variant: symfony/symfony:"7.3.*" - php-version: '8.2' dependencies: highest allowed-to-fail: false @@ -35,8 +47,8 @@ jobs: - php-version: '8.2' dependencies: highest allowed-to-fail: false - symfony-require: 7.1.* - variant: symfony/symfony:"7.1.*" + symfony-require: 7.3.* + variant: symfony/symfony:"7.3.*" - php-version: '8.3' dependencies: highest allowed-to-fail: false @@ -45,8 +57,18 @@ jobs: - php-version: '8.3' dependencies: highest allowed-to-fail: false - symfony-require: 7.1.* - variant: symfony/symfony:"7.1.*" + symfony-require: 7.3.* + variant: symfony/symfony:"7.3.*" + - 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.*" steps: - name: Checkout From 266fd2c394d782dd5361573ecbb80bc0685a21ff Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Fri, 8 Aug 2025 17:48:51 +0200 Subject: [PATCH 4/5] #38 Update rector configuration with minimal version PHP 8.1 --- rector.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/rector.php b/rector.php index 72a2408..513e708 100644 --- a/rector.php +++ b/rector.php @@ -4,27 +4,20 @@ use Rector\Config\RectorConfig; use Rector\Set\ValueObject\LevelSetList; -use Rector\Symfony\Set\SymfonySetList; use Rector\ValueObject\PhpVersion; return RectorConfig::configure() - ->withPhpVersion(PhpVersion::PHP_82) + ->withPhpVersion(PhpVersion::PHP_84) ->withPaths([ __DIR__.'/src', __DIR__.'/tests', ]) - ->withPhpSets(php82: true) + ->withPhpSets(php81: true) // here we can define, what prepared sets of rules will be applied - ->withPreparedSets( - deadCode: true, - codeQuality: true - ) + ->withComposerBased(symfony: true) + ->withPreparedSets(deadCode: true, codeQuality: true, doctrineCodeQuality: true, symfonyCodeQuality: true) + ->withAttributesSets(symfony: true, doctrine: true) ->withSets([ - LevelSetList::UP_TO_PHP_82, - SymfonySetList::SYMFONY_64, - SymfonySetList::SYMFONY_71, - SymfonySetList::SYMFONY_CODE_QUALITY, - SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION, - SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES, + LevelSetList::UP_TO_PHP_81, ]) ; From 644a44fc09f1b45562ddfb25a89340b27e146188 Mon Sep 17 00:00:00 2001 From: Nicolas Joubert Date: Mon, 11 Aug 2025 15:01:20 +0200 Subject: [PATCH 5/5] #38 Update github workflows with PHP 8.2 to 8.4 for Symfony ^7.3 --- .github/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf986ec..0e07db0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,6 @@ jobs: strategy: matrix: php-version: - - '8.1' - '8.2' - '8.3' - '8.4' @@ -34,11 +33,6 @@ jobs: allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - - php-version: '8.1' - dependencies: highest - allowed-to-fail: false - symfony-require: 7.3.* - variant: symfony/symfony:"7.3.*" - php-version: '8.2' dependencies: highest allowed-to-fail: false