minor #34284 [ErrorHandler] Remove Symfony ClassLoader support in an error enhancer (fancyweb)

nicolas-grekas · nicolas-grekas · commit 0628892c21f4 · 2019-11-08T09:55:23.000+01:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [ErrorHandler] Remove Symfony ClassLoader support in an error enhancer | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | #33053 (comment) | License | MIT | Doc PR | - Throwing a deprecation for this on 4.4 looks useless to me as the component was deprecated 2 years ago and stopping its support will not break anything. Commits ------- e745654 [ErrorHandler] Remove Symfony ClassLoader support in an error enhancer
diff --git 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));

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\ErrorHandler\ErrorEnhancer;`
`13`	`13`
`14`		`-use Composer\Autoload\ClassLoader as ComposerClassLoader;`
`15`		`-use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;`
	`14`	`+use Composer\Autoload\ClassLoader;`
`16`	`15`	`use Symfony\Component\ErrorHandler\DebugClassLoader;`
`17`	`16`	`use Symfony\Component\ErrorHandler\Error\ClassNotFoundError;`
`18`	`17`	`use Symfony\Component\ErrorHandler\Error\FatalError;`
`@@ -107,14 +106,13 @@ private function getClassCandidates(string $class): array`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
`110`		`- if ($function[0] instanceof ComposerClassLoader \|\| $function[0] instanceof SymfonyClassLoader) {`
	`109`	`+ if ($function[0] instanceof ClassLoader) {`
`111`	`110`	`foreach ($function[0]->getPrefixes() as $prefix => $paths) {`
`112`	`111`	`foreach ($paths as $path) {`
`113`	`112`	`$classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));`
`114`	`113`	`}`
`115`	`114`	`}`
`116`		`- }`
`117`		`- if ($function[0] instanceof ComposerClassLoader) {`
	`115`	`+`
`118`	`116`	`foreach ($function[0]->getPrefixesPsr4() as $prefix => $paths) {`
`119`	`117`	`foreach ($paths as $path) {`
`120`	`118`	`$classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));`