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

fabpot · fabpot · commit 77d79066d3bc · 2013-09-18T09:00:03.000+02:00
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
diff --git a/src/Symfony/Component/HttpFoundation/RequestStack.php b/src/Symfony/Component/HttpFoundation/RequestStack.php
@@ -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);
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -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()) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -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());
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -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": {

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ public function push(Request $request)`
`42`	`42`	`* This method should generally not be called directly as the stack`
`43`	`43`	`* management should be taken care of by the application itself.`
`44`	`44`	`*`
`45`		`- * @return Request`
	`45`	`+ * @return Request\|null`
`46`	`46`	`*/`
`47`	`47`	`public function pop()`
`48`	`48`	`{`
`49`	`49`	`if (!$this->requests) {`
`50`		`- throw new \LogicException('Unable to pop a Request as the stack is already empty.');`
	`50`	`+ return null;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return array_pop($this->requests);`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function onKernelRequest(GetResponseEvent $event)`
`78`	`78`	`public function onKernelFinishRequest(FinishRequestEvent $event)`
`79`	`79`	`{`
`80`	`80`	`if (null === $this->requestStack) {`
`81`		`- throw new \LogicException('You must pass a RequestStack.');`
	`81`	`+ return; // removed when requestStack is required`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if (null !== $parentRequest = $this->requestStack->getParentRequest()) {`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function setRequest(Request $request = null)`
`94`	`94`	`public function onKernelFinishRequest(FinishRequestEvent $event)`
`95`	`95`	`{`
`96`	`96`	`if (null === $this->requestStack) {`
`97`		`- throw new \LogicException('You must pass a RequestStack.');`
	`97`	`+ return; // removed when requestStack is required`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`$this->setRequest($this->requestStack->getParentRequest());`