minor #33760 [HttpKernel] drop support for retrieving container from non-booted kernels (xabbuh)

xabbuh · xabbuh · commit 5e48c39f7996 · 2019-09-30T16:37:48.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [HttpKernel] drop support for retrieving container from non-booted kernels | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 81ae635 drop support for retrieving container from non-booted kernels
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 5.0.0
 -----
 
+ * removed support for getting the container from a non-booted kernel
  * removed the first and second constructor argument of `ConfigDataCollector` 
  * removed `ConfigDataCollector::getApplicationName()` 
  * removed `ConfigDataCollector::getApplicationVersion()`
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -301,7 +301,7 @@ public function getProjectDir()
     public function getContainer()
     {
         if (!$this->booted) {
-            @trigger_error('Getting the container from a non-booted kernel is deprecated since Symfony 4.4.', E_USER_DEPRECATED);
+            throw new \LogicException('Cannot retrieve the container from a non-booted kernel.');
         }
 
         return $this->container;
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -47,18 +47,6 @@ public function testConstructor()
         $this->assertLessThanOrEqual(microtime(true), $kernel->getStartTime());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Getting the container from a non-booted kernel is deprecated since Symfony 4.4.
-     */
-    public function testGetContainerForANonBootedKernel()
-    {
-        $kernel = new KernelForTest('test_env', true);
-
-        $this->assertFalse($kernel->isBooted());
-        $this->assertNull($kernel->getContainer());
-    }
-
     public function testClone()
     {
         $env = 'test_env';
@@ -407,18 +395,6 @@ public function testTerminateReturnsSilentlyIfKernelIsNotBooted()
         $kernel->terminate(Request::create('/'), new Response());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Getting the container from a non-booted kernel is deprecated since Symfony 4.4.
-     */
-    public function testDeprecatedNullKernel()
-    {
-        $kernel = $this->getKernel();
-        $kernel->shutdown();
-
-        $this->assertNull($kernel->getContainer());
-    }
-
     public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
     {
         // does not implement TerminableInterface

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public function getProjectDir()`
`301`	`301`	`public function getContainer()`
`302`	`302`	`{`
`303`	`303`	`if (!$this->booted) {`
`304`		`- @trigger_error('Getting the container from a non-booted kernel is deprecated since Symfony 4.4.', E_USER_DEPRECATED);`
	`304`	`+ throw new \LogicException('Cannot retrieve the container from a non-booted kernel.');`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`return $this->container;`