minor #13280 [HttpKernel] deprecated ContainerAwareHttpKernel (fabpot)

fabpot · fabpot · commit b009902f906b · 2015-01-06T13:02:23.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] deprecated ContainerAwareHttpKernel | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a In Symfony 3.0, the `request` scope will be removed as the `request` is not a service anymore. So, the `ContainerAwareHttpKernel` should be deprecated now as it won't be needed anymore in 3.0. I've moved the only line of code that is still relevant in `HttpKernel` directly. Note that I did not trigger a deprecation notice as the class is still used in Symfony 2.7. Commits ------- 0c50301 [HttpKernel] deprecated ContainerAwareHttpKernel
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -25,6 +25,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * @deprecated since version 2.7, to be removed in 3.0.
  */
 class ContainerAwareHttpKernel extends HttpKernel
 {
@@ -55,8 +57,6 @@ public function __construct(EventDispatcherInterface $dispatcher, ContainerInter
      */
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-        $request->headers->set('X-Php-Ob-Level', ob_get_level());
-
         $this->container->enterScope('request');
         $this->container->set('request', $request, 'request');
 
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -62,6 +62,8 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
      */
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
+        $request->headers->set('X-Php-Ob-Level', ob_get_level());
+
         try {
             return $this->handleRaw($request, $type);
         } catch (\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Fabien Potencier <fabien@symfony.com>`
`27`	`27`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
	`28`	`+ *`
	`29`	`+ * @deprecated since version 2.7, to be removed in 3.0.`
`28`	`30`	`*/`
`29`	`31`	`class ContainerAwareHttpKernel extends HttpKernel`
`30`	`32`	`{`
`@@ -55,8 +57,6 @@ public function __construct(EventDispatcherInterface $dispatcher, ContainerInter`
`55`	`57`	`*/`
`56`	`58`	`public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)`
`57`	`59`	`{`
`58`		`- $request->headers->set('X-Php-Ob-Level', ob_get_level());`
`59`		`-`
`60`	`60`	`$this->container->enterScope('request');`
`61`	`61`	`$this->container->set('request', $request, 'request');`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso`
`62`	`62`	`*/`
`63`	`63`	`public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)`
`64`	`64`	`{`
	`65`	`+ $request->headers->set('X-Php-Ob-Level', ob_get_level());`
	`66`	`+`
`65`	`67`	`try {`
`66`	`68`	`return $this->handleRaw($request, $type);`
`67`	`69`	`} catch (\Exception $e) {`