Merge pull request #9076 from derrabus/remove/hydrate-row

Author: greg0ire

UPGRADE.md

@@ -31,9 +31,14 @@ Using the `UUID` strategy for generating identifiers is not supported anymore.
 
 ## BC BREAK: Removed `Query::iterate()`
 
-The deprecated methods `Query::iterate()` and `AbstractHydrator::iterate()`
-have been removed along with the `IterableResult` class. Use `toIterable()`
-instead.
+The deprecated method `Query::iterate()` has been removed along with the
+following classes and methods:
+
+- `AbstractHydrator::iterate()`
+- `AbstractHydrator::hydrateRow()`
+- `IterableResult`
+
+Use `toIterable()` instead.
 
 # Upgrade to 2.11
 

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -7,7 +7,6 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -183,38 +182,6 @@ public function hydrateAll(Result $stmt, object $resultSetMapping, array $hints
         return $result;
     }
 
-    /**
-     * Hydrates a single row returned by the current statement instance during
-     * row-by-row hydration with {@link toIterable()}.
-     *
-     * @deprecated
-     *
-     * @return mixed[]|false
-     */
-    public function hydrateRow()
-    {
-        Deprecation::triggerIfCalledFromOutside(
-            'doctrine/orm',
-            'https://github.com/doctrine/orm/pull/9072',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        $row = $this->statement()->fetchAssociative();
-
-        if ($row === false) {
-            $this->cleanup();
-
-            return false;
-        }
-
-        $result = [];
-
-        $this->hydrateRowData($row, $result);
-
-        return $result;
-    }
-
     /**
      * When executed in a hydrate() loop we have to clear internal state to
      * decrease memory consumption.

psalm.xml

@@ -29,7 +29,6 @@
                 <!-- We're calling the deprecated method for BC here. -->
                 <file name="lib/Doctrine/ORM/Internal/SQLResultCasing.php"/>
                 <!-- Remove on 3.0.x -->
-                <referencedMethod name="Doctrine\ORM\Internal\Hydration\AbstractHydrator::hydrateRow"/>
                 <referencedMethod name="Doctrine\ORM\Configuration::ensureProductionSettings"/>
             </errorLevel>
         </DeprecatedMethod>