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

Merge branch '2.1' into 2.2

Browse Source 
* 2.1:
  changed sub-requests creation to '::create()'

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
This commit is contained in:
Fabien Potencier 2013-03-15 11:54:52 +01:00
commit 801a7f887b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,7 +250,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 ($request->hasSession()) {
$newRequest->setSession($request->getSession());
}