|
@@ -267,7 +267,7 @@ discard block |
|
|
block discarded – undo |
|
267
|
267
|
|
|
268
|
268
|
foreach ($namespaces as $namespace) { |
|
269
|
269
|
if (array_key_exists($namespace, $projectPsr4Namespaces) && $namespace !== 'Magento\\Framework\\') { |
|
270
|
|
- $dependencyPackagePath = (string)$projectPsr4Namespaces[$namespace][0]; |
|
|
270
|
+ $dependencyPackagePath = (string) $projectPsr4Namespaces[$namespace][0]; |
|
271
|
271
|
$composerFilePath = preg_replace('/\/src$/', '', $dependencyPackagePath); |
|
272
|
272
|
$composerFilePath = preg_replace('/\/Psr\/Log$/', '', $composerFilePath); |
|
273
|
273
|
$dependencies = \array_merge($dependencies, $this->getComposerJsonVersionConstraint($composerFilePath)); |
|
@@ -306,7 +306,7 @@ discard block |
|
|
block discarded – undo |
|
306
|
306
|
$moduleXmlLoaded = simplexml_load_string($moduleXmlFile->getContents()); |
|
307
|
307
|
if (isset($moduleXmlLoaded->module->sequence)) { |
|
308
|
308
|
foreach ($moduleXmlLoaded->module->sequence->module as $module) { |
|
309
|
|
- $moduleName = (string)$module->attributes()->name; |
|
|
309
|
+ $moduleName = (string) $module->attributes()->name; |
|
310
|
310
|
if (array_key_exists($moduleName, $registeredModulesPaths)) { |
|
311
|
311
|
$composerFilePath = preg_replace('/\/src$/', '', $registeredModulesPaths[$moduleName]); |
|
312
|
312
|
$result = \array_merge($result, $this->getComposerJsonVersionConstraint($composerFilePath)); |
Please login to merge, or discard this patch.