revert removing Generator

yiisoft · Nov 12, 2023 · 1795dad · 1795dad
1 parent e84c617
commit 1795dad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/src/QueryBuilder/AbstractDMLQueryBuilder.php b/src/QueryBuilder/AbstractDMLQueryBuilder.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\QueryBuilder;
 
-use Generator;
 use JsonException;
 use Yiisoft\Db\Constraint\Constraint;
 use Yiisoft\Db\Constraint\IndexConstraint;
@@ -50,7 +49,7 @@ public function __construct(
     ) {
     }
 
-    public function batchInsert(string $table, array $columns, iterable|Generator $rows, array &$params = []): string
+    public function batchInsert(string $table, array $columns, iterable $rows, array &$params = []): string
     {
         if (empty($rows)) {
             return '';

diff --git a/src/QueryBuilder/AbstractQueryBuilder.php b/src/QueryBuilder/AbstractQueryBuilder.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\QueryBuilder;
 
-use Generator;
 use Yiisoft\Db\Command\CommandInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Query\QueryInterface;
@@ -109,7 +108,7 @@ public function alterColumn(string $table, string $column, ColumnInterface|strin
         return $this->ddlBuilder->alterColumn($table, $column, $type);
     }
 
-    public function batchInsert(string $table, array $columns, iterable|Generator $rows, array &$params = []): string
+    public function batchInsert(string $table, array $columns, iterable $rows, array &$params = []): string
     {
         return $this->dmlBuilder->batchInsert($table, $columns, $rows, $params);
     }

diff --git a/src/QueryBuilder/DMLQueryBuilderInterface.php b/src/QueryBuilder/DMLQueryBuilderInterface.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\QueryBuilder;
 
-use Generator;
 use JsonException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
@@ -34,7 +33,7 @@ interface DMLQueryBuilderInterface
      *
      * @param string $table The table to insert new rows into.
      * @param string[] $columns The column names of the table.
-     * @param Generator|iterable $rows The rows to batch-insert into the table.
+     * @param iterable $rows The rows to batch-insert into the table.
      * @param array $params The binding parameters. This parameter exists.
      *
      * @throws Exception
@@ -49,7 +48,7 @@ interface DMLQueryBuilderInterface
      * - That the values in each row must match the corresponding column names.
      * - The method will escape the column names, and quote the values to insert.
      */
-    public function batchInsert(string $table, array $columns, iterable|Generator $rows, array &$params = []): string;
+    public function batchInsert(string $table, array $columns, iterable $rows, array &$params = []): string;
 
     /**
      * Creates a `DELETE` SQL statement.

diff --git a/tests/AbstractQueryBuilderTest.php b/tests/AbstractQueryBuilderTest.php
@@ -5,7 +5,6 @@
 namespace Yiisoft\Db\Tests;
 
 use Closure;
-use Generator;
 use JsonException;
 use PHPUnit\Framework\TestCase;
 use stdClass;
@@ -211,7 +210,7 @@ public function testAlterColumn(): void
      *
      * @psalm-param array<array-key, string> $columns
      */
-    public function testBatchInsert(string $table, array $columns, iterable|Generator $rows, string $expected): void
+    public function testBatchInsert(string $table, array $columns, iterable $rows, string $expected): void
     {
         $db = $this->getConnection();
 

diff --git a/tests/Db/QueryBuilder/QueryBuilderTest.php b/tests/Db/QueryBuilder/QueryBuilderTest.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\Tests\Db\QueryBuilder;
 
-use Generator;
 use JsonException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
@@ -48,7 +47,7 @@ public function testAddDefaultValue(): void
     /**
      * @dataProvider \Yiisoft\Db\Tests\Provider\QueryBuilderProvider::batchInsert
      */
-    public function testBatchInsert(string $table, array $columns, iterable|Generator $rows, string $expected): void
+    public function testBatchInsert(string $table, array $columns, iterable $rows, string $expected): void
     {
         $db = $this->getConnection();