bug #45839 [Translation] Fix intersect in TranslatorBag (ossinkine)

fabpot · fabpot · commit f749f5e64e8d · 2022-03-25T10:31:09.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Translation] Fix intersect in TranslatorBag | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Actually `TranslatorBag::intersect` does the same as `TranslatorBag::diff`, you can see this in tests. This PR fixes it. Commits ------- 363b151 Fix intersect in TranslatorBag
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php b/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php
@@ -82,8 +82,8 @@ public function testIntersect()
 
         $this->assertEquals([
             'en' => [
-                'domain1' => ['bar' => 'bar'],
-                'domain2' => ['qux' => 'qux'],
+                'domain1' => ['foo' => 'foo'],
+                'domain2' => ['baz' => 'baz'],
             ],
         ], $this->getAllMessagesFromTranslatorBag($bagResult));
     }
diff --git a/src/Symfony/Component/Translation/TranslatorBag.php b/src/Symfony/Component/Translation/TranslatorBag.php
@@ -94,7 +94,10 @@ public function intersect(TranslatorBagInterface $intersectBag): self
             $obsoleteCatalogue = new MessageCatalogue($locale);
 
             foreach ($operation->getDomains() as $domain) {
-                $obsoleteCatalogue->add($operation->getObsoleteMessages($domain), $domain);
+                $obsoleteCatalogue->add(
+                    array_diff($operation->getMessages($domain), $operation->getNewMessages($domain)),
+                    $domain
+                );
             }
 
             $diff->addCatalogue($obsoleteCatalogue);
