diff options
author | ignace nyamagana butera <nyamsprod@gmail.com> | 2015-12-01 12:33:30 +0100 |
---|---|---|
committer | ignace nyamagana butera <nyamsprod@gmail.com> | 2015-12-01 12:33:30 +0100 |
commit | 4aafc97b50ace01758de7824dbc15d1a242cec24 (patch) | |
tree | 3c6fa9cf1b0ff0cf6347901cc43c3096b5c1d874 /src | |
parent | e2b4f8530bdd3fc5b47891defc6da08c015c0a4e (diff) | |
download | csv-4aafc97b50ace01758de7824dbc15d1a242cec24.zip csv-4aafc97b50ace01758de7824dbc15d1a242cec24.tar.gz csv-4aafc97b50ace01758de7824dbc15d1a242cec24.tar.bz2 |
Improve QueryFilter code
Diffstat (limited to 'src')
-rw-r--r-- | src/Modifier/QueryFilter.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Modifier/QueryFilter.php b/src/Modifier/QueryFilter.php index 591579a..12d4ff5 100644 --- a/src/Modifier/QueryFilter.php +++ b/src/Modifier/QueryFilter.php @@ -296,13 +296,14 @@ trait QueryFilter $obj = new ArrayObject(iterator_to_array($iterator)); $obj->uasort(function ($rowA, $rowB) { - foreach ($this->iterator_sort_by as $callable) { - if (0 !== ($sortRes = call_user_func($callable, $rowA, $rowB))) { + foreach ($this->iterator_sort_by as $compareRows) { + $res = call_user_func($compareRows, $rowA, $rowB); + if (0 !== $res) { break; } } - return $sortRes; + return $res; }); $this->iterator_sort_by = []; @@ -319,8 +320,8 @@ trait QueryFilter protected function applyIteratorInterval(Iterator $iterator) { $offset = $this->iterator_offset; - $limit = $this->iterator_limit; - $this->iterator_limit = -1; + $limit = $this->iterator_limit; + $this->iterator_limit = -1; $this->iterator_offset = 0; return new LimitIterator($iterator, $offset, $limit); |