diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed sub-requests creation to '::create()'

Browse Source
This commit is contained in:
Jean-François Simon 2013-03-15 11:44:42 +01:00
parent e51432abaa
commit b9c37f2727
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
View File

@ -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);
}

2
src/Symfony/Component/HttpKernel/HttpCache/Store.php
View File

@ -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);
}

2
src/Symfony/Component/Security/Http/HttpUtils.php
View File

@ -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);
}