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

- rephrased error message

Author: eddielau

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

@@ -49,7 +49,7 @@ public function checkConflictWhenEnableModuleDataProvider()
                 [['Vendor_A', ['Vendor_B' => '0.1']], ['Vendor_B', []]],
                 ['Vendor_A'],
                 ['Vendor_B'],
-                ['Vendor_B' => ['Vendor_A conflicts with Vendor_B version 0.1 (current 0.1)']]
+                ['Vendor_B' => ['Vendor_A conflicts with current Vendor_B version 0.1 (version should not be 0.1)']]
             ],
             [
                 [['Vendor_A', ['Vendor_B' => '0.1']], ['Vendor_B', []]],
@@ -61,7 +61,7 @@ public function checkConflictWhenEnableModuleDataProvider()
                 [['Vendor_B', ['Vendor_A' => '0.1']], ['Vendor_A', []]],
                 ['Vendor_A'],
                 ['Vendor_B'],
-                ['Vendor_B' => ['Vendor_B conflicts with Vendor_A version 0.1 (current 0.1)']]
+                ['Vendor_B' => ['Vendor_B conflicts with current Vendor_A version 0.1 (version should not be 0.1)']]
             ],
             [
                 [['Vendor_B', ['Vendor_A' => '0.1']], ['Vendor_A', []]],
@@ -85,28 +85,31 @@ public function checkConflictWhenEnableModuleDataProvider()
                 [['Vendor_A', ['Vendor_C' => '0.1']], ['Vendor_B', []], ['Vendor_C', []]],
                 ['Vendor_A'],
                 ['Vendor_B', 'Vendor_C'],
-                ['Vendor_B' => [], 'Vendor_C' => ['Vendor_A conflicts with Vendor_C version 0.1 (current 0.1)']]
+                [
+                    'Vendor_B' => [],
+                    'Vendor_C' => ['Vendor_A conflicts with current Vendor_C version 0.1 (version should not be 0.1)']
+                ]
             ],
             [
                 [['Vendor_A', []], ['Vendor_B', ['Vendor_C' => '0.1']], ['Vendor_C', []]],
                 ['Vendor_A'],
                 ['Vendor_B', 'Vendor_C'],
                 [
-                    'Vendor_B' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)'],
-                    'Vendor_C' => ['Vendor_B conflicts with Vendor_C version 0.1 (current 0.1)']
+                    'Vendor_B' => ['Vendor_B conflicts with current Vendor_C version 0.1 (version should not be 0.1)'],
+                    'Vendor_C' => ['Vendor_B conflicts with current Vendor_C version 0.1 (version should not be 0.1)']
                 ]
             ],
             [
                 [['Vendor_A', ['Vendor_B' => '>=0.1']], ['Vendor_B', []]],
                 ['Vendor_A'],
                 ['Vendor_B'],
-                ['Vendor_B' => ['Vendor_A conflicts with Vendor_B version >=0.1 (current 0.1)']]
+                ['Vendor_B' => ['Vendor_A conflicts with current Vendor_B version 0.1 (version should not be >=0.1)']]
             ],
             [
                 [['Vendor_A', ['Vendor_B' => '~0.1']], ['Vendor_B', []]],
                 ['Vendor_A'],
                 ['Vendor_B'],
-                ['Vendor_B' => ['Vendor_A conflicts with Vendor_B version ~0.1 (current 0.1)']]
+                ['Vendor_B' => ['Vendor_A conflicts with current Vendor_B version 0.1 (version should not be ~0.1)']]
             ],
         ];
     }
@@ -134,7 +137,7 @@ public function testCheckConflictWhenEnableModuleDifferentVersion()
             ->will($this->returnValue($packageInfoMock));
         $conflictChecker = new ConflictChecker($moduleListMock, $packageInfoFactoryMock);
         $this->assertEquals(
-            ['Vendor_C' => ['Vendor_C conflicts with Vendor_A version >=0.2,<0.3 (current 0.2)']],
+            ['Vendor_C' => ['Vendor_C conflicts with current Vendor_A version 0.2 (version should not be >=0.2,<0.3)']],
             $conflictChecker->checkConflictsWhenEnableModules(['Vendor_C'])
         );
     }

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

@@ -80,9 +80,9 @@ private function getConflictMessages($moduleA, $moduleB)
             $constraintA = $versionParser->parseConstraints($this->packageInfo->getConflict($moduleB)[$moduleA]);
             $constraintB = $versionParser->parseConstraints($this->packageInfo->getVersion($moduleA));
             if ($constraintA->matches($constraintB)) {
-                $messages[] = "$moduleB conflicts with $moduleA version " .
-                    $this->packageInfo->getConflict($moduleB)[$moduleA] .
-                    ' (current ' . $this->packageInfo->getVersion($moduleA) . ')';
+                $messages[] = "$moduleB conflicts with current $moduleA version " .
+                    $this->packageInfo->getVersion($moduleA) .
+                    ' (version should not be ' . $this->packageInfo->getConflict($moduleB)[$moduleA] . ')';
             }
         }
         if (isset($this->packageInfo->getConflict($moduleA)[$moduleB]) &&
@@ -92,9 +92,9 @@ private function getConflictMessages($moduleA, $moduleB)
             $constraintA = $versionParser->parseConstraints($this->packageInfo->getConflict($moduleA)[$moduleB]);
             $constraintB = $versionParser->parseConstraints($this->packageInfo->getVersion($moduleB));
             if ($constraintA->matches($constraintB)) {
-                $messages[] = "$moduleA conflicts with $moduleB version " .
-                    $this->packageInfo->getConflict($moduleA)[$moduleB] .
-                    ' (current ' . $this->packageInfo->getVersion($moduleA) . ')';;
+                $messages[] = "$moduleA conflicts with current $moduleB version " .
+                    $this->packageInfo->getVersion($moduleA) .
+                    ' (version should not be ' . $this->packageInfo->getConflict($moduleA)[$moduleB] . ')';;
             }
         }
         return $messages;