minor symfony#52983 [Messenger] Fix Redis integration tests data provider (alexandre-daubois)

xabbuh · xabbuh · commit dd3ef59bba6a · 2023-12-10T14:31:31.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Messenger] Fix Redis integration tests data provider | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT This fixes the data provider for `RedisExtIntegrationTest` and add `redis_sentinel` as a valid option Commits ------- 4b20186 [Messenger] Fix Redis integration tests data provider
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
@@ -221,7 +221,7 @@ public function testConnectionClaimAndRedeliver()
     }
 
     /**
-     * @dataProvider
+     * @dataProvider sentinelOptionNames
      */
     public function testSentinel(string $sentinelOptionName)
     {
@@ -252,10 +252,10 @@ public function testSentinel(string $sentinelOptionName)
         $connection->cleanup();
     }
 
-    public function sentinelOptionNames(): iterable
+    public static function sentinelOptionNames(): \Generator
     {
-        yield 'redis_sentinel';
-        yield 'sentinel_master';
+        yield ['redis_sentinel'];
+        yield ['sentinel_master'];
     }
 
     public function testLazySentinel()
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -47,6 +47,7 @@ class Connection
         'auth' => null,
         'serializer' => 1, // see \Redis::SERIALIZER_PHP,
         'sentinel_master' => null, // String, master to look for (optional, default is NULL meaning Sentinel support is disabled)
+        'redis_sentinel' => null, // String, alias for 'sentinel_master'
         'timeout' => 0.0, // Float, value in seconds (optional, default is 0 meaning unlimited)
         'read_timeout' => 0.0, //  Float, value in seconds (optional, default is 0 meaning unlimited)
         'retry_interval' => 0, //  Int, value in milliseconds (optional, default is 0)

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public function testConnectionClaimAndRedeliver()`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`/**`
`224`		`- * @dataProvider`
	`224`	`+ * @dataProvider sentinelOptionNames`
`225`	`225`	`*/`
`226`	`226`	`public function testSentinel(string $sentinelOptionName)`
`227`	`227`	`{`
`@@ -252,10 +252,10 @@ public function testSentinel(string $sentinelOptionName)`
`252`	`252`	`$connection->cleanup();`
`253`	`253`	`}`
`254`	`254`
`255`		`- public function sentinelOptionNames(): iterable`
	`255`	`+ public static function sentinelOptionNames(): \Generator`
`256`	`256`	`{`
`257`		`- yield 'redis_sentinel';`
`258`		`- yield 'sentinel_master';`
	`257`	`+ yield ['redis_sentinel'];`
	`258`	`+ yield ['sentinel_master'];`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`public function testLazySentinel()`