Skip to content

Commit 5254b53

Browse files
authored
Merge branch 'magento-commerce:develop' into ACQE-4318
2 parents 79cfbd7 + a077bf9 commit 5254b53

File tree

22 files changed

+2118
-1381
lines changed

22 files changed

+2118
-1381
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-versions: ['8.0', '8.1', '8.2']
15+
php-versions: ['8.1', '8.2']
1616
steps:
1717
- uses: actions/checkout@v2
1818

@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
php-versions: ['8.0', '8.1', '8.2']
57+
php-versions: ['8.1', '8.2']
5858
steps:
5959
- uses: actions/checkout@v2
6060

@@ -86,7 +86,7 @@ jobs:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
php-versions: ['8.0', '8.1', '8.2']
89+
php-versions: ['8.1', '8.2']
9090
steps:
9191
- uses: actions/checkout@v2
9292

@@ -118,7 +118,7 @@ jobs:
118118
strategy:
119119
fail-fast: false
120120
matrix:
121-
php-versions: ['8.0', '8.1', '8.2']
121+
php-versions: ['8.1', '8.2']
122122

123123
services:
124124
chrome:

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,50 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
4.2.1
5+
---------
6+
### Fixes
7+
8+
* Updated constraint for php-webdriver to restrict pulling versions above 1.14.0
9+
10+
4.2.0
11+
---------
12+
### Fixes
13+
14+
* Bumped `allure-framework/allure-codeception` dependency to `^1.5` to fix downstream dependency issues in Magento.
15+
16+
17+
4.1.0
18+
---------
19+
### Enhancements
20+
21+
* Dropped Support for PHP 8.0 and disabled PR checks for PHP 8.0
22+
* Allow MFTF generate minimum possible groups runnable by codeception
23+
24+
### Fixes
25+
26+
* Fixed Allure report not generating issue
27+
* MFTF displays an appropriate message for unable to connect to Selenium server
28+
29+
4.0.1
30+
---------
31+
### Fixes
32+
33+
* Fixed HTML files and images not attached to allure report issue
34+
35+
4.0.0
36+
---------
37+
### Enhancements
38+
39+
* Added Supported for PHP 8.2 and enabled PR checks for PHP 8.2
40+
* Dropped Support for PHP 7.4 and disabled PR checks for PHP 7.4
41+
* Upgraded allure-framework/allure-phpunit to its latest version
42+
43+
### Fixes
44+
45+
* MFTF deprecation errors fixes
46+
* Composer downgraded from 2.4 to 2.2 due to lamina issue
47+
448
3.12.0
549
---------
650

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.12.0",
5+
"version": "4.2.1",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": ">=8.0",
12+
"php": ">=8.1",
1313
"ext-curl": "*",
1414
"ext-dom": "*",
1515
"ext-iconv": "*",
1616
"ext-intl": "*",
1717
"ext-json": "*",
1818
"ext-openssl": "*",
19-
"allure-framework/allure-codeception": "^1.4",
19+
"allure-framework/allure-codeception": "^2.1",
2020
"allure-framework/allure-phpunit": "^2",
2121
"aws/aws-sdk-php": "^3.132",
22-
"codeception/codeception": "^4.1",
23-
"codeception/module-asserts": "^1.1",
24-
"codeception/module-sequence": "^1.0",
25-
"codeception/module-webdriver": "^1.0",
22+
"codeception/codeception": "^5.0",
23+
"codeception/module-asserts": "^3.0",
24+
"codeception/module-sequence": "^3.0",
25+
"codeception/module-webdriver": "^3.0",
2626
"composer/composer": "^1.9 || ^2.0, !=2.2.16",
2727
"csharpru/vault-php": "^4.2.1",
2828
"guzzlehttp/guzzle": "^7.3.0",
2929
"laminas/laminas-diactoros": "^2.8",
3030
"monolog/monolog": "^2.3",
3131
"mustache/mustache": "~2.5",
3232
"nikic/php-parser": "^4.4",
33-
"php-webdriver/webdriver": "^1.9.0",
33+
"php-webdriver/webdriver": "^1.9.0 <1.14.0",
3434
"spomky-labs/otphp": "^10.0",
3535
"symfony/console": "^4.4||^5.4",
3636
"symfony/string": "^5.4",
@@ -39,14 +39,15 @@
3939
"symfony/http-foundation": "^5.0",
4040
"symfony/mime": "^5.0",
4141
"symfony/process": "^4.4||^5.4",
42-
"weew/helpers-array": "^1.3"
42+
"weew/helpers-array": "^1.3",
43+
"doctrine/annotations": "^1.13"
4344
},
4445
"require-dev": {
4546
"brainmaestro/composer-git-hooks": "^2.3.1",
4647
"codacy/coverage": "^1.4",
4748
"php-coveralls/php-coveralls": "^1.0||^2.2",
4849
"phpmd/phpmd": "^2.8.0",
49-
"phpunit/phpunit": "^9.0",
50+
"phpunit/phpunit": "<=9.5.20",
5051
"sebastian/phpcpd": "~6.0.0",
5152
"squizlabs/php_codesniffer": "~3.6.0"
5253
},

0 commit comments

Comments
 (0)