Merge branch '6.2' into 6.3

* 6.2:
  [Validator] Add missing validator translations in Polish language
  [HttpClient] Fix encoding some characters in query strings
  [SecurityBundle] Remove last usages of tag `security.remember_me_aware`
  [VarDumper] Dumping DateTime throws error if getTimezone is false
  Only update autoload_runtime.php when it changed
  [Intl] Update the ICU data to 73.2
  [HttpClient] Force int conversion for floated multiplier for GenericRetryStrategy
  [FrameworkBundle] Ignore missing directories in about command
  Revert "[Messenger] Respect `isRetryable` decision of the retry strategy when deciding if failed message should be re-delivered"
  [Validator][Translator] Fix xlf files for en & fr translations. Bug introduced by #50590
  Add missing EN and FR translations for newest constraints

Author: nicolas-grekas

HttpClientTrait.php

@@ -659,7 +659,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
             }
 
             // https://tools.ietf.org/html/rfc3986#section-3.3
-            $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()[\]*+,;=:@\\\\^`{|}%]++#", fn ($m) => rawurlencode($m[0]), $parts[$part]);
+            $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()[\]*+,;=:@{}%]++#", fn ($m) => rawurlencode($m[0]), $parts[$part]);
         }
 
         return [
@@ -748,11 +748,7 @@ private static function mergeQueryString(?string $queryString, array $queryArray
                     '%3B' => ';',
                     '%40' => '@',
                     '%5B' => '[',
-                    '%5C' => '\\',
                     '%5D' => ']',
-                    '%5E' => '^',
-                    '%60' => '`',
-                    '%7C' => '|',
                 ]);
             }
 

Retry/GenericRetryStrategy.php

@@ -102,7 +102,7 @@ public function getDelay(AsyncContext $context, ?string $responseContent, ?Trans
         $delay = $this->delayMs * $this->multiplier ** $context->getInfo('retry_count');
 
         if ($this->jitter > 0) {
-            $randomness = $delay * $this->jitter;
+            $randomness = (int) ($delay * $this->jitter);
             $delay = $delay + random_int(-$randomness, +$randomness);
         }
 

Tests/HttpClientTraitTest.php

@@ -269,12 +269,13 @@ public static function provideParseUrl(): iterable
         yield [['http:', '//example.com', null, null, null], 'http://Example.coM:80'];
         yield [['https:', '//xn--dj-kia8a.example.com:8000', '/', null, null], 'https://DÉjà.Example.com:8000/'];
         yield [[null, null, '/f%20o.o', '?a=b', '#c'], '/f o%2Eo?a=b#c'];
+        yield [[null, null, '/custom%7C2010-01-01%2000:00:00%7C2023-06-15%2005:50:35', '?a=b', '#c'], '/custom|2010-01-01 00:00:00|2023-06-15 05:50:35?a=b#c'];
         yield [[null, '//a:b@foo', '/bar', null, null], '//a:b@foo/bar'];
         yield [[null, '//a:b@foo', '/b{}', null, null], '//a:b@foo/b{}'];
         yield [['http:', null, null, null, null], 'http:'];
         yield [['http:', null, 'bar', null, null], 'http:bar'];
         yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]];
-        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B%2C;%3D:@%25\\^`%7B|%7D', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
+        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B%2C;%3D:@%25%5C%5E%60%7B%7C%7D', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
         yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']];
         yield [[null, null, 'bar', '?a[b]=c', null], 'bar', ['a' => ['b' => 'c']]];
         yield [[null, null, 'bar', '?a[b[c]=d', null], 'bar?a[b[c]=d', []];

Tests/Retry/GenericRetryStrategyTest.php

@@ -67,7 +67,7 @@ public function testGetDelay(int $delay, int $multiplier, int $maxDelay, int $pr
 
     public static function provideDelay(): iterable
     {
-        // delay, multiplier, maxDelay, retries, expectedDelay
+        // delay, multiplier, maxDelay, previousRetries, expectedDelay
         yield [1000, 1, 5000, 0, 1000];
         yield [1000, 1, 5000, 1, 1000];
         yield [1000, 1, 5000, 2, 1000];
@@ -90,13 +90,16 @@ public static function provideDelay(): iterable
         yield [0, 2, 10000, 1, 0];
     }
 
-    public function testJitter()
+    /**
+     * @dataProvider provideJitter
+     */
+    public function testJitter(float $multiplier, int $previousRetries)
     {
-        $strategy = new GenericRetryStrategy([], 1000, 1, 0, 1);
+        $strategy = new GenericRetryStrategy([], 1000, $multiplier, 0, 1);
         $min = 2000;
         $max = 0;
         for ($i = 0; $i < 50; ++$i) {
-            $delay = $strategy->getDelay($this->getContext(0, 'GET', 'http://example.com/', 200), null, null);
+            $delay = $strategy->getDelay($this->getContext($previousRetries, 'GET', 'http://example.com/', 200), null, null);
             $min = min($min, $delay);
             $max = max($max, $delay);
         }
@@ -105,6 +108,13 @@ public function testJitter()
         $this->assertLessThanOrEqual(1000, $min);
     }
 
+    public static function provideJitter(): iterable
+    {
+        // multiplier, previousRetries
+        yield [1, 0];
+        yield [1.1, 2];
+    }
+
     private function getContext($retryCount, $method, $url, $statusCode): AsyncContext
     {
         $passthru = null;