bug symfony#18 Allow multiple calls to Request::getContent() (aimeos)

dunglas · dunglas · commit d16c63c9e049 · 2016-02-16T14:21:11.000+01:00
This PR was squashed before being merged into the master branch (closes symfony#18). Discussion ---------- Allow multiple calls to Request::getContent() The Symfony request throws a LogicException if getContent() is called more than once and the first time with parameter "true". If $symfonyRequest->getContent(true) has thrown the exception, the call to $symfonyRequest->getContent() will do the same again. Commits ------- 9624b8b Allow multiple calls to Request::getContent()
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -45,11 +45,11 @@ public function createRequest(Request $symfonyRequest)
         $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
         $headers = $symfonyRequest->headers->all();
 
-        try {
-            $body = new DiactorosStream($symfonyRequest->getContent(true));
-        } catch (\LogicException $e) {
+        if (PHP_VERSION_ID < 50600) {
             $body = new DiactorosStream('php://temp', 'wb+');
             $body->write($symfonyRequest->getContent());
+        } else {
+            $body = new DiactorosStream($symfonyRequest->getContent(true));
         }
 
         $request = new ServerRequest(
diff --git a/Tests/Factory/DiactorosFactoryTest.php b/Tests/Factory/DiactorosFactoryTest.php
@@ -111,6 +111,17 @@ public function testCreateRequest()
         $this->assertEquals(array('2.8'), $psrRequest->getHeader('X-Symfony'));
     }
 
+    public function testGetContentCanBeCalledAfterRequestCreation()
+    {
+        $header = array('HTTP_HOST' => 'dunglas.fr');
+        $request = new Request(array(), array(), array(), array(), array(), $header, 'Content');
+
+        $psrRequest = $this->factory->createRequest($request);
+
+        $this->assertEquals('Content', $psrRequest->getBody()->__toString());
+        $this->assertEquals('Content', $request->getContent());
+    }
+
     private function createUploadedFile($content, $originalName, $mimeType, $error)
     {
         $path = tempnam($this->tmpDir, uniqid());
