From ae89e290e57fb5200e55757ba215d861c1146527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Mon, 4 Mar 2024 13:19:08 +0100 Subject: [PATCH 1/5] [GH] Build config file update --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60bfde3..45e6247 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP From 0677f89cfa997a55956235b894d1244c04f32839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Mon, 4 Mar 2024 13:22:58 +0100 Subject: [PATCH 2/5] [GH] Bump dependencies --- .github/workflows/build.yml | 10 ++++++---- composer.json | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45e6247..42cb16a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,12 +17,14 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.0", "8.1"] - symfony: ["5.4.*", "6.0.*", "6.1.*"] + php: ["8.1", "8.2", "8.3"] + symfony: ["5.4.*", "6.4.*", "7.0.*"] twig: ["^2.12", "^3.3"] exclude: - - php: "8.0" - symfony: "6.1.*" + - twig: "^2.12" + symfony: "7.0.*" + - php: "8.1" + symfony: "7.0.*" steps: - diff --git a/composer.json b/composer.json index b4c38ae..6dcb872 100644 --- a/composer.json +++ b/composer.json @@ -24,13 +24,13 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "sylius-labs/polyfill-symfony-event-dispatcher": "^1.0", - "symfony/config": "^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.4 || ^7.0", "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0", "twig/twig": "^2.12 || ^3.3", "webmozart/assert": "^1.9" }, @@ -38,7 +38,7 @@ "sylius/mailer": "self.version" }, "require-dev": { - "matthiasnoback/symfony-dependency-injection-test": "^4.2", + "matthiasnoback/symfony-dependency-injection-test": "^5.0", "phpspec/phpspec": "^7.0", "phpstan/phpstan": "1.8.5", "phpstan/phpstan-phpunit": "1.1.1", @@ -46,12 +46,12 @@ "phpunit/phpunit": "^9.4", "rector/rector": "^0.13.6", "sylius-labs/coding-standard": "^4.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/dotenv": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/mailer": "^5.4 || ^6.0", - "symfony/twig-bundle": "^5.4 || ^6.0", - "vimeo/psalm": "^4.22" + "symfony/console": "^5.4 || ^6.4 || ^7.0", + "symfony/dotenv": "^5.4 || ^6.4 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0", + "symfony/mailer": "^5.4 || ^6.4 || ^7.0", + "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0", + "vimeo/psalm": "^5.22" }, "extra": { "branch-alias": { From e11bfb2adb94c0e6921175cb42ca88b884293dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Mon, 4 Mar 2024 14:10:30 +0100 Subject: [PATCH 3/5] [Config] Drop psalm checks --- composer.json | 9 +++----- psalm.symfony5.xml | 52 ---------------------------------------------- psalm.xml | 52 ---------------------------------------------- 3 files changed, 3 insertions(+), 110 deletions(-) delete mode 100644 psalm.symfony5.xml delete mode 100644 psalm.xml diff --git a/composer.json b/composer.json index 6dcb872..8b3b5c8 100644 --- a/composer.json +++ b/composer.json @@ -50,8 +50,7 @@ "symfony/dotenv": "^5.4 || ^6.4 || ^7.0", "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0", "symfony/mailer": "^5.4 || ^6.4 || ^7.0", - "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0", - "vimeo/psalm": "^5.22" + "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0" }, "extra": { "branch-alias": { @@ -85,14 +84,12 @@ "analyse": [ "@composer validate --strict", "vendor/bin/ecs check src", - "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src", - "vendor/bin/psalm src" + "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src" ], "analyse-symfony5": [ "@composer validate --strict", "vendor/bin/ecs check src", - "vendor/bin/phpstan analyse --ansi -c phpstan.symfony5.neon -l max src", - "vendor/bin/psalm -c psalm.symfony5.xml src" + "vendor/bin/phpstan analyse --ansi -c phpstan.symfony5.neon -l max src" ], "fix": [ "vendor/bin/ecs check src --fix" diff --git a/psalm.symfony5.xml b/psalm.symfony5.xml deleted file mode 100644 index 51a1153..0000000 --- a/psalm.symfony5.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/psalm.xml b/psalm.xml deleted file mode 100644 index b6aab53..0000000 --- a/psalm.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e5fb7deba920a8725526e62fe5695d23e9f9c7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Mon, 4 Mar 2024 14:46:38 +0100 Subject: [PATCH 4/5] [Maintenance] Drop different phpstan configs --- .github/workflows/build.yml | 8 -------- composer.json | 5 ----- phpstan.symfony5.neon | 21 --------------------- 3 files changed, 34 deletions(-) delete mode 100644 phpstan.symfony5.neon diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42cb16a..d1dba04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,16 +58,8 @@ jobs: composer update ${{ matrix.composer-flags }} --no-scripts (cd src/Component && composer update ${{ matrix.composer-flags }} --no-scripts) - - - name: Run analysis with Symfony 5 - if: matrix.symfony == '5.4.*' - run: | - composer analyse-symfony5 - (cd src/Component && composer validate --strict) - - name: Run analysis with Symfony 6 - if: matrix.symfony != '5.4.*' run: | composer analyse (cd src/Component && composer validate --strict) diff --git a/composer.json b/composer.json index 8b3b5c8..286d6bd 100644 --- a/composer.json +++ b/composer.json @@ -86,11 +86,6 @@ "vendor/bin/ecs check src", "vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src" ], - "analyse-symfony5": [ - "@composer validate --strict", - "vendor/bin/ecs check src", - "vendor/bin/phpstan analyse --ansi -c phpstan.symfony5.neon -l max src" - ], "fix": [ "vendor/bin/ecs check src --fix" ], diff --git a/phpstan.symfony5.neon b/phpstan.symfony5.neon deleted file mode 100644 index 546d012..0000000 --- a/phpstan.symfony5.neon +++ /dev/null @@ -1,21 +0,0 @@ -includes: - - vendor/phpstan/phpstan-webmozart-assert/extension.neon - - vendor/phpstan/phpstan-phpunit/extension.neon - - - vendor/phpstan/phpstan-phpunit/rules.neon - -parameters: - checkMissingIterableValueType: false - - excludePaths: - - %currentWorkingDirectory%/src/Bundle/DependencyInjection/Configuration.php - - %currentWorkingDirectory%/src/Bundle/spec/* - - %currentWorkingDirectory%/src/Bundle/test/* - - %currentWorkingDirectory%/src/Bundle/tests/* - - %currentWorkingDirectory%/src/Component/spec/* - - %currentWorkingDirectory%/src/Component/vendor/* - - ignoreErrors: - - '/Property Sylius\\Component\\Mailer\\Model\\Email\:\:\$id is never written\, only read\./' - - '/PHPDoc tag \@param references unknown parameter\: \$bccRecipients/' - - '/PHPDoc tag \@param references unknown parameter\: \$ccRecipients/' From 0fba2b068bc63ef5ad422761070c1628e9deeae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= Date: Mon, 4 Mar 2024 14:48:08 +0100 Subject: [PATCH 5/5] [Maintenance] Change Symfony version restrictions --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1dba04..aa5fa31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,13 +18,13 @@ jobs: fail-fast: false matrix: php: ["8.1", "8.2", "8.3"] - symfony: ["5.4.*", "6.4.*", "7.0.*"] + symfony: ["^5.4", "^6.4", "^7.0"] twig: ["^2.12", "^3.3"] exclude: - twig: "^2.12" - symfony: "7.0.*" + symfony: "^7.0" - php: "8.1" - symfony: "7.0.*" + symfony: "^7.0" steps: - @@ -59,7 +59,7 @@ jobs: (cd src/Component && composer update ${{ matrix.composer-flags }} --no-scripts) - - name: Run analysis with Symfony 6 + name: Run analysis run: | composer analyse (cd src/Component && composer validate --strict)