[Translation] correctly handle intl domains with TargetOperation

acran · acran · commit 84b48fe1368c · 2021-09-02T14:27:07.000+02:00
This would cause issues with merging existing intl domains since it was trying to merge with the target instead of the source. This was originally introduced with c71dfb9 The incorrect Test was introduced with b72b7d3
diff --git a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
@@ -49,7 +49,7 @@ protected function processDomain($domain)
         foreach ($this->source->all($domain) as $id => $message) {
             if ($this->target->has($id, $domain)) {
                 $this->messages[$domain]['all'][$id] = $message;
-                $d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
+                $d = $this->source->defines($id, $intlDomain) ? $intlDomain : $domain;
                 $this->result->add([$id => $message], $d);
                 if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) {
                     $this->result->setMetadata($id, $keyMetadata, $d);
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
@@ -71,13 +71,45 @@ public function testGetResultWithMixedDomains()
     {
         $this->assertEquals(
             new MessageCatalogue('en', [
-                'messages+intl-icu' => ['a' => 'old_a'],
+                'messages' => ['a' => 'old_a'],
             ]),
             $this->createOperation(
                 new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]),
                 new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'new_a']])
             )->getResult()
         );
+
+        $this->assertEquals(
+            new MessageCatalogue('en', [
+                'messages+intl-icu' => ['a' => 'old_a'],
+            ]),
+            $this->createOperation(
+                new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a']]),
+                new MessageCatalogue('en', ['messages' => ['a' => 'new_a']])
+            )->getResult()
+        );
+
+        $this->assertEquals(
+            new MessageCatalogue('en', [
+                'messages+intl-icu' => ['a' => 'old_a'],
+                'messages' => ['b' => 'new_b'],
+            ]),
+            $this->createOperation(
+                new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a']]),
+                new MessageCatalogue('en', ['messages' => ['a' => 'new_a', 'b' => 'new_b']])
+            )->getResult()
+        );
+
+        $this->assertEquals(
+            new MessageCatalogue('en', [
+                'messages' => ['a' => 'old_a'],
+                'messages+intl-icu' => ['b' => 'new_b'],
+            ]),
+            $this->createOperation(
+                new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]),
+                new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'new_a', 'b' => 'new_b']])
+            )->getResult()
+        );
     }
 
     public function testGetResultWithMetadata()
