Merge pull request #3882 from magento-engcom/composer-test-convention-update-2.2

ishakhsuvarov · web-flow · commit eef6935a716d · 2019-03-14T14:33:23.000-05:00
[EngCom] Elasticsearch 6 Support
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -452,7 +452,7 @@ private function convertModuleToPackageName($moduleName)
     {
         list($vendor, $name) = explode('_', $moduleName, 2);
         $package = 'module';
-        foreach (preg_split('/([A-Z][a-z\d]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
+        foreach (preg_split('/([A-Z\d][a-z]*)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
             $package .= $chunk ? "-{$chunk}" : '';
         }
         return strtolower("{$vendor}/{$package}");

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ private function convertModuleToPackageName($moduleName)`
`452`	`452`	`{`
`453`	`453`	`list($vendor, $name) = explode('_', $moduleName, 2);`
`454`	`454`	`$package = 'module';`
`455`		`- foreach (preg_split('/([A-Z][a-z\d]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {`
	`455`	`+ foreach (preg_split('/([A-Z\d][a-z]*)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {`
`456`	`456`	`$package .= $chunk ? "-{$chunk}" : '';`
`457`	`457`	`}`
`458`	`458`	`return strtolower("{$vendor}/{$package}");`