More compensation for poor PHP 8.1 backward compatibility

CHANGELOG.md

@@ -1,3 +1,6 @@
+- 2.0.1
+    - Compensate for PHP 8.1 backward compatibility issues
+
 - 2.0.0
     - Gradient Boost now uses gradient-based subsampling
     - Allow Token Hashing Vectorizer custom hash functions

src/Extractors/CSV.php

@@ -4,7 +4,7 @@
 
 use Rubix\ML\Exceptions\InvalidArgumentException;
 use Rubix\ML\Exceptions\RuntimeException;
-use Generator;
+use Traversable;
 
 use function Rubix\ML\iterator_first;
 use function is_dir;
@@ -168,7 +168,7 @@ public function export(iterable $iterator) : void
      * @throws \Rubix\ML\Exceptions\RuntimeException
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         if (!is_file($this->path)) {
             throw new RuntimeException("Path {$this->path} is not a file.");

src/Extractors/ColumnPicker.php

@@ -3,7 +3,7 @@
 namespace Rubix\ML\Extractors;
 
 use Rubix\ML\Exceptions\RuntimeException;
-use Generator;
+use Traversable;
 
 /**
  * Column Picker
@@ -48,7 +48,7 @@ public function __construct(iterable $iterator, array $columns)
      *
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         foreach ($this->iterator as $i => $record) {
             $picked = [];

src/Extractors/Concatenator.php

@@ -2,7 +2,7 @@
 
 namespace Rubix\ML\Extractors;
 
-use Generator;
+use Traversable;
 
 use function array_values;
 
@@ -37,7 +37,7 @@ public function __construct(array $iterators)
      *
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         foreach ($this->iterators as $iterator) {
             foreach ($iterator as $record) {

src/Extractors/Deduplicator.php

@@ -3,7 +3,7 @@
 namespace Rubix\ML\Extractors;
 
 use OkBloomer\BloomFilter;
-use Generator;
+use Traversable;
 
 use function serialize;
 
@@ -71,7 +71,7 @@ public function dropped() : int
      *
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         foreach ($this->iterator as $record) {
             $token = serialize($record);

src/Extractors/NDJSON.php

@@ -5,7 +5,7 @@
 use Rubix\ML\Helpers\JSON;
 use Rubix\ML\Exceptions\InvalidArgumentException;
 use Rubix\ML\Exceptions\RuntimeException;
-use Generator;
+use Traversable;
 
 use function is_dir;
 use function is_file;
@@ -99,7 +99,7 @@ public function export(iterable $iterator) : void
      * @throws \Rubix\ML\Exceptions\RuntimeException
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         if (!is_file($this->path)) {
             throw new InvalidArgumentException("Path {$this->path} is not a file.");

src/Extractors/SQLTable.php

@@ -5,7 +5,7 @@
 use Rubix\ML\Specifications\ExtensionIsLoaded;
 use Rubix\ML\Exceptions\InvalidArgumentException;
 use Rubix\ML\Exceptions\RuntimeException;
-use Generator;
+use Traversable;
 use PDO;
 
 use function Rubix\ML\iterator_first;
@@ -85,7 +85,7 @@ public function header() : array
      *
      * @return \Generator<mixed[]>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         $query = "SELECT * FROM {$this->table} LIMIT :offset, {$this->batchSize}";
 

src/Graph/Trees/DecisionTree.php

@@ -9,6 +9,7 @@
 use Rubix\ML\Exceptions\InvalidArgumentException;
 use Rubix\ML\Exceptions\RuntimeException;
 use IteratorAggregate;
+use Traversable;
 use Generator;
 
 use function array_pop;
@@ -272,7 +273,7 @@ public function featureImportances() : array
      *
      * @return \Generator<\Rubix\ML\Graph\Nodes\Decision>
      */
-    public function getIterator() : Generator
+    public function getIterator() : Traversable
     {
         $stack = [$this->root];