Also allowing callables in Response::body() to return a string(ish)

cakephp · Jul 7, 2015 · 2cfde27 · 2cfde27
1 parent c37930b
commit 2cfde27
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/Network/Response.php b/src/Network/Response.php
@@ -546,10 +546,10 @@ protected function _sendHeader($name, $value = null)
     protected function _sendContent($content)
     {
         if (!is_string($content) && is_callable($content)) {
-            call_user_func($content);
-        } else {
-            echo $content;
+            $content = $content();
         }
+
+        echo $content;
     }
 
     /**

diff --git a/tests/TestCase/Network/ResponseTest.php b/tests/TestCase/Network/ResponseTest.php
@@ -331,6 +331,24 @@ public function testSendWithCallableBody()
         $this->assertEquals('the response body', ob_get_clean());
     }
 
+    /**
+     * Tests that the returned a string from a body callable is also sent
+     * as the response body
+     *
+     * @return void
+     */
+    public function testSendWithCallableBodyWithReturn()
+    {
+        $response = $this->getMock('Cake\Network\Response', ['_sendHeader']);
+        $response->body(function () {
+            return 'the response body';
+        });
+
+        ob_start();
+        $response->send();
+        $this->assertEquals('the response body', ob_get_clean());
+    }
+
     /**
      * Tests the disableCache method
      *