Merge pull request #32 from boesing/bugfix/update-lock-with-additiona…

…l-options bugfix: use proper methods to receive input option informations
laminas · Feb 15, 2021 · 3d6d6eb · 3d6d6eb
2 parents 5c063cd + 0161b47
commit 3d6d6eb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/src/DependencyRewriterV2.php b/src/DependencyRewriterV2.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 
+use function array_merge;
 use function assert;
 use function call_user_func;
 use function dirname;
@@ -262,13 +263,10 @@ private function updateLockFile(): void
             '--working-dir' => dirname($this->composerFile),
         ];
 
-        foreach (self::COMPOSER_LOCK_UPDATE_OPTIONS as $optionName) {
-            if (! $this->input->hasOption($optionName)) {
-                continue;
-            }
-
-            $input[sprintf('--%s', $optionName)] = $this->input->getOption($optionName);
-        }
+        $input = array_merge($input, $this->extractAdditionalInputOptionsFromInput(
+            $this->input,
+            self::COMPOSER_LOCK_UPDATE_OPTIONS
+        ));
 
         $application->run(new ArrayInput($input));
     }
@@ -348,4 +346,24 @@ private function createComposerFile()
     {
         return new JsonFile($this->composerFile, null, $this->io);
     }
+
+    /**
+     * @psalm-param list<non-empty-string> $options
+     * @psalm-return array<non-empty-string,mixed>
+     */
+    private function extractAdditionalInputOptionsFromInput(InputInterface $input, array $options): array
+    {
+        $additionalInputOptions = [];
+        foreach ($options as $optionName) {
+            $option = sprintf('--%s', $optionName);
+            assert(! empty($option));
+            if (! $input->hasParameterOption($option, true)) {
+                continue;
+            }
+            /** @psalm-suppress MixedAssignment */
+            $additionalInputOptions[$option] = $input->getParameterOption($option, false, true);
+        }
+
+        return $additionalInputOptions;
+    }
 }
diff --git a/test/DependencyRewriterV2Test.php b/test/DependencyRewriterV2Test.php
@@ -970,26 +970,27 @@ public function testComposerOptionsArePassedToUpdateLockCommand(
         $consecutiveGetOptionReturnValues = [];
 
         foreach (DependencyRewriterV2::COMPOSER_LOCK_UPDATE_OPTIONS as $optionName) {
-            $consecutiveHasOptionArguments[]    = [$optionName];
+            $option                             = sprintf('--%s', $optionName);
+            $consecutiveHasOptionArguments[]    = [$option, true];
             $passed                             = array_key_exists($optionName, $optionsPassedToComposer);
             $consecutiveHasOptionReturnValues[] = $passed;
             if (! $passed) {
                 continue;
             }
 
-            $consecutiveGetOptionArguments[]    = [$optionName];
+            $consecutiveGetOptionArguments[]    = [$option, false, true];
             $consecutiveGetOptionReturnValues[] = $optionsPassedToComposer[$optionName];
         }
 
         $input
             ->expects(self::exactly(count(DependencyRewriterV2::COMPOSER_LOCK_UPDATE_OPTIONS)))
-            ->method('hasOption')
+            ->method('hasParameterOption')
             ->withConsecutive(...$consecutiveHasOptionArguments)
             ->willReturnOnConsecutiveCalls(...$consecutiveHasOptionReturnValues);
 
         $input
             ->expects(self::exactly(count($consecutiveGetOptionArguments)))
-            ->method('getOption')
+            ->method('getParameterOption')
             ->withConsecutive(...$consecutiveGetOptionArguments)
             ->willReturnOnConsecutiveCalls(...$consecutiveGetOptionReturnValues);