SCA: consolidate non empty array checks across codebase

kalessil · nicolas-grekas · commit 05a6285201cb · 2018-11-20T17:01:59.000+01:00
diff --git a/Constraint.php b/Constraint.php
@@ -120,7 +120,7 @@ public function __construct($options = null)
         if (\is_array($options)) {
             reset($options);
         }
-        if (\is_array($options) && \count($options) > 0 && \is_string(key($options))) {
+        if ($options && \is_array($options) && \is_string(key($options))) {
             foreach ($options as $option => $value) {
                 if (array_key_exists($option, $knownOptions)) {
                     $this->$option = $value;

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function __construct($options = null)`
`120`	`120`	`if (\is_array($options)) {`
`121`	`121`	`reset($options);`
`122`	`122`	`}`
`123`		`- if (\is_array($options) && \count($options) > 0 && \is_string(key($options))) {`
	`123`	`+ if ($options && \is_array($options) && \is_string(key($options))) {`
`124`	`124`	`foreach ($options as $option => $value) {`
`125`	`125`	`if (array_key_exists($option, $knownOptions)) {`
`126`	`126`	`$this->$option = $value;`