[FrameworkBundle] deprecated HttpKernel::forward() (it is only used once now and not part of any interface anyway)

fabpot · fabpot · commit a8ea4e4b10fc · 2013-01-10T09:21:31.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -59,7 +59,10 @@ public function generateUrl($route, $parameters = array(), $referenceType = UrlG
      */
     public function forward($controller, array $path = array(), array $query = array())
     {
-        return $this->container->get('http_kernel')->forward($controller, $path, $query);
+        $path['_controller'] = $controller;
+        $subRequest = $this->container->get('request')->duplicate($query, null, $path);
+
+        return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -65,9 +65,13 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
      * @param array  $query      An array of request query parameters
      *
      * @return Response A Response instance
+     *
+     * @deprecated in 2.2, will be removed in 2.3
      */
     public function forward($controller, array $attributes = array(), array $query = array())
     {
+        trigger_error('forward() is deprecated since version 2.2 and will be removed in 2.3.', E_USER_DEPRECATED);
+
         $attributes['_controller'] = $controller;
         $subRequest = $this->container->get('request')->duplicate($query, null, $attributes);
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,10 @@ public function generateUrl($route, $parameters = array(), $referenceType = UrlG`
`59`	`59`	`*/`
`60`	`60`	`public function forward($controller, array $path = array(), array $query = array())`
`61`	`61`	`{`
`62`		`- return $this->container->get('http_kernel')->forward($controller, $path, $query);`
	`62`	`+ $path['_controller'] = $controller;`
	`63`	`+ $subRequest = $this->container->get('request')->duplicate($query, null, $path);`
	`64`	`+`
	`65`	`+ return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,13 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ`
`65`	`65`	`* @param array $query An array of request query parameters`
`66`	`66`	`*`
`67`	`67`	`* @return Response A Response instance`
	`68`	`+ *`
	`69`	`+ * @deprecated in 2.2, will be removed in 2.3`
`68`	`70`	`*/`
`69`	`71`	`public function forward($controller, array $attributes = array(), array $query = array())`
`70`	`72`	`{`
	`73`	`+ trigger_error('forward() is deprecated since version 2.2 and will be removed in 2.3.', E_USER_DEPRECATED);`
	`74`	`+`
`71`	`75`	`$attributes['_controller'] = $controller;`
`72`	`76`	`$subRequest = $this->container->get('request')->duplicate($query, null, $attributes);`
`73`	`77`