Remove ArrayIterator::uasort and SplFileObject::READ_AHEAD usage (#590)

Author: nyamsprod

CHANGELOG.md

@@ -20,6 +20,7 @@ All Notable changes to `Csv` will be documented in this file
 - `EscapeFormula` round-trip now preserves fields starting with the escape character
 - BOM handling is re-written to fix [#586]([https://github](https://github.com/thephpleague/csv/issues/586))
 - CSV Header during CSV download.
+- Remove `ArrayIterator::uasort` usage because the method is deprecated in PHP8.6.
 
 ### Remove
 

README.md

@@ -42,6 +42,7 @@ Please find below the PHP support for `Csv` version 9.
 | 9.8.0                | PHP 7.4.0        | PHP 8.1.x                  |
 | 9.9.0                | PHP 8.1.2        | PHP 8.3.x                  |
 | 9.16.0               | PHP 8.1.2        | PHP 8.x                    |
+| 9.29.0               | PHP 8.2.0        | PHP 8.x                    |
 
 ## Install
 

src/Query/Ordering/Column.php

@@ -19,7 +19,6 @@
 use League\Csv\Query\QueryException;
 use League\Csv\Query\Row;
 use League\Csv\Query\Sort;
-use OutOfBoundsException;
 use ReflectionException;
 use SortDirection;
 
@@ -28,6 +27,7 @@
 use function iterator_to_array;
 use function strtoupper;
 use function trim;
+use function uasort;
 
 /**
  * Enable sorting a record based on the value of a one of its cell.
@@ -111,20 +111,9 @@ public function __invoke(mixed $valueA, mixed $valueB): int
 
     public function sort(iterable $value): Iterator
     {
-        $class = new class () extends ArrayIterator {
-            public function seek(int $offset): void
-            {
-                try {
-                    parent::seek($offset);
-                } catch (OutOfBoundsException) {
-                    return;
-                }
-            }
-        };
-
-        $it = new $class(!is_array($value) ? iterator_to_array($value) : $value);
-        $it->uasort($this);
+        $arr = !is_array($value) ? iterator_to_array($value) : $value;
+        uasort($arr, $this);
 
-        return $it;
+        return new ArrayIterator($arr);
     }
 }

src/Query/Ordering/MultiSort.php

@@ -19,9 +19,11 @@
 use League\Csv\MapIterator;
 use League\Csv\Query\Sort;
 use League\Csv\Query\SortCombinator;
-use OutOfBoundsException;
 
 use function array_map;
+use function is_array;
+use function iterator_to_array;
+use function uasort;
 
 /**
  * Enable sorting a record based on multiple column.
@@ -96,20 +98,9 @@ public function sort(iterable $value): Iterator
             return MapIterator::toIterator($value);
         }
 
-        $class = new class () extends ArrayIterator {
-            public function seek(int $offset): void
-            {
-                try {
-                    parent::seek($offset);
-                } catch (OutOfBoundsException) {
-                    return;
-                }
-            }
-        };
-
-        $it = new $class(!is_array($value) ? iterator_to_array($value) : $value);
-        $it->uasort($this);
+        $arr = !is_array($value) ? iterator_to_array($value) : $value;
+        uasort($arr, $this);
 
-        return $it;
+        return new ArrayIterator($arr);
     }
 }

src/Query/Sort.php

@@ -21,7 +21,6 @@
  * The class can be used directly with PHP's
  * <ol>
  * <li>usort and uasort.</li>
- * <li>ArrayIterator::uasort.</li>
  * <li>ArrayObject::uasort.</li>
  * </ol>
  */

src/Reader.php

@@ -205,7 +205,7 @@ protected function getSeekableIterator(): SeekableIterator
      */
     protected function getDocument(): SplFileObject|Stream
     {
-        $this->document->setFlags(SplFileObject::READ_CSV | SplFileObject::READ_AHEAD);
+        $this->document->setFlags(SplFileObject::READ_CSV);
         $this->document->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
         $this->document->rewind();
 

src/ResultSet.php

@@ -27,6 +27,7 @@
 use League\Csv\Serializer\TypeCastingFailed;
 use LimitIterator;
 use mysqli_result;
+use OutOfBoundsException;
 use PDOStatement;
 use PgSql\Result;
 use ReflectionException;
@@ -534,8 +535,12 @@ public function nth(int $nth): array
     {
         0 <= $nth || throw InvalidArgument::dueToInvalidRecordOffset($nth, __METHOD__);
 
-        $iterator = new LimitIterator($this->getIterator(), $nth, 1);
-        $iterator->rewind();
+        try {
+            $iterator = new LimitIterator($this->getIterator(), $nth, 1);
+            $iterator->rewind();
+        } catch (OutOfBoundsException) {
+            return [];
+        }
 
         /** @var array|null $result */
         $result = $iterator->current(); /* @phpstan-ignore-line */

src/Statement.php

@@ -18,7 +18,6 @@
 use Closure;
 use Deprecated;
 use Iterator;
-use OutOfBoundsException;
 use ReflectionException;
 use ReflectionFunction;
 use SortDirection;
@@ -464,22 +463,11 @@ protected function buildOrderBy(Iterator $iterator): Iterator
             return $cmp ?? 0;
         };
 
-        $class = new class () extends ArrayIterator {
-            public function seek(int $offset): void
-            {
-                try {
-                    parent::seek($offset);
-                } catch (OutOfBoundsException) {
-                    return;
-                }
-            }
-        };
-
-        /** @var ArrayIterator<array-key, array<string|null>> $it */
-        $it = new $class([...$iterator]);
-        $it->uasort($compare);
+        /** @var array<array-key, array<string|null>> $arr */
+        $arr = [...$iterator];
+        uasort($arr, $compare);
 
-        return $it;
+        return new ArrayIterator($arr);
     }