bug #685 Fix Unpacker failing on Intervals::compactConstraint() (nicolas-grekas)

This PR was merged into the 1.8-dev branch.

Discussion
----------

Fix Unpacker failing on Intervals::compactConstraint()

Fix #678

Commits
-------

d7105c8 Fix Unpacker failing on Intervals::compactConstraint()

Author: nicolas-grekas

src/Flex.php

@@ -120,13 +120,14 @@ class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__)
         $this->config = $composer->getConfig();
         $this->options = $this->initOptions();
 
+        $symfonyRequire = preg_replace('/\.x$/', '.x-dev', getenv('SYMFONY_REQUIRE') ?: ($composer->getPackage()->getExtra()['symfony']['require'] ?? null));
+
         if ($composer2 = version_compare('2.0.0', PluginInterface::PLUGIN_API_VERSION, '<=')) {
             $rfs = Factory::createHttpDownloader($this->io, $this->config);
 
             $this->downloader = $downloader = new Downloader($composer, $io, $rfs);
             $this->downloader->setFlexId($this->getFlexId());
 
-            $symfonyRequire = getenv('SYMFONY_REQUIRE') ?: ($composer->getPackage()->getExtra()['symfony']['require'] ?? null);
             if ($symfonyRequire) {
                 $this->filter = new PackageFilter($io, $symfonyRequire, $this->downloader);
             }
@@ -136,7 +137,6 @@ class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__)
             $rfs = Factory::createRemoteFilesystem($this->io, $this->config);
             $this->rfs = $rfs = new ParallelDownloader($this->io, $this->config, $rfs->getOptions(), $rfs->isTlsDisabled());
 
-            $symfonyRequire = getenv('SYMFONY_REQUIRE') ?: ($composer->getPackage()->getExtra()['symfony']['require'] ?? null);
             $this->downloader = $downloader = new Downloader($composer, $io, $this->rfs);
             $this->downloader->setFlexId($this->getFlexId());
 

src/Unpacker.php

@@ -25,6 +25,7 @@
 use Composer\Repository\RepositorySet;
 use Composer\Semver\Constraint\MultiConstraint;
 use Composer\Semver\Intervals;
+use Composer\Semver\VersionParser;
 use Symfony\Flex\Unpack\Operation;
 use Symfony\Flex\Unpack\Result;
 
@@ -33,12 +34,14 @@ class Unpacker
     private $composer;
     private $resolver;
     private $dryRun;
+    private $versionParser;
 
     public function __construct(Composer $composer, PackageResolver $resolver, bool $dryRun)
     {
         $this->composer = $composer;
         $this->resolver = $resolver;
         $this->dryRun = $dryRun;
+        $this->versionParser = new VersionParser();
     }
 
     public function unpack(Operation $op, Result $result = null, &$links = []): Result
@@ -101,7 +104,7 @@ public function unpack(Operation $op, Result $result = null, &$links = []): Resu
                 $linkType = $package['dev'] ? 'require-dev' : 'require';
 
                 if (isset($links[$linkName])) {
-                    $links[$linkName]['constraints'][] = $constraint;
+                    $links[$linkName]['constraints'][] = $this->versionParser->parseConstraints($constraint);
                     if ('require' === $linkType) {
                         $links[$linkName]['type'] = 'require';
                     }
@@ -138,16 +141,16 @@ public function unpack(Operation $op, Result $result = null, &$links = []): Resu
 
                 // removes package from "require-dev", because it will be moved to "require"
                 // save stored constraint
-                $link['constraints'][] = $jsonStored['require-dev'][$link['name']];
+                $link['constraints'][] = $this->versionParser->parseConstraints($jsonStored['require-dev'][$link['name']]);
                 $jsonManipulator->removeSubNode('require-dev', $link['name']);
             }
 
             $constraint = class_exists(Intervals::class, false)
-                ? Intervals::compactConstraint(MultiConstraint::create($link['constraints']))->getPrettyString()
+                ? Intervals::compactConstraint(MultiConstraint::create($link['constraints']))
                 : end($link['constraints'])
             ;
 
-            if (!$jsonManipulator->addLink($link['type'], $link['name'], $constraint, $op->shouldSort())) {
+            if (!$jsonManipulator->addLink($link['type'], $link['name'], $constraint->getPrettyString(), $op->shouldSort())) {
                 throw new \RuntimeException(sprintf('Unable to unpack package "%s".', $link['name']));
             }
         }

tests/FlexTest.php

@@ -25,6 +25,7 @@
 use Composer\Repository\RepositoryManager;
 use Composer\Repository\WritableRepositoryInterface;
 use Composer\Script\Event;
+use Composer\Semver\Constraint\MatchAllConstraint;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Flex\Configurator;
@@ -99,7 +100,7 @@ public function testActivateLoadsClasses()
         $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE);
 
         $package = $this->mockRootPackage(['symfony' => ['allow-contrib' => true]]);
-        $package->method('getRequires')->willReturn([new Link('dummy', 'symfony/flex')]);
+        $package->method('getRequires')->willReturn([new Link('dummy', 'symfony/flex', class_exists(MatchAllConstraint::class) ? new MatchAllConstraint() : null)]);
 
         $composer = $this->mockComposer($this->mockLocker(), $package, Factory::createConfig($io));
         if (version_compare('2.0.0', PluginInterface::PLUGIN_API_VERSION, '>')) {

tests/UnpackerTest.php

@@ -7,6 +7,7 @@
 use Composer\Package\Package;
 use Composer\Repository\InstalledArrayRepository;
 use Composer\Repository\RepositoryManager;
+use Composer\Semver\Constraint\MatchAllConstraint;
 use PHPUnit\Framework\TestCase;
 use Symfony\Flex\PackageResolver;
 use Symfony\Flex\Unpack\Operation;
@@ -44,7 +45,7 @@ public function testDoNotDuplicateEntry(): void
         // Setup packages
 
         $realPkg = new Package('real', '1.0.0', '1.0.0');
-        $realPkgLink = new Link('lorem', 'real', null, 'wraps', '1.0.0');
+        $realPkgLink = new Link('lorem', 'real', class_exists(MatchAllConstraint::class) ? new MatchAllConstraint() : null, 'wraps', '1.0.0');
 
         $virtualPkgFoo = new Package('pack_foo', '1.0.0', '1.0.0');
         $virtualPkgFoo->setType('symfony-pack');