Copy extra.symfony.require when unpacking

Author: nicolas-grekas

src/Command/RequireCommand.php

@@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $op->addPackage($package['name'], $package['version'] ?? '', $input->getOption('dev'));
             }
 
-            $unpacker = new Unpacker($this->getComposer());
+            $unpacker = new Unpacker($this->getComposer(), $this->resolver);
             $result = $unpacker->unpack($op);
             $io = $this->getIO();
             foreach ($result->getUnpacked() as $pkg) {

src/Command/UnpackCommand.php

@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $op->addPackage($pkg->getName(), $pkg->getVersion(), $dev);
         }
 
-        $unpacker = new Unpacker($composer);
+        $unpacker = new Unpacker($composer, $this->resolver);
         $result = $unpacker->unpack($op);
 
         // remove the packages themselves

src/PackageResolver.php

@@ -80,7 +80,7 @@ public function resolve(array $arguments = [], bool $isRequire = false): array
         return array_unique($requires);
     }
 
-    private function parseVersion(string $package, string $version, bool $isRequire): string
+    public function parseVersion(string $package, string $version, bool $isRequire): string
     {
         if (0 !== strpos($package, 'symfony/')) {
             return $version ? ':'.$version : '';
@@ -94,7 +94,7 @@ private function parseVersion(string $package, string $version, bool $isRequire)
             return $version ? ':'.$version : '';
         }
 
-        if (!$version) {
+        if (!$version || '*' === $version) {
             try {
                 $config = @json_decode(file_get_contents(Factory::getComposerFile()), true);
             } finally {

src/Unpacker.php

@@ -21,10 +21,12 @@
 class Unpacker
 {
     private $composer;
+    private $resolver;
 
-    public function __construct(Composer $composer)
+    public function __construct(Composer $composer, PackageResolver $resolver)
     {
         $this->composer = $composer;
+        $this->resolver = $resolver;
     }
 
     public function unpack(Operation $op): Result
@@ -53,7 +55,10 @@ public function unpack(Operation $op): Result
                     continue;
                 }
 
-                if (!$manipulator->addLink($package['dev'] ? 'require-dev' : 'require', $link->getTarget(), $link->getPrettyConstraint(), $op->shouldSort())) {
+                $constraint = $link->getPrettyConstraint();
+                $constraint = substr($this->resolver->parseVersion($link->getTarget(), $constraint, !$package['dev']), 1) ?: $constraint;
+
+                if (!$manipulator->addLink($package['dev'] ? 'require-dev' : 'require', $link->getTarget(), $constraint, $op->shouldSort())) {
                     throw new \RuntimeException(sprintf('Unable to unpack package "%s".', $link->getTarget()));
                 }
             }