bug symfony#254 Several small unpack fixes (fabpot)

This PR was squashed before being merged into the 1.0-dev branch (closes symfony#254). Discussion ---------- Several small unpack fixes Commits ------- aee80d5 made composer req --unpack fails 1d81d8c avoid unneeded code 638b68d made packages required for composer unpack
khalid-s · Dec 27, 2017 · cc4b1ba · cc4b1ba
2 parents 0fb53be + aee80d5
commit cc4b1ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/Command/RequireCommand.php b/src/Command/RequireCommand.php
@@ -40,14 +40,13 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $packages = $this->resolver->resolve($input->getArgument('packages'), true);
-
-        $versionParser = new VersionParser();
-        $op = new Operation($input->getOption('unpack'), $input->getOption('sort-packages') || $this->getComposer()->getConfig()->get('sort-packages'));
-        foreach ($versionParser->parseNameVersionPairs($packages) as $package) {
-            $op->addPackage($package['name'], $package['version'] ?? '', $input->getOption('dev'));
-        }
-
         if ($packages) {
+            $versionParser = new VersionParser();
+            $op = new Operation($input->getOption('unpack'), $input->getOption('sort-packages') || $this->getComposer()->getConfig()->get('sort-packages'));
+            foreach ($versionParser->parseNameVersionPairs($packages) as $package) {
+                $op->addPackage($package['name'], $package['version'] ?? '', $input->getOption('dev'));
+            }
+
             $unpacker = new Unpacker($this->getComposer());
             $result = $unpacker->unpack($op);
             $io = $this->getIo();
@@ -56,6 +55,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $input->setArgument('packages', $result->getRequired());
+        } elseif ($input->getOption('unpack')) {
+            $this->getIo()->writeError('<error>--unpack is incompatible with the interactive mode.</error>');
+
+            return 1;
         }
 
         if ($input->hasOption('no-suggest')) {

diff --git a/src/Command/UnpackCommand.php b/src/Command/UnpackCommand.php
@@ -40,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::REQUIRED, 'Installed packages to unpack.'),
                 new InputOption('sort-packages', null, InputOption::VALUE_NONE, 'Sorts packages'),
             ))
         ;