From 3e7dde1e3eb744edbb22b9bc23b959b72f3ad891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 2 Jun 2014 22:50:07 +0200 Subject: [PATCH] [HttpKernel] Revert BC break introduced by 464439d195fc895079176498cb28d182dc8aef14 --- .../Component/HttpKernel/Fragment/InlineFragmentRenderer.php | 2 +- src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php | 2 +- src/Symfony/Component/Security/Http/HttpUtils.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php index c6ca3d475e882..7d6a2f5c7501a 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php @@ -132,7 +132,7 @@ protected function createSubRequest($uri, Request $request) $server['REMOTE_ADDR'] = '127.0.0.1'; - $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server); + $subRequest = $request::create($uri, 'get', array(), $cookies, array(), $server); if ($request->headers->has('Surrogate-Capability')) { $subRequest->headers->set('Surrogate-Capability', $request->headers->get('Surrogate-Capability')); } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 7931f01e6df34..ad69ed3a0e443 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -267,7 +267,7 @@ protected function invalidate(Request $request, $catch = false) // As per the RFC, invalidate Location and Content-Location URLs if present foreach (array('Location', 'Content-Location') as $header) { if ($uri = $response->headers->get($header)) { - $subRequest = Request::create($uri, 'get', array(), array(), array(), $request->server->all()); + $subRequest = $request::create($uri, 'get', array(), array(), array(), $request->server->all()); $this->store->invalidate($subRequest); } diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php index 451c12cba0e85..50d4f263559d6 100644 --- a/src/Symfony/Component/Security/Http/HttpUtils.php +++ b/src/Symfony/Component/Security/Http/HttpUtils.php @@ -72,7 +72,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 = $request::create($this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all()); if ($request->hasSession()) { $newRequest->setSession($request->getSession()); }