bug #16609 [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase (nicolas-grekas)

fabpot · fabpot · commit 922b9468b162 · 2015-11-23T10:32:50.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase | Q | A | ------------- | --- | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15185 | License | MIT | Doc PR | - While trying to migrate Blackfire to 2.8-beta, I found this BC-break: by resetting the container on kernel shut-down, functional tests are broken when they need to use the container after a call to `$this->client->request()`. Broken because e.g . the session or the profiler state is lost between consecutive requests in the same test, and because a call to $container->get('kernel') throws a synthetic-related exception. This PR fixes the BC-break by reverting to the <=2.7 behavior (not resetting the container on kernel shut-down), and moving resetting to the KernelTestCase. Commits ------- baad4da [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Test;
 
+use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -171,7 +172,11 @@ protected static function createKernel(array $options = array())
     protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
+            $container = static::$kernel->getContainer();
             static::$kernel->shutdown();
+            if ($container instanceof ResettableContainerInterface) {
+                $container->reset();
+            }
         }
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -23,7 +23,6 @@
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
-use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -171,10 +170,6 @@ public function shutdown()
             $bundle->setContainer(null);
         }
 
-        if ($this->container instanceof ResettableContainerInterface) {
-            $this->container->reset();
-        }
-
         $this->container = null;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Test;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\ResettableContainerInterface;`
`14`	`15`	`use Symfony\Component\Finder\Finder;`
`15`	`16`	`use Symfony\Component\HttpKernel\KernelInterface;`
`16`	`17`
`@@ -171,7 +172,11 @@ protected static function createKernel(array $options = array())`
`171`	`172`	`protected static function ensureKernelShutdown()`
`172`	`173`	`{`
`173`	`174`	`if (null !== static::$kernel) {`
	`175`	`+ $container = static::$kernel->getContainer();`
`174`	`176`	`static::$kernel->shutdown();`
	`177`	`+ if ($container instanceof ResettableContainerInterface) {`
	`178`	`+ $container->reset();`
	`179`	`+ }`
`175`	`180`	`}`
`176`	`181`	`}`
`177`	`182`