Skip to content

Commit dca4d9b

Browse files
authored
Merge branch 'develop' into issue-915
2 parents 6752cf1 + 0cfbc78 commit dca4d9b

File tree

56 files changed

+1792
-2256
lines changed

Some content is hidden

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

56 files changed

+1792
-2256
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.1', '8.2', '8.3']
15+
php-versions: ['8.2', '8.3', '8.4']
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.1', '8.2', '8.3']
57+
php-versions: ['8.2', '8.3', '8.4']
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.1', '8.2', '8.3']
89+
php-versions: ['8.2', '8.3', '8.4']
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.1', '8.2', '8.3']
121+
php-versions: ['8.2', '8.3', '8.4']
122122

123123
services:
124124
chrome:

CHANGELOG.md

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

4+
4.8.2
5+
---------
6+
### Enhancements
7+
* Bumped brainmaestro/composer-git-hook to ^3.0
8+
* Bumped nikic/php-parser to 5.1.0
9+
* Bumped monolog/monolog to 3.7.0
10+
* Bumped guzzlehttp/guzzle to 7.9.2
11+
12+
4.8.1
13+
---------
14+
### Enhancements
15+
* Bumped allure-codeception to ^2.4
16+
* Bumped squizlabs/php_codesniffer to 3.10.1
17+
* Bumped composer/composer to 2.7.7
18+
* Bumped monolog/monolog to 3.6.0
19+
* Bumped spomky-labs/otphp to 11.3.0
20+
* Bumped aws-sdk-php to 3.314.1
21+
22+
### Fixes
23+
* Unneeded reports are shown when MFTF Static tests fail.
24+
25+
4.8.0
26+
---------
27+
### Enhancements
28+
* Bumped phpunit/phpunit to ^10.0
29+
* Bumped allure-framework/allure-phpunit to ^3
30+
* Bumped codeception/module-webdriver ^4.0
31+
32+
### Fixes
33+
* Fixed Class "Magento\FunctionalTestingFramework\StaticCheck\ActionGroupArgumentsCheck" not found on running vendor/bin/mftf build:project --upgrade.
34+
35+
4.7.2
36+
---------
37+
### Enhancements
38+
* Fail static test when introduced filename does not equal the MFTF object name
39+
contained within.
40+
41+
4.7.1
42+
---------
43+
### Enhancements
44+
* Bumped all symfony dependencies to `^6.0
45+
* Removed abandoned package codacy/coverage
46+
* Removed abandoned package sebastian/phpcpd
47+
* Bumped monolog/monolog to ^3.0
48+
* Bumped nikic/php-parser to ^5.0
49+
50+
4.7.0
51+
---------
52+
### Enhancements
53+
* Bumped all symfony dependencies to `^6.0
54+
* Unit Test for PTS enabled doesn't apply filter fix
55+
456
4.6.1
557
---------
658
### Enhancements

bin/static-checks

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ echo ""
1616
echo "==============================="
1717
echo " COPY PASTE DETECTOR"
1818
echo "==============================="
19-
vendor/bin/phpcpd ./src
20-
echo ""
2119

2220
echo "==============================="
2321
echo " MESS DETECTOR"

composer.json

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "4.6.1",
5+
"version": "4.8.2",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
1212
"allure-framework/allure-codeception": "^2.1",
13-
"allure-framework/allure-phpunit": "^2",
1413
"aws/aws-sdk-php": "^3.132",
1514
"codeception/codeception": "^5.0",
1615
"codeception/module-asserts": "^3.0",
17-
"codeception/module-sequence": "^3.0",
18-
"codeception/module-webdriver": "^3.0",
16+
"codeception/module-webdriver": "^4.0",
1917
"composer/composer": "^1.9||^2.0,!=2.2.16",
2018
"csharpru/vault-php": "^4.2.1",
2119
"ext-curl": "*",
@@ -26,36 +24,25 @@
2624
"ext-openssl": "*",
2725
"guzzlehttp/guzzle": "^7.3.0",
2826
"laminas/laminas-diactoros": "^3.0",
29-
"monolog/monolog": "^2.3",
27+
"monolog/monolog": "^2.3||^3.0",
3028
"mustache/mustache": "~2.5",
31-
"nikic/php-parser": "^4.4",
32-
"php": ">=8.1",
29+
"nikic/php-parser": "^4.4||^5.0",
30+
"php": ">=8.2",
3331
"php-webdriver/webdriver": "^1.14.0",
3432
"spomky-labs/otphp": "^10.0||^11.0",
35-
"symfony/config": "^6.4",
36-
"symfony/console": "^5.4||^6.4",
37-
"symfony/dependency-injection": "^6.4",
33+
"symfony/console": "^6.4",
3834
"symfony/dotenv": "^6.4",
39-
"symfony/filesystem": "^6.4",
4035
"symfony/finder": "^6.4",
41-
"symfony/http-foundation": "^6.4",
4236
"symfony/mime": "^6.4",
4337
"symfony/process": "^6.4",
44-
"symfony/stopwatch": "^6.4",
45-
"symfony/string": "^6.4",
46-
"symfony/var-exporter": "^6.4",
47-
"symfony/css-selector": "^6.4",
48-
"symfony/event-dispatcher": "^6.4",
4938
"weew/helpers-array": "^1.3"
5039
},
5140
"require-dev": {
52-
"brainmaestro/composer-git-hooks": "^2.8.5",
53-
"codacy/coverage": "^1.4",
41+
"brainmaestro/composer-git-hooks": "^3.0",
5442
"php-coveralls/php-coveralls": "^1.0||^2.2",
5543
"phpmd/phpmd": "^2.8.0",
56-
"phpunit/phpunit": "^9.5",
57-
"sebastian/phpcpd": "~6.0.0",
58-
"squizlabs/php_codesniffer": "~3.7.0"
44+
"phpunit/phpunit": "^10.0",
45+
"squizlabs/php_codesniffer": "~3.10.1"
5946
},
6047
"suggest": {
6148
"hoa/console": "Enables <pause /> action and interactive console functionality"
@@ -64,7 +51,8 @@
6451
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
6552
"psr-4": {
6653
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
67-
"MFTF\\": "dev/tests/functional/tests/MFTF"
54+
"MFTF\\": "dev/tests/functional/tests/MFTF",
55+
"Magento\\FunctionalTestingFramework\\Tests\\Verification\\": "dev/tests/verification/Tests"
6856
}
6957
},
7058
"autoload-dev": {

0 commit comments

Comments
 (0)