Skip to content

Commit 690619f

Browse files
authored
Merge pull request #33 from magento-commerce/MQE-2501-php74
[2.7.0] Mqe 2501 php74
2 parents af0d8d0 + 0723093 commit 690619f

File tree

65 files changed

+2456
-1508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2456
-1508
lines changed

.github/workflows/main.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-versions: ['7.1', '7.2', '7.3']
15+
php-versions: ['7.3', '7.4']
1616
steps:
1717
- uses: actions/checkout@v2
1818

@@ -53,7 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
php-versions: ['7.1', '7.2', '7.3']
56+
php-versions: ['7.3', '7.4']
5757
steps:
5858
- uses: actions/checkout@v2
5959

@@ -85,7 +85,7 @@ jobs:
8585
strategy:
8686
fail-fast: false
8787
matrix:
88-
php-versions: ['7.1', '7.2', '7.3']
88+
php-versions: ['7.3', '7.4']
8989
steps:
9090
- uses: actions/checkout@v2
9191

@@ -94,8 +94,6 @@ jobs:
9494
with:
9595
php-version: ${{ matrix.php-versions }}
9696
extensions: curl, dom, intl, json, openssl
97-
coverage: none
98-
if: ${{ matrix.php-versions >= 7.2 }}
9997

10098
- name: Cache Composer packages
10199
id: composer-cache
@@ -119,7 +117,7 @@ jobs:
119117
strategy:
120118
fail-fast: false
121119
matrix:
122-
php-versions: ['7.1', '7.2', '7.3']
120+
php-versions: ['7.3', '7.4']
123121

124122
services:
125123
chrome:
@@ -150,3 +148,5 @@ jobs:
150148

151149
- name: Run tests
152150
run: bin/functional
151+
152+

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
4+
2.7.0
5+
---------
6+
7+
* Maintainability
8+
* Added support for PHP 7.4.
9+
* Added support for PHPUnit 9.
10+
* Dropped support for PHP 7.0, 7.1, 7.2.
11+
* Removed action `formatMoney` and added `formatCurrency`. [See actions page for details](./docs/test/actions.md#formatcurrency)
12+
* Updated in test generation to support PHPUnit 9 with the following assertion action changes: [See assertions page for details](./docs/test/assertions.md)
13+
* Removed the action `assertArraySubset`.
14+
* Added a new result type `arrayVariable`.
15+
316
2.6.6
417
---------
518

bin/functional

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ echo "==============================="
99
bin/mftf build:project
1010
bin/mftf run:test DeprecatedDevDocsTest -f
1111
bin/mftf run:test DevDocsTest -f
12+
bin/mftf run:test FormatCurrencyTest -f
13+
bin/mftf run:test AssertTest -f

composer.json

+18-15
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.6.6",
5+
"version": "2.7.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "~7.1.0||~7.2.0||~7.3.0",
12+
"php": "^7.3",
1313
"ext-curl": "*",
1414
"ext-dom": "*",
1515
"ext-json": "*",
1616
"ext-openssl": "*",
17-
"allure-framework/allure-codeception": "~1.3.0",
17+
"allure-framework/allure-codeception": "~1.4.0",
1818
"aws/aws-sdk-php": "^3.132",
19-
"codeception/codeception": "~2.4.5",
20-
"composer/composer": "^1.6",
19+
"codeception/codeception": "~4.1.4",
20+
"codeception/module-asserts": "^1.1",
21+
"codeception/module-sequence": "^1.0",
22+
"codeception/module-webdriver": "^1.0",
23+
"composer/composer": "^1.9||^2.0",
2124
"csharpru/vault-php": "~3.5.3",
2225
"csharpru/vault-php-guzzle6-transport": "^2.0",
2326
"flow/jsonpath": ">0.2",
@@ -26,24 +29,24 @@
2629
"mustache/mustache": "~2.5",
2730
"php-webdriver/webdriver": "^1.8.0",
2831
"symfony/console": "^4.4",
29-
"symfony/finder": "^4.4",
30-
"symfony/http-foundation": "^4.4",
31-
"symfony/mime": "^4.4",
32+
"symfony/finder": "^4.4||^5.0",
33+
"symfony/http-foundation": "^4.4||^5.0",
34+
"symfony/mime": "^4.4||^5.0",
3235
"symfony/process": "^4.4",
3336
"vlucas/phpdotenv": "^2.4"
3437
},
3538
"require-dev": {
36-
"squizlabs/php_codesniffer": "~3.2",
37-
"sebastian/phpcpd": "~3.0 || ~4.0",
3839
"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",
4240
"codacy/coverage": "^1.4",
41+
"codeception/aspect-mock": "^3.0",
42+
"doctrine/cache": "<1.7.0",
43+
"goaop/framework": "~2.3.4",
44+
"php-coveralls/php-coveralls": "^1.0",
4345
"phpmd/phpmd": "^2.6.0",
44-
"phpunit/phpunit": "~6.5.0 || ~7.0.0",
46+
"phpunit/phpunit": "^9.0",
4547
"rregeer/phpunit-coverage-check": "^0.1.4",
46-
"php-coveralls/php-coveralls": "^1.0",
48+
"sebastian/phpcpd": "~6.0.0",
49+
"squizlabs/php_codesniffer": "~3.5.4",
4750
"symfony/stopwatch": "~3.4.6"
4851
},
4952
"suggest": {

0 commit comments

Comments
 (0)