Skip to content

Commit f0d818c

Browse files
Merge branch '4.4' into 5.0
* 4.4: Fix leftover from doctrine/persistence < 1.3 Require doctrine/persistence ^1.3
2 parents 6ce16a4 + 8ccd2cf commit f0d818c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

DebugClassLoader.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
namespace Symfony\Component\ErrorHandler;
1313

14-
use Doctrine\Common\Persistence\Proxy;
14+
use Doctrine\Common\Persistence\Proxy as LegacyProxy;
15+
use Doctrine\Persistence\Proxy;
1516
use PHPUnit\Framework\MockObject\Matcher\StatelessInvocation;
1617
use PHPUnit\Framework\MockObject\MockObject;
1718
use Prophecy\Prophecy\ProphecySubjectInterface;
@@ -298,6 +299,7 @@ public static function checkClasses(): bool
298299
&& !is_subclass_of($symbols[$i], ProphecySubjectInterface::class)
299300
&& !is_subclass_of($symbols[$i], Proxy::class)
300301
&& !is_subclass_of($symbols[$i], ProxyInterface::class)
302+
&& !is_subclass_of($symbols[$i], LegacyProxy::class)
301303
) {
302304
$loader->checkClass($symbols[$i]);
303305
}

0 commit comments

Comments
 (0)