Merge branch '6.3' into 6.4

* 6.3:
  fix merge
  do not detect the deserialization_path context value twice
  fix detecting the database server version
  [Cache] Add url decoding of password in `RedisTrait` DSN
  [Serializer] Remove incompatible type declaration with PHP 7.2
  [Serializer] Fix test
  Fix denormalizing empty string into object|null parameter
  [PropertyInfo] Fixed promoted property type detection for `PhpStanExtractor`
  [Serializer] Move discrimination to abstract
  [Serializer] Fix deserialization_path missing using contructor
  [Serializer] Fix access to private when Ignore
  [HttpKernel] Fix logging deprecations to the "php" channel when channel "deprecation" is not defined
  Fix message handlers with multiple from_transports
  fix detecting the server version with Doctrine DBAL 4
  [Serializer] Fix constructor deserialization path
  [Serializer] Fix XML attributes not added on empty

Author: xabbuh

.github/workflows/integration-tests.yml

@@ -48,6 +48,12 @@ jobs:
         image: redis:6.2.8
         ports:
           - 16379:6379
+      redis-authenticated:
+        image: redis:6.2.8
+        ports:
+          - 16380:6379
+        env:
+          REDIS_ARGS: "--requirepass p@ssword"
       redis-cluster:
         image: grokzen/redis-cluster:6.2.8
         ports:
@@ -170,6 +176,7 @@ jobs:
         run: ./phpunit --group integration -v
         env:
           REDIS_HOST: 'localhost:16379'
+          REDIS_AUTHENTICATED_HOST: 'localhost:16380'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'unreachable-host:26379 localhost:26379 localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel

src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php

@@ -27,7 +27,7 @@
                 param('debug.error_handler.throw_at'),
                 param('kernel.debug'),
                 param('kernel.debug'),
-                service('logger')->nullOnInvalid(),
+                null, // Deprecation logger if different from the one above
             ])
             ->tag('monolog.logger', ['channel' => 'php'])
 

src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php

@@ -21,6 +21,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\ServerVersionProvider;
 use Doctrine\DBAL\Tools\DsnParser;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
@@ -385,13 +386,14 @@ private function getServerVersion(): string
             return $this->serverVersion;
         }
 
+        if ($this->conn instanceof ServerVersionProvider || $this->conn instanceof ServerInfoAwareConnection) {
+            return $this->serverVersion = $this->conn->getServerVersion();
+        }
+
         // The condition should be removed once support for DBAL <3.3 is dropped
         $conn = method_exists($this->conn, 'getNativeConnection') ? $this->conn->getNativeConnection() : $this->conn->getWrappedConnection();
-        if ($conn instanceof ServerInfoAwareConnection) {
-            return $this->serverVersion = $conn->getServerVersion();
-        }
 
-        return $this->serverVersion = '0';
+        return $this->serverVersion = $conn->getAttribute(\PDO::ATTR_SERVER_VERSION);
     }
 
     private function addTableToSchema(Schema $schema): void

src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php

@@ -14,15 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Traits\RedisTrait;
 
+/**
+ * @requires extension redis
+ */
 class RedisTraitTest extends TestCase
 {
-    public static function setUpBeforeClass(): void
-    {
-        if (!getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-    }
-
     /**
      * @dataProvider provideCreateConnection
      */
@@ -41,6 +37,19 @@ public function testCreateConnection(string $dsn, string $expectedClass)
         self::assertInstanceOf($expectedClass, $connection);
     }
 
+    public function testUrlDecodeParameters()
+    {
+        if (!getenv('REDIS_AUTHENTICATED_HOST')) {
+            self::markTestSkipped('REDIS_AUTHENTICATED_HOST env var is not defined.');
+        }
+
+        $mock = self::getObjectForTrait(RedisTrait::class);
+        $connection = $mock::createConnection('redis://:p%40ssword@'.getenv('REDIS_AUTHENTICATED_HOST'));
+
+        self::assertInstanceOf(\Redis::class, $connection);
+        self::assertSame('p@ssword', $connection->getAuth());
+    }
+
     public static function provideCreateConnection(): array
     {
         $hosts = array_map(fn ($host) => sprintf('host[%s]', $host), explode(' ', getenv('REDIS_CLUSTER_HOSTS')));

src/Symfony/Component/Cache/Traits/RedisTrait.php

@@ -101,9 +101,9 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m['password'])) {
                 if (\in_array($m['user'], ['', 'default'], true)) {
-                    $auth = $m['password'];
+                    $auth = rawurldecode($m['password']);
                 } else {
-                    $auth = [$m['user'], $m['password']];
+                    $auth = [rawurldecode($m['user']), rawurldecode($m['password'])];
                 }
 
                 if ('' === $auth) {

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

@@ -294,10 +294,10 @@ private static function parseDsn(string $dsn, array &$options): array
         $url = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m['password'])) {
                 if (!\in_array($m['user'], ['', 'default'], true)) {
-                    $auth['user'] = $m['user'];
+                    $auth['user'] = rawurldecode($m['user']);
                 }
 
-                $auth['pass'] = $m['password'];
+                $auth['pass'] = rawurldecode($m['password']);
             }
 
             return 'file:'.($m[1] ?? '');

src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php

@@ -106,6 +106,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds): v
                     unset($options['handles']);
                     $priority = $options['priority'] ?? 0;
                     $method = $options['method'] ?? '__invoke';
+                    $fromTransport = $options['from_transport'] ?? '';
 
                     if (isset($options['bus'])) {
                         if (!\in_array($options['bus'], $busIds)) {
@@ -131,10 +132,10 @@ private function registerHandlers(ContainerBuilder $container, array $busIds): v
                         throw new RuntimeException(sprintf('Invalid handler service "%s": method "%s::%s()" does not exist.', $serviceId, $r->getName(), $method));
                     }
 
-                    if ('__invoke' !== $method) {
+                    if ('__invoke' !== $method || '' !== $fromTransport) {
                         $wrapperDefinition = (new Definition('Closure'))->addArgument([new Reference($serviceId), $method])->setFactory('Closure::fromCallable');
 
-                        $definitions[$definitionId = '.messenger.method_on_object_wrapper.'.ContainerBuilder::hash($message.':'.$priority.':'.$serviceId.':'.$method)] = $wrapperDefinition;
+                        $definitions[$definitionId = '.messenger.method_on_object_wrapper.'.ContainerBuilder::hash($message.':'.$priority.':'.$serviceId.':'.$method.':'.$fromTransport)] = $wrapperDefinition;
                     } else {
                         $definitionId = $serviceId;
                     }

src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php

@@ -52,6 +52,7 @@
 use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
 use Symfony\Component\Messenger\Tests\Fixtures\TaggedDummyHandler;
 use Symfony\Component\Messenger\Tests\Fixtures\TaggedDummyHandlerWithUnionTypes;
+use Symfony\Component\Messenger\Tests\Fixtures\ThirdMessage;
 use Symfony\Component\Messenger\Tests\Fixtures\UnionBuiltinTypeArgumentHandler;
 use Symfony\Component\Messenger\Tests\Fixtures\UnionTypeArgumentHandler;
 use Symfony\Component\Messenger\Tests\Fixtures\UnionTypeOneMessage;
@@ -102,7 +103,7 @@ public function testFromTransportViaTagAttribute()
         $container = $this->getContainerBuilder($busId = 'message_bus');
         $container
             ->register(DummyHandler::class, DummyHandler::class)
-            ->addTag('messenger.message_handler', ['from_transport' => 'async'])
+            ->addTag('messenger.message_handler', ['from_transport' => 'async', 'method' => '__invoke'])
         ;
 
         (new MessengerPass())->process($container);
@@ -113,7 +114,7 @@ public function testFromTransportViaTagAttribute()
         $handlerDescriptionMapping = $handlersLocatorDefinition->getArgument(0);
         $this->assertCount(1, $handlerDescriptionMapping);
 
-        $this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [DummyHandler::class], [['from_transport' => 'async']]);
+        $this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [[DummyHandler::class, '__invoke']], [['from_transport' => 'async']]);
     }
 
     public function testHandledMessageTypeResolvedWithMethodAndNoHandlesViaTagAttributes()
@@ -178,7 +179,7 @@ public function testTaggedMessageHandler()
         $this->assertSame(HandlersLocator::class, $handlersLocatorDefinition->getClass());
 
         $handlerDescriptionMapping = $handlersLocatorDefinition->getArgument(0);
-        $this->assertCount(2, $handlerDescriptionMapping);
+        $this->assertCount(3, $handlerDescriptionMapping);
 
         $this->assertHandlerDescriptor($container, $handlerDescriptionMapping, DummyMessage::class, [TaggedDummyHandler::class], [[]]);
         $this->assertHandlerDescriptor(
@@ -187,6 +188,19 @@ public function testTaggedMessageHandler()
             SecondMessage::class,
             [[TaggedDummyHandler::class, 'handleSecondMessage']]
         );
+        $this->assertHandlerDescriptor(
+            $container,
+            $handlerDescriptionMapping,
+            ThirdMessage::class,
+            [
+                [TaggedDummyHandler::class, 'handleThirdMessage'],
+                [TaggedDummyHandler::class, 'handleThirdMessage'],
+            ],
+            [
+                ['from_transport' => 'a'],
+                ['from_transport' => 'b'],
+            ],
+        );
     }
 
     public function testTaggedMessageHandlerWithUnionTypes()

src/Symfony/Component/Messenger/Tests/Fixtures/TaggedDummyHandler.php

@@ -15,4 +15,10 @@ public function __invoke(DummyMessage $message)
     public function handleSecondMessage(SecondMessage $message)
     {
     }
+
+    #[AsMessageHandler(fromTransport: 'a')]
+    #[AsMessageHandler(fromTransport: 'b')]
+    public function handleThirdMessage(ThirdMessage $message): void
+    {
+    }
 }

src/Symfony/Component/Messenger/Tests/Fixtures/ThirdMessage.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Messenger\Tests\Fixtures;
+
+class ThirdMessage
+{
+}