MAGETWO-33157: Conflict restriction checking is missing version checking in enable/disable module CLI

- fixed PackageInfo loading fails when composer.json doesn't exist

Author: eddielau

dev/tests/unit/testsuite/Magento/Framework/Module/PackageInfoTest.php

@@ -31,11 +31,11 @@ public function setUp()
             ->will($this->returnValue(['A' => [], 'B' => [], 'C' => [], 'D' => [], 'E' => []]));
 
         $composerData = [
-            'A' => '{"name":"a", "require":{"b":"0.1"}, "conflict":{"c":"0.1"}, "version":"0.1"}',
-            'B' => '{"name":"b", "require":{"d":"0.3"}, "version":"0.2"}',
-            'C' => '{"name":"c", "require":{"e":"0.1"}, "version":"0.1"}',
-            'D' => '{"name":"d", "conflict":{"c":"0.1"}, "version":"0.3"}',
-            'E' => '{"name":"e", "version":"0.4"}',
+            'A/composer.json' => '{"name":"a", "require":{"b":"0.1"}, "conflict":{"c":"0.1"}, "version":"0.1"}',
+            'B/composer.json' => '{"name":"b", "require":{"d":"0.3"}, "version":"0.2"}',
+            'C/composer.json' => '{"name":"c", "require":{"e":"0.1"}, "version":"0.1"}',
+            'D/composer.json' => '{"name":"d", "conflict":{"c":"0.1"}, "version":"0.3"}',
+            'E/composer.json' => '{"name":"e", "version":"0.4"}',
         ];
         $fileIteratorMock = $this->getMock('Magento\Framework\Config\FileIterator', [], [], '', false);
         $fileIteratorMock->expects($this->once())
@@ -45,7 +45,7 @@ public function setUp()
             ->method('getComposerJsonFiles')
             ->will($this->returnValue($fileIteratorMock));
 
-        $this->packageInfo = new PackageInfo($this->loader, $this->reader);
+        $this->packageInfo = new PackageInfo($this->loader, $this->reader, new \Magento\Framework\Stdlib\String());
     }
 
     public function testGetModuleName()

lib/internal/Magento/Framework/Module/ConflictChecker.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Module;
 
-use Composer\Package\LinkConstraint\VersionConstraint;
 use Composer\Package\Version\VersionParser;
 
 /**

lib/internal/Magento/Framework/Module/PackageInfo.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Module;
 
+use Magento\Framework\Stdlib\String;
+
 /**
  * Provide information of dependencies and conflicts in composer.json files, mapping of package name to module name,
  * and mapping of module name to package version
@@ -53,16 +55,24 @@ class PackageInfo
      */
     private $reader;
 
+    /**
+     * String utilities
+     *
+     * @var String
+     */
+    private $string;
+
     /**
      * Constructor
      *
      * @param ModuleList\Loader $loader
      * @param Dir\Reader $reader
      */
-    public function __construct(ModuleList\Loader $loader, Dir\Reader $reader)
+    public function __construct(ModuleList\Loader $loader, Dir\Reader $reader, String $string)
     {
         $this->loader = $loader;
         $this->reader = $reader;
+        $this->string = $string;
     }
 
     /**
@@ -77,13 +87,21 @@ private function load()
              * array keys: module name in module.xml; array values: raw content from composer.json
              * this raw data is used to create a dependency graph and also a package name-module name mapping
              */
-            $rawData = array_combine(
-                array_keys($this->loader->load()),
-                $this->reader->getComposerJsonFiles()->toArray()
-            );
+            $rawData = [];
+            $jsonData = $this->reader->getComposerJsonFiles()->toArray();
+            foreach (array_keys($this->loader->load()) as $moduleName) {
+                $key = $this->string->upperCaseWords($moduleName, '_', '/') . '/composer.json';
+                if (isset($jsonData[$key])) {
+                    $rawData[$moduleName] = $jsonData[$key];
+                } else {
+                    $rawData[$moduleName] = '{}';
+                }
+            }
             foreach ($rawData as $moduleName => $jsonData) {
                 $jsonData = \Zend_Json::decode($jsonData);
-                $this->packageModuleMap[$jsonData['name']] = $moduleName;
+                if (isset($jsonData['name'])) {
+                    $this->packageModuleMap[$jsonData['name']] = $moduleName;
+                }
                 if (isset($jsonData['version'])) {
                     $this->modulePackageVersionMap[$moduleName] = $jsonData['version'];
                 }