From df9e6a1266f41b0538273135fa3c6479bb7da658 Mon Sep 17 00:00:00 2001 From: Leon Helmus Date: Wed, 24 Dec 2025 11:35:30 +0100 Subject: [PATCH 1/4] feat: Add exclusion rules for the Magento2 coding standards --- config/magento2/ruleset.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/magento2/ruleset.xml b/config/magento2/ruleset.xml index 5eefd8d..1222edc 100644 --- a/config/magento2/ruleset.xml +++ b/config/magento2/ruleset.xml @@ -5,5 +5,15 @@ - - \ No newline at end of file + + + + + + + + + From edb1af2d0d71f617eb0c05d26c219bfe08ffc229 Mon Sep 17 00:00:00 2001 From: Leon Helmus Date: Wed, 24 Dec 2025 11:43:44 +0100 Subject: [PATCH 2/4] fix: allow grumphp to run git in all directories --- .github/workflows/testing-suite.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing-suite.yml b/.github/workflows/testing-suite.yml index 981282a..f882705 100644 --- a/.github/workflows/testing-suite.yml +++ b/.github/workflows/testing-suite.yml @@ -21,6 +21,7 @@ jobs: - name: Install Dependencies run: | + git config --global --add safe.directory "*" composer2 install --dev --prefer-dist --no-scripts --no-progress --optimize-autoloader --no-interaction -vvv composer2 show shell: bash From 7aab843019759b798398f4aa0be19b08812b3d64 Mon Sep 17 00:00:00 2001 From: Leon Helmus Date: Wed, 24 Dec 2025 11:55:49 +0100 Subject: [PATCH 3/4] fix: prevent error by not installing specific version of package --- CHANGELOG.md | 2 ++ composer.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14a3de4..ed806fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Commit Message validator to validate the commit message adheres to the [Conventional Commit Message structure](https://cheatography.com/albelop/cheat-sheets/conventional-commits/) and that the commit message contains a Jira ticket number it relates to. +- Prevent installation of `phpro/grumphp-shim:2.18.0` to prevent error "symfony/cache" conflicts with extension `redis` + , see [github link](https://github.com/phpro/grumphp-shim/issues/30) ### Changed - [BREAKING] The composer.json configurations `config.youwe-testing-suite.type` and `config.mediact-testing-suite.type` diff --git a/composer.json b/composer.json index eb6d8aa..45cab79 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "php-cs-fixer/shim": "@stable", "php-parallel-lint/php-parallel-lint": "^1.4", "phpmd/phpmd": "^2.15 || 3.x-dev", - "phpro/grumphp-shim": "^2.15", + "phpro/grumphp-shim": "^2.15 !=2.18.0", "phpstan/phpstan": "@stable", "squizlabs/php_codesniffer": "^3.12.0", "youwe/composer-dependency-installer": "^2.0", From 50177dd76049ff0f66110e40e95cc761b662e888 Mon Sep 17 00:00:00 2001 From: Leon Helmus Date: Wed, 24 Dec 2025 13:05:13 +0100 Subject: [PATCH 4/4] refactor: Add changelog about phpcs rules changed --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed806fe..590531f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Default Pimcore coding standards disables PHPCS in favour of PHP CS Fixer. - JSON Lint will ignore folders `.ddev/` and `tests/fixtures/`. - Added Symfony function `dump()` to the git blacklist for all project types +- Added new excludes to magento 2 phpcs rules. ### Removed - Removed support for EOL PHP versions. Projects running PHP < 8.1 can stick to version 2 of the testing-suite.