merge 5.x

.gitignore

@@ -8,3 +8,4 @@ var
 vendor
 .php_cs.cache
 php-cs-fixer.phar
+.phpunit.result.cache

composer.json

@@ -13,7 +13,7 @@
   "require": {
     "php": "^7.2",
     "symfony/framework-bundle": "^3.4 || ^4.3 || ^5.0",
-    "doctrine/dbal": "^2.9",
+    "doctrine/dbal": "^2.9,>=2.9.3",
     "doctrine/doctrine-bundle": "^1.11 || ^2.0"
   },
   "require-dev": {

src/DAMA/DoctrineTestBundle/Doctrine/DBAL/PostConnectEventListener.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace DAMA\DoctrineTestBundle\Doctrine\DBAL;
+
+use Doctrine\DBAL\Event\ConnectionEventArgs;
+
+class PostConnectEventListener
+{
+    public function postConnect(ConnectionEventArgs $args): void
+    {
+        // The underlying connection already has a transaction started.
+        // We start a transaction on the connection as well
+        // so the internal state ($_transactionNestingLevel) is in sync with the underlying connection.
+        $args->getConnection()->beginTransaction();
+    }
+}

src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnectionFactory.php

@@ -6,6 +6,7 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Events;
 
 class StaticConnectionFactory extends ConnectionFactory
 {
@@ -37,15 +38,12 @@ public function createConnection(array $params, Configuration $config = null, Ev
         );
 
         if (StaticDriver::isKeepStaticConnections()) {
-            // The underlying connection already has a transaction started.
+            $connection->getEventManager()->addEventListener(Events::postConnect, new PostConnectEventListener());
+
             // Make sure we use savepoints to be able to easily roll-back nested transactions
             if ($connection->getDriver()->getDatabasePlatform()->supportsSavepoints()) {
                 $connection->setNestTransactionsWithSavepoints(true);
             }
-
-            // We start a transaction on the connection as well
-            // so the internal state ($_transactionNestingLevel) is in sync with the underlying connection.
-            $connection->beginTransaction();
         }
 
         return $connection;

src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php

@@ -3,10 +3,10 @@
 namespace DAMA\DoctrineTestBundle\Doctrine\DBAL;
 
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver;
+use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\VersionAwarePlatformDriver;

tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnectionFactoryTest.php

@@ -23,6 +23,9 @@ public function testCreateConnection(bool $keepStaticConnections, int $expectedN
         ]);
 
         $this->assertInstanceOf(StaticDriver::class, $connection->getDriver());
+        $this->assertSame(0, $connection->getTransactionNestingLevel());
+
+        $connection->connect();
         $this->assertSame($expectedNestingLevel, $connection->getTransactionNestingLevel());
     }
 

tests/Functional/FunctionalTest.php

@@ -90,4 +90,12 @@ public function testPreviousChangesAreRolledBackAfterUsingSavePoint(): void
     {
         $this->assertRowCount(0);
     }
+
+    public function testRollBackChangesWithReOpenedConnection(): void
+    {
+        $this->connection->close();
+        $this->connection->beginTransaction();
+        $this->connection->commit();
+        $this->assertRowCount(0);
+    }
 }