Fixed Required validator if used for arrays

iherwig · iherwig · commit 687510898d29 · 2020-05-07T23:07:09.000+02:00
diff --git a/src/wcmf/lib/validation/impl/Filter.php b/src/wcmf/lib/validation/impl/Filter.php
@@ -27,6 +27,9 @@
  *
  * // FILTER_VALIDATE_REGEXP with regexp option
  * filter:{"type":"validate_regexp","options":{"options":{"regexp":"/^[0-9]*$/"}}}
+ *
+ * // FILTER_UNSAFE_RAW with FILTER_REQUIRE_ARRAY flag
+ * filter:{"type":"unsafe_raw","options":16777216}
  * @endcode
  *
  * @author ingo herwig <ingo@wemove.com>
diff --git a/src/wcmf/lib/validation/impl/Required.php b/src/wcmf/lib/validation/impl/Required.php
@@ -28,7 +28,7 @@ class Required implements ValidateType {
    * @see ValidateType::validate
    */
   public function validate($value, $options=null, $context=null) {
-    return strlen($value) > 0;
+    return is_array($value) && count($value) > 0 || strlen($value) > 0;
   }
 }
 ?>

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@`
`27`	`27`	`*`
`28`	`28`	`* // FILTER_VALIDATE_REGEXP with regexp option`
`29`	`29`	`* filter:{"type":"validate_regexp","options":{"options":{"regexp":"/^[0-9]*$/"}}}`
	`30`	`+ *`
	`31`	`+ * // FILTER_UNSAFE_RAW with FILTER_REQUIRE_ARRAY flag`
	`32`	`+ * filter:{"type":"unsafe_raw","options":16777216}`
`30`	`33`	`* @endcode`
`31`	`34`	`*`
`32`	`35`	`* @author ingo herwig <[email protected]>`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Required implements ValidateType {`
`28`	`28`	`* @see ValidateType::validate`
`29`	`29`	`*/`
`30`	`30`	`public function validate($value, $options=null, $context=null) {`
`31`		`- return strlen($value) > 0;`
	`31`	`+ return is_array($value) && count($value) > 0 \|\| strlen($value) > 0;`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`?>`