[FrameworkBundle] WebTestCase KernelBrowser::getContainer null return type

Simperfit · Simperfit · commit 3d11b16482da · 2019-04-26T09:00:45.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -32,7 +32,8 @@ CHANGELOG
  * Added a `InMemoryTransport` to Messenger. Use it with a DSN starting with `in-memory://`.
  * Added `framework.property_access.throw_exception_on_invalid_property_path` config option.
  * Added `cache:pool:list` command to list all available cache pools.
-
+ * Getting the container from a non-booted kernel is deprecated.
+ 
 4.2.0
 -----
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -46,7 +46,11 @@ public function __construct(KernelInterface $kernel, array $server = [], History
      */
     public function getContainer()
     {
-        return $this->kernel->getContainer();
+        if (null === ($container = $this->kernel->getContainer())) {
+            @trigger_error('Getting the container from a non-booted kernel is deprecated since 4.3.', E_USER_DEPRECATED);
+        }
+
+        return $container;
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php
@@ -62,4 +62,17 @@ private function getKernelMock()
 
         return $mock;
     }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Getting the container from a non-booted kernel is deprecated since 4.3
+     */
+    public function testDeprecatedNullKernel()
+    {
+        $mock = $this->getKernelMock();
+        $client = new KernelBrowser($mock);
+        $client->getKernel()->shutdown();
+
+        $this->assertNull($client->getContainer());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,11 @@ public function __construct(KernelInterface $kernel, array $server = [], History`
`46`	`46`	`*/`
`47`	`47`	`public function getContainer()`
`48`	`48`	`{`
`49`		`- return $this->kernel->getContainer();`
	`49`	`+ if (null === ($container = $this->kernel->getContainer())) {`
	`50`	`+ @trigger_error('Getting the container from a non-booted kernel is deprecated since 4.3.', E_USER_DEPRECATED);`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ return $container;`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`/**`