X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Futils%2FAvroValidator.php;h=554dda9d6d2bd29c852a6b61621e2216ef3dd3cb;hb=575a886a466bab5ffb255c936e16999eacea167c;hp=b9d30d7784f04524c7c36dc9dd2e63e2fa563477;hpb=9e6032545bfb638963ac999420942b60ef82e240;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/utils/AvroValidator.php b/includes/utils/AvroValidator.php index b9d30d7784..554dda9d6d 100644 --- a/includes/utils/AvroValidator.php +++ b/includes/utils/AvroValidator.php @@ -41,18 +41,18 @@ class AvroValidator { if ( !is_null( $datum ) ) { return self::wrongType( 'null', $datum ); } - return array(); + return []; case AvroSchema::BOOLEAN_TYPE: if ( !is_bool( $datum ) ) { return self::wrongType( 'boolean', $datum ); } - return array(); + return []; case AvroSchema::STRING_TYPE: case AvroSchema::BYTES_TYPE: if ( !is_string( $datum ) ) { return self::wrongType( 'string', $datum ); } - return array(); + return []; case AvroSchema::INT_TYPE: if ( !is_int( $datum ) ) { return self::wrongType( 'integer', $datum ); @@ -66,7 +66,7 @@ class AvroValidator { $datum ); } - return array(); + return []; case AvroSchema::LONG_TYPE: if ( !is_int( $datum ) ) { return self::wrongType( 'integer', $datum ); @@ -80,18 +80,18 @@ class AvroValidator { $datum ); } - return array(); + return []; case AvroSchema::FLOAT_TYPE: case AvroSchema::DOUBLE_TYPE: if ( !is_float( $datum ) && !is_int( $datum ) ) { return self::wrongType( 'float or integer', $datum ); } - return array(); + return []; case AvroSchema::ARRAY_SCHEMA: if ( !is_array( $datum ) ) { return self::wrongType( 'array', $datum ); } - $errors = array(); + $errors = []; foreach ( $datum as $d ) { $result = self::getErrors( $schema->items(), $d ); if ( $result ) { @@ -103,7 +103,7 @@ class AvroValidator { if ( !is_array( $datum ) ) { return self::wrongType( 'array', $datum ); } - $errors = array(); + $errors = []; foreach ( $datum as $k => $v ) { if ( !is_string( $k ) ) { $errors[] = self::wrongType( 'string key', $k ); @@ -115,16 +115,16 @@ class AvroValidator { } return $errors; case AvroSchema::UNION_SCHEMA: - $errors = array(); + $errors = []; foreach ( $schema->schemas() as $schema ) { $result = self::getErrors( $schema, $datum ); if ( !$result ) { - return array(); + return []; } $errors[] = $result; } if ( $errors ) { - return array( "Expected any one of these to be true", $errors ); + return [ "Expected any one of these to be true", $errors ]; } return "No schemas provided to union"; case AvroSchema::ENUM_SCHEMA: @@ -132,7 +132,7 @@ class AvroValidator { $symbols = implode( ', ', $schema->symbols ); return "Expected one of $symbols but recieved $datum"; } - return array(); + return []; case AvroSchema::FIXED_SCHEMA: if ( !is_string( $datum ) ) { return self::wrongType( 'string', $datum ); @@ -142,14 +142,14 @@ class AvroValidator { return "Expected string of length {$schema->size()}, " . "but recieved one of length $len"; } - return array(); + return []; case AvroSchema::RECORD_SCHEMA: case AvroSchema::ERROR_SCHEMA: case AvroSchema::REQUEST_SCHEMA: if ( !is_array( $datum ) ) { return self::wrongType( 'array', $datum ); } - $errors = array(); + $errors = []; foreach ( $schema->fields() as $field ) { $name = $field->name(); if ( !array_key_exists( $name, $datum ) ) {