diff --git a/.docker/php/Dockerfile b/.docker/php/Dockerfile index f98c3ba0..33dd796b 100644 --- a/.docker/php/Dockerfile +++ b/.docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm-alpine +FROM php:8.4-fpm-alpine ARG UID ARG GID diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 9f1580fe..a07ce8b6 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) @@ -36,7 +36,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) @@ -53,7 +53,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 2d7e7a41..0e07db02 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/composer.json b/composer.json index e6316520..1293d7f6 100644 --- a/composer.json +++ b/composer.json @@ -59,23 +59,23 @@ "ext-json": "*", "ext-mbstring": "*", "psr/cache": "^1|^2|^3", - "symfony/config": "^6.4|^7.1", - "symfony/console": "^6.4|^7.1", - "symfony/dependency-injection": "^6.4|^7.1", - "symfony/dotenv": "^6.4|^7.1", + "symfony/config": "^6.4|^7.3", + "symfony/console": "^6.4|^7.3", + "symfony/dependency-injection": "^6.4|^7.3", + "symfony/dotenv": "^6.4|^7.3", "symfony/event-dispatcher-contracts": "^3", - "symfony/expression-language": "^6.4|^7.1", - "symfony/framework-bundle": "^6.4|^7.1", - "symfony/monolog-bridge": "^6.4|^7.1", + "symfony/expression-language": "^6.4|^7.3", + "symfony/framework-bundle": "^6.4|^7.3", + "symfony/monolog-bridge": "^6.4|^7.3", "symfony/monolog-bundle": "~3.3", - "symfony/options-resolver": "^6.4|^7.1", - "symfony/process": "^6.4|^7.1", - "symfony/property-access": "^6.4|^7.1", - "symfony/runtime": "^6.4|^7.1", - "symfony/serializer": "^6.4|^7.1", - "symfony/stopwatch": "^6.4|^7.1", - "symfony/validator": "^6.4|^7.1", - "symfony/yaml": "^6.4|^7.1", + "symfony/options-resolver": "^6.4|^7.3", + "symfony/process": "^6.4|^7.3", + "symfony/property-access": "^6.4|^7.3", + "symfony/runtime": "^6.4|^7.3", + "symfony/serializer": "^6.4|^7.3", + "symfony/stopwatch": "^6.4|^7.3", + "symfony/validator": "^6.4|^7.3", + "symfony/yaml": "^6.4|^7.3", "symfony/service-contracts": ">=1.0.0" }, "require-dev": { diff --git a/rector.php b/rector.php index 72a24086..b19c1121 100644 --- a/rector.php +++ b/rector.php @@ -8,23 +8,19 @@ 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 - ) + ->withPreparedSets(deadCode: true, codeQuality: true, symfonyCodeQuality: true) + ->withAttributesSets(symfony: true) ->withSets([ - LevelSetList::UP_TO_PHP_82, + LevelSetList::UP_TO_PHP_81, SymfonySetList::SYMFONY_64, - SymfonySetList::SYMFONY_71, SymfonySetList::SYMFONY_CODE_QUALITY, SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION, - SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES, ]) ;