Merge pull request #453 from cakephp/streamed-html

Fix warnings when streaming HTML responses are used.

Author: lorenzo

src/Routing/Filter/DebugBarFilter.php

@@ -233,6 +233,9 @@ protected function _injectScripts($id, $response)
             return;
         }
         $body = $response->body();
+        if (!is_string($body)) {
+            return;
+        }
         $pos = strrpos($body, '</body>');
         if ($pos === false) {
             return;

tests/TestCase/Cache/Engine/DebugEngineTest.php

@@ -42,7 +42,7 @@ class DebugEngineTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $mock = $this->getMock('Cake\Cache\CacheEngine');
+        $mock = $this->getMockBuilder('Cake\Cache\CacheEngine')->getMock();
         $this->mock = $mock;
         $this->engine = new DebugEngine($mock);
         $this->engine->init();

tests/TestCase/Controller/ToolbarControllerTest.php

@@ -69,7 +69,7 @@ public function testClearCacheNoGet()
      */
     public function testClearCache()
     {
-        $mock = $this->getMock('Cake\Cache\CacheEngine');
+        $mock = $this->getMockBuilder('Cake\Cache\CacheEngine')->getMock();
         $mock->expects($this->once())
             ->method('init')
             ->will($this->returnValue(true));

tests/TestCase/Database/Log/DebugLogTest.php

@@ -69,7 +69,7 @@ public function testLog()
      */
     public function testLogDecorates()
     {
-        $orig = $this->getMock('Cake\Database\Log\QueryLogger');
+        $orig = $this->getMockBuilder('Cake\Database\Log\QueryLogger')->getMock();
         $orig->expects($this->once())
             ->method('log');
 

tests/TestCase/Routing/Filter/DebugBarFilterTest.php

@@ -109,6 +109,31 @@ public function testAfterDispatchIgnoreRequestAction()
         $this->assertNotContains('<script>', $response->body());
     }
 
+    /**
+     * Test that afterDispatch ignores streaming bodies
+     *
+     * @return void
+     */
+    public function testAfterDispatchIgnoreStreamBodies()
+    {
+        $request = new Request([
+            'url' => '/articles',
+            'params' => ['plugin' => null]
+        ]);
+        $response = new Response([
+            'statusCode' => 200,
+            'type' => 'text/html',
+        ]);
+        $response->body(function () {
+            echo 'I am a teapot!';
+        });
+
+        $bar = new DebugBarFilter($this->events, []);
+        $event = new Event('Dispatcher.afterDispatch', $bar, compact('request', 'response'));
+        $this->assertNull($bar->afterDispatch($event));
+        $this->assertInstanceOf('Closure', $response->body());
+    }
+
     /**
      * Test that afterDispatch saves panel data.
      *