Skip to content

Commit

Permalink
minor #34284 [ErrorHandler] Remove Symfony ClassLoader support in an …
Browse files Browse the repository at this point in the history
…error enhancer (fancyweb)

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
  • Loading branch information
nicolas-grekas committed Nov 8, 2019
2 parents 8e6cc01 + e745654 commit 0628892
Showing 1 changed file with 3 additions and 5 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit 0628892

Please sign in to comment.