Merge pull request magento#237 from magento-gl/master

ACQE-4111 : Merging master back to develop

Author: jilu1

CHANGELOG.md

@@ -1,6 +1,19 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+3.11.0
+---------
+### Enhancements
+* Composer updated to 2.4.2 version
+* Static check for duplicate step keys in action group
+
+
+### Fixes
+
+* Fixed incorrect MFTF test dependencies path
+* Removed PHP 7.3 build check from MFTF PR build as PHP 7.3 is no longer supported
+
+
 3.10.3
 ---------
 

composer.json

@@ -2,7 +2,7 @@
  "name": "magento/magento2-functional-testing-framework",
  "description": "Magento2 Functional Testing Framework",
  "type": "library",
- "version": "3.10.3",
+ "version": "3.11.0",
  "license": "AGPL-3.0",
  "keywords": ["magento", "automation", "functional", "testing"],
  "config": {

src/Magento/FunctionalTestingFramework/StaticCheck/ActionGroupStandardsCheck.php

@@ -103,7 +103,11 @@ private function findErrorsInFileSet($files)
  $actionGroupReferencesDataArray = [];
  $actionGroupToArguments = [];
  $contents = $filePath->getContents();
- preg_match_all(self::STEP_KEY_REGEX_PATTERN, $contents, $actionGroupReferences);
+ preg_match_all(
+ self::STEP_KEY_REGEX_PATTERN,
+ preg_replace('/<!--(.|\s)*?-->/', '', $contents),
+ $actionGroupReferences
+ );
  foreach ($actionGroupReferences[0] as $actionGroupReferencesData) {
  $actionGroupReferencesDataArray[] = trim(
  str_replace(['stepKey', '='], [""], $actionGroupReferencesData)
@@ -119,7 +123,8 @@ private function findErrorsInFileSet($files)
  );
  unset($actionGroupReferencesDataArray);
  if (isset($duplicateStepKeys) && count($duplicateStepKeys) > 0) {
- throw new TestFrameworkException('Action group has duplicate step keys');
+ throw new TestFrameworkException('Action group has duplicate step keys '
+ .implode(",", array_unique($duplicateStepKeys))." File Path ".$filePath);
  }
  /** @var DOMElement $actionGroup */
  $actionGroup = $this->getActionGroupDomElement($contents);