bug #34114 [Console] SymonfyStyle - Check value isset to avoid PHP notice (leevigraham)

fabpot · fabpot · commit a536342a96cd · 2020-02-03T10:58:05.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Console] SymonfyStyle - Check value isset to avoid PHP notice | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34093 | License | MIT | Doc PR | n/a This PR addresses the issue when a default value is not a valid choice. Currently this would throw a notice which outputs to the console. This fix is a similar implementation to the `QuestionHelper`: https://github.com/symfony/symfony/blob/4.4/src/Symfony/Component/Console/Helper/QuestionHelper.php#L63 Example console command and output can be found in the issue: #34093 Commits ------- c9072c7 Check value isset to avoid PHP notice
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -229,7 +229,7 @@ public function choice($question, array $choices, $default = null)
     {
         if (null !== $default) {
             $values = array_flip($choices);
-            $default = $values[$default];
+            $default = isset($values[$default]) ? $values[$default] : $default;
         }
 
         return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public function choice($question, array $choices, $default = null)`
`229`	`229`	`{`
`230`	`230`	`if (null !== $default) {`
`231`	`231`	`$values = array_flip($choices);`
`232`		`- $default = $values[$default];`
	`232`	`+ $default = isset($values[$default]) ? $values[$default] : $default;`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));`