Skip to content

Commit 2c1caf0

Browse files
Merge branch '6.2' into 6.3
* 6.2: (21 commits) Fix tests CS fix [HttpKernel] Tests for DataCollector for #49320 [Console] Fix computing column width containing multibyte chars [Messenger] Fix deprecation layer of RedeliveryStamp [Mime] Form field values with integer keys not resolved correctly [Messenger] [Redis] Fixed problem where worker stops handling messages on first empty message [PHPUnitBridge] Fix PHPUnit 10.1 compatibility [VarDumper] Make the server TCP connection sync [Messenger] Fix warning message on failed messenger show command [Mailer] [Mailjet] Use body MessageID instead of X-MJ-Request-GUID [HttpFoundation] Fix BinaryFileResponse [Form] fix merge [HttpFoundation] Fix memory limit problems in BinaryFileResponse [PropertyAccess] Readonly properties must have no PropertyWriteInfo [Form] Cast choices value callback result to string [Serializer] Unexpected value should throw UnexpectedValueException [ErrorHandler] Don't throw deprecations for HttplugClient [Serializer] Fix denormalization of object with typed constructor arg (not castable) and with COLLECT_DENORMALIZATION_ERRORS ...
2 parents 3d79d9f + 8b7e9f1 commit 2c1caf0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

DebugClassLoader.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Prophecy\Prophecy\ProphecySubjectInterface;
2222
use ProxyManager\Proxy\ProxyInterface;
2323
use Symfony\Component\ErrorHandler\Internal\TentativeTypes;
24+
use Symfony\Component\HttpClient\HttplugClient;
2425
use Symfony\Component\VarExporter\LazyObjectInterface;
2526

2627
/**
@@ -421,7 +422,9 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
421422
if (!isset(self::$checkedClasses[$use])) {
422423
$this->checkClass($use);
423424
}
424-
if (isset(self::$deprecated[$use]) && strncmp($vendor, str_replace('_', '\\', $use), $vendorLen) && !isset(self::$deprecated[$class])) {
425+
if (isset(self::$deprecated[$use]) && strncmp($vendor, str_replace('_', '\\', $use), $vendorLen) && !isset(self::$deprecated[$class])
426+
&& !(HttplugClient::class === $class && \in_array($use, [\Http\Message\RequestFactory::class, \Http\Message\StreamFactory::class, \Http\Message\UriFactory::class], true))
427+
) {
425428
$type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
426429
$verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
427430

0 commit comments

Comments
 (0)