From e7456547bd1c1fb182584912cb350ff9f8dae238 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Thu, 7 Nov 2019 15:52:56 +0100 Subject: [PATCH] [ErrorHandler] Remove Symfony ClassLoader support in an error enhancer --- .../ErrorEnhancer/ClassNotFoundErrorEnhancer.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php index 38111078bc31..7cd2b382f163 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php @@ -11,8 +11,7 @@ namespace Symfony\Component\ErrorHandler\ErrorEnhancer; -use Composer\Autoload\ClassLoader as ComposerClassLoader; -use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader; +use Composer\Autoload\ClassLoader; use Symfony\Component\ErrorHandler\DebugClassLoader; use Symfony\Component\ErrorHandler\Error\ClassNotFoundError; use Symfony\Component\ErrorHandler\Error\FatalError; @@ -107,14 +106,13 @@ private function getClassCandidates(string $class): array } } - if ($function[0] instanceof ComposerClassLoader || $function[0] instanceof SymfonyClassLoader) { + if ($function[0] instanceof ClassLoader) { foreach ($function[0]->getPrefixes() as $prefix => $paths) { foreach ($paths as $path) { $classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix)); } } - } - if ($function[0] instanceof ComposerClassLoader) { + foreach ($function[0]->getPrefixesPsr4() as $prefix => $paths) { foreach ($paths as $path) { $classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));