@@ -27,8 +27,8 @@ |
||
| 27 | 27 | * @return DBExprFilter |
| 28 | 28 | */ |
| 29 | 29 | public function __invoke($expression, $keyPath, $validator = null) { |
| 30 | - return new DBExprFilter($expression, $this->map, $keyPath, $validator, function ($result, array $data) { |
|
| 31 | - if(!$result) { |
|
| 30 | + return new DBExprFilter($expression, $this->map, $keyPath, $validator, function($result, array $data) { |
|
| 31 | + if (!$result) { |
|
| 32 | 32 | throw new RequiredValueNotFoundException(sprintf("Required value %s not found", $data['key'])); |
| 33 | 33 | } |
| 34 | 34 | }); |
@@ -28,16 +28,16 @@ discard block |
||
| 28 | 28 | $this->value = $data; |
| 29 | 29 | $this->keyPath = $this->buildKey($keyPath); |
| 30 | 30 | $this->value = $this->recursiveGet($data, $this->keyPath, null); |
| 31 | - if($validator === null) { |
|
| 32 | - $validator = function ($data) { |
|
| 33 | - if(is_array($data)) { |
|
| 31 | + if ($validator === null) { |
|
| 32 | + $validator = function($data) { |
|
| 33 | + if (is_array($data)) { |
|
| 34 | 34 | return $this->isValidArray($data); |
| 35 | 35 | } |
| 36 | 36 | return (string) $data !== ''; |
| 37 | 37 | }; |
| 38 | 38 | } |
| 39 | - if($validationResultHandler === null) { |
|
| 40 | - $validationResultHandler = function () {}; |
|
| 39 | + if ($validationResultHandler === null) { |
|
| 40 | + $validationResultHandler = function() {}; |
|
| 41 | 41 | } |
| 42 | 42 | $this->validator = $validator; |
| 43 | 43 | $this->validationResultHandler = $validationResultHandler; |
@@ -75,10 +75,10 @@ discard block |
||
| 75 | 75 | * @throws Exception |
| 76 | 76 | */ |
| 77 | 77 | private function buildKey($keyPath) { |
| 78 | - if(is_string($keyPath)) { |
|
| 78 | + if (is_string($keyPath)) { |
|
| 79 | 79 | $keyPath = explode('.', $keyPath); |
| 80 | 80 | } |
| 81 | - if(!is_array($keyPath)) { |
|
| 81 | + if (!is_array($keyPath)) { |
|
| 82 | 82 | throw new Exception('Invalid key'); |
| 83 | 83 | } |
| 84 | 84 | return $keyPath; |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | * @return bool |
| 90 | 90 | */ |
| 91 | 91 | private function isValidArray(array $array) { |
| 92 | - $data = array_filter($array, function ($value) { |
|
| 93 | - if(is_array($value)) { |
|
| 92 | + $data = array_filter($array, function($value) { |
|
| 93 | + if (is_array($value)) { |
|
| 94 | 94 | return $this->isValidArray($value); |
| 95 | 95 | } |
| 96 | 96 | return (string) $value !== ''; |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | if (!$count) { |
| 110 | 110 | return $default; |
| 111 | 111 | } |
| 112 | - for($idx = 0; $idx < $count; $idx++) { |
|
| 112 | + for ($idx = 0; $idx < $count; $idx++) { |
|
| 113 | 113 | $part = $path[$idx]; |
| 114 | - if(!array_key_exists($part, $array)) { |
|
| 114 | + if (!array_key_exists($part, $array)) { |
|
| 115 | 115 | return $default; |
| 116 | 116 | } |
| 117 | 117 | $array = $array[$part]; |
@@ -21,16 +21,16 @@ |
||
| 21 | 21 | * @return array[]|\Generator |
| 22 | 22 | */ |
| 23 | 23 | public function generate(QueryStatement $statement, Closure $callback = null) { |
| 24 | - while($row = $statement->fetch(\PDO::FETCH_ASSOC)) { |
|
| 25 | - if($this->preserveTypes) { |
|
| 24 | + while ($row = $statement->fetch(\PDO::FETCH_ASSOC)) { |
|
| 25 | + if ($this->preserveTypes) { |
|
| 26 | 26 | $columnDefinitions = FieldTypeProvider::getFieldTypes($statement); |
| 27 | 27 | $row = FieldValueConverter::convertValues($row, $columnDefinitions); |
| 28 | 28 | } |
| 29 | - if($callback !== null) { |
|
| 29 | + if ($callback !== null) { |
|
| 30 | 30 | $result = $callback($row); |
| 31 | - if($result instanceof DBIgnoreRow) { |
|
| 31 | + if ($result instanceof DBIgnoreRow) { |
|
| 32 | 32 | // Do nothing in this case |
| 33 | - } elseif($result !== null) { |
|
| 33 | + } elseif ($result !== null) { |
|
| 34 | 34 | yield $result; |
| 35 | 35 | } else { |
| 36 | 36 | yield $row; |