Merge e0a67d4 into ff82332

slimphp · Dec 14, 2016 · 9bdb7f7 · 9bdb7f7
2 parents ff82332 + e0a67d4
commit 9bdb7f7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/Slim/Http/Environment.php b/Slim/Http/Environment.php
@@ -45,6 +45,7 @@ public static function mock(array $userData = [])
             'REMOTE_ADDR'          => '127.0.0.1',
             'REQUEST_TIME'         => time(),
             'REQUEST_TIME_FLOAT'   => microtime(true),
+            'MOCK_POST_DATA'       => null
         ], $userData);
 
         return new static($data);

diff --git a/Slim/Http/Request.php b/Slim/Http/Request.php
@@ -140,13 +140,14 @@ public static function createFromEnvironment(Environment $environment)
         $headers = Headers::createFromEnvironment($environment);
         $cookies = Cookies::parseHeader($headers->get('Cookie', []));
         $serverParams = $environment->all();
-        $body = new RequestBody();
+        $body = new RequestBody($environment);
         $uploadedFiles = UploadedFile::createFromEnvironment($environment);
 
         $request = new static($method, $uri, $headers, $cookies, $serverParams, $body, $uploadedFiles);
 
         if ($method === 'POST' &&
-            in_array($request->getMediaType(), ['application/x-www-form-urlencoded', 'multipart/form-data'])
+            in_array($request->getMediaType(), ['application/x-www-form-urlencoded', 'multipart/form-data']) &&
+            !$environment["MOCK_POST_DATA"]
         ) {
             // parsed body must be $_POST
             $request = $request->withParsedBody($_POST);

diff --git a/Slim/Http/RequestBody.php b/Slim/Http/RequestBody.php
@@ -15,11 +15,17 @@ class RequestBody extends Body
 {
     /**
      * Create a new RequestBody.
+     *
+     * @param Environment $environment The Slim application Environment
      */
-    public function __construct()
+    public function __construct(Environment $environment = null)
     {
         $stream = fopen('php://temp', 'w+');
-        stream_copy_to_stream(fopen('php://input', 'r'), $stream);
+        if ($environment != null && $environment["MOCK_POST_DATA"] != null) {
+            fwrite($stream, $environment["MOCK_POST_DATA"]);
+        } else {
+            stream_copy_to_stream(fopen('php://input', 'r'), $stream);
+        }
         rewind($stream);
 
         parent::__construct($stream);

diff --git a/tests/Http/EnvironmentTest.php b/tests/Http/EnvironmentTest.php
@@ -9,6 +9,7 @@
 namespace Slim\Tests\Http;
 
 use Slim\Http\Environment;
+use Slim\Http\Request;
 
 class EnvironmentTest extends \PHPUnit_Framework_TestCase
 {
@@ -55,4 +56,17 @@ public function testMock()
         $this->assertEquals('/foo/bar?abc=123', $env->get('REQUEST_URI'));
         $this->assertEquals('localhost', $env->get('HTTP_HOST'));
     }
+
+    /**
+     * Test mock post data
+     */
+    public function testMockPostData()
+    {
+        $env = Environment::mock([
+            'MOCK_POST_DATA' => 'data'
+        ]);
+
+        $request = Request::createFromEnvironment($env);
+        $this->assertEquals($request->getBody(), "data");
+    }
 }