bug #43609 [Console] Fix array argument completion without input (wouterj)

fabpot · fabpot · commit 6a6bc7df959c · 2021-10-20T14:59:13.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] Fix array argument completion without input | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43605 | License | MIT | Doc PR | n/a Commits ------- ebd7342 [Console] Fix array argument completion without input
diff --git a/src/Symfony/Component/Console/Completion/CompletionInput.php b/src/Symfony/Component/Console/Completion/CompletionInput.php
@@ -117,7 +117,11 @@ public function bind(InputDefinition $definition): void
             }
 
             $this->completionName = $argumentName;
-            $this->completionValue = \is_array($argumentValue ?? '') ? $argumentValue[array_key_last($argumentValue)] : $argumentValue;
+            if (\is_array($argumentValue)) {
+                $this->completionValue = $argumentValue ? $argumentValue[array_key_last($argumentValue)] : null;
+            } else {
+                $this->completionValue = $argumentValue;
+            }
         }
 
         if ($this->currentIndex >= \count($this->tokens)) {
diff --git a/src/Symfony/Component/Console/Tests/Completion/CompletionInputTest.php b/src/Symfony/Component/Console/Tests/Completion/CompletionInputTest.php
@@ -92,6 +92,7 @@ public function testBindWithLastArrayArgument(CompletionInput $input, ?string $e
 
     public function provideBindWithLastArrayArgumentData()
     {
+        yield [CompletionInput::fromTokens(['bin/console'], 1), null];
         yield [CompletionInput::fromTokens(['bin/console', 'symfony', 'sensiolabs'], 3), null];
         yield [CompletionInput::fromTokens(['bin/console', 'symfony', 'sen'], 2), 'sen'];
     }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,11 @@ public function bind(InputDefinition $definition): void`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`$this->completionName = $argumentName;`
`120`		`- $this->completionValue = \is_array($argumentValue ?? '') ? $argumentValue[array_key_last($argumentValue)] : $argumentValue;`
	`120`	`+ if (\is_array($argumentValue)) {`
	`121`	`+ $this->completionValue = $argumentValue ? $argumentValue[array_key_last($argumentValue)] : null;`
	`122`	`+ } else {`
	`123`	`+ $this->completionValue = $argumentValue;`
	`124`	`+ }`
`121`	`125`	`}`
`122`	`126`
`123`	`127`	`if ($this->currentIndex >= \count($this->tokens)) {`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public function testBindWithLastArrayArgument(CompletionInput $input, ?string $e`
`92`	`92`
`93`	`93`	`public function provideBindWithLastArrayArgumentData()`
`94`	`94`	`{`
	`95`	`+ yield [CompletionInput::fromTokens(['bin/console'], 1), null];`
`95`	`96`	`yield [CompletionInput::fromTokens(['bin/console', 'symfony', 'sensiolabs'], 3), null];`
`96`	`97`	`yield [CompletionInput::fromTokens(['bin/console', 'symfony', 'sen'], 2), 'sen'];`
`97`	`98`	`}`