Fix incorrect triggering of callable strings

cakephp · Dec 4, 2017 · c68a773 · c68a773
1 parent 3bf426d
commit c68a773
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -828,7 +828,7 @@ public function body($content = null)
         }
 
         // Compatibility with closure/streaming responses
-        if (is_callable($content)) {
+        if (!is_string($content) && is_callable($content)) {
             $this->stream = new CallbackStream($content);
         } else {
             $this->_createStream();

diff --git a/tests/TestCase/Http/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php
@@ -521,6 +521,23 @@ public function testSendWithCallableBodyWithReturn()
         $this->assertEquals('the response body', ob_get_clean());
     }
 
+    /**
+     * Tests that callable strings are not triggered
+     *
+     * @return void
+     */
+    public function testSendWithCallableStringBody()
+    {
+        $response = $this->getMockBuilder('Cake\Http\Response')
+            ->setMethods(['_sendHeader'])
+            ->getMock();
+        $response->body('phpversion');
+
+        ob_start();
+        $response->send();
+        $this->assertEquals('phpversion', ob_get_clean());
+    }
+
     /**
      * Tests the disableCache method
      *