MAGECLOUD-3228: Installation from git is broken with 2.3.1-develop due to ElasticSerch 6.5 (#427)

oshmyheliuk · shiftedreality · commit f8d88dfd3128 · 2019-03-05T16:39:02.000-06:00
diff --git a/src/Command/Dev/UpdateComposer/ClearModuleRequirements.php b/src/Command/Dev/UpdateComposer/ClearModuleRequirements.php
@@ -62,7 +62,7 @@ public function generate(array $repos)
         \$composerJson = json_decode(file_get_contents(\$moduleDir . '/composer.json'), true);
 
         foreach (\$composerJson['require'] as \$requireName => \$requireVersion) {
-            if (strpos(\$requireName, 'magento/') !== false) {
+            if (preg_match('{^(magento\/|elasticsearch\/)}i', \$requireName)) {
                 unset(\$composerJson['require'][\$requireName]);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function generate(array $repos)`
`62`	`62`	`\$composerJson = json_decode(file_get_contents(\$moduleDir . '/composer.json'), true);`
`63`	`63`
`64`	`64`	`foreach (\$composerJson['require'] as \$requireName => \$requireVersion) {`
`65`		`- if (strpos(\$requireName, 'magento/') !== false) {`
	`65`	`+ if (preg_match('{^(magento\/\|elasticsearch\/)}i', \$requireName)) {`
`66`	`66`	`unset(\$composerJson['require'][\$requireName]);`
`67`	`67`	`}`
`68`	`68`	`}`