Merge branch '1.2'

Payum · Apr 29, 2016 · 18b1f99 · 18b1f99
2 parents 3dbbb4a + 95cd634
commit 18b1f99
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Bridge/Symfony/Action/GetHttpRequestAction.php b/Bridge/Symfony/Action/GetHttpRequestAction.php
@@ -46,7 +46,7 @@ public function execute($request)
 
         if ($this->httpRequest instanceof Request) {
             $this->updateRequest($request, $this->httpRequest);
-        } else if ($this->httpRequestStack instanceof RequestStack) {
+        } else if ($this->httpRequestStack instanceof RequestStack && null !== $this->httpRequestStack->getMasterRequest()) {
             $this->updateRequest($request, $this->httpRequestStack->getMasterRequest());
         }
     }

diff --git a/Tests/Bridge/Symfony/Action/GetHttpRequestActionTest.php b/Tests/Bridge/Symfony/Action/GetHttpRequestActionTest.php
@@ -4,6 +4,7 @@
 use Payum\Core\Bridge\Symfony\Action\GetHttpRequestAction;
 use Payum\Core\Request\GetHttpRequest;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 class GetHttpRequestActionTest extends \PHPUnit_Framework_TestCase
 {
@@ -87,6 +88,23 @@ public function shouldDoNothingIfHttpRequestNotSet()
         $this->assertSame('', $request->uri);
     }
 
+    /**
+     * @test
+     */
+    public function shouldDoNothingIfHttpRequestStackIsEmpty()
+    {
+        $action = new GetHttpRequestAction();
+        $action->setHttpRequestStack(new RequestStack());
+
+        $request = new \Payum\Core\Request\GetHttpRequest();
+        $action->execute($request);
+
+        $this->assertSame(array(), $request->query);
+        $this->assertSame(array(), $request->request);
+        $this->assertSame('', $request->method);
+        $this->assertSame('', $request->uri);
+    }
+
     /**
      * @test
      */