Merge conflict fix

Author: sandesh-shivakumar

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v2
 
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v2
 
@@ -86,7 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v2
 
@@ -118,7 +118,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
 
     services:
       chrome:
@@ -133,6 +133,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: curl, dom, intl, json, openssl
+          ini-values: register_argc_argv=On
 
       - name: Cache Composer packages
         id: composer-cache

CHANGELOG.md

@@ -1,6 +1,40 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+5.2.0
+---------
+### Enhancements
+* Provided support for PHP 8.4
+* Bumped symfony/console to 7.4
+* Bumped symfony/intl to 7.4
+* Bumped symfony/string to 7.4
+* Bumped symfony/dotenv to 7.4
+* Bumped symfony/finder to 7.4
+* Bumped symfony/mime to 7.4
+* Bumped symfony/process to 7.4
+* Added support for symfony ^7.4
+
+5.1.0
+---------
+### Enhancements
+* Bumped aws/aws-sdk-php package to 3.362.1
+* Bumped codeception/module-asserts to 3.2.1
+* Bumped composer/composer to 2.9.2
+* Bumped guzzlehttp/guzzle to 7.10.0
+* Bumped laminas/laminas-diactoros to 3.8.0
+* Bumped mustache/mustache to 3.0.0
+* Bumped nikic/php-parser to 5.6.2
+* Bumped symfony/console to 7.3.6
+* Bumped symfony/string to 7.3.4
+* Bumped symfony/dotenv to 7.3.2
+* Bumped symfony/finder to 7.3.5
+* Bumped symfony/http-foundation to 7.3.7
+* Bumped symfony/mime to 7.3.4
+* Bumped symfony/process to 7.3.4
+* Bumped squizlabs/php_codesniffer to 4.0.12025
+* Bumped php-coveralls/php-coveralls to 2.9.0
+* Added support for symfony ^7.0
+
 5.0.6
 ---------
 ### Fixes

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "5.0.6",
+    "version": "5.2.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -30,11 +30,14 @@
         "php": "^8.2",
         "php-webdriver/webdriver": "^1.14.0",
         "spomky-labs/otphp": "^10.0||^11.0",
-        "symfony/console": "^7.0",
-        "symfony/dotenv": "^7.0",
-        "symfony/finder": "^7.0",
-        "symfony/mime": "^7.0",
-        "symfony/process": "^7.0",
+        "symfony/console": "^6.4||^7.4",
+        "symfony/intl": "^6.4||^7.4",
+        "symfony/mailer": "^6.4||^7.4",
+        "symfony/mime": "^6.4||^7.4",
+        "symfony/process": "^6.4||^7.4",
+        "symfony/string": "^6.4||^7.4",
+        "symfony/finder": "^6.4||^7.4",
+        "symfony/dotenv": "^6.4||^7.4",
         "weew/helpers-array": "^1.3"
     },
     "require-dev": {