Merge pull request #35 from jasny/reparse-on-null

Setting parsedBody to null, means that the body will be (re-)parsed
jasny · Jan 26, 2017 · 4a2160a · 4a2160a
2 parents 20b5df3 + 4527b44
commit 4a2160a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 19 deletions.
diff --git a/src/ServerRequest/Headers.php b/src/ServerRequest/Headers.php
@@ -19,6 +19,25 @@ trait Headers
      */
     abstract public function getServerParams();
 
+
+    /**
+     * Turn a server parameter key to a header name
+     * 
+     * @param string $key
+     * @return string|null
+     */
+    protected function serverParamKeyToHeaderName($key)
+    {
+        $name = null;
+
+        if (\Jasny\str_starts_with($key, 'HTTP_')) {
+            $name = $this->headerCase(substr($key, 5));
+        } elseif (in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
+            $name = $this->headerCase($key);
+        }
+
+        return $name;
+    }
 
     /**
      * Determine the headers based on the server parameters
@@ -30,19 +49,12 @@ protected function determineHeaders()
         $params = $this->getServerParams();
         $headers = [];
 
-        foreach ($params as $param => $value) {
-            if (!is_string($value)) {
-                continue;
-            }
-            if (\Jasny\str_starts_with($param, 'HTTP_')) {
-                $key = $this->headerCase(substr($param, 5));
-            } elseif (in_array($param, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
-                $key = $this->headerCase($param);
-            } else {
-                continue;
-            }
+        foreach ($params as $key => $value) {
+            $name = $this->serverParamKeyToHeaderName($key);
 
-            $headers[$key] = [$value];
+            if (isset($name) && is_string($value)) {
+                $headers[$name] = [$value];
+            }
         }
 
         return $headers;

diff --git a/src/ServerRequest/ParsedBody.php b/src/ServerRequest/ParsedBody.php
@@ -17,7 +17,7 @@ trait ParsedBody
 
     /**
      * The condition under which the body was parsed
-     * @var array|null
+     * @var array|false|null
      */
     protected $parseCondition;
 
@@ -232,6 +232,7 @@ public function getParsedBody()
 
     /**
      * Return an instance with the specified body parameters.
+     * Setting the parsed body to `null` means that the body will be (re-)parsed on `getParsedBody()`.
      *
      * @param null|array|object|mixed $data The deserialized body data.
      * @return static
@@ -240,7 +241,7 @@ public function withParsedBody($data)
     {
         $request = $this->copy();
 
-        $request->parseCondition = false;
+        $request->parseCondition = ($data === null ? null : false);
 
         if ($this->shouldUsePostData()) {
             $request->postData = $data;

diff --git a/tests/LegacyCodeTest.php b/tests/LegacyCodeTest.php
@@ -39,8 +39,16 @@ public function setUp()
             'cookie' => $_COOKIE,
             'server' => $_SERVER
         ];
+
+        ob_start();
     }
 
+    public function tearDown()
+    {
+        ob_end_clean();
+    }
+
+
     /**
      * Initialize the request
      * 
@@ -137,8 +145,6 @@ protected function assertCleanedEnvironment()
      */
     public function test()
     {
-        ob_start();
-
         // Create server request with (actual) global enviroment.
         $request = (new ServerRequest())->withGlobalEnvironment(true);
 
@@ -176,6 +182,5 @@ public function test()
         $this->assertEquals('http://example.com/foo/1', $finalResponse->getHeaderLine('Location'));
         $this->assertStringStartsWith('text/plain', $finalResponse->getHeaderLine('Content-Type'));
         $this->assertEquals("Hello world", (string)$finalResponse->getBody());
-
     }
 }
diff --git a/tests/Response/ProtocolVersionTest.php b/tests/Response/ProtocolVersionTest.php
@@ -67,8 +67,6 @@ public function protocolVersionProvider()
      */
     public function testWithProtocolVersion($version, $expect)
     {
-        $this->status->expects($this->never())->method('withProtocolVersion');
-
         $response = $this->baseResponse->withProtocolVersion($version);
 
         $this->assertInstanceof(Response::class, $response);

diff --git a/tests/ServerRequest/ParsedBodyTest.php b/tests/ServerRequest/ParsedBodyTest.php
@@ -242,6 +242,8 @@ public function testWithParsedBody()
 
     public function testWithParsedBodyNoReset()
     {
+        $this->setContentType('application/json');
+
         $body = $this->createMock(Stream::class);
         $body->expects($this->never())
             ->method('__toString');
@@ -254,6 +256,22 @@ public function testWithParsedBodyNoReset()
         $this->assertEquals(['foo' => 'bar'], $request->getParsedBody());
     }
 
+    public function testWithParsedBodySetNull()
+    {
+        $this->setContentType('application/json');
+
+        $body = $this->createMock(Stream::class);
+        $body->expects($this->once())
+            ->method('__toString')
+            ->willReturn('{"foo": "bar"}');
+
+        $request = $this->baseRequest->withBody($body)->withParsedBody(['foo' => 'qux']);
+        $this->assertEquals(['foo' => 'qux'], $request->getParsedBody());
+
+        $nextRequest = $request->withParsedBody(null);
+        $this->assertEquals(['foo' => 'bar'], $nextRequest->getParsedBody());
+    }
+
     public function testWithParsedBodyTurnStale()
     {
         $refl = new \ReflectionProperty(ServerRequest::class, 'isStale');