Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit cd3b51c47860 · 2023-03-06T21:44:06.000+01:00
* 6.2:
  Fix tests
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php
@@ -45,7 +45,7 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             foreach ($domains as $domain) {
                 $responses[] = function (string $method, string $url, array $options = []) use ($responseContents, $lastModifieds, $locale, $domain): ResponseInterface {
                     $this->assertSame('GET', $method);
-                    $this->assertSame('https://localise.biz/api/export/locale/'.$locale.'.xlf?filter='.$domain.'&status=translated,blank-translation', $url);
+                    $this->assertSame('https://localise.biz/api/export/locale/'.$locale.'.xlf?filter='.rawurlencode($domain).'&status=translated%2Cblank-translation', $url);
                     $this->assertSame(['filter' => $domain, 'status' => 'translated,blank-translation'], $options['query']);
                     $this->assertSame(['Accept: */*'], $options['headers']);
 
@@ -84,7 +84,7 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             foreach ($domains as $domain) {
                 $responses[] = function (string $method, string $url, array $options = []) use ($responseContents, $lastModifieds, $locale, $domain): ResponseInterface {
                     $this->assertSame('GET', $method);
-                    $this->assertSame('https://localise.biz/api/export/locale/'.$locale.'.xlf?filter='.$domain.'&status=translated,blank-translation', $url);
+                    $this->assertSame('https://localise.biz/api/export/locale/'.$locale.'.xlf?filter='.rawurlencode($domain).'&status=translated%2Cblank-translation', $url);
                     $this->assertSame(['filter' => $domain, 'status' => 'translated,blank-translation'], $options['query']);
                     $this->assertNotContains('If-Modified-Since: '.$lastModifieds[$locale], $options['headers']);
                     $this->assertSame(['Accept: */*'], $options['headers']);
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/composer.json b/src/Symfony/Component/Translation/Bridge/Loco/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/http-client": "^5.4.21|^6.2.7",
+        "symfony/http-client": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/translation": "^6.2.7"
     },
