Fix remaining tests in Error package.

tests/TestCase/Error/ErrorHandlerTest.php

@@ -85,9 +85,12 @@ class ErrorHandlerTest extends TestCase
         parent::setUp();
         Router::reload();
 
-        $request = new ServerRequest();
+        $request = new ServerRequest([
+            'environment' => [
+                'HTTP_REFERER' => '/referer'
+            ]
+        ]);
         $request->base = '';
-        $request->env('HTTP_REFERER', '/referer');
 
         Router::setRequestInfo($request);
         Configure::write('debug', true);
@@ -259,7 +262,7 @@ class ErrorHandlerTest extends TestCase
         $errorHandler = new TestErrorHandler();
 
         $errorHandler->handleException($error);
-        $this->assertContains('Kaboom!', $errorHandler->response->body(), 'message missing.');
+        $this->assertContains('Kaboom!', (string)$errorHandler->response->getBody(), 'message missing.');
     }
 
     /**
@@ -291,7 +294,7 @@ class ErrorHandlerTest extends TestCase
             ));
 
         $errorHandler->handleException($error);
-        $this->assertContains('Kaboom!', $errorHandler->response->body(), 'message missing.');
+        $this->assertContains('Kaboom!', (string)$errorHandler->response->getBody(), 'message missing.');
 
         $errorHandler = new TestErrorHandler([
             'log' => true,
@@ -364,10 +367,10 @@ class ErrorHandlerTest extends TestCase
         ]);
 
         $errorHandler->handleException($notFound);
-        $this->assertContains('Kaboom!', $errorHandler->response->body(), 'message missing.');
+        $this->assertContains('Kaboom!', (string)$errorHandler->response->getBody(), 'message missing.');
 
         $errorHandler->handleException($forbidden);
-        $this->assertContains('Fooled you!', $errorHandler->response->body(), 'message missing.');
+        $this->assertContains('Fooled you!', (string)$errorHandler->response->getBody(), 'message missing.');
     }
 
     /**
@@ -403,14 +406,14 @@ class ErrorHandlerTest extends TestCase
         Configure::write('debug', true);
 
         $errorHandler->handleFatalError(E_ERROR, 'Something wrong', __FILE__, $line);
-        $result = $errorHandler->response->body();
+        $result = (string)$errorHandler->response->getBody();
         $this->assertContains('Something wrong', $result, 'message missing.');
         $this->assertContains(__FILE__, $result, 'filename missing.');
         $this->assertContains((string)$line, $result, 'line missing.');
 
         Configure::write('debug', false);
         $errorHandler->handleFatalError(E_ERROR, 'Something wrong', __FILE__, $line);
-        $result = $errorHandler->response->body();
+        $result = (string)$errorHandler->response->getBody();
         $this->assertNotContains('Something wrong', $result, 'message must not appear.');
         $this->assertNotContains(__FILE__, $result, 'filename must not appear.');
         $this->assertContains('An Internal Error Has Occurred.', $result);
@@ -450,7 +453,7 @@ class ErrorHandlerTest extends TestCase
         $errorHandler = new TestErrorHandler();
 
         $errorHandler->handleException($error);
-        $this->assertContains('Unexpected variable foo', $errorHandler->response->body(), 'message missing.');
+        $this->assertContains('Unexpected variable foo', (string)$errorHandler->response->getBody(), 'message missing.');
     }
 
     /**