Merge pull request #3807 from morozov/remove-requires-query-for-server-version

Removed ServerInfoAwareConnection#requiresQueryForServerVersion() as implementation detail

UPGRADE.md

 # Upgrade to 3.0
 
+## BC BREAK: `ServerInfoAwareConnection::requiresQueryForServerVersion()` is removed.
+
+The `ServerInfoAwareConnection::requiresQueryForServerVersion()` method has been removed as an implementation detail which is the same for almost all supported drivers.
+
 ## BC BREAK: PingableConnection and ServerInfoAwareConnection interfaces now extends Connection
 
 All implementations of the `PingableConnection` and `ServerInfoAwareConnection` interfaces have to implement the methods defined in the `Connection` interface as well.

lib/Doctrine/DBAL/Connection.php

@@ -393,7 +393,7 @@ class Connection implements DriverConnection
         $connection = $this->getWrappedConnection();
 
         // Automatic platform version detection.
-        if ($connection instanceof ServerInfoAwareConnection && ! $connection->requiresQueryForServerVersion()) {
+        if ($connection instanceof ServerInfoAwareConnection) {
             return $connection->getServerVersion();
         }
 

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php

@@ -59,14 +59,6 @@ class DB2Connection implements ServerInfoAwareConnection
         return $serverInfo->DBMS_VER;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      */

lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php

@@ -117,14 +117,6 @@ class MysqliConnection implements PingableConnection, ServerInfoAwareConnection
         return $majorVersion . '.' . $minorVersion . '.' . $patchVersion;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      */

lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php

@@ -85,14 +85,6 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
         return $matches[1];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      */

lib/Doctrine/DBAL/Driver/PDOConnection.php

@@ -105,14 +105,6 @@ class PDOConnection implements ServerInfoAwareConnection
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return false;
-    }
-
     /**
      * Creates a wrapped statement
      */

lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php

@@ -144,14 +144,6 @@ class SQLAnywhereConnection implements ServerInfoAwareConnection
         return "'" . sasql_escape_string($this->connection, $input) . "'";
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return true;
-    }
-
     /**
      * {@inheritdoc}
      *

lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php

@@ -59,14 +59,6 @@ class SQLSrvConnection implements ServerInfoAwareConnection
         return $serverInfo['SQLServerVersion'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function requiresQueryForServerVersion() : bool
-    {
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */

lib/Doctrine/DBAL/Driver/ServerInfoAwareConnection.php

@@ -13,11 +13,4 @@ interface ServerInfoAwareConnection extends Connection
      * Returns the version number of the database server connected to.
      */
     public function getServerVersion() : string;
-
-    /**
-     * Checks whether a query is required to retrieve the database server version.
-     *
-     * @return bool True if a query is required to retrieve the database server version, false otherwise.
-     */
-    public function requiresQueryForServerVersion() : bool;
 }

tests/Doctrine/Tests/DBAL/ConnectionTest.php

@@ -687,10 +687,6 @@ class ConnectionTest extends DbalTestCase
             ->method('connect')
             ->will($this->returnValue($driverConnectionMock));
 
-        $driverConnectionMock->expects($this->once())
-            ->method('requiresQueryForServerVersion')
-            ->will($this->returnValue(false));
-
         $driverConnectionMock->expects($this->once())
             ->method('getServerVersion')
             ->will($this->returnValue('6.6.6'));

tests/Doctrine/Tests/DBAL/Driver/IBMDB2/DB2ConnectionTest.php

-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\DBAL\Driver\IBMDB2;
-
-use Doctrine\DBAL\Driver\IBMDB2\DB2Connection;
-use Doctrine\Tests\DbalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use function extension_loaded;
-
-class DB2ConnectionTest extends DbalTestCase
-{
-    /**
-     * The ibm_db2 driver connection mock under test.
-     *
-     * @var DB2Connection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp() : void
-    {
-        if (! extension_loaded('ibm_db2')) {
-            $this->markTestSkipped('ibm_db2 is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(DB2Connection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion() : void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php

@@ -8,20 +8,12 @@ use Doctrine\DBAL\Driver\Mysqli\Exception\ConnectionError;
 use Doctrine\DBAL\Driver\Mysqli\MysqliConnection;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\Tests\DbalFunctionalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
 use function extension_loaded;
 use function restore_error_handler;
 use function set_error_handler;
 
 class MysqliConnectionTest extends DbalFunctionalTestCase
 {
-    /**
-     * The mysqli driver connection mock under test.
-     *
-     * @var MysqliConnection|MockObject
-     */
-    private $connectionMock;
-
     protected function setUp() : void
     {
         if (! extension_loaded('mysqli')) {
@@ -30,18 +22,11 @@ class MysqliConnectionTest extends DbalFunctionalTestCase
 
         parent::setUp();
 
-        if (! $this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-            $this->markTestSkipped('MySQL only test.');
-        }
-
-        $this->connectionMock = $this->getMockBuilder(MysqliConnection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            return;
         }
 
-    public function testDoesNotRequireQueryForServerVersion() : void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
+        $this->markTestSkipped('MySQL only test.');
     }
 
     public function testRestoresErrorHandlerOnException() : void

tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8ConnectionTest.php

-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\DBAL\Driver\OCI8;
-
-use Doctrine\DBAL\Driver\OCI8\OCI8Connection;
-use Doctrine\Tests\DbalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use function extension_loaded;
-
-class OCI8ConnectionTest extends DbalTestCase
-{
-    /**
-     * The oci8 driver connection mock under test.
-     *
-     * @var OCI8Connection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp() : void
-    {
-        if (! extension_loaded('oci8')) {
-            $this->markTestSkipped('oci8 is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(OCI8Connection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion() : void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Doctrine/Tests/DBAL/Driver/SQLAnywhere/SQLAnywhereConnectionTest.php

-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\DBAL\Driver\SQLAnywhere;
-
-use Doctrine\DBAL\Driver\SQLAnywhere\SQLAnywhereConnection;
-use Doctrine\Tests\DbalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use function extension_loaded;
-
-class SQLAnywhereConnectionTest extends DbalTestCase
-{
-    /**
-     * The sqlanywhere driver connection mock under test.
-     *
-     * @var SQLAnywhereConnection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp() : void
-    {
-        if (! extension_loaded('sqlanywhere')) {
-            $this->markTestSkipped('sqlanywhere is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(SQLAnywhereConnection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testRequiresQueryForServerVersion() : void
-    {
-        self::assertTrue($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Doctrine/Tests/DBAL/Driver/SQLSrv/SQLSrvConnectionTest.php

-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\DBAL\Driver\SQLSrv;
-
-use Doctrine\DBAL\Driver\SQLSrv\SQLSrvConnection;
-use Doctrine\Tests\DbalTestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use function extension_loaded;
-
-class SQLSrvConnectionTest extends DbalTestCase
-{
-    /**
-     * The sqlsrv driver connection mock under test.
-     *
-     * @var SQLSrvConnection|MockObject
-     */
-    private $connectionMock;
-
-    protected function setUp() : void
-    {
-        if (! extension_loaded('sqlsrv')) {
-            $this->markTestSkipped('sqlsrv is not installed.');
-        }
-
-        parent::setUp();
-
-        $this->connectionMock = $this->getMockBuilder(SQLSrvConnection::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    public function testDoesNotRequireQueryForServerVersion() : void
-    {
-        self::assertFalse($this->connectionMock->requiresQueryForServerVersion());
-    }
-}

tests/Doctrine/Tests/DBAL/Functional/Driver/PDOConnectionTest.php

@@ -46,11 +46,6 @@ class PDOConnectionTest extends DbalFunctionalTestCase
         parent::tearDown();
     }
 
-    public function testDoesNotRequireQueryForServerVersion() : void
-    {
-        self::assertFalse($this->driverConnection->requiresQueryForServerVersion());
-    }
-
     public function testThrowsWrappedExceptionOnConstruct() : void
     {
         $this->expectException(PDOException::class);