Merge pull request #62 from ndench/single-kernel

Prevent duplicate kernels booting and ensure they're cleaned up
liip · Apr 27, 2020 · 44f60a7 · 44f60a7
2 parents 664e155 + c6ca3fb
commit 44f60a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/doc/database.md b/doc/database.md
@@ -92,6 +92,10 @@ Tips for Fixture Loading Tests
 
         public function testIndex()
         {
+            // If you need a client, you must create it before loading fixtures because
+            // creating the client boots the kernel, which is used by loadFixtures
+            $client = $this->createClient();
+    
             // add all your fixtures classes that implement
             // Doctrine\Common\DataFixtures\FixtureInterface
             $this->loadFixtures(array(
@@ -100,7 +104,6 @@ Tips for Fixture Loading Tests
             ));
 
             // you can now run your functional tests with a populated database
-            $client = $this->createClient();
             // ...
         }
     }
@@ -120,10 +123,12 @@ Tips for Fixture Loading Tests
 
         public function testIndex()
         {
+            // If you need a client, you must create it before loading fixtures because
+            // creating the client boots the kernel, which is used by loadFixtures
+            $client = $this->createClient();
             $this->loadFixtures();
 
             // you can now run your functional tests with a populated database
-            $client = $this->createClient();
             // ...
         }
     }
@@ -190,9 +195,10 @@ Tips for Fixture Loading Tests
                 'Me\MyBundle\DataFixtures\MongoDB\LoadData'
             );
 
-            $this->loadFixtures($fixtures, false, null, 'doctrine_mongodb');
-
+            // If you need a client, you must create it before loading fixtures because
+            // creating the client boots the kernel, which is used by loadFixtures
             $client = $this->createClient();
+            $this->loadFixtures($fixtures, false, null, 'doctrine_mongodb');
         }
     }
     ```

diff --git a/doc/examples.md b/doc/examples.md
@@ -36,9 +36,11 @@ class ExampleFunctionalTest extends WebTestCase
      */
     public function testUserFooIndex(): void
     {
+        // If you need a client, you must create it before loading fixtures because
+        // creating the client boots the kernel, which is used by loadFixtures
+        $client = $this->createClient();
         $this->loadFixtures(['Liip\FooBundle\Tests\Fixtures\LoadUserData']);
 
-        $client = $this->createClient();
         $crawler = $client->request('GET', '/users/foo');
 
         // …

diff --git a/src/Test/FixturesTrait.php b/src/Test/FixturesTrait.php
@@ -45,10 +45,13 @@ protected function getContainer(): ContainerInterface
             $options = [
                 'environment' => $environment,
             ];
-            $kernel = $this->createKernel($options);
-            $kernel->boot();
 
-            $container = $kernel->getContainer();
+            // Check that the kernel has not been booted separately (eg. with static::createClient())
+            if (null === static::$kernel || null === static::$kernel->getContainer()) {
+                $this->bootKernel($options);
+            }
+
+            $container = static::$kernel->getContainer();
             if ($container->has('test.service_container')) {
                 $this->containers[$environment] = $container->get('test.service_container');
             } else {