@@ -83,7 +83,9 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | protected function _isAssoc(array $arr) |
| 85 | 85 | {
|
| 86 | - if (array() === $arr) return false; |
|
| 86 | + if (array() === $arr) { |
|
| 87 | + return false; |
|
| 88 | + } |
|
| 87 | 89 | return array_keys($arr) !== range(0, count($arr) - 1); |
| 88 | 90 | } |
| 89 | 91 | |
@@ -94,8 +96,7 @@ discard block |
||
| 94 | 96 | $newPath = $path; |
| 95 | 97 | $newPath[] = 0; |
| 96 | 98 | $this->_validateItems($subValue, $newPath, $validate); |
| 97 | - } |
|
| 98 | - else {
|
|
| 99 | + } else {
|
|
| 99 | 100 | $path[count($path) - 1] = $idx; |
| 100 | 101 | $err = $validate($subValue); |
| 101 | 102 | |
@@ -127,8 +128,7 @@ discard block |
||
| 127 | 128 | if(isset($arg['validateItem'])) {
|
| 128 | 129 | try {
|
| 129 | 130 | $this->_validateItems($value, [0], $arg['validateItem']); |
| 130 | - } |
|
| 131 | - catch(ValidateItemsError $e) {
|
|
| 131 | + } catch(ValidateItemsError $e) {
|
|
| 132 | 132 | $res['suberrors'] = [ |
| 133 | 133 | 'error' => $e->error, |
| 134 | 134 | 'path' => $e->path |