Merge pull request #4734 from derrabus/bugfix/return-type-will-change

Add ReturnTypeWillChange to core interface implementations
doctrine · Aug 2, 2021 · 10022d9 · 10022d9
2 parents f2cb302 + f4a706f
commit 10022d9
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Cache/ArrayStatement.php b/lib/Doctrine/DBAL/Cache/ArrayStatement.php
@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_merge;
 use function array_values;
@@ -95,6 +96,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  $data = $this->fetchAll();

diff --git a/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php b/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php
@@ -13,6 +13,7 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_map;
 use function array_merge;
@@ -109,6 +110,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  $data = $this->fetchAll();

diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
@@ -17,6 +17,7 @@
 use ReflectionClass;
 use ReflectionObject;
 use ReflectionProperty;
+use ReturnTypeWillChange;
 use stdClass;
 
 use function array_change_key_case;
@@ -270,6 +271,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
@@ -17,6 +17,7 @@
 use mysqli;
 use mysqli_stmt;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_combine;
 use function array_fill;
@@ -563,6 +564,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -13,6 +13,7 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_key_exists;
 use function assert;
@@ -431,6 +432,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
@@ -13,6 +13,7 @@
 use PDO;
 use ReflectionClass;
 use ReflectionObject;
+use ReturnTypeWillChange;
 use stdClass;
 
 use function array_key_exists;
@@ -320,6 +321,7 @@ public function fetchColumn($columnIndex = 0)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
@@ -11,6 +11,7 @@
 use Doctrine\DBAL\ParameterType;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_key_exists;
 use function count;
@@ -349,6 +350,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Driver/StatementIterator.php b/lib/Doctrine/DBAL/Driver/StatementIterator.php
@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Driver;
 
 use IteratorAggregate;
+use ReturnTypeWillChange;
 
 /**
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn().
@@ -20,6 +21,7 @@ public function __construct(ResultStatement $statement)
  /**
  * {@inheritdoc}
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  while (($result = $this->statement->fetch()) !== false) {

diff --git a/lib/Doctrine/DBAL/ForwardCompatibility/Result.php b/lib/Doctrine/DBAL/ForwardCompatibility/Result.php
@@ -9,6 +9,7 @@
 use Doctrine\Deprecations\Deprecation;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 use Traversable;
 
 use function array_shift;
@@ -40,6 +41,7 @@ public function __construct(Driver\ResultStatement $stmt)
  /**
  * @return Driver\ResultStatement
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return $this->stmt;

diff --git a/lib/Doctrine/DBAL/Portability/Statement.php b/lib/Doctrine/DBAL/Portability/Statement.php
@@ -10,6 +10,7 @@
 use Doctrine\DBAL\ParameterType;
 use IteratorAggregate;
 use PDO;
+use ReturnTypeWillChange;
 
 use function array_change_key_case;
 use function assert;
@@ -134,6 +135,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  return new StatementIterator($this);

diff --git a/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php b/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php
@@ -4,6 +4,7 @@
 
 use Countable;
 use Doctrine\Deprecations\Deprecation;
+use ReturnTypeWillChange;
 
 use function array_merge;
 use function count;
@@ -153,6 +154,7 @@ public function with($part, ...$parts): self
  *
  * @return int
  */
+ #[ReturnTypeWillChange]
  public function count()
  {
  return count($this->parts);

diff --git a/lib/Doctrine/DBAL/Statement.php b/lib/Doctrine/DBAL/Statement.php
@@ -13,6 +13,7 @@
 use IteratorAggregate;
 use PDO;
 use PDOStatement;
+use ReturnTypeWillChange;
 use Throwable;
 use Traversable;
 
@@ -319,6 +320,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * {@inheritdoc}
  */
+ #[ReturnTypeWillChange]
  public function getIterator()
  {
  Deprecation::trigger(

diff --git a/tests/Doctrine/Tests/DBAL/Functional/Connection/BackwardCompatibility/Statement.php b/tests/Doctrine/Tests/DBAL/Functional/Connection/BackwardCompatibility/Statement.php
@@ -8,6 +8,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Statement as BaseStatement;
 use PDO;
+use Traversable;
 
 use function assert;
 
@@ -112,7 +113,7 @@ public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
  *
  * @deprecated Use iterateNumeric(), iterateAssociative() or iterateColumn() instead.
  */
- public function getIterator()
+ public function getIterator(): Traversable
  {
  return new StatementIterator($this);
  }