Improve exception messages for invalid class references

Author: clue

src/Container.php

@@ -77,19 +77,14 @@ public function __invoke(ServerRequestInterface $request, ?callable $next = null
     public function callable(string $class): callable
     {
         return function (ServerRequestInterface $request, ?callable $next = null) use ($class) {
-            // Check `$class` references a valid class name that can be autoloaded
-            if (\is_array($this->container) && !\class_exists($class, true) && !interface_exists($class, false) && !trait_exists($class, false)) {
-                throw new \BadMethodCallException('Request handler class ' . $class . ' not found');
-            }
-
             try {
                 if ($this->container instanceof ContainerInterface) {
                     $handler = $this->container->get($class);
                 } else {
                     $handler = $this->loadObject($class);
                 }
             } catch (\Throwable $e) {
-                throw new \BadMethodCallException(
+                throw new \Error(
                     'Request handler class ' . $class . ' failed to load: ' . $e->getMessage(),
                     0,
                     $e
@@ -100,8 +95,8 @@ public function callable(string $class): callable
             // This initial version is intentionally limited to checking the method name only.
             // A follow-up version will likely use reflection to check request handler argument types.
             if (!is_callable($handler)) {
-                throw new \BadMethodCallException(
-                    'Request handler class ' . \explode("\0", $class)[0] . ' has no public __invoke() method'
+                throw new \Error(
+                    'Request handler ' . \explode("\0", $class)[0] . ' has no public __invoke() method'
                 );
             }
 
@@ -180,7 +175,7 @@ public function getErrorHandler(): ErrorHandler
      * @param class-string<T> $name
      * @return T
      * @throws \TypeError if container config or factory returns an unexpected type
-     * @throws \Error|\BadMethodCallException if object of type $name can not be loaded
+     * @throws \Error if object of type $name can not be loaded
      * @throws \Throwable if container factory function throws unexpected exception
      */
     private function loadObject(string $name, int $depth = 64) /*: object (PHP 7.2+) */
@@ -238,7 +233,7 @@ private function loadObject(string $name, int $depth = 64) /*: object (PHP 7.2+)
 
         // Check `$name` references a valid class name that can be autoloaded
         if (!\class_exists($name, true) && !interface_exists($name, false) && !trait_exists($name, false)) {
-            throw new \BadMethodCallException('Class ' . $name . ' not found');
+            throw new \Error('Class ' . $name . ' not found');
         }
 
         $class = new \ReflectionClass($name);
@@ -251,7 +246,7 @@ private function loadObject(string $name, int $depth = 64) /*: object (PHP 7.2+)
             } elseif ($class->isTrait()) {
                 $modifier = 'trait';
             }
-            throw new \BadMethodCallException('Cannot instantiate ' . $modifier . ' '. $name);
+            throw new \Error('Cannot instantiate ' . $modifier . ' '. $name);
         }
 
         // build list of constructor parameters based on parameter types
@@ -266,7 +261,7 @@ private function loadObject(string $name, int $depth = 64) /*: object (PHP 7.2+)
     /**
      * @return list<mixed>
      * @throws \TypeError if container config or factory returns an unexpected type
-     * @throws \Error|\BadMethodCallException if either parameter can not be loaded
+     * @throws \Error if either parameter can not be loaded
      * @throws \Throwable if container factory function throws unexpected exception
      */
     private function loadFunctionParams(\ReflectionFunctionAbstract $function, int $depth, bool $allowVariables, string $for): array
@@ -282,7 +277,7 @@ private function loadFunctionParams(\ReflectionFunctionAbstract $function, int $
     /**
      * @return mixed
      * @throws \TypeError if container config or factory returns an unexpected type
-     * @throws \Error|\BadMethodCallException if $parameter can not be loaded
+     * @throws \Error if $parameter can not be loaded
      * @throws \Throwable if container factory function throws unexpected exception
      */
     private function loadParameter(\ReflectionParameter $parameter, int $depth, bool $allowVariables, string $for) /*: mixed (PHP 8.0+) */
@@ -355,7 +350,7 @@ private function hasVariable(string $name): bool
     /**
      * @return object|string|int|float|bool|null
      * @throws \TypeError if container factory returns an unexpected type
-     * @throws \Error|\BadMethodCallException if $name can not be loaded
+     * @throws \Error if $name can not be loaded
      * @throws \Throwable if container factory function throws unexpected exception
      */
     private function loadVariable(string $name, int $depth = 64) /*: object|string|int|float|bool|null (PHP 8.0+) */

tests/AppTest.php

@@ -1605,7 +1605,7 @@ public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhe
 
         $this->assertStringContainsString("<title>Error 500: Internal Server Error</title>\n", (string) $response->getBody());
         $this->assertStringContainsString("<p>The requested page failed to load, please try again later.</p>\n", (string) $response->getBody());
-        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>BadMethodCallException</code> with message <code>Request handler class UnknownClass not found</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
+        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>Error</code> with message <code>Request handler class UnknownClass failed to load: Class UnknownClass not found</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
     }
 
     public function provideInvalidClasses(): \Generator
@@ -1692,7 +1692,7 @@ public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhe
 
         $this->assertStringContainsString("<title>Error 500: Internal Server Error</title>\n", (string) $response->getBody());
         $this->assertStringContainsString("<p>The requested page failed to load, please try again later.</p>\n", (string) $response->getBody());
-        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>BadMethodCallException</code> with message <code>Request handler class " . $class . " failed to load: $error</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
+        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>Error</code> with message <code>Request handler class $class failed to load: $error</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
     }
 
     public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhenHandlerClassRequiresUnexpectedCallableParameter(): void
@@ -1739,7 +1739,7 @@ public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhe
 
         $this->assertStringContainsString("<title>Error 500: Internal Server Error</title>\n", (string) $response->getBody());
         $this->assertStringContainsString("<p>The requested page failed to load, please try again later.</p>\n", (string) $response->getBody());
-        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>BadMethodCallException</code> with message <code>Request handler class class@anonymous has no public __invoke() method</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
+        $this->assertStringMatchesFormat("%a<p>Expected request handler to return <code>Psr\Http\Message\ResponseInterface</code> but got uncaught <code>Error</code> with message <code>Request handler class@anonymous has no public __invoke() method</code> in <code title=\"See %s\">Container.php:%d</code>.</p>\n%a", (string) $response->getBody());
     }
 
     public function testInvokeWithMatchingRouteReturnsInternalServerErrorResponseWhenHandlerReturnsPromiseWhichFulfillsWithWrongValue(): void