Merge pull request #33 from magento-commerce/MQE-2501-php74

[2.7.0] Mqe 2501 php74
magento · Feb 24, 2021 · 690619f · 690619f
2 parents af0d8d0 + 0723093
commit 690619f
Show file tree

Hide file tree

Showing 65 changed files with 2,456 additions and 1,508 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.3', '7.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.3', '7.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -85,7 +85,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.3', '7.4']
     steps:
       - uses: actions/checkout@v2
 
@@ -94,8 +94,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: curl, dom, intl, json, openssl
-          coverage: none
-          if: ${{ matrix.php-versions >= 7.2 }}
 
       - name: Cache Composer packages
         id: composer-cache
@@ -119,7 +117,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.3', '7.4']
 
     services:
       chrome:
@@ -150,3 +148,5 @@ jobs:
 
       - name: Run tests
         run: bin/functional
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 Magento Functional Testing Framework Changelog
 ================================================
+
+2.7.0
+---------
+
+* Maintainability
+   * Added support for PHP 7.4.
+   * Added support for PHPUnit 9.
+   * Dropped support for PHP 7.0, 7.1, 7.2.
+   * Removed action `formatMoney` and added `formatCurrency`. [See actions page for details](./docs/test/actions.md#formatcurrency)
+   * Updated in test generation to support PHPUnit 9 with the following assertion action changes: [See assertions page for details](./docs/test/assertions.md)
+      *  Removed the action `assertArraySubset`.
+      *  Added a new result type `arrayVariable`.
+
 2.6.6
 ---------
 

diff --git a/bin/functional b/bin/functional
@@ -9,3 +9,5 @@ echo "==============================="
 bin/mftf build:project
 bin/mftf run:test DeprecatedDevDocsTest -f
 bin/mftf run:test DevDocsTest -f
+bin/mftf run:test FormatCurrencyTest -f
+bin/mftf run:test AssertTest -f
diff --git a/composer.json b/composer.json
@@ -2,22 +2,25 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.6.6",
+    "version": "2.7.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.0||~7.2.0||~7.3.0",
+        "php": "^7.3",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-openssl": "*",
-        "allure-framework/allure-codeception": "~1.3.0",
+        "allure-framework/allure-codeception": "~1.4.0",
         "aws/aws-sdk-php": "^3.132",
-        "codeception/codeception": "~2.4.5",
-        "composer/composer": "^1.6",
+        "codeception/codeception": "~4.1.4",
+        "codeception/module-asserts": "^1.1",
+        "codeception/module-sequence": "^1.0",
+        "codeception/module-webdriver": "^1.0",
+        "composer/composer": "^1.9||^2.0",
         "csharpru/vault-php": "~3.5.3",
         "csharpru/vault-php-guzzle6-transport": "^2.0",
         "flow/jsonpath": ">0.2",
@@ -26,24 +29,24 @@
         "mustache/mustache": "~2.5",
         "php-webdriver/webdriver": "^1.8.0",
         "symfony/console": "^4.4",
-        "symfony/finder": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/mime": "^4.4",
+        "symfony/finder": "^4.4||^5.0",
+        "symfony/http-foundation": "^4.4||^5.0",
+        "symfony/mime": "^4.4||^5.0",
         "symfony/process": "^4.4",
         "vlucas/phpdotenv": "^2.4"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~3.2",
-        "sebastian/phpcpd": "~3.0 || ~4.0",
         "brainmaestro/composer-git-hooks": "^2.3.1",
-        "doctrine/cache": "<1.7.0",
-        "codeception/aspect-mock": "^3.0",
-        "goaop/framework": "2.2.0",
         "codacy/coverage": "^1.4",
+        "codeception/aspect-mock": "^3.0",
+        "doctrine/cache": "<1.7.0",
+        "goaop/framework": "~2.3.4",
+        "php-coveralls/php-coveralls": "^1.0",
         "phpmd/phpmd": "^2.6.0",
-        "phpunit/phpunit": "~6.5.0 || ~7.0.0",
+        "phpunit/phpunit": "^9.0",
         "rregeer/phpunit-coverage-check": "^0.1.4",
-        "php-coveralls/php-coveralls": "^1.0",
+        "sebastian/phpcpd": "~6.0.0",
+        "squizlabs/php_codesniffer": "~3.5.4",
         "symfony/stopwatch": "~3.4.6"
     },
     "suggest": {