Remove Abstraction\Result

UPGRADE.md

@@ -1,5 +1,9 @@
 # Upgrade to 3.0
 
+## BC BREAK `Doctrine\DBAL\Abstraction\Result` removed
+
+The `Doctrine\DBAL\Abstraction\Result` interface is removed. Use the `Doctrine\DBAL\Result` class instead.
+
 ## BC BREAK: `Doctrine\DBAL\Types\Type::getDefaultLength()` removed
 
 The `Doctrine\DBAL\Types\Type::getDefaultLength()` method has been removed as it served no purpose.

src/Cache/CachingResult.php

@@ -5,7 +5,8 @@
 use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\FetchUtils;
-use Doctrine\DBAL\Driver\Result;
+use Doctrine\DBAL\Driver\Result as DriverResult;
+use Doctrine\DBAL\Result;
 
 use function array_map;
 use function array_values;
@@ -23,7 +24,7 @@
  *
  * @internal The class is internal to the caching layer implementation.
  */
-class CachingResult implements Result
+class CachingResult implements DriverResult
 {
     /** @var Cache */
     private $cache;

src/Connection.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Doctrine\Common\EventManager;
-use Doctrine\DBAL\Abstraction\Result as AbstractionResult;
 use Doctrine\DBAL\Cache\ArrayResult;
 use Doctrine\DBAL\Cache\CacheException;
 use Doctrine\DBAL\Cache\CachingResult;
@@ -974,7 +973,7 @@ public function executeQuery(
         array $params = [],
         $types = [],
         ?QueryCacheProfile $qcp = null
-    ): AbstractionResult {
+    ): Result {
         if ($qcp !== null) {
             return $this->executeCacheQuery($sql, $params, $types, $qcp);
         }

src/Query/QueryBuilder.php

@@ -3,11 +3,11 @@
 namespace Doctrine\DBAL\Query;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Query\Expression\CompositeExpression;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
+use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Statement;
 
 use function array_key_exists;

src/Result.php

@@ -4,13 +4,12 @@
 
 namespace Doctrine\DBAL;
 
-use Doctrine\DBAL\Abstraction\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\Exception\NoKeyValue;
 use Traversable;
 
-final class Result implements ResultInterface
+class Result
 {
     /** @var DriverResult */
     private $result;
@@ -28,7 +27,9 @@ public function __construct(DriverResult $result, Connection $connection)
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the next row of the result as a numeric array or FALSE if there are no more rows.
+     *
+     * @return array<int,mixed>|false
      *
      * @throws Exception
      */
@@ -42,7 +43,9 @@ public function fetchNumeric()
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the next row of the result as an associative array or FALSE if there are no more rows.
+     *
+     * @return array<string,mixed>|false
      *
      * @throws Exception
      */
@@ -56,7 +59,9 @@ public function fetchAssociative()
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the first value of the next row of the result or FALSE if there are no more rows.
+     *
+     * @return mixed|false
      *
      * @throws Exception
      */
@@ -70,7 +75,9 @@ public function fetchOne()
     }
 
     /**
-     * {@inheritDoc}
+     * Returns an array containing all of the result rows represented as numeric arrays.
+     *
+     * @return array<int,array<int,mixed>>
      *
      * @throws Exception
      */
@@ -84,7 +91,9 @@ public function fetchAllNumeric(): array
     }
 
     /**
-     * {@inheritDoc}
+     * Returns an array containing all of the result rows represented as associative arrays.
+     *
+     * @return array<int,array<string,mixed>>
      *
      * @throws Exception
      */
@@ -98,7 +107,9 @@ public function fetchAllAssociative(): array
     }
 
     /**
-     * {@inheritDoc}
+     * Returns an array containing the values of the first column of the result.
+     *
+     * @return array<mixed,mixed>
      *
      * @throws Exception
      */

tests/ConnectionTest.php

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\EventManager;
-use Doctrine\DBAL\Abstraction\Result;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
@@ -19,6 +18,7 @@
 use Doctrine\DBAL\Logging\DebugStack;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Result;
 use Doctrine\DBAL\VersionAwarePlatformDriver;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

tests/Functional/ResultCacheTest.php

@@ -4,8 +4,8 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
-use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Logging\DebugStack;
+use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 

tests/Functional/StatementTest.php

@@ -4,8 +4,8 @@
 
 use Doctrine\DBAL\Driver\Exception;
 use Doctrine\DBAL\Driver\PDO;
-use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Types\Type;