Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 94512ba255f4 · 2024-10-25T17:11:02.000+02:00
* 6.4:
  initialize RedisAdapter cursor to 0
  do not skip tests from data providers
  ensure compatibility with Twig 3.15
  [Mime] fix encoding issue with UTF-8 addresses containing doubles spaces
  fix translation file syntax
  [Notifier] Improve Telegrams markdown escaping
  [Validator] [Choice] Fix callback option if not array returned
  [DependencyInjection] Fix linting factories implemented via __callStatic
  [DependencyInjection] Fix replacing abstract arguments with bindings
  Minor fixes around parse_url() checks
  Ensure compatibility with mongodb v2
  Add missing translations for Turkish (tr)
diff --git a/Tests/Adapter/MemcachedAdapterTest.php b/Tests/Adapter/MemcachedAdapterTest.php
@@ -169,33 +169,29 @@ public static function provideServersSetting(): iterable
     }
 
     /**
-     * @dataProvider provideDsnWithOptions
+     * @requires extension memcached
      */
-    public function testDsnWithOptions(string $dsn, array $options, array $expectedOptions)
+    public function testOptionsFromDsnWinOverAdditionallyPassedOptions()
     {
-        $client = MemcachedAdapter::createConnection($dsn, $options);
+        $client = MemcachedAdapter::createConnection('memcached://localhost:11222?retry_timeout=10', [
+            \Memcached::OPT_RETRY_TIMEOUT => 8,
+        ]);
 
-        foreach ($expectedOptions as $option => $expect) {
-            $this->assertSame($expect, $client->getOption($option));
-        }
+        $this->assertSame(10, $client->getOption(\Memcached::OPT_RETRY_TIMEOUT));
     }
 
-    public static function provideDsnWithOptions(): iterable
+    /**
+     * @requires extension memcached
+     */
+    public function testOptionsFromDsnAndAdditionallyPassedOptionsAreMerged()
     {
-        if (!class_exists(\Memcached::class)) {
-            self::markTestSkipped('Extension memcached required.');
-        }
+        $client = MemcachedAdapter::createConnection('memcached://localhost:11222?socket_recv_size=1&socket_send_size=2', [
+            \Memcached::OPT_RETRY_TIMEOUT => 8,
+        ]);
 
-        yield [
-            'memcached://localhost:11222?retry_timeout=10',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_RETRY_TIMEOUT => 10],
-        ];
-        yield [
-            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
-        ];
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_SOCKET_RECV_SIZE));
+        $this->assertSame(2, $client->getOption(\Memcached::OPT_SOCKET_SEND_SIZE));
+        $this->assertSame(8, $client->getOption(\Memcached::OPT_RETRY_TIMEOUT));
     }
 
     public function testClear()
diff --git a/Traits/RedisTrait.php b/Traits/RedisTrait.php
@@ -512,7 +512,7 @@ protected function doClear(string $namespace): bool
                 continue;
             }
 
-            $cursor = null;
+            $cursor = 0;
             do {
                 $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
                 if (isset($keys[1]) && \is_array($keys[1])) {

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ protected function doClear(string $namespace): bool`
`512`	`512`	`continue;`
`513`	`513`	`}`
`514`	`514`
`515`		`- $cursor = null;`
	`515`	`+ $cursor = 0;`
`516`	`516`	`do {`
`517`	`517`	`$keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);`
`518`	`518`	`if (isset($keys[1]) && \is_array($keys[1])) {`