Skip to content

Commit d558832

Browse files
authored
Merge pull request #684 from magento/MQE-2027-2
MQE-2027: MFTF PHP Compatibility Update (PHP 7.4)
2 parents a7fda0a + 1289e77 commit d558832

File tree

17 files changed

+365
-374
lines changed

17 files changed

+365
-374
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: php
22
php:
33
- 7.3
4+
- 7.4
45
services:
56
- docker
67
before_install:

bin/functional

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
set -e
55

66
echo "==============================="
7-
echo " EXECUTE DevDocsTest "
7+
echo " EXECUTE Functional Tests "
88
echo "==============================="
99
bin/mftf build:project
1010
bin/mftf run:test DevDocsTest -f
11+
bin/mftf run:test FormatCurrencyTest -f

composer.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,39 @@
1414
"ext-dom": "*",
1515
"ext-json": "*",
1616
"ext-openssl": "*",
17+
"ext-intl": "*",
1718
"allure-framework/allure-codeception": "~1.4.0",
1819
"aws/aws-sdk-php": "^3.132",
1920
"codeception/codeception": "~4.1.4",
2021
"codeception/module-asserts": "^1.1",
2122
"codeception/module-sequence": "^1.0",
2223
"codeception/module-webdriver": "^1.0",
23-
"composer/composer": "^1.6",
24+
"composer/composer": "^1.9",
2425
"csharpru/vault-php": "~3.5.3",
2526
"csharpru/vault-php-guzzle6-transport": "^2.0",
26-
"monolog/monolog": "^1.0",
27+
"monolog/monolog": "^1.17",
2728
"mustache/mustache": "~2.5",
2829
"php-webdriver/webdriver": "^1.8.0",
2930
"symfony/console": "^4.4",
30-
"symfony/finder": "^4.4",
31+
"symfony/finder": "^5.0",
3132
"symfony/mime": "^5.0",
3233
"symfony/process": "^4.4",
3334
"vlucas/phpdotenv": "^2.4"
3435
},
3536
"require-dev": {
36-
"squizlabs/php_codesniffer": "~3.2",
37-
"sebastian/phpcpd": "~5.0",
3837
"brainmaestro/composer-git-hooks": "^2.3.1",
39-
"doctrine/cache": "<1.7.0",
40-
"codeception/aspect-mock": "^3.0",
41-
"goaop/framework": "2.2.0",
4238
"codacy/coverage": "^1.4",
43-
"phpmd/phpmd": "^2.6.0",
44-
"phpunit/phpunit": "^9",
45-
"rregeer/phpunit-coverage-check": "^0.1.4",
39+
"codeception/aspect-mock": "^3.0",
40+
"doctrine/cache": "<1.7.0",
41+
"goaop/framework": "~2.3.4",
4642
"php-coveralls/php-coveralls": "^1.0",
43+
"phpmd/phpmd": "^2.8.0",
44+
"phpunit/phpunit": "^9.0",
45+
"rregeer/phpunit-coverage-check": "^0.1.4",
46+
"sebastian/phpcpd": "~5.0.0",
47+
"squizlabs/php_codesniffer": "~3.5.4",
4748
"symfony/stopwatch": "~3.4.6"
4849
},
49-
"suggest": {
50-
"epfremme/swagger-php": "^2.0"
51-
},
5250
"replace": {
5351
"facebook/webdriver": "^1.7.1"
5452
},

0 commit comments

Comments
 (0)