Merge pull request #3549 from morozov/issues/3487

Removed the assertion which doesn't work with a user-provided PDO connection
doctrine · May 22, 2019 · 9e086fe · 9e086fe
2 parents 06d1d8c + 6820036
commit 9e086fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -1429,7 +1429,6 @@ public function rollbackSavepoint($savepoint)
     public function getWrappedConnection()
     {
         $this->connect();
-        assert($this->_conn instanceof DriverConnection);
 
         return $this->_conn;
     }

diff --git a/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
@@ -12,6 +12,7 @@
 use Doctrine\Tests\DbalFunctionalTestCase;
 use Error;
 use Exception;
+use PDO;
 use RuntimeException;
 use Throwable;
 use function in_array;
@@ -311,4 +312,16 @@ public function testDeterminesDatabasePlatformWhenConnectingToNonExistentDatabas
 
         $connection->close();
     }
+
+    /**
+     * @requires extension pdo_sqlite
+     */
+    public function testUserProvidedPDOConnection() : void
+    {
+        self::assertTrue(
+            DriverManager::getConnection([
+                'pdo' => new PDO('sqlite::memory:'),
+            ])->ping()
+        );
+    }
 }