feature #22276 [FrameworkBundle] Returns the kernel instance in KernelTestCase::bootKernel (lyrixx)

fabpot · fabpot · commit a146e4da1bd8 · 2017-04-04T07:53:29.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [FrameworkBundle] Returns the kernel instance in KernelTestCase::bootKernel | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- da333a0 [FrameworkBundle] Returns the kernel instance in KernelTestCase::bootKernel
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -138,13 +138,17 @@ protected static function getKernelClass()
      * Boots the Kernel for this test.
      *
      * @param array $options
+     *
+     * @return KernelInterface A KernelInterface instance
      */
     protected static function bootKernel(array $options = array())
     {
         static::ensureKernelShutdown();
 
         static::$kernel = static::createKernel($options);
         static::$kernel->boot();
+
+        return static::$kernel;
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -30,9 +30,9 @@ abstract class WebTestCase extends KernelTestCase
      */
     protected static function createClient(array $options = array(), array $server = array())
     {
-        static::bootKernel($options);
+        $kernel = static::bootKernel($options);
 
-        $client = static::$kernel->getContainer()->get('test.client');
+        $client = $kernel->getContainer()->get('test.client');
         $client->setServerParameters($server);
 
         return $client;

Original file line number	Diff line number	Diff line change
`@@ -138,13 +138,17 @@ protected static function getKernelClass()`
`138`	`138`	`* Boots the Kernel for this test.`
`139`	`139`	`*`
`140`	`140`	`* @param array $options`
	`141`	`+ *`
	`142`	`+ * @return KernelInterface A KernelInterface instance`
`141`	`143`	`*/`
`142`	`144`	`protected static function bootKernel(array $options = array())`
`143`	`145`	`{`
`144`	`146`	`static::ensureKernelShutdown();`
`145`	`147`
`146`	`148`	`static::$kernel = static::createKernel($options);`
`147`	`149`	`static::$kernel->boot();`
	`150`	`+`
	`151`	`+ return static::$kernel;`
`148`	`152`	`}`
`149`	`153`
`150`	`154`	`/**`