sub-requests are now created with the same class as their parent

jfsimon · jfsimon · commit e51432abaa36 · 2013-03-14T17:43:08.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -153,12 +153,12 @@ public function render($controller, array $options = array())
 
         // controller or URI or path?
         if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
-            $subRequest = Request::create($controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
+            $subRequest = call_user_func(array(get_class($request), 'create'), $controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
             if ($session = $request->getSession()) {
                 $subRequest->setSession($session);
             }
         } elseif (0 === strpos($controller, '/')) {
-            $subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
+            $subRequest = call_user_func(array(get_class($request), 'create'), $request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
             if ($session = $request->getSession()) {
                 $subRequest->setSession($session);
             }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -235,7 +235,7 @@ public function invalidate(Request $request)
         // As per the RFC, invalidate Location and Content-Location URLs if present
         foreach (array('Location', 'Content-Location') as $header) {
             if ($uri = $request->headers->get($header)) {
-                $subRequest = Request::create($uri, 'get', array(), array(), array(), $request->server->all());
+                $subRequest = call_user_func(array(get_class($request), 'create'), 'get', array(), array(), array(), $request->server->all());
 
                 $this->invalidate($subRequest);
             }
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -70,7 +70,7 @@ public function createRedirectResponse(Request $request, $path, $status = 302)
      */
     public function createRequest(Request $request, $path)
     {
-        $newRequest = Request::create($this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
+        $newRequest = call_user_func(array(get_class($request), 'create'), $this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
         if ($session = $request->getSession()) {
             $newRequest->setSession($session);
         }

Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,12 @@ public function render($controller, array $options = array())`
`153`	`153`
`154`	`154`	`// controller or URI or path?`
`155`	`155`	`if (0 === strpos($controller, 'http://') \|\| 0 === strpos($controller, 'https://')) {`
`156`		`- $subRequest = Request::create($controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());`
	`156`	`+ $subRequest = call_user_func(array(get_class($request), 'create'), $controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());`
`157`	`157`	`if ($session = $request->getSession()) {`
`158`	`158`	`$subRequest->setSession($session);`
`159`	`159`	`}`
`160`	`160`	`} elseif (0 === strpos($controller, '/')) {`
`161`		`- $subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());`
	`161`	`+ $subRequest = call_user_func(array(get_class($request), 'create'), $request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());`
`162`	`162`	`if ($session = $request->getSession()) {`
`163`	`163`	`$subRequest->setSession($session);`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public function invalidate(Request $request)`
`235`	`235`	`// As per the RFC, invalidate Location and Content-Location URLs if present`
`236`	`236`	`foreach (array('Location', 'Content-Location') as $header) {`
`237`	`237`	`if ($uri = $request->headers->get($header)) {`
`238`		`- $subRequest = Request::create($uri, 'get', array(), array(), array(), $request->server->all());`
	`238`	`+ $subRequest = call_user_func(array(get_class($request), 'create'), 'get', array(), array(), array(), $request->server->all());`
`239`	`239`
`240`	`240`	`$this->invalidate($subRequest);`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function createRedirectResponse(Request $request, $path, $status = 302)`
`70`	`70`	`*/`
`71`	`71`	`public function createRequest(Request $request, $path)`
`72`	`72`	`{`
`73`		`- $newRequest = Request::create($this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());`
	`73`	`+ $newRequest = call_user_func(array(get_class($request), 'create'), $this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());`
`74`	`74`	`if ($session = $request->getSession()) {`
`75`	`75`	`$newRequest->setSession($session);`
`76`	`76`	`}`