Merge 5b969c3 into 2e21ccc

cakephp · May 10, 2020 · 66f6de9 · 66f6de9
2 parents 2e21ccc + 5b969c3
commit 66f6de9
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 24 deletions.
diff --git a/src/Http/ServerRequestFactory.php b/src/Http/ServerRequestFactory.php
@@ -49,6 +49,7 @@ abstract class ServerRequestFactory implements ServerRequestFactoryInterface
      * @param array $body $_POST superglobal
      * @param array $cookies $_COOKIE superglobal
      * @param array $files $_FILES superglobal
+     * @param string $input php://input Used to stub request streams in testing.
      * @return \Cake\Http\ServerRequest
      * @throws \InvalidArgumentException for invalid file values
      */
@@ -57,7 +58,8 @@ public static function fromGlobals(
         ?array $query = null,
         ?array $body = null,
         ?array $cookies = null,
-        ?array $files = null
+        ?array $files = null,
+        ?string $input = null
     ): ServerRequest {
         $server = normalizeServer($server ?: $_SERVER);
         $uri = static::createUri($server);
@@ -79,6 +81,7 @@ public static function fromGlobals(
             'base' => $uri->base,
             'session' => $session,
             'mergeFilesAsObjects' => Configure::read('App.uploadedFilesAsObjects', true),
+            'input' => $input,
         ]);
 
         return $request;

diff --git a/src/TestSuite/IntegrationTestTrait.php b/src/TestSuite/IntegrationTestTrait.php
@@ -592,19 +592,6 @@ protected function _buildRequest(string $url, $method, $data = []): array
         }
 
         parse_str($query, $queryData);
-        $props = [
-            'url' => $url,
-            'session' => $session,
-            'query' => $queryData,
-            'files' => [],
-        ];
-        if (is_string($data)) {
-            $props['input'] = $data;
-        } else {
-            $data = $this->_addTokens($tokenUrl, $data);
-            $props['post'] = $this->_castToString($data);
-        }
-        $props['cookies'] = $this->_cookie;
 
         $env = [
             'REQUEST_METHOD' => $method,
@@ -627,7 +614,28 @@ protected function _buildRequest(string $url, $method, $data = []): array
             }
             unset($this->_request['headers']);
         }
-        $props['environment'] = $env;
+        $props = [
+            'url' => $url,
+            'session' => $session,
+            'query' => $queryData,
+            'files' => [],
+            'environment' => $env,
+        ];
+
+        if (is_string($data)) {
+            $props['input'] = $data;
+        } elseif (
+            is_array($data) &&
+            isset($props['environment']['CONTENT_TYPE']) &&
+            $props['environment']['CONTENT_TYPE'] === 'application/x-www-form-urlencoded'
+        ) {
+            $props['input'] = http_build_query($data);
+        } else {
+            $data = $this->_addTokens($tokenUrl, $data);
+            $props['post'] = $this->_castToString($data);
+        }
+
+        $props['cookies'] = $this->_cookie;
         $props = Hash::merge($props, $this->_request);
 
         return $props;

diff --git a/src/TestSuite/MiddlewareDispatcher.php b/src/TestSuite/MiddlewareDispatcher.php
@@ -23,7 +23,6 @@
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
 use Cake\Routing\RoutingApplicationInterface;
-use Laminas\Diactoros\Stream;
 use LogicException;
 use Psr\Http\Message\ResponseInterface;
 
@@ -162,17 +161,11 @@ protected function _createRequest(array $spec): ServerRequest
             $spec['query'],
             $spec['post'],
             $spec['cookies'],
-            $spec['files']
+            $spec['files'],
+            $spec['input'] ?? null
         );
         $request = $request->withAttribute('session', $spec['session']);
 
-        if (isset($spec['input'])) {
-            $stream = new Stream('php://memory', 'rw');
-            $stream->write($spec['input']);
-            $stream->rewind();
-            $request = $request->withBody($stream);
-        }
-
         return $request;
     }
 

diff --git a/tests/TestCase/TestSuite/IntegrationTestTraitTest.php b/tests/TestCase/TestSuite/IntegrationTestTraitTest.php
@@ -467,6 +467,24 @@ public function testPostDataHttpServer()
         $this->assertHeader('X-Middleware', 'true');
     }
 
+    /**
+     * Test that the PSR7 requests receive put data
+     *
+     * @return void
+     */
+    public function testPutDataFormUrlEncoded()
+    {
+        $this->configRequest([
+            'headers' => [
+                'Content-Type' => 'application/x-www-form-urlencoded',
+            ],
+        ]);
+        $this->put('/request_action/post_pass', ['title' => 'value']);
+        $this->assertResponseOk();
+        $data = json_decode('' . $this->_response->getBody());
+        $this->assertSame('value', $data->title);
+    }
+
     /**
      * Test that the uploaded files are passed correctly to the request
      *