Skip to content

Commit 76a309a

Browse files
committed
MC-40591: Update Magento core
-- fix merge conflicts
1 parent c562d96 commit 76a309a

File tree

3 files changed

+1074
-656
lines changed

3 files changed

+1074
-656
lines changed

composer.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
"preferred-install": "dist",
1111
"sort-packages": true
1212
},
13+
"repositories": [
14+
{
15+
"type": "vcs",
16+
"url": "https://github.com/magento-commerce/magento2-functional-testing-framework"
17+
}
18+
],
1319
"require": {
14-
"php": "~7.1.3||~7.2.0||~7.3.0",
20+
"php": "~7.3.0",
1521
"ext-bcmath": "*",
1622
"ext-ctype": "*",
1723
"ext-curl": "*",
@@ -86,17 +92,17 @@
8692
"require-dev": {
8793
"allure-framework/allure-phpunit": "~1.2.0",
8894
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
89-
"friendsofphp/php-cs-fixer": "~2.14.0",
95+
"friendsofphp/php-cs-fixer": "~2.16.0",
9096
"lusitanian/oauth": "~0.8.10",
9197
"magento/magento-coding-standard": "*",
92-
"magento/magento2-functional-testing-framework": "~2.6.5",
93-
"pdepend/pdepend": "2.5.2",
98+
"magento/magento2-functional-testing-framework": "MQE-2488-php73-dev",
99+
"pdepend/pdepend": "~2.7.1",
94100
"phpcompatibility/php-compatibility": "^9.3",
95101
"phpmd/phpmd": "@stable",
96102
"phpstan/phpstan": ">=0.12.3 <=0.12.23",
97-
"phpunit/phpunit": "~6.5.0",
98-
"sebastian/phpcpd": "~3.0.0",
99-
"squizlabs/php_codesniffer": "~3.4.0"
103+
"phpunit/phpunit": "^9",
104+
"sebastian/phpcpd": "~5.0.0",
105+
"squizlabs/php_codesniffer": "~3.5.4"
100106
},
101107
"suggest": {
102108
"ext-pcntl": "Need for run processes in parallel mode"

0 commit comments

Comments
 (0)