@@ -3,58 +3,58 @@ |
||
| 3 | 3 | use Maphper\Maphper; |
| 4 | 4 | |
| 5 | 5 | class ArrayFilter { |
| 6 | - private $array; |
|
| 7 | - |
|
| 8 | - public function __construct(array $array) { |
|
| 9 | - $this->array = $array; |
|
| 10 | - } |
|
| 11 | - |
|
| 12 | - public function filter($fields) { |
|
| 13 | - $filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND)); |
|
| 14 | - // Need to reset indexes |
|
| 15 | - $filteredArray = array_values($filteredArray); |
|
| 16 | - return $filteredArray; |
|
| 17 | - } |
|
| 18 | - |
|
| 19 | - private function getSearchFieldFunction($fields, $mode) { |
|
| 20 | - return function ($data) use ($fields, $mode) { |
|
| 21 | - foreach ($fields as $key => $val) { |
|
| 22 | - $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode); |
|
| 23 | - |
|
| 24 | - if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true; |
|
| 25 | - else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) return false; |
|
| 26 | - } |
|
| 27 | - return (bool)(Maphper::FIND_OR ^ $mode); |
|
| 28 | - }; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - private function getIfFieldMatches($key, $val, $data, $mode) { |
|
| 32 | - if ($this->shouldRunDeepSearch($key, $val)) { |
|
| 33 | - return $this->getSearchFieldFunction($val, $key)($data); |
|
| 34 | - } |
|
| 35 | - else if (!isset($data->$key)) return false; |
|
| 36 | - else if ($this->isInArraySearch($mode, $key, $val)) |
|
| 37 | - return in_array($data->$key, $val); |
|
| 38 | - else |
|
| 39 | - return $this->processFilter($mode, $val, $data->$key); |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - private function shouldRunDeepSearch($key, $val) { |
|
| 43 | - return is_numeric($key) && is_array($val); |
|
| 44 | - } |
|
| 45 | - |
|
| 46 | - private function isInArraySearch($mode, $key, $val) { |
|
| 47 | - return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val); |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - private function processFilter($mode, $expected, $actual) { |
|
| 51 | - if (Maphper::FIND_NOT & $mode) return $expected != $actual; |
|
| 52 | - else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) return $expected <= $actual; |
|
| 53 | - else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) return $expected >= $actual; |
|
| 54 | - else if (Maphper::FIND_GREATER & $mode) return $expected < $actual; |
|
| 55 | - else if (Maphper::FIND_LESS & $mode) return $expected > $actual; |
|
| 56 | - else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1]; |
|
| 57 | - else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual); |
|
| 58 | - return $expected == $actual; |
|
| 59 | - } |
|
| 6 | + private $array; |
|
| 7 | + |
|
| 8 | + public function __construct(array $array) { |
|
| 9 | + $this->array = $array; |
|
| 10 | + } |
|
| 11 | + |
|
| 12 | + public function filter($fields) { |
|
| 13 | + $filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND)); |
|
| 14 | + // Need to reset indexes |
|
| 15 | + $filteredArray = array_values($filteredArray); |
|
| 16 | + return $filteredArray; |
|
| 17 | + } |
|
| 18 | + |
|
| 19 | + private function getSearchFieldFunction($fields, $mode) { |
|
| 20 | + return function ($data) use ($fields, $mode) { |
|
| 21 | + foreach ($fields as $key => $val) { |
|
| 22 | + $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode); |
|
| 23 | + |
|
| 24 | + if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true; |
|
| 25 | + else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) return false; |
|
| 26 | + } |
|
| 27 | + return (bool)(Maphper::FIND_OR ^ $mode); |
|
| 28 | + }; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + private function getIfFieldMatches($key, $val, $data, $mode) { |
|
| 32 | + if ($this->shouldRunDeepSearch($key, $val)) { |
|
| 33 | + return $this->getSearchFieldFunction($val, $key)($data); |
|
| 34 | + } |
|
| 35 | + else if (!isset($data->$key)) return false; |
|
| 36 | + else if ($this->isInArraySearch($mode, $key, $val)) |
|
| 37 | + return in_array($data->$key, $val); |
|
| 38 | + else |
|
| 39 | + return $this->processFilter($mode, $val, $data->$key); |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + private function shouldRunDeepSearch($key, $val) { |
|
| 43 | + return is_numeric($key) && is_array($val); |
|
| 44 | + } |
|
| 45 | + |
|
| 46 | + private function isInArraySearch($mode, $key, $val) { |
|
| 47 | + return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val); |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + private function processFilter($mode, $expected, $actual) { |
|
| 51 | + if (Maphper::FIND_NOT & $mode) return $expected != $actual; |
|
| 52 | + else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) return $expected <= $actual; |
|
| 53 | + else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) return $expected >= $actual; |
|
| 54 | + else if (Maphper::FIND_GREATER & $mode) return $expected < $actual; |
|
| 55 | + else if (Maphper::FIND_LESS & $mode) return $expected > $actual; |
|
| 56 | + else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1]; |
|
| 57 | + else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual); |
|
| 58 | + return $expected == $actual; |
|
| 59 | + } |
|
| 60 | 60 | } |
@@ -21,8 +21,11 @@ discard block |
||
| 21 | 21 | foreach ($fields as $key => $val) { |
| 22 | 22 | $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode); |
| 23 | 23 | |
| 24 | - if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true; |
|
| 25 | - else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) return false; |
|
| 24 | + if (Maphper::FIND_OR & $mode && $currentFieldResult === true) { |
|
| 25 | + return true; |
|
| 26 | + } else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) { |
|
| 27 | + return false; |
|
| 28 | + } |
|
| 26 | 29 | } |
| 27 | 30 | return (bool)(Maphper::FIND_OR ^ $mode); |
| 28 | 31 | }; |
@@ -31,12 +34,13 @@ discard block |
||
| 31 | 34 | private function getIfFieldMatches($key, $val, $data, $mode) { |
| 32 | 35 | if ($this->shouldRunDeepSearch($key, $val)) { |
| 33 | 36 | return $this->getSearchFieldFunction($val, $key)($data); |
| 37 | + } else if (!isset($data->$key)) { |
|
| 38 | + return false; |
|
| 39 | + } else if ($this->isInArraySearch($mode, $key, $val)) { |
|
| 40 | + return in_array($data->$key, $val); |
|
| 41 | + } else { |
|
| 42 | + return $this->processFilter($mode, $val, $data->$key); |
|
| 34 | 43 | } |
| 35 | - else if (!isset($data->$key)) return false; |
|
| 36 | - else if ($this->isInArraySearch($mode, $key, $val)) |
|
| 37 | - return in_array($data->$key, $val); |
|
| 38 | - else |
|
| 39 | - return $this->processFilter($mode, $val, $data->$key); |
|
| 40 | 44 | } |
| 41 | 45 | |
| 42 | 46 | private function shouldRunDeepSearch($key, $val) { |
@@ -48,13 +52,21 @@ discard block |
||
| 48 | 52 | } |
| 49 | 53 | |
| 50 | 54 | private function processFilter($mode, $expected, $actual) { |
| 51 | - if (Maphper::FIND_NOT & $mode) return $expected != $actual; |
|
| 52 | - else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) return $expected <= $actual; |
|
| 53 | - else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) return $expected >= $actual; |
|
| 54 | - else if (Maphper::FIND_GREATER & $mode) return $expected < $actual; |
|
| 55 | - else if (Maphper::FIND_LESS & $mode) return $expected > $actual; |
|
| 56 | - else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1]; |
|
| 57 | - else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual); |
|
| 55 | + if (Maphper::FIND_NOT & $mode) { |
|
| 56 | + return $expected != $actual; |
|
| 57 | + } else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) { |
|
| 58 | + return $expected <= $actual; |
|
| 59 | + } else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) { |
|
| 60 | + return $expected >= $actual; |
|
| 61 | + } else if (Maphper::FIND_GREATER & $mode) { |
|
| 62 | + return $expected < $actual; |
|
| 63 | + } else if (Maphper::FIND_LESS & $mode) { |
|
| 64 | + return $expected > $actual; |
|
| 65 | + } else if (Maphper::FIND_BETWEEN & $mode) { |
|
| 66 | + return $expected[0] <= $actual && $actual <= $expected[1]; |
|
| 67 | + } else if (Maphper::FIND_NOCASE & $mode) { |
|
| 68 | + return strtolower($expected) == strtolower($actual); |
|
| 69 | + } |
|
| 58 | 70 | return $expected == $actual; |
| 59 | 71 | } |
| 60 | 72 | } |