Merge branch '5.3' into 5.4

derrabus · derrabus · commit dcf09d6c0a19 · 2021-12-05T21:33:52.000+01:00
* 5.3:
  Fix TranslationTrait for multiple domains
  Fix parameter types for ProcessHelper::mustRun()
  Fix: Wording
  Remove return void PHPDoc in test
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
         self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
     }
 
-    /** @return void */
     private function dumpLazyServiceProjectAsFilesServiceContainer()
     {
         if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
@@ -74,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 1;
         }
 
-        $io->success('The container was lint successfully: all services are injected with values that are compatible with their type declarations.');
+        $io->success('The container was linted successfully: all services are injected with values that are compatible with their type declarations.');
 
         return 0;
     }
diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php
@@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl
      * This is identical to run() except that an exception is thrown if the process
      * exits with a non-zero exit code.
      *
-     * @param string|Process $cmd      An instance of Process or a command to run
-     * @param callable|null  $callback A PHP callback to run whenever there is some
-     *                                 output available on STDOUT or STDERR
+     * @param array|Process $cmd      An instance of Process or a command to run
+     * @param callable|null $callback A PHP callback to run whenever there is some
+     *                                output available on STDOUT or STDERR
      *
      * @return Process
      *
diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php
@@ -478,6 +478,83 @@ public function testPullMessagesWithDefaultLocale()
             , file_get_contents($filenameFr));
     }
 
+    public function testPullMessagesMultipleDomains()
+    {
+        $arrayLoader = new ArrayLoader();
+        $filenameMessages = $this->createFile(['note' => 'NOTE']);
+        $filenameDomain = $this->createFile(['note' => 'NOTE'], 'en', 'domain.%locale%.xlf');
+        $locales = ['en'];
+        $domains = ['messages', 'domain'];
+
+        $providerReadTranslatorBag = new TranslatorBag();
+        $providerReadTranslatorBag->addCatalogue($arrayLoader->load([
+            'new.foo' => 'newFoo',
+        ], 'en'));
+
+        $providerReadTranslatorBag->addCatalogue($arrayLoader->load([
+            'new.foo' => 'newFoo',
+        ], 'en',
+            'domain'
+        ));
+
+        $provider = $this->createMock(ProviderInterface::class);
+        $provider->expects($this->once())
+            ->method('read')
+            ->with($domains, $locales)
+            ->willReturn($providerReadTranslatorBag);
+
+        $provider->expects($this->once())
+            ->method('__toString')
+            ->willReturn('null://default');
+
+        $tester = $this->createCommandTester($provider, $locales, $domains, 'en');
+        $tester->execute(['--locales' => ['en'], '--domains' => ['messages', 'domain']]);
+
+        $this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en" locale(s), and "messages, domain" domain(s)).', trim($tester->getDisplay()));
+        $this->assertXmlStringEqualsXmlString(<<<XLIFF
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+        <header>
+            <tool tool-id="symfony" tool-name="Symfony"/>
+        </header>
+        <body>
+            <trans-unit id="994ixRL" resname="new.foo">
+                <source>new.foo</source>
+                <target>newFoo</target>
+            </trans-unit>
+            <trans-unit id="7bRlYkK" resname="note">
+                <source>note</source>
+                <target>NOTE</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
+XLIFF
+            , file_get_contents($filenameMessages));
+        $this->assertXmlStringEqualsXmlString(<<<XLIFF
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+        <header>
+            <tool tool-id="symfony" tool-name="Symfony"/>
+        </header>
+        <body>
+            <trans-unit id="994ixRL" resname="new.foo">
+                <source>new.foo</source>
+                <target>newFoo</target>
+            </trans-unit>
+            <trans-unit id="7bRlYkK" resname="note">
+                <source>note</source>
+                <target>NOTE</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
+XLIFF
+            , file_get_contents($filenameDomain));
+    }
+
     /**
      * @dataProvider provideCompletionSuggestions
      */

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()`
`95`	`95`	`self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);`
`96`	`96`	`}`
`97`	`97`
`98`		`- /** @return void */`
`99`	`98`	`private function dumpLazyServiceProjectAsFilesServiceContainer()`
`100`	`99`	`{`
`101`	`100`	`if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`74`	`74`	`return 1;`
`75`	`75`	`}`
`76`	`76`
`77`		`- $io->success('The container was lint successfully: all services are injected with values that are compatible with their type declarations.');`
	`77`	`+ $io->success('The container was linted successfully: all services are injected with values that are compatible with their type declarations.');`
`78`	`78`
`79`	`79`	`return 0;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl`
`92`	`92`	`* This is identical to run() except that an exception is thrown if the process`
`93`	`93`	`* exits with a non-zero exit code.`
`94`	`94`	`*`
`95`		`- * @param string\|Process $cmd An instance of Process or a command to run`
`96`		`- * @param callable\|null $callback A PHP callback to run whenever there is some`
`97`		`- * output available on STDOUT or STDERR`
	`95`	`+ * @param array\|Process $cmd An instance of Process or a command to run`
	`96`	`+ * @param callable\|null $callback A PHP callback to run whenever there is some`
	`97`	`+ * output available on STDOUT or STDERR`
`98`	`98`	`*`
`99`	`99`	`* @return Process`
`100`	`100`	`*`