Fix static analysis errors.

psalm-baseline.xml

@@ -210,10 +210,18 @@
     </DeprecatedProperty>
   </file>
   <file src="src/Error/ErrorHandler.php">
+    <DeprecatedClass occurrences="1">
+      <code>ExceptionRenderer::class</code>
+    </DeprecatedClass>
     <DeprecatedMethod occurrences="1">
       <code>outputError</code>
     </DeprecatedMethod>
   </file>
+  <file src="src/Error/ExceptionTrap.php">
+    <DeprecatedClass occurrences="2">
+      <code>\Cake\Error\ExceptionRenderer</code>
+    </DeprecatedClass>
+  </file>
   <file src="src/Http/BaseApplication.php">
     <ArgumentTypeCoercion occurrences="1">
       <code>$request</code>

src/TestSuite/IntegrationTestTrait.php

@@ -18,7 +18,7 @@ namespace Cake\TestSuite;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Database\Exception\DatabaseException;
-use Cake\Error\ExceptionRenderer;
+use Cake\Error\Renderer\WebExceptionRenderer;
 use Cake\Event\EventInterface;
 use Cake\Event\EventManager;
 use Cake\Form\FormProtector;
@@ -553,9 +553,9 @@ trait IntegrationTestTrait
     {
         $class = Configure::read('Error.exceptionRenderer');
         if (empty($class) || !class_exists($class)) {
-            $class = ExceptionRenderer::class;
+            $class = WebExceptionRenderer::class;
         }
-        /** @var \Cake\Error\ExceptionRenderer $instance */
+        /** @var \Cake\Error\Renderer\WebExceptionRenderer $instance */
         $instance = new $class($exception);
         $this->_response = $instance->render();
     }

tests/TestCase/Error/ExceptionTrapTest.php

@@ -64,7 +64,7 @@ class ExceptionTrapTest extends TestCase
         $output = new ConsoleOutput();
         $trap = new ExceptionTrap(['exceptionRenderer' => ExceptionRenderer::class, 'stderr' => $output]);
         $error = new InvalidArgumentException('nope');
-        // Even though we asked for ExceptionRenderer we should get a 
+        // Even though we asked for ExceptionRenderer we should get a
         // ConsoleExceptionRenderer as we're in a CLI context.
         $this->assertInstanceOf(ConsoleExceptionRenderer::class, $trap->renderer($error));
     }

tests/TestCase/Error/Middleware/ErrorHandlerMiddlewareTest.php

@@ -21,8 +21,8 @@ use Cake\Datasource\Exception\RecordNotFoundException;
 use Cake\Error\ErrorHandler;
 use Cake\Error\ExceptionRendererInterface;
 use Cake\Error\ExceptionTrap;
-use Cake\Error\Renderer\WebExceptionRenderer;
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
+use Cake\Error\Renderer\WebExceptionRenderer;
 use Cake\Http\Exception\MissingControllerException;
 use Cake\Http\Exception\NotFoundException;
 use Cake\Http\Exception\RedirectException;