MQE-2305: Implement -report-type=mftf in magento-semver to launch MFTF SVC

okolesnyk · okolesnyk · commit c61b911421d4 · 2020-10-08T11:31:37.000-05:00
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
     {
-        $matches = [];
-        preg_match('/([\w]*)\/([\w]*)\/Test\/Mftf/', $filePath, $matches);
-        return sprintf('%s_%s', $matches[1], $matches[2]);
+        $match = [];
+        preg_match('/(?<vendor>[\w]*?)(\/?)(?<module>[\w]*)\/Test\/Mftf/', $filePath, $match);
+        return empty($match['vendor']) ? $match['module'] : sprintf('%s_%s', $match['vendor'], $match['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`		`- $matches = [];`
`52`		`- preg_match('/([\w])\/([\w])\/Test\/Mftf/', $filePath, $matches);`
`53`		`- return sprintf('%s_%s', $matches[1], $matches[2]);`
	`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']);`
`54`	`54`	`}`
`55`	`55`	`}`