Permalink
Browse files

[HttpKernel] made request stack feature BC

  • Loading branch information...
1 parent d3ca145 commit 08a42e7e794d229e1939d72cde5296420478a7ef @Tobion Tobion committed Sep 17, 2013
@@ -42,12 +42,12 @@ public function push(Request $request)
* This method should generally not be called directly as the stack
* management should be taken care of by the application itself.
*
- * @return Request
+ * @return Request|null
*/
public function pop()
{
if (!$this->requests) {
- throw new \LogicException('Unable to pop a Request as the stack is already empty.');
+ return null;
}
return array_pop($this->requests);
@@ -78,7 +78,7 @@ public function onKernelRequest(GetResponseEvent $event)
public function onKernelFinishRequest(FinishRequestEvent $event)
{
if (null === $this->requestStack) {
- throw new \LogicException('You must pass a RequestStack.');
+ return; // removed when requestStack is required
}
if (null !== $parentRequest = $this->requestStack->getParentRequest()) {
@@ -94,7 +94,7 @@ public function setRequest(Request $request = null)
public function onKernelFinishRequest(FinishRequestEvent $event)
{
if (null === $this->requestStack) {
- throw new \LogicException('You must pass a RequestStack.');
+ return; // removed when requestStack is required
}
$this->setRequest($this->requestStack->getParentRequest());
@@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.3",
"symfony/event-dispatcher": "~2.1",
- "symfony/http-foundation": "~2.4",
+ "symfony/http-foundation": "~2.1",
"symfony/http-kernel": "~2.4"
},
"require-dev": {

0 comments on commit 08a42e7

Please sign in to comment.