Fix conversion of && range version

francoispluchino · francoispluchino · commit dacfc81d781f · 2017-02-15T20:54:36.000+01:00
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'),

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,15 @@ public function convertRange($range)`
`55`	`55`	`*/`
`56`	`56`	`protected function cleanRange($range)`
`57`	`57`	`{`
`58`		`- foreach (array('<', '>', '=', '~', '^', '\|\|') as $character) {`
	`58`	`+ foreach (array('<', '>', '=', '~', '^', '\|\|', '&&') as $character) {`
`59`	`59`	`$range = str_replace($character.' ', $character, $range);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$range = preg_replace('/(?:[vV])(\d+)/', '${1}', $range);`
	`63`	`+ $range = str_replace(' \|\|', '\|\|', $range);`
	`64`	`+ $range = str_replace(array(' &&', '&&'), ',', $range);`
`63`	`65`
`64`		`- return str_replace(' \|\|', '\|\|', $range);`
	`66`	`+ return $range;`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`/**`