Skip to content

Commit a65eac6

Browse files
committed
Some prep work for upcoming Magento 2.4.4 and PHP 8 support, updated some extra dev-dependencies:
- Upgrading magento/magento-coding-standard (6 => 20) - Locking rector/rector (0.12.16) - Upgrading webonyx/graphql-php (v0.13.9 => v14.11.5)
1 parent 22dc138 commit a65eac6

File tree

3 files changed

+99
-29
lines changed

3 files changed

+99
-29
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ check: checkstyle checkquality test
1111
.PHONY: checkstyle
1212
checkstyle:
1313
vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
14-
vendor/bin/phpcs -s --standard=Magento2 --exclude=Magento2.Security.InsecureFunction --ignore=./vendor/ .
14+
vendor/bin/phpcs -s --standard=Magento2 --exclude=Magento2.Security.InsecureFunction,Magento2.Commenting.ClassPropertyPHPDocFormatting,Magento2.Annotation.MethodAnnotationStructure,Magento2.Annotation.MethodArguments,PSR12.Properties.ConstantVisibility --ignore=./vendor/ .
1515
vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/,./Test/ .
1616
vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.1- ./Test/
1717
vendor/bin/composer normalize --dry-run

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"require-dev": {
2525
"bitexpert/phpstan-magento": "^0.19.0",
26-
"ergebnis/composer-normalize": "^2.2",
26+
"ergebnis/composer-normalize": "^2.17",
2727
"friendsofphp/php-cs-fixer": "^3.0",
28-
"magento/magento-coding-standard": "^6.0",
28+
"magento/magento-coding-standard": ">=6",
2929
"mikey179/vfsstream": "^1.6",
3030
"phpcompatibility/php-compatibility": "^9.2",
3131
"phpstan/extension-installer": "^1.0",
@@ -50,6 +50,7 @@
5050
"config": {
5151
"allow-plugins": {
5252
"ergebnis/composer-normalize": true,
53+
"magento/composer-dependency-version-audit-plugin": true,
5354
"phpstan/extension-installer": true
5455
},
5556
"sort-packages": true

composer.lock

Lines changed: 95 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)