merged branch Tobion/request-stack-bc (PR #9059)

This PR was merged into the master branch.

Discussion
----------

[HttpKernel] made request stack feature BC

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8904 see comments
| License       | MIT

Commits
-------

08a42e7 [HttpKernel] made request stack feature BC
This commit is contained in:
Fabien Potencier 2013-09-18 09:00:03 +02:00
commit 77d79066d3
4 changed files with 5 additions and 5 deletions

View File

@ -42,12 +42,12 @@ class RequestStack
* 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);

View File

@ -78,7 +78,7 @@ class LocaleListener implements EventSubscriberInterface
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()) {

View File

@ -94,7 +94,7 @@ class RouterListener implements EventSubscriberInterface
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());

View File

@ -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": {