X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Futils%2FAvroValidator.php;h=b9d30d7784f04524c7c36dc9dd2e63e2fa563477;hb=3de7e73bd0f0ddf5d7c38fd46edfae96d1a64e40;hp=4f8e0b177bb3b4100490079089bf7f464ffbbaf7;hpb=84a843e168c2bf966f361c8e2fdc4441c44941b4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/utils/AvroValidator.php b/includes/utils/AvroValidator.php
index 4f8e0b177b..b9d30d7784 100644
--- a/includes/utils/AvroValidator.php
+++ b/includes/utils/AvroValidator.php
@@ -36,25 +36,25 @@ class AvroValidator {
 	 *  returned.
 	 */
 	public static function getErrors( AvroSchema $schema, $datum ) {
-		switch ( $schema->type) {
+		switch ( $schema->type ) {
 		case AvroSchema::NULL_TYPE:
-			if ( !is_null($datum) ) {
+			if ( !is_null( $datum ) ) {
 				return self::wrongType( 'null', $datum );
 			}
 			return array();
 		case AvroSchema::BOOLEAN_TYPE:
-			if ( !is_bool($datum) ) {
+			if ( !is_bool( $datum ) ) {
 				return self::wrongType( 'boolean', $datum );
 			}
 			return array();
 		case AvroSchema::STRING_TYPE:
 		case AvroSchema::BYTES_TYPE:
-			if ( !is_string($datum) ) {
+			if ( !is_string( $datum ) ) {
 				return self::wrongType( 'string', $datum );
 			}
 			return array();
 		case AvroSchema::INT_TYPE:
-			if ( !is_int($datum) ) {
+			if ( !is_int( $datum ) ) {
 				return self::wrongType( 'integer', $datum );
 			}
 			if ( AvroSchema::INT_MIN_VALUE > $datum
@@ -68,7 +68,7 @@ class AvroValidator {
 			}
 			return array();
 		case AvroSchema::LONG_TYPE:
-			if ( !is_int($datum) ) {
+			if ( !is_int( $datum ) ) {
 				return self::wrongType( 'integer', $datum );
 			}
 			if ( AvroSchema::LONG_MIN_VALUE > $datum
@@ -83,32 +83,29 @@ class AvroValidator {
 			return array();
 		case AvroSchema::FLOAT_TYPE:
 		case AvroSchema::DOUBLE_TYPE:
-			if ( !is_float($datum) && !is_int($datum) ) {
+			if ( !is_float( $datum ) && !is_int( $datum ) ) {
 				return self::wrongType( 'float or integer', $datum );
 			}
 			return array();
 		case AvroSchema::ARRAY_SCHEMA:
-			if (!is_array($datum)) {
+			if ( !is_array( $datum ) ) {
 				return self::wrongType( 'array', $datum );
 			}
 			$errors = array();
-			foreach ($datum as $d) {
-				$result = $this->validate( $schema->items(), $d );
+			foreach ( $datum as $d ) {
+				$result = self::getErrors( $schema->items(), $d );
 				if ( $result ) {
 					$errors[] = $result;
 				}
 			}
-			if ( $errors ) {
-				return $errors;
-			}
-			return array();
+			return $errors;
 		case AvroSchema::MAP_SCHEMA:
-			if (!is_array($datum)) {
+			if ( !is_array( $datum ) ) {
 				return self::wrongType( 'array', $datum );
 			}
 			$errors = array();
-			foreach ($datum as $k => $v) {
-			if ( !is_string($k) ) {
+			foreach ( $datum as $k => $v ) {
+				if ( !is_string( $k ) ) {
 					$errors[] = self::wrongType( 'string key', $k );
 				}
 				$result = self::getErrors( $schema->values(), $v );
@@ -119,7 +116,7 @@ class AvroValidator {
 			return $errors;
 		case AvroSchema::UNION_SCHEMA:
 			$errors = array();
-			foreach ($schema->schemas() as $schema) {
+			foreach ( $schema->schemas() as $schema ) {
 				$result = self::getErrors( $schema, $datum );
 				if ( !$result ) {
 					return array();