dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mw.widgets.CategorySelector: Link to category page and display existence status"
[lhc/web/wiklou.git]
/
includes
/
utils
/
AvroValidator.php
diff --git
a/includes/utils/AvroValidator.php
b/includes/utils/AvroValidator.php
index
4f8e0b1
..
b9d30d7
100644
(file)
--- a/
includes/utils/AvroValidator.php
+++ b/
includes/utils/AvroValidator.php
@@
-36,25
+36,25
@@
class AvroValidator {
* returned.
*/
public static function getErrors( AvroSchema $schema, $datum ) {
* returned.
*/
public static function getErrors( AvroSchema $schema, $datum ) {
- switch ( $schema->type) {
+ switch ( $schema->type
) {
case AvroSchema::NULL_TYPE:
case AvroSchema::NULL_TYPE:
- if ( !is_null(
$datum
) ) {
+ if ( !is_null(
$datum
) ) {
return self::wrongType( 'null', $datum );
}
return array();
case AvroSchema::BOOLEAN_TYPE:
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:
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:
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
return self::wrongType( 'integer', $datum );
}
if ( AvroSchema::INT_MIN_VALUE > $datum
@@
-68,7
+68,7
@@
class AvroValidator {
}
return array();
case AvroSchema::LONG_TYPE:
}
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
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:
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:
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();
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 ( $result ) {
$errors[] = $result;
}
}
- if ( $errors ) {
- return $errors;
- }
- return array();
+ return $errors;
case AvroSchema::MAP_SCHEMA:
case AvroSchema::MAP_SCHEMA:
- if (
!is_array($datum)
) {
+ if (
!is_array( $datum )
) {
return self::wrongType( 'array', $datum );
}
$errors = array();
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 );
$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();
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();
$result = self::getErrors( $schema, $datum );
if ( !$result ) {
return array();