[HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase

nicolas-grekas · nicolas-grekas · commit 21879475c9c3 · 2015-11-20T13:11:01.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -171,7 +171,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
@@ -171,10 +171,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
`@@ -171,7 +171,11 @@ protected static function createKernel(array $options = array())`
`171`	`171`	`protected static function ensureKernelShutdown()`
`172`	`172`	`{`
`173`	`173`	`if (null !== static::$kernel) {`
	`174`	`+ $container = static::$kernel->getContainer();`
`174`	`175`	`static::$kernel->shutdown();`
	`176`	`+ if ($container instanceof ResettableContainerInterface) {`
	`177`	`+ $container->reset();`
	`178`	`+ }`
`175`	`179`	`}`
`176`	`180`	`}`
`177`	`181`
Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,6 @@ public function shutdown()`
`171`	`171`	`$bundle->setContainer(null);`
`172`	`172`	`}`
`173`	`173`
`174`		`- if ($this->container instanceof ResettableContainerInterface) {`
`175`		`- $this->container->reset();`
`176`		`- }`
`177`		`-`
`178`	`174`	`$this->container = null;`
`179`	`175`	`}`
`180`	`176`