Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit 4798ba575c28 · 2025-10-13T13:49:56.000+02:00
* 6.4:
  [DebugBundle] Wire `DumpDataCollector`'s `webMode` argument
  filter should be empty when filtering on all domains
diff --git a/src/Symfony/Bundle/DebugBundle/Resources/config/services.php b/src/Symfony/Bundle/DebugBundle/Resources/config/services.php
@@ -52,6 +52,7 @@
                 param('kernel.charset'),
                 service('.virtual_request_stack'),
                 null, // var_dumper.cli_dumper or var_dumper.server_connection when debug.dump_destination is set
+                param('kernel.runtime_mode.web'),
             ])
             ->tag('data_collector', [
                 'id' => 'dump',
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -100,7 +100,7 @@ public function read(array $domains, array $locales): TranslatorBag
                 // Loco forbids concurrent requests, so the requests must be synchronous in order to prevent "429 Too Many Requests" errors.
                 $response = $this->client->request('GET', \sprintf('export/locale/%s.xlf', rawurlencode($locale)), [
                     'query' => [
-                        'filter' => $domain,
+                        'filter' => '*' !== $domain ? $domain : '',
                         'status' => $this->restrictToStatus ?? 'translated,blank-translation',
                     ],
                     'headers' => [
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
@@ -967,8 +967,7 @@ public static function getResponsesForOneLocaleAndOneDomain(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-            ,
+XLIFF,
             $expectedTranslatorBagEn,
         ];
 
@@ -997,8 +996,7 @@ public static function getResponsesForOneLocaleAndOneDomain(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-            ,
+XLIFF,
             $expectedTranslatorBagFr,
         ];
     }
@@ -1049,8 +1047,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                     'messages+intl-icu' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
@@ -1066,8 +1063,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                     'validators' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
@@ -1087,8 +1083,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                 ],
                 'fr' => [
                     'messages' => <<<'XLIFF'
@@ -1106,8 +1101,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                     'messages+intl-icu' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
@@ -1123,8 +1117,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                     'validators' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
@@ -1144,8 +1137,7 @@ public static function getResponsesForManyLocalesAndManyDomains(): \Generator
     </body>
   </file>
 </xliff>
-XLIFF
-                    ,
+XLIFF,
                 ],
             ],
             $expectedTranslatorBag,
@@ -1171,6 +1163,34 @@ public static function getResponsesForReadWithLastModified(): \Generator
         }
     }
 
+    public function testReadForAllDomains()
+    {
+        $loader = $this->getLoader();
+
+        $loader
+            ->expects($this->once())
+            ->method('load')
+            ->willReturn($this->createMock(MessageCatalogue::class));
+
+        $provider = self::createProvider(
+            new MockHttpClient([
+                function (string $method, string $url, array $options = []): ResponseInterface {
+                    $this->assertSame('GET', $method);
+                    $this->assertSame('https://localise.biz/api/export/locale/fr.xlf?filter=&status=translated%2Cblank-translation', $url);
+                    $this->assertSame(['filter' => '', 'status' => 'translated,blank-translation'], $options['query']);
+
+                    return new MockResponse();
+                },
+            ], 'https://localise.biz/api/'),
+            $this->getLoader(),
+            $this->getLogger(),
+            $this->getDefaultLocale(),
+            'localise.biz/api/',
+        );
+
+        $this->translatorBag = $provider->read(['*'], ['fr']);
+    }
+
     public function testReadWithRestrictToStatus()
     {
         $loader = $this->getLoader();
