Merge pull request #39 from cleverage/38

Upgrade to Symfony 7.3 & PHP 8.4

Author: njoubert-cleverage

.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

.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

.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)

.github/workflows/test.yml

@@ -22,11 +22,17 @@ jobs:
         php-version:
           - '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.2'
             dependencies: highest
             allowed-to-fail: false
@@ -35,8 +41,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 +51,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

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.*"
         }
     }
 }

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

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,
     ])
 ;

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": {