Skip to content

Commit 2521d3c

Browse files
committed
Remove Debug component leftovers
1 parent 092ccc3 commit 2521d3c

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

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);

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;

0 commit comments

Comments
 (0)