diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config/Output.php | 2 | ||||
| -rw-r--r-- | src/Modifier/QueryFilter.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Config/Output.php b/src/Config/Output.php index e275e9b..27221d6 100644 --- a/src/Config/Output.php +++ b/src/Config/Output.php @@ -103,7 +103,7 @@ trait Output */ public function getEncodingFrom() { - return $this->input_encoding; + return $this->getInputEncoding(); } /** diff --git a/src/Modifier/QueryFilter.php b/src/Modifier/QueryFilter.php index a9be156..2dad9bd 100644 --- a/src/Modifier/QueryFilter.php +++ b/src/Modifier/QueryFilter.php @@ -12,7 +12,7 @@ */ namespace League\Csv\Modifier; -use ArrayObject; +use ArrayIterator; use CallbackFilterIterator; use Iterator; use LimitIterator; @@ -263,7 +263,7 @@ trait QueryFilter return $iterator; } - $obj = new ArrayObject(iterator_to_array($iterator)); + $obj = new ArrayIterator(iterator_to_array($iterator)); $obj->uasort(function ($row_a, $row_b) { $res = 0; foreach ($this->iterator_sort_by as $compare) { @@ -276,7 +276,7 @@ trait QueryFilter }); $this->iterator_sort_by = []; - return $obj->getIterator(); + return $obj; } /** |