Merge branch 'MAGETWO-5081-manage-modules' into develop

Author: eddielau

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

@@ -93,6 +93,18 @@ public function checkConflictWhenEnableModuleDataProvider()
                 ['Vendor_B', 'Vendor_C'],
                 ['Vendor_B' => ['Vendor_C'], 'Vendor_C' => ['Vendor_B']]
             ],
+            [
+                [['Vendor_A', ['Vendor_B' => '>=0.1']], ['Vendor_B', []]],
+                ['Vendor_A'],
+                ['Vendor_B'],
+                ['Vendor_B' => ['Vendor_A']]
+            ],
+            [
+                [['Vendor_A', ['Vendor_B' => '~0.1']], ['Vendor_B', []]],
+                ['Vendor_A'],
+                ['Vendor_B'],
+                ['Vendor_B' => ['Vendor_A']]
+            ],
         ];
     }
 
@@ -108,7 +120,7 @@ public function testCheckConflictWhenEnableModuleDifferentVersion()
             ->will($this->returnValueMap([
                 ['Vendor_A', []],
                 ['Vendor_B', []],
-                ['Vendor_C', ['Vendor_A' => '0.2', 'Vendor_B' => '0.3']]
+                ['Vendor_C', ['Vendor_A' => '>=0.2,<0.3', 'Vendor_B' => '<0.4']]
             ]));
         $packageInfoMock->expects($this->any())
             ->method('getVersion')

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Module;
 
+use Composer\Package\LinkConstraint\VersionConstraint;
+use Composer\Package\Version\VersionParser;
+
 /**
  * Checks for conflicts between modules
  */
@@ -68,15 +71,21 @@ public function checkConflictsWhenEnableModules($moduleNames)
      */
     private function checkIfConflict($moduleA, $moduleB)
     {
-        if (isset($this->packageInfo->getConflict($moduleB)[$moduleA]) &&
-            $this->packageInfo->getConflict($moduleB)[$moduleA] === $this->packageInfo->getVersion($moduleA)) {
-            return true;
+        $versionParser = new VersionParser();
+        if (isset($this->packageInfo->getConflict($moduleB)[$moduleA]) && $this->packageInfo->getVersion($moduleA)) {
+            $constraintA = $versionParser->parseConstraints($this->packageInfo->getConflict($moduleB)[$moduleA]);
+            $constraintB = $versionParser->parseConstraints($this->packageInfo->getVersion($moduleA));
+            if ($constraintA->matches($constraintB)) {
+                return true;
+            }
         }
-        if (isset($this->packageInfo->getConflict($moduleA)[$moduleB]) &&
-            $this->packageInfo->getConflict($moduleA)[$moduleB] === $this->packageInfo->getVersion($moduleB)) {
-            return true;
+        if (isset($this->packageInfo->getConflict($moduleA)[$moduleB]) && $this->packageInfo->getVersion($moduleB)) {
+            $constraintA = $versionParser->parseConstraints($this->packageInfo->getConflict($moduleA)[$moduleB]);
+            $constraintB = $versionParser->parseConstraints($this->packageInfo->getVersion($moduleB));
+            if ($constraintA->matches($constraintB)) {
+                return true;
+            }
         }
-
         return false;
     }
 }

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

@@ -33,7 +33,7 @@ class PackageInfo
     private $requireMap;
 
     /**
-     * "conflict" field of each module, contains conflicting modules' name and version
+     * "conflict" field of each module, contains conflicting modules' name and version constraint
      *
      * @var array[]
      */