Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 09e2cba935d4 · 2023-11-24T14:24:35.000+01:00
* 5.4:
  fix detecting the database server version
  [Cache] Add url decoding of password in `RedisTrait` DSN
  [Serializer] Remove incompatible type declaration with PHP 7.2
diff --git a/.github/workflows/integration-tests.yml b/.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:
@@ -171,6 +177,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: 'localhost:26379 localhost:26379 localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -389,17 +389,14 @@ private function getServerVersion(): string
             return $this->serverVersion;
         }
 
-        if ($this->conn instanceof ServerVersionProvider) {
-            return $this->conn->getServerVersion();
+        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
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
@@ -15,15 +15,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')) {
-            throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-    }
-
     /**
      * @dataProvider provideCreateConnection
      */
@@ -42,6 +38,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')));
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/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) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -249,10 +249,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] ?? '');
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -641,10 +641,10 @@ interface PropertyDummyInterface
 
 class PropertyDiscriminatedDummyOne implements PropertyDummyInterface
 {
-    public string $url = 'URL_ONE';
+    public $url = 'URL_ONE';
 }
 
 class PropertyDiscriminatedDummyTwo implements PropertyDummyInterface
 {
-    public string $url = 'URL_TWO';
+    public $url = 'URL_TWO';
 }

Original file line number	Diff line number	Diff line change
`@@ -389,17 +389,14 @@ private function getServerVersion(): string`
`389`	`389`	`return $this->serverVersion;`
`390`	`390`	`}`
`391`	`391`
`392`		`- if ($this->conn instanceof ServerVersionProvider) {`
`393`		`- return $this->conn->getServerVersion();`
	`392`	`+ if ($this->conn instanceof ServerVersionProvider \|\| $this->conn instanceof ServerInfoAwareConnection) {`
	`393`	`+ return $this->serverVersion = $this->conn->getServerVersion();`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`// The condition should be removed once support for DBAL <3.3 is dropped`
`397`	`397`	`$conn = method_exists($this->conn, 'getNativeConnection') ? $this->conn->getNativeConnection() : $this->conn->getWrappedConnection();`
`398`		`- if ($conn instanceof ServerInfoAwareConnection) {`
`399`		`- return $this->serverVersion = $conn->getServerVersion();`
`400`		`- }`
`401`	`398`
`402`		`- return $this->serverVersion = '0';`
	`399`	`+ return $this->serverVersion = $conn->getAttribute(\PDO::ATTR_SERVER_VERSION);`
`403`	`400`	`}`
`404`	`401`
`405`	`402`	`private function addTableToSchema(Schema $schema): void`
Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,10 @@ private static function parseDsn(string $dsn, array &$options): array`
`249`	`249`	`$url = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]+):)?(?<password>[^@]+)@)?#', function ($m) use (&$auth) {`
`250`	`250`	`if (isset($m['password'])) {`
`251`	`251`	`if (!\in_array($m['user'], ['', 'default'], true)) {`
`252`		`- $auth['user'] = $m['user'];`
	`252`	`+ $auth['user'] = rawurldecode($m['user']);`
`253`	`253`	`}`
`254`	`254`
`255`		`- $auth['pass'] = $m['password'];`
	`255`	`+ $auth['pass'] = rawurldecode($m['password']);`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`return 'file:'.($m[1] ?? '');`
Original file line number	Diff line number	Diff line change
`@@ -641,10 +641,10 @@ interface PropertyDummyInterface`
`641`	`641`
`642`	`642`	`class PropertyDiscriminatedDummyOne implements PropertyDummyInterface`
`643`	`643`	`{`
`644`		`- public string $url = 'URL_ONE';`
	`644`	`+ public $url = 'URL_ONE';`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`class PropertyDiscriminatedDummyTwo implements PropertyDummyInterface`
`648`	`648`	`{`
`649`		`- public string $url = 'URL_TWO';`
	`649`	`+ public $url = 'URL_TWO';`
`650`	`650`	`}`