diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
index 445bb036da..8ce564265e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
@@ -15,8 +15,8 @@ use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
use Symfony\Bridge\Twig\Tests\TestCase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
-use Symfony\Component\HttpKernel\RequestContext;
class HttpKernelExtensionTest extends TestCase
{
@@ -41,7 +41,7 @@ class HttpKernelExtensionTest extends TestCase
public function testUnknownFragmentRenderer()
{
- $context = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\RequestContext')
+ $context = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
->disableOriginalConstructor()
->getMock()
;
@@ -57,7 +57,7 @@ class HttpKernelExtensionTest extends TestCase
$strategy->expects($this->once())->method('getName')->will($this->returnValue('inline'));
$strategy->expects($this->once())->method('render')->will($return);
- $context = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\RequestContext')
+ $context = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
->disableOriginalConstructor()
->getMock()
;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
index 27fff103fc..a1beee30a1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
@@ -17,7 +17,7 @@
%kernel.debug%
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 5db144e814..6b2f7c9688 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -94,7 +94,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 3bcbe16d62..608bf42d52 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -12,8 +12,7 @@
Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer
Symfony\Component\HttpKernel\Config\FileLocator
Symfony\Component\HttpKernel\UriSigner
- Symfony\Component\HttpKernel\RequestStack
- Symfony\Component\HttpKernel\RequestContext
+ Symfony\Component\HttpFoundation\RequestStack
@@ -28,12 +27,7 @@
-
-
-
-
-
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index 3f6e455aab..6c1dd73e2e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -38,7 +38,7 @@
%kernel.default_locale%
-
+
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 954b66ac43..061d47e7ee 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
2.4.0
-----
+ * added RequestStack
* added Request::getEncodings()
* added accessors methods to session handlers
diff --git a/src/Symfony/Component/HttpKernel/RequestStack.php b/src/Symfony/Component/HttpFoundation/RequestStack.php
similarity index 68%
rename from src/Symfony/Component/HttpKernel/RequestStack.php
rename to src/Symfony/Component/HttpFoundation/RequestStack.php
index 40e37718b7..71bfd10699 100644
--- a/src/Symfony/Component/HttpKernel/RequestStack.php
+++ b/src/Symfony/Component/HttpFoundation/RequestStack.php
@@ -9,9 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\HttpKernel;
-
-use Symfony\Component\HttpFoundation\Request;
+namespace Symfony\Component\HttpFoundation;
/**
* Request stack that controls the lifecycle of requests.
@@ -25,6 +23,12 @@ class RequestStack
*/
private $requests = array();
+ /**
+ * Pushes a Request on the stack.
+ *
+ * This method should generally not be called directly as the stack
+ * management should be taken care of by the application itself.
+ */
public function push(Request $request)
{
$this->requests[] = $request;
@@ -35,6 +39,9 @@ class RequestStack
*
* This operation lets the current request go out of scope.
*
+ * This method should generally not be called directly as the stack
+ * management should be taken care of by the application itself.
+ *
* @return Request
*/
public function pop()
@@ -55,6 +62,12 @@ class RequestStack
}
/**
+ * Gets the master Request.
+ *
+ * Be warned that making your code aware of the master request
+ * might make it un-compatible with other features of your framework
+ * like ESI support.
+ *
* @return Request|null
*/
public function getMasterRequest()
@@ -69,6 +82,10 @@ class RequestStack
/**
* Returns the parent request of the current.
*
+ * Be warned that making your code aware of the parent request
+ * might make it un-compatible with other features of your framework
+ * like ESI support.
+ *
* If current Request is the master request, it returns null.
*
* @return Request|null
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index c06dd3fa57..b36e9358ff 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+2.4.0
+-----
+
+ * added the KernelEvents::FINISH_REQUEST event
+
2.3.0
-----
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
index c7fea3be7b..69e7937d18 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -12,9 +12,9 @@
namespace Symfony\Component\HttpKernel\DependencyInjection;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\RequestStack;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -29,7 +29,6 @@ use Symfony\Component\DependencyInjection\Scope;
class ContainerAwareHttpKernel extends HttpKernel
{
protected $container;
- protected $requestStack;
/**
* Constructor.
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
index 2170376b98..7cab6aa39b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\HttpKernel\EventListener;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\RequestContext;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\RequestContextAwareInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -25,7 +25,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
* This listener works in 2 modes:
*
* * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- * * 2.4+ mode where you must pass a RequestContext instance in the constructor.
+ * * 2.4+ mode where you must pass a RequestStack instance in the constructor.
*
* @author Fabien Potencier
*/
@@ -33,15 +33,15 @@ class LocaleListener implements EventSubscriberInterface
{
private $router;
private $defaultLocale;
- private $requestContext;
+ private $requestStack;
/**
- * RequestContext will become required in 3.0.
+ * RequestStack will become required in 3.0.
*/
- public function __construct($defaultLocale = 'en', RequestContextAwareInterface $router = null, RequestContext $requestContext = null)
+ public function __construct($defaultLocale = 'en', RequestContextAwareInterface $router = null, RequestStack $requestStack = null)
{
$this->defaultLocale = $defaultLocale;
- $this->requestContext = $requestContext;
+ $this->requestStack = $requestStack;
$this->router = $router;
}
@@ -77,11 +77,11 @@ class LocaleListener implements EventSubscriberInterface
public function onKernelFinishRequest(FinishRequestEvent $event)
{
- if (null === $this->requestContext) {
- throw new \LogicException('You must pass a RequestContext.');
+ if (null === $this->requestStack) {
+ throw new \LogicException('You must pass a RequestStack.');
}
- if (null !== $parentRequest = $this->requestContext->getParentRequest()) {
+ if (null !== $parentRequest = $this->requestStack->getParentRequest()) {
$this->setRouterContext($parentRequest);
}
}
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index 5ed590d457..d122388b4b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\RequestContext as KernelRequestContext;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
@@ -33,7 +33,7 @@ use Symfony\Component\HttpFoundation\Request;
* This listener works in 2 modes:
*
* * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- * * 2.4+ mode where you must pass a RequestContext instance in the constructor.
+ * * 2.4+ mode where you must pass a RequestStack instance in the constructor.
*
* @author Fabien Potencier
*/
@@ -43,12 +43,12 @@ class RouterListener implements EventSubscriberInterface
private $context;
private $logger;
private $request;
- private $kernelContext;
+ private $requestStack;
/**
* Constructor.
*
- * RequestContext will become required in 3.0.
+ * RequestStack will become required in 3.0.
*
* @param UrlMatcherInterface|RequestMatcherInterface $matcher The Url or Request matcher
* @param RequestContext|null $context The RequestContext (can be null when $matcher implements RequestContextAwareInterface)
@@ -56,7 +56,7 @@ class RouterListener implements EventSubscriberInterface
*
* @throws \InvalidArgumentException
*/
- public function __construct($matcher, RequestContext $context = null, LoggerInterface $logger = null, KernelRequestContext $kernelContext = null)
+ public function __construct($matcher, RequestContext $context = null, LoggerInterface $logger = null, RequestStack $requestStack = null)
{
if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) {
throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
@@ -68,7 +68,7 @@ class RouterListener implements EventSubscriberInterface
$this->matcher = $matcher;
$this->context = $context ?: $matcher->getContext();
- $this->kernelContext = $kernelContext;
+ $this->requestStack = $requestStack;
$this->logger = $logger;
}
@@ -93,11 +93,11 @@ class RouterListener implements EventSubscriberInterface
public function onKernelFinishRequest(FinishRequestEvent $event)
{
- if (null === $this->kernelContext) {
- throw new \LogicException('You must pass a RequestContext.');
+ if (null === $this->requestStack) {
+ throw new \LogicException('You must pass a RequestStack.');
}
- $this->setRequest($this->kernelContext->getParentRequest());
+ $this->setRequest($this->requestStack->getParentRequest());
}
public function onKernelRequest(GetResponseEvent $event)
@@ -107,8 +107,8 @@ class RouterListener implements EventSubscriberInterface
// initialize the context that is also used by the generator (assuming matcher and generator share the same context instance)
// we call setRequest even if most of the time, it has already been done to keep compatibility
// with frameworks which do not use the Symfony service container
- // when we have a RequestContext, no need to do it
- if (null !== $this->kernelContext) {
+ // when we have a RequestStack, no need to do it
+ if (null !== $this->requestStack) {
$this->setRequest($request);
}
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
index d7cc5d1827..05b6a086e9 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -14,8 +14,8 @@ namespace Symfony\Component\HttpKernel\Fragment;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\RequestContext;
/**
* Renders a URI that represents a resource fragment.
@@ -26,7 +26,7 @@ use Symfony\Component\HttpKernel\RequestContext;
* This listener works in 2 modes:
*
* * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- * * 2.4+ mode where you must pass a RequestContext instance in the constructor.
+ * * 2.4+ mode where you must pass a RequestStack instance in the constructor.
*
* @author Fabien Potencier
*
@@ -37,19 +37,19 @@ class FragmentHandler
private $debug;
private $renderers;
private $request;
- private $context;
+ private $requestStack;
/**
* Constructor.
*
- * RequestContext will become required in 3.0.
+ * RequestStack will become required in 3.0.
*
* @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances
* @param Boolean $debug Whether the debug mode is enabled or not
*/
- public function __construct(array $renderers = array(), $debug = false, RequestContext $context = null)
+ public function __construct(array $renderers = array(), $debug = false, RequestStack $requestStack = null)
{
- $this->context = $context;
+ $this->requestStack = $requestStack;
$this->renderers = array();
foreach ($renderers as $renderer) {
$this->addRenderer($renderer);
@@ -143,6 +143,6 @@ class FragmentHandler
private function getRequest()
{
- return $this->context ? $this->context->getCurrentRequest() : $this->request;
+ return $this->requestStack ? $this->requestStack->getCurrentRequest() : $this->request;
}
}
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 7ac5316adf..0be8e1b4db 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -22,6 +22,7 @@ use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/src/Symfony/Component/HttpKernel/RequestContext.php b/src/Symfony/Component/HttpKernel/RequestContext.php
deleted file mode 100644
index de8aacc3e5..0000000000
--- a/src/Symfony/Component/HttpKernel/RequestContext.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel;
-
-/**
- * Registry for Requests.
- *
- * Facade for RequestStack that prevents modification of the stack,
- * so that users don't accidentally push()/pop() from the stack and
- * mess up the request cycle.
- *
- * @author Benjamin Eberlei
- */
-class RequestContext
-{
- private $stack;
-
- public function __construct(RequestStack $stack)
- {
- $this->stack = $stack;
- }
-
- /**
- * @return Request|null
- */
- public function getCurrentRequest()
- {
- return $this->stack->getCurrentRequest();
- }
-
- /**
- * @return Request|null
- */
- public function getMasterRequest()
- {
- return $this->stack->getMasterRequest();
- }
-
- /**
- * @return Request|null
- */
- public function getParentRequest()
- {
- return $this->stack->getParentRequest();
- }
-}
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
index 292a5e9f45..2c8a6a28ec 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel;
-use Symfony\Component\HttpKernel\RequestStack;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -60,7 +60,7 @@ class ContainerAwareHttpKernelTest extends \PHPUnit_Framework_TestCase
return $expected;
};
- $stack = $this->getMock('Symfony\Component\HttpKernel\RequestStack', array('push', 'pop'));
+ $stack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array('push', 'pop'));
$stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
$stack->expects($this->at(1))->method('pop');
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index 270a11d295..d128753ffa 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -11,24 +11,24 @@
namespace Symfony\Component\HttpKernel\Tests\EventListener;
-use Symfony\Component\HttpKernel\EventListener\LocaleListener;
-use Symfony\Component\HttpKernel\RequestContext;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\EventListener\LocaleListener;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
class LocaleListenerTest extends \PHPUnit_Framework_TestCase
{
- private $context;
+ private $requestStack;
protected function setUp()
{
- $this->context = $this->getMock('Symfony\Component\HttpKernel\RequestContext', array(), array(), '', false);
+ $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
}
public function testDefaultLocaleWithoutSession()
{
- $listener = new LocaleListener('fr', null, $this->context);
+ $listener = new LocaleListener('fr', null, $this->requestStack);
$event = $this->getEvent($request = Request::create('/'));
$listener->onKernelRequest($event);
@@ -42,7 +42,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
$request->cookies->set('foo', 'value');
$request->attributes->set('_locale', 'es');
- $listener = new LocaleListener('fr', null, $this->context);
+ $listener = new LocaleListener('fr', null, $this->requestStack);
$event = $this->getEvent($request);
$listener->onKernelRequest($event);
@@ -61,7 +61,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
$request = Request::create('/');
$request->attributes->set('_locale', 'es');
- $listener = new LocaleListener('fr', $router, $this->context);
+ $listener = new LocaleListener('fr', $router, $this->requestStack);
$listener->onKernelRequest($this->getEvent($request));
}
@@ -81,11 +81,11 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
$parentRequest = Request::create('/');
$parentRequest->setLocale('es');
- $this->context->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));
+ $this->requestStack->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));
$event = $this->getMock('Symfony\Component\HttpKernel\Event\FinishRequestEvent', array(), array(), '', false);
- $listener = new LocaleListener('fr', $router, $this->context);
+ $listener = new LocaleListener('fr', $router, $this->requestStack);
$listener->onKernelFinishRequest($event);
}
@@ -93,7 +93,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
{
$request = Request::create('/');
$request->setLocale('de');
- $listener = new LocaleListener('fr', null, $this->context);
+ $listener = new LocaleListener('fr', null, $this->requestStack);
$event = $this->getEvent($request);
$listener->onKernelRequest($event);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index 07be703f87..ac742b35e0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -11,20 +11,20 @@
namespace Symfony\Component\HttpKernel\Tests\EventListener;
-use Symfony\Component\HttpKernel\EventListener\RouterListener;
-use Symfony\Component\HttpKernel\RequestContext as KernelRequestContext;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\EventListener\RouterListener;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\Routing\RequestContext;
class RouterListenerTest extends \PHPUnit_Framework_TestCase
{
- private $kernelContext;
+ private $requestStack;
public function setUp()
{
- $this->kernelContext = $this->getMock('Symfony\Component\HttpKernel\RequestContext', array(), array(), '', false);
+ $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
}
/**
@@ -42,7 +42,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
->method('getContext')
->will($this->returnValue($context));
- $listener = new RouterListener($urlMatcher, null, null, $this->kernelContext);
+ $listener = new RouterListener($urlMatcher, null, null, $this->requestStack);
$event = $this->createGetResponseEventForUri($uri);
$listener->onKernelRequest($event);
@@ -80,7 +80,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testInvalidMatcher()
{
- new RouterListener(new \stdClass(), null, null, $this->kernelContext);
+ new RouterListener(new \stdClass(), null, null, $this->requestStack);
}
public function testRequestMatcher()
@@ -95,7 +95,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
->will($this->returnValue(array()));
- $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->kernelContext);
+ $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->requestStack);
$listener->onKernelRequest($event);
}
@@ -116,7 +116,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
->method('getContext')
->will($this->returnValue($context));
- $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->kernelContext);
+ $listener = new RouterListener($requestMatcher, new RequestContext(), null, $this->requestStack);
$listener->onKernelRequest($event);
// sub-request with another HTTP method
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index 1ea7b50c33..dbf6b20b42 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -17,15 +17,15 @@ use Symfony\Component\HttpFoundation\Response;
class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
{
- private $context;
+ private $requestStack;
public function setUp()
{
- $this->context = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\RequestContext')
+ $this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
->disableOriginalConstructor()
->getMock()
;
- $this->context
+ $this->requestStack
->expects($this->any())
->method('getCurrentRequest')
->will($this->returnValue(Request::create('/')))
@@ -37,7 +37,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
*/
public function testRenderWhenRendererDoesNotExist()
{
- $handler = new FragmentHandler(array(), null, $this->context);
+ $handler = new FragmentHandler(array(), null, $this->requestStack);
$handler->render('/', 'foo');
}
@@ -87,7 +87,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
call_user_func_array(array($e, 'with'), $arguments);
}
- $handler = new FragmentHandler(array(), null, $this->context);
+ $handler = new FragmentHandler(array(), null, $this->requestStack);
$handler->addRenderer($renderer);
return $handler;
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
index 120e945cd6..2f69a94575 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -242,7 +242,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
{
$request = new Request();
- $stack = $this->getMock('Symfony\Component\HttpKernel\RequestStack', array('push', 'pop'));
+ $stack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array('push', 'pop'));
$stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
$stack->expects($this->at(1))->method('pop');
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 0e8aac54c6..a09b001327 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.3",
"symfony/event-dispatcher": "~2.1",
- "symfony/http-foundation": "~2.2",
+ "symfony/http-foundation": "~2.4",
"symfony/debug": "~2.3",
"psr/log": "~1.0"
},