Skip to content

Commit 7226af8

Browse files
authored
Added cweagans/composer-patches to composer.json (#2822)
1 parent f51ab22 commit 7226af8

File tree

3 files changed

+109
-11
lines changed

3 files changed

+109
-11
lines changed

composer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"ext-zlib": "*",
2525
"colinmollenhour/cache-backend-redis": "^1.14",
2626
"colinmollenhour/magento-redis-session": "^3.0",
27+
"cweagans/composer-patches": "^1.7",
2728
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
2829
"pelago/emogrifier": "^6.0",
2930
"phpseclib/mcrypt_compat": "^2.0.3",
@@ -36,9 +37,10 @@
3637
"magento-ecg/coding-standard": "^4.5",
3738
"phpcompatibility/php-compatibility": "^9.3",
3839
"phpmd/phpmd": "^2.13",
39-
"phpstan/phpstan": "^1.9.3",
40+
"phpstan/phpstan": "^1.9.4",
4041
"phpunit/phpunit": "^9.5",
41-
"squizlabs/php_codesniffer": "^3.7"
42+
"squizlabs/php_codesniffer": "^3.7",
43+
"symplify/vendor-patches": "^11.1"
4244
},
4345
"conflict": {
4446
"n98/n98_layouthelper": "*"
@@ -84,7 +86,8 @@
8486
"config": {
8587
"allow-plugins": {
8688
"magento-hackathon/magento-composer-installer": true,
87-
"dealerdirect/phpcodesniffer-composer-installer": true
89+
"dealerdirect/phpcodesniffer-composer-installer": true,
90+
"cweagans/composer-patches": true
8891
},
8992
"sort-packages": true
9093
}

composer.lock

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

phpstan.dist.baseline.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ parameters:
846846
path: app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php
847847

848848
-
849-
message: "#^Parameter \\#2 \\$filter of method Mage_Reports_Model_Resource_Quote_Collection\\:\\:prepareForAbandonedReport\\(\\) expects string\\|null, array\\<int\\|string, array\\<int, string\\>\\|string\\> given\\.$#"
849+
message: "#^Parameter \\#2 \\$filter of method Mage_Reports_Model_Resource_Quote_Collection\\:\\:prepareForAbandonedReport\\(\\) expects string\\|null, array\\<int\\|string, array\\|string\\> given\\.$#"
850850
count: 1
851851
path: app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
852852

0 commit comments

Comments
 (0)