do not require support for releasing savepoints (#257)

dmaicher · Aug 9, 2023 · 8b0991d · 8b0991d
1 parent a9ff7d7
commit 8b0991d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnection.php b/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnection.php
@@ -54,7 +54,9 @@ public function commit(): bool
             throw new \BadMethodCallException(sprintf('Bad call to "%s". There is no savepoint for a nested transaction.', __METHOD__));
         }
 
-        $this->exec($this->platform->releaseSavePoint(self::SAVEPOINT_NAME));
+        if ($this->platform->supportsReleaseSavepoints()) {
+            $this->exec($this->platform->releaseSavePoint(self::SAVEPOINT_NAME));
+        }
 
         $this->nested = false;
 

diff --git a/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php b/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php
@@ -51,7 +51,7 @@ public function connect(array $params): DriverConnection
             ? $this->createDatabasePlatformForVersion($params['serverVersion'])
             : $this->getDatabasePlatform());
 
-        if (!$platform->supportsSavepoints() || !$platform->supportsReleaseSavepoints()) {
+        if (!$platform->supportsSavepoints()) {
             throw new \RuntimeException('This bundle only works for database platforms that support savepoints.');
         }
 

diff --git a/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/MockDriver.php b/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/MockDriver.php
@@ -8,13 +8,18 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQL80Platform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use PHPUnit\Framework\MockObject\Generator;
 
 class MockDriver implements Driver
 {
     private function getMock(string $class)
     {
-        return (new Generator())->getMock(
+        // TODO: remove this once we drop support for PHPUnit < 10
+        $generatorClass = class_exists('PHPUnit\Framework\MockObject\Generator')
+            ? 'PHPUnit\Framework\MockObject\Generator'
+            : 'PHPUnit\Framework\MockObject\Generator\Generator';
+
+        /** @phpstan-ignore-next-line */
+        return (new $generatorClass())->getMock(
             $class,
             [],
             [],

diff --git a/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriverTest.php b/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriverTest.php
@@ -69,11 +69,6 @@ public function testConnectWithPlatform(): void
             ->method('supportsSavepoints')
             ->willReturn(true)
         ;
-        $platform
-            ->expects(self::exactly(7))
-            ->method('supportsReleaseSavepoints')
-            ->willReturn(true)
-        ;
 
         $params = [
             'driver' => 'pdo_mysql',

diff --git a/tests/Functional/PhpunitTest.php b/tests/Functional/PhpunitTest.php
@@ -79,10 +79,21 @@ public function testChangeDbStateWithinTransaction(): void
         $this->rollbackTransaction();
         $this->assertRowCount(0);
 
+        $this->beginTransaction();
+        $this->insertRow();
+        $this->assertRowCount(1);
+        $this->rollbackTransaction();
+        $this->assertRowCount(0);
+
         $this->beginTransaction();
         $this->insertRow();
         $this->commitTransaction();
         $this->assertRowCount(1);
+
+        $this->beginTransaction();
+        $this->insertRow();
+        $this->commitTransaction();
+        $this->assertRowCount(2);
     }
 
     /**

diff --git a/tests/Functional/app/AppKernel.php b/tests/Functional/app/AppKernel.php
@@ -2,7 +2,10 @@
 
 namespace Tests\Functional\app;
 
+use DAMA\DoctrineTestBundle\DAMADoctrineTestBundle;
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
@@ -12,9 +15,9 @@ class AppKernel extends Kernel
     public function registerBundles(): array
     {
         return [
-            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new \DAMA\DoctrineTestBundle\DAMADoctrineTestBundle(),
+            new FrameworkBundle(),
+            new DoctrineBundle(),
+            new DAMADoctrineTestBundle(),
         ];
     }