Fix conversion of && range version

fxpio · Feb 15, 2017 · dacfc81 · dacfc81
1 parent 41520c8
commit dacfc81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Converter/SemverConverter.php b/Converter/SemverConverter.php
@@ -55,13 +55,15 @@ public function convertRange($range)
      */
     protected function cleanRange($range)
     {
-        foreach (array('<', '>', '=', '~', '^', '||') as $character) {
+        foreach (array('<', '>', '=', '~', '^', '||', '&&') as $character) {
             $range = str_replace($character.' ', $character, $range);
         }
 
         $range = preg_replace('/(?:[vV])(\d+)/', '${1}', $range);
+        $range = str_replace(' ||', '||', $range);
+        $range = str_replace(array(' &&', '&&'), ',', $range);
 
-        return str_replace(' ||', '||', $range);
+        return $range;
     }
 
     /**

diff --git a/Tests/Converter/SemverConverterTest.php b/Tests/Converter/SemverConverterTest.php
@@ -134,6 +134,7 @@ public function getTestRanges()
             array('>=1.2 <2.0', '>=1.2,<2.0'),
             array('>=1 <2', '>=1,<2'),
             array('>=1.0 <1.1 || >=1.2', '>=1.0,<1.1|>=1.2'),
+            array('>=1.0 && <1.1 || >=1.2', '>=1.0,<1.1|>=1.2'),
             array('< 1.2.3', '<1.2.3'),
             array('> 1.2.3', '>1.2.3'),
             array('<= 1.2.3', '<=1.2.3'),