TranslatorBag::diff now iterates over catalogue domains instead of operation domains

welcoMattic · welcoMattic · commit bd29580e8d88 · 2023-03-27T17:40:43.000+02:00
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php b/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php
@@ -66,6 +66,34 @@ public function testDiff()
         ], $this->getAllMessagesFromTranslatorBag($bagResult));
     }
 
+    public function testDiffWithIntlDomain()
+    {
+        $catalogueA = new MessageCatalogue('en', [
+            'domain1+intl-icu' => ['foo' => 'foo', 'bar' => 'bar'],
+            'domain2' => ['baz' => 'baz', 'qux' => 'qux'],
+        ]);
+
+        $bagA = new TranslatorBag();
+        $bagA->addCatalogue($catalogueA);
+
+        $catalogueB = new MessageCatalogue('en', [
+            'domain1' => ['foo' => 'foo'],
+            'domain2' => ['baz' => 'baz', 'corge' => 'corge'],
+        ]);
+
+        $bagB = new TranslatorBag();
+        $bagB->addCatalogue($catalogueB);
+
+        $bagResult = $bagA->diff($bagB);
+
+        $this->assertEquals([
+            'en' => [
+                'domain1' => ['bar' => 'bar'],
+                'domain2' => ['qux' => 'qux'],
+            ],
+        ], $this->getAllMessagesFromTranslatorBag($bagResult));
+    }
+
     public function testIntersect()
     {
         $catalogueA = new MessageCatalogue('en', ['domain1' => ['foo' => 'foo', 'bar' => 'bar'], 'domain2' => ['baz' => 'baz', 'qux' => 'qux']]);
diff --git a/src/Symfony/Component/Translation/TranslatorBag.php b/src/Symfony/Component/Translation/TranslatorBag.php
@@ -70,7 +70,7 @@ public function diff(TranslatorBagInterface $diffBag): self
             $operation->moveMessagesToIntlDomainsIfPossible(AbstractOperation::NEW_BATCH);
             $newCatalogue = new MessageCatalogue($locale);
 
-            foreach ($operation->getDomains() as $domain) {
+            foreach ($catalogue->getDomains() as $domain) {
                 $newCatalogue->add($operation->getNewMessages($domain), $domain);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function diff(TranslatorBagInterface $diffBag): self`
`70`	`70`	`$operation->moveMessagesToIntlDomainsIfPossible(AbstractOperation::NEW_BATCH);`
`71`	`71`	`$newCatalogue = new MessageCatalogue($locale);`
`72`	`72`
`73`		`- foreach ($operation->getDomains() as $domain) {`
	`73`	`+ foreach ($catalogue->getDomains() as $domain) {`
`74`	`74`	`$newCatalogue->add($operation->getNewMessages($domain), $domain);`
`75`	`75`	`}`
`76`	`76`