MAGETWO-32948: Contribution to Mainline of Sprint 22 Work

Olga Kopylova · Olga Kopylova · commit c515de9833f1 · 2015-02-04T21:30:20.000-06:00
- fixed code style
diff --git a/lib/internal/Magento/Framework/Module/ConflictChecker.php b/lib/internal/Magento/Framework/Module/ConflictChecker.php
@@ -94,7 +94,7 @@ private function getConflictMessages($moduleA, $moduleB)
             if ($constraintA->matches($constraintB)) {
                 $messages[] = "$moduleA conflicts with current $moduleB version " .
                     $this->packageInfo->getVersion($moduleA) .
-                    ' (version should not be ' . $this->packageInfo->getConflict($moduleA)[$moduleB] . ')';;
+                    ' (version should not be ' . $this->packageInfo->getConflict($moduleA)[$moduleB] . ')';
             }
         }
         return $messages;

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function getConflictMessages($moduleA, $moduleB)`
`94`	`94`	`if ($constraintA->matches($constraintB)) {`
`95`	`95`	`$messages[] = "$moduleA conflicts with current $moduleB version " .`
`96`	`96`	`$this->packageInfo->getVersion($moduleA) .`
`97`		`- ' (version should not be ' . $this->packageInfo->getConflict($moduleA)[$moduleB] . ')';;`
	`97`	`+ ' (version should not be ' . $this->packageInfo->getConflict($moduleA)[$moduleB] . ')';`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`return $messages;`