From 363b151f62b3c85b8a90cd28ff3c7710168bab4f Mon Sep 17 00:00:00 2001 From: Gocha Ossinkine Date: Thu, 24 Mar 2022 19:09:09 +0200 Subject: [PATCH] Fix intersect in TranslatorBag --- .../Component/Translation/Tests/TranslatorBagTest.php | 4 ++-- src/Symfony/Component/Translation/TranslatorBag.php | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php b/src/Symfony/Component/Translation/Tests/TranslatorBagTest.php index a202bc65caa5f..58b8fa02bdc1b 100644 --- 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 index 6d98455e5b78a..555a9e8147fd2 100644 --- 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);