bug #800 Fix support for versions with slashes (fabpot)

This PR was merged into the 1.13-dev branch.

Discussion
----------

Fix support for versions with slashes

Commits
-------

083521a Fix support for versions with slashes

Author: fabpot

src/PackageResolver.php

@@ -31,46 +31,20 @@ public function __construct(Downloader $downloader)
 
     public function resolve(array $arguments = [], bool $isRequire = false): array
     {
-        $versionParser = new VersionParser();
-
-        // first pass split on : and = to separate package names and versions
-        $explodedArguments = [];
-        foreach ($arguments as $argument) {
+        // first pass split on : and = to resolve package names
+        $packages = [];
+        foreach ($arguments as $i => $argument) {
             if ((false !== $pos = strpos($argument, ':')) || (false !== $pos = strpos($argument, '='))) {
-                $explodedArguments[] = substr($argument, 0, $pos);
-                $explodedArguments[] = substr($argument, $pos + 1);
+                $package = $this->resolvePackageName(substr($argument, 0, $pos), $i);
+                $version = substr($argument, $pos + 1);
+                $packages[] = $package.':'.$version;
             } else {
-                $explodedArguments[] = $argument;
+                $packages[] = $this->resolvePackageName($argument, $i);
             }
         }
 
-        // second pass to resolve package names
-        $packages = [];
-        foreach ($explodedArguments as $i => $argument) {
-            if (false === strpos($argument, '/') && !preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $argument) && !preg_match('{(?<=[a-z0-9_/-])\*|\*(?=[a-z0-9_/-])}i', $argument) && !\in_array($argument, ['mirrors', 'nothing'])) {
-                if (null === self::$aliases) {
-                    self::$aliases = $this->downloader->get('/aliases.json')->getBody();
-                }
-
-                if (isset(self::$aliases[$argument])) {
-                    $argument = self::$aliases[$argument];
-                } else {
-                    // is it a version or an alias that does not exist?
-                    try {
-                        $versionParser->parseConstraints($argument);
-                    } catch (\UnexpectedValueException $e) {
-                        // is it a special Symfony version?
-                        if (!\in_array($argument, self::$SYMFONY_VERSIONS, true)) {
-                            $this->throwAlternatives($argument, $i);
-                        }
-                    }
-                }
-            }
-
-            $packages[] = $argument;
-        }
-
-        // third pass to resolve versions
+        // second pass to resolve versions
+        $versionParser = new VersionParser();
         $requires = [];
         foreach ($versionParser->parseNameVersionPairs($packages) as $package) {
             $requires[] = $package['name'].$this->parseVersion($package['name'], $package['version'] ?? '', $isRequire);
@@ -111,6 +85,34 @@ public function parseVersion(string $package, string $version, bool $isRequire):
         return ':'.$version;
     }
 
+    private function resolvePackageName(string $argument, int $position): string
+    {
+        if (false !== strpos($argument, '/') || preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $argument) || preg_match('{(?<=[a-z0-9_/-])\*|\*(?=[a-z0-9_/-])}i', $argument) || \in_array($argument, ['mirrors', 'nothing'])) {
+            return $argument;
+        }
+
+        if (null === self::$aliases) {
+            self::$aliases = $this->downloader->get('/aliases.json')->getBody();
+        }
+
+        if (isset(self::$aliases[$argument])) {
+            $argument = self::$aliases[$argument];
+        } else {
+            // is it a version or an alias that does not exist?
+            try {
+                $versionParser = new VersionParser();
+                $versionParser->parseConstraints($argument);
+            } catch (\UnexpectedValueException $e) {
+                // is it a special Symfony version?
+                if (!\in_array($argument, self::$SYMFONY_VERSIONS, true)) {
+                    $this->throwAlternatives($argument, $position);
+                }
+            }
+        }
+
+        return $argument;
+    }
+
     /**
      * @throws \UnexpectedValueException
      */

tests/PackageResolverTest.php

@@ -31,6 +31,10 @@ public function getPackages()
                 ['cli'],
                 ['symfony/console'],
             ],
+            [
+                ['cli', 'symfony/workflow'],
+                ['symfony/console', 'symfony/workflow'],
+            ],
             [
                 ['console', 'validator', 'translation'],
                 ['symfony/console', 'symfony/validator', 'symfony/translation'],
@@ -43,6 +47,10 @@ public function getPackages()
                 ['cli:lts', 'validator=3.2', 'translation', 'next'],
                 ['symfony/console:^3.4', 'symfony/validator:3.2', 'symfony/translation:^4.0@dev'],
             ],
+            [
+                ['cli:dev-feature/abc'],
+                ['symfony/console:dev-feature/abc'],
+            ],
             [
                 ['php'],
                 ['php'],
@@ -83,10 +91,6 @@ public function getWrongPackages()
                 ['qwerty'],
                 '"qwerty" is not a valid alias.',
             ],
-            [
-                ['lts:'],
-                'Could not parse version constraint "".',
-            ],
         ];
     }