bug #17818 [Console] InvalidArgumentException is thrown under wrong condition (robinkanters)

fabpot · fabpot · commit 2c59be51df2e · 2016-02-17T07:13:05.000+01:00
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17818). Discussion ---------- [Console] InvalidArgumentException is thrown under wrong condition | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | no When an object is passed to `setAutocompleterValues` that implements `\Countable` and `\Traversable`, an `InvalidArgumentException` is thrown, even though its message says that the argument should implement both of those interfaces. Instead, the exception should be thrown if the parameter fails to implement either `\Countable` or `\Traversable`, like the exception message says. _Disclaimer: I've been looking at this line for 10min, and I've become convinced it should be changed according to my PR, but I could be wrong._ Commits ------- 8eea65e The exception should be thrown if an object doesn't implement Traversable AND doesn't implement Countable, not when it doesn't implement Traversable but DOES implement Countable
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -140,7 +140,7 @@ public function setAutocompleterValues($values)
         }
 
         if (null !== $values && !is_array($values)) {
-            if (!$values instanceof \Traversable || $values instanceof \Countable) {
+            if (!$values instanceof \Traversable || !$values instanceof \Countable) {
                 throw new \InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.');
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function setAutocompleterValues($values)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`if (null !== $values && !is_array($values)) {`
`143`		`- if (!$values instanceof \Traversable \|\| $values instanceof \Countable) {`
	`143`	`+ if (!$values instanceof \Traversable \|\| !$values instanceof \Countable) {`
`144`	`144`	throw new \InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.');
`145`	`145`	`}`
`146`	`146`	`}`