Fix version constraint for PHP dependency.

horde · Apr 20, 2017 · c0e0006 · c0e0006
1 parent 481c69b
commit c0e0006
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/components/lib/Conductor/Package2XmlToComposer.php b/components/lib/Conductor/Package2XmlToComposer.php
@@ -710,15 +710,19 @@ protected function getDepVersionString($req)
                 $req['exclude'][0] == $req['max'] &&
                 preg_match('/(\d)\.0\.0alpha1/', $req['max'], $version)) {
                 if (substr($req['min'], 0, 2) != ($version[1] - 1) . '.') {
-                    $out[] = '<'.preg_replace('/(.0)*alpha1$/', '', $req['max']);
+                    if ($req['dep'] == 'php') {
+                        $out[] = '|| ^' . ($version[1] - 1);
+                    } else {
+                        $out[] = '<'.preg_replace('/(.0)*alpha1$/', '', $req['max']);
+                    }
                 }
             } else {
                 $out[] = '<='.$req['max'];
             }
         }
 
         if (! empty($out)) {
-            $ret = join(',', $out);
+            $ret = join(' ', $out);
         } else {
             $ret = '*';
         }