Merge remote-tracking branch 'origin/3.next' into automatic-database-reconnect

src/Error/ErrorHandler.php

@@ -17,6 +17,7 @@
 namespace Cake\Error;
 
 use Cake\Core\App;
+use Cake\Http\ResponseEmitter;
 use Exception;
 use Throwable;
 
@@ -194,6 +195,8 @@ class ErrorHandler extends BaseErrorHandler
 
             return;
         }
-        $response->send();
+
+        $emitter = new ResponseEmitter();
+        $emitter->emit($response);
     }
 }

src/Shell/Task/CommandTask.php

@@ -90,6 +90,10 @@ class CommandTask extends Shell
      */
     protected function _appendShells($type, $shells, $shellList, $skip)
     {
+        if (!isset($shellList[$type])) {
+            $shellList[$type] = [];
+        }
+
         foreach ($shells as $shell) {
             $name = Inflector::underscore(preg_replace('/(Shell|Command)$/', '', $shell));
             if (!in_array($name, $skip, true)) {

src/TestSuite/TestCase.php

@@ -96,9 +96,9 @@ abstract class TestCase extends BaseTestCase
      */
     public function withErrorReporting($errorLevel, $callable)
     {
+        $default = error_reporting();
+        error_reporting($errorLevel);
         try {
-            $default = error_reporting();
-            error_reporting($errorLevel);
             $callable();
         } finally {
             error_reporting($default);
@@ -113,9 +113,9 @@ abstract class TestCase extends BaseTestCase
      */
     public function deprecated($callable)
     {
+        $errorLevel = error_reporting();
+        error_reporting(E_ALL ^ E_USER_DEPRECATED);
         try {
-            $errorLevel = error_reporting();
-            error_reporting(E_ALL ^ E_USER_DEPRECATED);
             $callable();
         } finally {
             error_reporting($errorLevel);

tests/TestCase/Shell/Task/AssetsTaskTest.php

@@ -229,6 +229,7 @@ class AssetsTaskTest extends TestCase
         $this->assertFileEquals($path . DS . 'root.js', $pluginPath . DS . 'root.js');
 
         $folder = new Folder($path);
+        $folder->delete();
     }
 
     /**