Skip to content

Commit 09a0edf

Browse files
fabpotfabpot
committed
feature #46614 Remove Debug component leftovers (chalasr)
This PR was merged into the 6.2 branch. Discussion ---------- Remove Debug component leftovers | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - These layers survived 2 major versions, time to remove them? Commits ------- 4ab7a3a Remove Debug component leftovers
2 parents 527e085 + 4ab7a3a commit 09a0edf

File tree

6 files changed

+7
-20
lines changed

6 files changed

+7
-20
lines changed

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use PHPUnit\Metadata\Api\Groups;
1717
use PHPUnit\Util\Test;
1818
use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerFor;
19-
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
2019
use Symfony\Component\ErrorHandler\DebugClassLoader;
2120

2221
class_exists(Groups::class);
@@ -81,7 +80,7 @@ public function __construct($message, array $trace, $file)
8180
}
8281

8382
if ('trigger_error' === $trace[$j]['function'] && !isset($trace[$j]['class'])) {
84-
if (\in_array($trace[1 + $j]['class'], [DebugClassLoader::class, LegacyDebugClassLoader::class], true)) {
83+
if (DebugClassLoader::class === $trace[1 + $j]['class']) {
8584
$class = $trace[1 + $j]['args'][0];
8685
$this->triggeringFile = isset($trace[1 + $j]['args'][1]) ? realpath($trace[1 + $j]['args'][1]) : (new \ReflectionClass($class))->getFileName();
8786
$this->getOriginalFilesStack();
@@ -323,9 +322,6 @@ private static function getVendors()
323322
if (class_exists(DebugClassLoader::class, false)) {
324323
self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
325324
}
326-
if (class_exists(LegacyDebugClassLoader::class, false)) {
327-
self::$vendors[] = \dirname((new \ReflectionClass(LegacyDebugClassLoader::class))->getFileName());
328-
}
329325
foreach (get_declared_classes() as $class) {
330326
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
331327
$r = new \ReflectionClass($class);

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Symfony\Bridge\PhpUnit\ClockMock;
2424
use Symfony\Bridge\PhpUnit\DnsMock;
2525
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
26-
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
2726
use Symfony\Component\ErrorHandler\DebugClassLoader;
2827

2928
/**
@@ -61,7 +60,7 @@ public function __construct(array $mockedNamespaces = [])
6160
Blacklist::$blacklistedClassNames[__CLASS__] = 2;
6261
}
6362

64-
$enableDebugClassLoader = class_exists(DebugClassLoader::class) || class_exists(LegacyDebugClassLoader::class);
63+
$enableDebugClassLoader = class_exists(DebugClassLoader::class);
6564

6665
foreach ($mockedNamespaces as $type => $namespaces) {
6766
if (!\is_array($namespaces)) {
@@ -82,11 +81,7 @@ public function __construct(array $mockedNamespaces = [])
8281
}
8382
}
8483
if ($enableDebugClassLoader) {
85-
if (class_exists(DebugClassLoader::class)) {
86-
DebugClassLoader::enable();
87-
} else {
88-
LegacyDebugClassLoader::enable();
89-
}
84+
DebugClassLoader::enable();
9085
}
9186
if (self::$globallyEnabled) {
9287
$this->state = -2;

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Dumper;
1313

1414
use Composer\Autoload\ClassLoader;
15-
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
1615
use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
1716
use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
1817
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
@@ -2193,7 +2192,7 @@ private function getAutoloadFile(): ?string
21932192
continue;
21942193
}
21952194

2196-
if ($autoloader[0] instanceof DebugClassLoader || $autoloader[0] instanceof LegacyDebugClassLoader) {
2195+
if ($autoloader[0] instanceof DebugClassLoader) {
21972196
$autoloader = $autoloader[0]->getClassLoader();
21982197
}
21992198

‎src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\HttpKernel\DependencyInjection;
1313

1414
use Composer\Autoload\ClassLoader;
15-
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
1615
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\ErrorHandler\DebugClassLoader;
@@ -93,7 +92,7 @@ private function getClassesInComposerClassMaps(): array
9392
continue;
9493
}
9594

96-
if ($function[0] instanceof DebugClassLoader || $function[0] instanceof LegacyDebugClassLoader) {
95+
if ($function[0] instanceof DebugClassLoader) {
9796
$function = $function[0]->getClassLoader();
9897
}
9998

‎src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\HttpKernel\EventListener;
1313

1414
use Psr\Log\LoggerInterface;
15-
use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
1615
use Symfony\Component\ErrorHandler\Exception\FlattenException;
1716
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1817
use Symfony\Component\HttpFoundation\Request;
@@ -126,7 +125,7 @@ public function onControllerArguments(ControllerArgumentsEvent $event)
126125
$r = new \ReflectionFunction($event->getController()(...));
127126
$r = $r->getParameters()[$k] ?? null;
128127

129-
if ($r && (!($r = $r->getType()) instanceof \ReflectionNamedType || \in_array($r->getName(), [FlattenException::class, LegacyFlattenException::class], true))) {
128+
if ($r && (!($r = $r->getType()) instanceof \ReflectionNamedType || FlattenException::class === $r->getName())) {
130129
$arguments = $event->getArguments();
131130
$arguments[$k] = FlattenException::createFromThrowable($e);
132131
$event->setArguments($arguments);

‎src/Symfony/Component/HttpKernel/Kernel.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\Config\ConfigCache;
1818
use Symfony\Component\Config\Loader\DelegatingLoader;
1919
use Symfony\Component\Config\Loader\LoaderResolver;
20-
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
2120
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2221
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
2322
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -513,7 +512,7 @@ protected function initializeContainer()
513512

514513
// Remove frames added by DebugClassLoader.
515514
for ($i = \count($backtrace) - 2; 0 < $i; --$i) {
516-
if (\in_array($backtrace[$i]['class'] ?? null, [DebugClassLoader::class, LegacyDebugClassLoader::class], true)) {
515+
if (DebugClassLoader::class === ($backtrace[$i]['class'] ?? null)) {
517516
$backtrace = [$backtrace[$i + 1]];
518517
break;
519518
}

0 commit comments

Comments
 (0)