merged branch jfsimon/issue-7185-2.1 (PR #7388)
This PR was merged into the 2.1 branch.
Commits
-------
b9c37f2
changed sub-requests creation to '::create()'
Discussion
----------
changed sub-requests creation to '::create()'
Added @henrikbjorn suggestion to #7381
This commit is contained in:
commit
6c0d2b92ac
@ -153,12 +153,12 @@ class HttpKernel extends BaseHttpKernel
|
||||
|
||||
// controller or URI or path?
|
||||
if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
|
||||
$subRequest = call_user_func(array(get_class($request), 'create'), $controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
$subRequest = $request::create($controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
if ($session = $request->getSession()) {
|
||||
$subRequest->setSession($session);
|
||||
}
|
||||
} elseif (0 === strpos($controller, '/')) {
|
||||
$subRequest = call_user_func(array(get_class($request), 'create'), $request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
$subRequest = $request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
if ($session = $request->getSession()) {
|
||||
$subRequest->setSession($session);
|
||||
}
|
||||
|
@ -235,7 +235,7 @@ class Store implements StoreInterface
|
||||
// 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 = call_user_func(array(get_class($request), 'create'), 'get', array(), array(), array(), $request->server->all());
|
||||
$subRequest = $request::create($uri, 'get', array(), array(), array(), $request->server->all());
|
||||
|
||||
$this->invalidate($subRequest);
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ class HttpUtils
|
||||
*/
|
||||
public function createRequest(Request $request, $path)
|
||||
{
|
||||
$newRequest = call_user_func(array(get_class($request), 'create'), $this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
$newRequest = $request::create($this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
|
||||
if ($session = $request->getSession()) {
|
||||
$newRequest->setSession($session);
|
||||
}
|
||||
|
Reference in New Issue
Block a user