-

Author: fabpot

src/Command/UnpackCommand.php

@@ -17,6 +17,7 @@
 use Composer\Installer;
 use Composer\Json\JsonFile;
 use Composer\Package\Locker;
+use Composer\Package\Version\VersionParser;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -39,7 +40,7 @@ protected function configure()
         $this->setName('unpack')
             ->setDescription('Unpack a Symfony pack.')
             ->setDefinition(array(
-                new InputArgument('packages', InputArgument::IS_ARRAY | InputArgument::OPTIONAL, 'Installed packages to unpack"'),
+                new InputArgument('packages', InputArgument::IS_ARRAY | InputArgument::OPTIONAL, 'Installed packages to unpack.'),
                 new InputOption('sort-packages', null, InputOption::VALUE_NONE, 'Sorts packages'),
             ))
         ;
@@ -55,37 +56,41 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $locker = $composer->getLocker();
         $lockData = $locker->getLockData();
         $installedRepo = $composer->getRepositoryManager()->getLocalRepository();
+        $versionParser = new VersionParser();
 
         $op = new Operation(true, $input->getOption('sort-packages') || $composer->getConfig()->get('sort-packages'));
-        foreach ($packages as $name) {
-            if (null === $pkg = $installedRepo->findPackage($name, '*')) {
-                $io->writeError(sprintf('<error>Package %s is not installed</>', $name));
+        foreach ($versionParser->parseNameVersionPairs($packages) as $package) {
+            if (null === $pkg = $installedRepo->findPackage($package['name'], '*')) {
+                $io->writeError(sprintf('<error>Package %s is not installed</>', $package['name']));
+
                 return 1;
             }
 
             $dev = false;
             foreach ($lockData['packages-dev'] as $p) {
-                if ($name === $p['name']) {
+                if ($package['name'] === $p['name']) {
                     $dev = true;
 
                     break;
                 }
             }
 
-            $op->addPackage($name, '*', $dev);
+            $op->addPackage($package['name'], '*', $dev);
         }
 
         $unpacker = new Unpacker($composer);
         $result = $unpacker->unpack($op);
-        foreach ($result->getUnpacked() as $pkg) {
-            $io->writeError(sprintf('<info>Unpacked %s dependencies</>', $pkg->getName()));
-        }
 
         // remove the packages themselves
         if (!$result->getUnpacked()) {
+            $io->writeError('<info>Nothing to unpack</>');
             return;
         }
 
+        foreach ($result->getUnpacked() as $pkg) {
+            $io->writeError(sprintf('<info>Unpacked %s dependencies</>', $pkg->getName()));
+        }
+
         foreach ($result->getUnpacked() as $package) {
             $manipulator->removeLink('require-dev', $package->getName());
             foreach ($lockData['packages-dev'] as $i => $pkg) {

src/Unpacker.php

@@ -38,19 +38,12 @@ public function unpack(Operation $op): Result
         foreach ($op->getPackages() as $package) {
             $pkg = $this->composer->getRepositoryManager()->findPackage($package['name'], $package['version'] ?: '*');
 
-            // force unpack on profiles + add dev deps
-            if ('symfony-profile' === $pkg->getType()) {
-                foreach ($pkg->getDevRequires() as $link) {
-                    if (!$manipulator->addLink('require-dev', $link->getTarget(), $link->getPrettyConstraint(), $op->shouldSort())) {
-                        throw new \RuntimeException(sprintf('Unable to unpack package "%s".', $link->getTarget()));
-                    }
-                }
-            } elseif (
+            // not unpackable or no --unpack flag or empty packs (markers)
+            if (
                 'symfony-pack' !== $pkg->getType() ||
                 !$op->shouldUnpack() ||
                 0 === count($pkg->getRequires()) + count($pkg->getDevRequires())
             ) {
-                // not unpackable or no --unpack flag or empty packs (markers)
                 $result->addRequired($package['name'].($package['version'] ? ':'.$package['version'] : ''));
 
                 continue;