SCA: consolidate non empty array checks across codebase

kalessil · nicolas-grekas · commit 6c768133540e · 2018-11-20T17:01:59.000+01:00
diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
@@ -48,7 +48,7 @@ public function validate($form, Constraint $constraint)
 
             // Validate the data against its own constraints
             if ($form->isRoot() && (\is_object($data) || \is_array($data))) {
-                if (\is_array($groups) && \count($groups) > 0 || $groups instanceof GroupSequence && \count($groups->groups) > 0) {
+                if (($groups && \is_array($groups)) || ($groups instanceof GroupSequence && $groups->groups)) {
                     $validator->atPath('data')->validate($form->getData(), null, $groups);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function validate($form, Constraint $constraint)`
`48`	`48`
`49`	`49`	`// Validate the data against its own constraints`
`50`	`50`	`if ($form->isRoot() && (\is_object($data) \|\| \is_array($data))) {`
`51`		`- if (\is_array($groups) && \count($groups) > 0 \|\| $groups instanceof GroupSequence && \count($groups->groups) > 0) {`
	`51`	`+ if (($groups && \is_array($groups)) \|\| ($groups instanceof GroupSequence && $groups->groups)) {`
`52`	`52`	`$validator->atPath('data')->validate($form->getData(), null, $groups);`
`53`	`53`	`}`
`54`	`54`	`}`