Merge pull request #12 from magento-pangolin/MQE-2353

jilu1 · web-flow · commit 2d5c68e927e9 · 2020-11-05T15:02:58.000-06:00
[Pangolin] MQE-2353: MFTF SVC does not resolve module name correctly for bundle …
diff --git a/src/Scanner/ModuleNamespaceResolver.php b/src/Scanner/ModuleNamespaceResolver.php
@@ -48,8 +48,8 @@ public function resolveByViewDirFilePath(string $filePath): string
      */
     public function resolveByTestMftfPath(string $filePath): string
     {
-        $match = [];
-        preg_match('/(?<vendor>[\-\w]*?)(\/?)(?<module>[\w]*)\/Test\/Mftf/', $filePath, $match);
-        return empty($match['vendor']) ? $match['module'] : sprintf('%s_%s', $match['vendor'], $match['module']);
+        $matches = [];
+        preg_match('/(?<module>[\w-]*)\/Test\/Mftf/', $filePath, $matches);
+        return sprintf('%s', $matches['module']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public function resolveByViewDirFilePath(string $filePath): string`
`48`	`48`	`*/`
`49`	`49`	`public function resolveByTestMftfPath(string $filePath): string`
`50`	`50`	`{`
`51`		`- $match = [];`
`52`		`- preg_match('/(?<vendor>[\-\w]?)(\/?)(?<module>[\w])\/Test\/Mftf/', $filePath, $match);`
`53`		`- return empty($match['vendor']) ? $match['module'] : sprintf('%s_%s', $match['vendor'], $match['module']);`
	`51`	`+ $matches = [];`
	`52`	`+ preg_match('/(?<module>[\w-]*)\/Test\/Mftf/', $filePath, $matches);`
	`53`	`+ return sprintf('%s', $matches['module']);`
`54`	`54`	`}`
`55`	`55`	`}`