Merge branch '5.4' into 6.2

* 5.4:
  [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
  [Validator][Translator] Fix xlf files for en & fr translations. Bug introduced by symfony#50590
  Add missing EN and FR translations for newest constraints

Author: nicolas-grekas

src/Symfony/Component/HttpClient/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);
         }
 

src/Symfony/Component/HttpClient/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;

src/Symfony/Component/Intl/Intl.php

@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
      */
     public static function getIcuStubVersion(): string
     {
-        return '73.1';
+        return '73.2';
     }
 
     /**

src/Symfony/Component/Intl/Resources/data/git-info.txt

@@ -2,6 +2,6 @@ Git information
 ===============
 
 URL: https://github.com/unicode-org/icu.git
-Revision: 5861e1fd52f1d7673eee38bc3c965aa18b336062
+Revision: 680f521746a3bd6a86f25f25ee50a62d88b489cf
 Author: Peter Edberg
-Date: 2023-04-11T10:32:35-07:00
+Date: 2023-06-07T19:19:55-07:00

src/Symfony/Component/Intl/Resources/data/version.txt

@@ -1 +1 @@
-73.1
+73.2

src/Symfony/Component/Runtime/Internal/ComposerPlugin.php

@@ -105,7 +105,12 @@ public function updateAutoloadFile(): void
             '%runtime_options%' => '['.substr(var_export($extra, true), 7, -1)."  'project_dir' => {$projectDir},\n]",
         ]);
 
-        file_put_contents(substr_replace($autoloadFile, '_runtime', -4, 0), $code);
+        // could use Composer\Util\Filesystem::filePutContentsIfModified once Composer 1.x support is dropped for this plugin
+        $path = substr_replace($autoloadFile, '_runtime', -4, 0);
+        $currentContent = @file_exists($path) ? @file_get_contents($path) : false;
+        if (false === $currentContent || $currentContent !== $code) {
+            file_put_contents($path, $code);
+        }
     }
 
     public static function getSubscribedEvents(): array

src/Symfony/Component/Validator/Resources/translations/validators.en.xlf

@@ -406,6 +406,26 @@
                 <source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
                 <target>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</target>
             </trans-unit>
+            <trans-unit id="105">
+                <source>The password strength is too low. Please use a stronger password.</source>
+                <target>The password strength is too low. Please use a stronger password.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>This value contains characters that are not allowed by the current restriction-level.</source>
+                <target>This value contains characters that are not allowed by the current restriction-level.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Using invisible characters is not allowed.</source>
+                <target>Using invisible characters is not allowed.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Mixing numbers from different scripts is not allowed.</source>
+                <target>Mixing numbers from different scripts is not allowed.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Using hidden overlay characters is not allowed.</source>
+                <target>Using hidden overlay characters is not allowed.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf

@@ -402,6 +402,30 @@
                 <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
                 <target>La valeur du masque de réseau doit être comprise entre {{ min }} et {{ max }}.</target>
             </trans-unit>
+            <trans-unit id="104">
+                <source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
+                <target>Le nom du fichier est trop long. Il doit contenir au maximum {{ filename_max_length }} caractère.|Le nom de fichier est trop long. Il doit contenir au maximum {{ filename_max_length }} caractères.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>The password strength is too low. Please use a stronger password.</source>
+                <target>La force du mot de passe est trop faible. Veuillez utiliser un mot de passe plus fort.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>This value contains characters that are not allowed by the current restriction-level.</source>
+                <target>Cette valeur contient des caractères qui ne sont pas autorisés par le niveau de restriction actuel.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Using invisible characters is not allowed.</source>
+                <target>Utiliser des caractères invisibles n'est pas autorisé.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Mixing numbers from different scripts is not allowed.</source>
+                <target>Mélanger des chiffres provenant de différents scripts n'est pas autorisé.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Using hidden overlay characters is not allowed.</source>
+                <target>Utiliser des caractères de superposition cachés n'est pas autorisé.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

src/Symfony/Component/VarDumper/Caster/DateCaster.php

@@ -27,7 +27,7 @@ class DateCaster
     public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
-        $location = $d->getTimezone()->getLocation();
+        $location = $d->getTimezone() ? $d->getTimezone()->getLocation() : null;
         $fromNow = (new \DateTimeImmutable())->diff($d);
 
         $title = $d->format('l, F j, Y')

src/Symfony/Component/VarDumper/Tests/Caster/DateCasterTest.php

@@ -106,6 +106,52 @@ public static function provideDateTimes()
         ];
     }
 
+    /**
+     * @dataProvider provideNoTimezoneDateTimes
+     */
+    public function testCastDateTimeNoTimezone($time, $xDate, $xInfos)
+    {
+        $stub = new Stub();
+        $date = new NoTimezoneDate($time);
+        $cast = DateCaster::castDateTime($date, Caster::castObject($date, \DateTime::class), $stub, false, 0);
+
+        $xDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00date" => $xDate
+]
+EODUMP;
+
+        $this->assertDumpEquals($xDump, $cast);
+
+        $xDump = <<<EODUMP
+Symfony\Component\VarDumper\Caster\ConstStub {
+  +type: 1
+  +class: "$xDate"
+  +value: "%A$xInfos%A"
+  +cut: 0
+  +handle: 0
+  +refCount: 0
+  +position: 0
+  +attr: []
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $cast["\0~\0date"]);
+    }
+
+    public static function provideNoTimezoneDateTimes()
+    {
+        return [
+            ['2017-04-30 00:00:00.000000', '2017-04-30 00:00:00.0 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.100000', '2017-04-30 00:00:00.100 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.120000', '2017-04-30 00:00:00.120 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.123000', '2017-04-30 00:00:00.123 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.123400', '2017-04-30 00:00:00.123400 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.123450', '2017-04-30 00:00:00.123450 +00:00', 'Sunday, April 30, 2017'],
+            ['2017-04-30 00:00:00.123456', '2017-04-30 00:00:00.123456 +00:00', 'Sunday, April 30, 2017'],
+        ];
+    }
+
     public function testCastDateTimeWithAdditionalChildProperty()
     {
         $stub = new Stub();
@@ -423,3 +469,11 @@ private function createInterval($intervalSpec, $ms, $invert)
         return $interval;
     }
 }
+
+class NoTimezoneDate extends \DateTime
+{
+    public function getTimezone(): \DateTimeZone|false
+    {
+        return false;
+    }
+}