From b9c27f059d15f59558f931400897201fab29249e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 18 Mar 2026 15:00:00 +0000 Subject: [PATCH 1/4] chore: widen deps and add phpcs4 config compatibility Co-authored-by: Zakhar --- composer.json | 22 +++++++++++----------- phpcs.xml.dist | 14 +++++++++++++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 2af46b1..22dae1e 100644 --- a/composer.json +++ b/composer.json @@ -5,19 +5,19 @@ "type": "library", "require": { "php": "^8.1", - "symfony/config": "^6.4 || ^7.0", - "symfony/dependency-injection": "^6.4 || ^7.0", - "symfony/http-kernel": "^6.4 || ^7.0", - "symfony/routing": "^6.4 || ^7.0", - "symfony/event-dispatcher": "^6.4 || ^7.0" + "symfony/config": "^6.4 || ^7.0 || ^8.0", + "symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0", + "symfony/http-kernel": "^6.4 || ^7.0 || ^8.0", + "symfony/routing": "^6.4 || ^7.0 || ^8.0", + "symfony/event-dispatcher": "^6.4 || ^7.0 || ^8.0" }, "require-dev": { - "symfony/browser-kit": "^6.0", - "phpunit/phpunit": "^10.5", - "squizlabs/php_codesniffer": "^3.8", - "symfony/yaml": "^6.4 || ^7.0", - "symfony/framework-bundle": "^6.4 || ^7.0", - "phpstan/phpstan-symfony": "^1.3 || ^2.0" + "symfony/browser-kit": "^6.4 || ^7.0 || ^8.0", + "phpunit/phpunit": "^12.5", + "squizlabs/php_codesniffer": "^4.0", + "symfony/yaml": "^6.4 || ^7.0 || ^8.0", + "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0", + "phpstan/phpstan-symfony": "^2.0" }, "autoload": { "psr-4": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index d89bc03..b22b9c9 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -23,7 +23,19 @@ - + + + + + + + + + + + + + From 5ec148aebeb67fb9700a254dfd9304d32b2e0826 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 18 Mar 2026 15:22:02 +0000 Subject: [PATCH 2/4] fix: add void return type to bundle build Co-authored-by: Zakhar --- src/DeprecatedRoutesBundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DeprecatedRoutesBundle.php b/src/DeprecatedRoutesBundle.php index 94b5021..1da1bdc 100644 --- a/src/DeprecatedRoutesBundle.php +++ b/src/DeprecatedRoutesBundle.php @@ -11,7 +11,7 @@ final class DeprecatedRoutesBundle extends Bundle { - public function build(ContainerBuilder $container) + public function build(ContainerBuilder $container): void { parent::build($container); } From 2b7dd51bb603742f880e7c0816244f708f960cff Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 18 Mar 2026 16:15:55 +0000 Subject: [PATCH 3/4] chore: add cs-fix and rector tooling scripts Co-authored-by: Zakhar --- Makefile | 7 +++++++ composer.json | 9 ++++++++- rector.php | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 100644 rector.php diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec7745a --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +.PHONY: cs-fix rector + +cs-fix: + vendor/bin/phpcbf + +rector: + vendor/bin/rector process --config rector.php diff --git a/composer.json b/composer.json index 22dae1e..296d89b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "squizlabs/php_codesniffer": "^4.0", "symfony/yaml": "^6.4 || ^7.0 || ^8.0", "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0", - "phpstan/phpstan-symfony": "^2.0" + "phpstan/phpstan-symfony": "^2.0", + "rector/rector": "^2.3" }, "autoload": { "psr-4": { @@ -35,6 +36,12 @@ } }, "scripts": { + "cs-fix": [ + "vendor/bin/phpcbf" + ], + "rector": [ + "vendor/bin/rector process --config rector.php" + ], "validate": [ "composer validate" ] diff --git a/rector.php b/rector.php new file mode 100644 index 0000000..53497e6 --- /dev/null +++ b/rector.php @@ -0,0 +1,14 @@ +withPaths([ + __DIR__ . '/src', + __DIR__ . '/tests', + ]) + ->withTypeCoverageLevel(0) + ->withDeadCodeLevel(0) + ->withCodeQualityLevel(0); From 545a6f431fe9000f1fb2b1be508d67f4dc0b546e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 18 Mar 2026 18:43:15 +0000 Subject: [PATCH 4/4] ci: add Symfony 8 lane to matrix Co-authored-by: Zakhar --- .github/workflows/ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 480d2fe..6353f77 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,6 +18,10 @@ jobs: - '6.4.*' - '7.0.*' include: + - description: 'Symfony 8' + php: '8.4' + symfony-versions: '8.0.*' + coverage: 'none' - description: 'Log Code Coverage' php: '8.3' symfony-versions: '^7.0' @@ -60,6 +64,8 @@ jobs: composer require symfony/dependency-injection:${{ matrix.symfony-versions }} --no-update --no-scripts composer require symfony/http-kernel:${{ matrix.symfony-versions }} --no-update --no-scripts composer require symfony/routing:${{ matrix.symfony-versions }} --no-update --no-scripts + composer require symfony/event-dispatcher:${{ matrix.symfony-versions }} --no-update --no-scripts + composer require --dev symfony/framework-bundle:${{ matrix.symfony-versions }} --no-update --no-scripts composer require --dev symfony/yaml:${{ matrix.symfony-versions }} --no-update --no-scripts composer require --dev symfony/browser-kit:${{ matrix.symfony-versions }} --no-update --no-scripts - name: Install dependencies