Merge pull request #1776 from specialtactics/feature/further-php-8-su…

…pport Further php 8 support
api-ecosystem-for-laravel · Apr 30, 2021 · e081cf6 · e081cf6
2 parents 7c6068e + 1346c2b
commit e081cf6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
         "league/fractal": "^0.19"
     },
     "require-dev": {
-        "phpdocumentor/reflection-docblock": "3.3.2",
         "friendsofphp/php-cs-fixer": "~2",
         "illuminate/auth": "^7.0|^8.0",
         "illuminate/cache": "^7.0|^8.0",

diff --git a/src/Exception/Handler.php b/src/Exception/Handler.php
@@ -370,8 +370,15 @@ protected function handlerHint(callable $callback)
         $reflection = new ReflectionFunction($callback);
 
         $exception = $reflection->getParameters()[0];
+        $reflectionType = $exception->getType();
 
-        return $exception->getClass()->getName();
+        if ($reflectionType && ! $reflectionType->isBuiltin()) {
+            if ($reflectionType instanceof \ReflectionNamedType) {
+                return $reflectionType->getName();
+            }
+        }
+
+        return '';
     }
 
     /**