Fix resetting static connections after test with data provider (#244)

dmaicher · Feb 7, 2023 · 175b471 · 175b471
1 parent 91abe52
commit 175b471
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php b/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php
@@ -7,10 +7,10 @@
 use PHPUnit\Event\Test\FinishedSubscriber as TestFinishedSubscriber;
 use PHPUnit\Event\Test\PreparationStarted as TestStartedEvent;
 use PHPUnit\Event\Test\PreparationStartedSubscriber as TestStartedSubscriber;
-use PHPUnit\Event\TestSuite\Finished as TestSuiteFinishedEvent;
-use PHPUnit\Event\TestSuite\FinishedSubscriber as TestSuiteFinishedSubscriber;
-use PHPUnit\Event\TestSuite\Started as TestSuiteStartedEvent;
-use PHPUnit\Event\TestSuite\StartedSubscriber as TestSuiteStartedSubscriber;
+use PHPUnit\Event\TestRunner\Finished as TestRunnerFinishedEvent;
+use PHPUnit\Event\TestRunner\FinishedSubscriber as TestRunnerFinishedSubscriber;
+use PHPUnit\Event\TestRunner\Started as TestRunnerStartedEvent;
+use PHPUnit\Event\TestRunner\StartedSubscriber as TestRunnerStartedSubscriber;
 use PHPUnit\Runner\AfterLastTestHook;
 use PHPUnit\Runner\AfterTestHook;
 use PHPUnit\Runner\BeforeFirstTestHook;
@@ -20,16 +20,16 @@
 use PHPUnit\Runner\Extension\ParameterCollection;
 use PHPUnit\TextUI\Configuration\Configuration;
 
-if (class_exists(TestSuiteStartedEvent::class)) {
+if (class_exists(TestRunnerStartedEvent::class)) {
     /**
      * PHPUnit >= 10.
      */
     class PHPUnitExtension implements Extension
     {
         public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
         {
-            $facade->registerSubscriber(new class() implements TestSuiteStartedSubscriber {
-                public function notify(TestSuiteStartedEvent $event): void
+            $facade->registerSubscriber(new class() implements TestRunnerStartedSubscriber {
+                public function notify(TestRunnerStartedEvent $event): void
                 {
                     StaticDriver::setKeepStaticConnections(true);
                 }
@@ -49,8 +49,8 @@ public function notify(TestFinishedEvent $event): void
                 }
             });
 
-            $facade->registerSubscriber(new class() implements TestSuiteFinishedSubscriber {
-                public function notify(TestSuiteFinishedEvent $event): void
+            $facade->registerSubscriber(new class() implements TestRunnerFinishedSubscriber {
+                public function notify(TestRunnerFinishedEvent $event): void
                 {
                     StaticDriver::setKeepStaticConnections(false);
                 }

diff --git a/tests/Functional/PhpunitTest.php b/tests/Functional/PhpunitTest.php
@@ -26,6 +26,24 @@ public function testPreviousChangesAreRolledBack(): void
         $this->assertTrue($this->connection->isTransactionActive());
     }
 
+    /**
+     * @dataProvider someDataProvider
+     */
+    public function testWithDataProvider(int $expectedRowCount): void
+    {
+        $this->assertRowCount($expectedRowCount);
+        $this->insertRow();
+        $this->assertTrue($this->connection->isTransactionActive());
+    }
+
+    /**
+     * @return iterable<array{int}>
+     */
+    public static function someDataProvider(): iterable
+    {
+        yield [0];
+    }
+
     public function testChangeDbStateForReplicaConnection(): void
     {
         $this->connection = $this->kernel->getContainer()->get('doctrine.dbal.replica_connection');