changes MessageCatalogue.php to returns intl-icu messages only if req…

…uested reverted MessageCatalogueInterface.php to initial version to keep BC
symfony · Apr 22, 2020 · b4478f3 · b4478f3
1 parent fecc728
commit b4478f3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -317,12 +317,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     private function filterCatalogue(MessageCatalogue $catalogue, string $domain): MessageCatalogue
     {
         $filteredCatalogue = new MessageCatalogue($catalogue->getLocale());
-        $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
 
-        if ($intlMessages = $catalogue->all($intlDomain, true)) {
+        // extract intl-icu messages only
+        $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
+        if ($intlMessages = $catalogue->all($intlDomain)) {
             $filteredCatalogue->add($intlMessages, $intlDomain);
         }
-        if ($messages = $catalogue->all($domain, true)) {
+
+        // extract all messages and subtract intl-icu messages
+        if ($messages = array_diff($catalogue->all($domain), $intlMessages)) {
             $filteredCatalogue->add($messages, $domain);
         }
         foreach ($catalogue->getResources() as $resource) {

diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -65,14 +65,16 @@ public function getDomains()
     /**
      * {@inheritdoc}
      */
-    public function all(string $domain = null, $strict = false)
+    public function all(string $domain = null)
     {
         if (null !== $domain) {
-            if ($strict) {
+
+            // skip messages merge if intl-icu requested explicitly
+            if (false !== strpos($domain, self::INTL_DOMAIN_SUFFIX)) {
                 return $this->messages[$domain] ?? [];
-            } else {
-                return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? []) + ($this->messages[$domain] ?? []);
             }
+
+            return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? []) + ($this->messages[$domain] ?? []);
         }
 
         $allMessages = [];

diff --git a/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/src/Symfony/Component/Translation/MessageCatalogueInterface.php
@@ -42,11 +42,10 @@ public function getDomains();
      * If $domain is null, it returns all messages.
      *
      * @param string $domain The domain name
-     * @param bool   $strict - return messages for defined domain only
      *
      * @return array An array of messages
      */
-    public function all(string $domain = null, $strict = false);
+    public function all(string $domain = null);
 
     /**
      * Sets a message translation.

diff --git a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@@ -39,9 +39,9 @@ public function testAll()
         $this->assertEquals($messages, $catalogue->all());
 
         $messages = ['domain1+intl-icu' => ['foo' => 'bar']] + $messages + [
-            'domain2+intl-icu' => ['bar' => 'foo'],
-            'domain3+intl-icu' => ['biz' => 'biz'],
-        ];
+                'domain2+intl-icu' => ['bar' => 'foo'],
+                'domain3+intl-icu' => ['biz' => 'biz'],
+            ];
         $catalogue = new MessageCatalogue('en', $messages);
 
         $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
@@ -69,13 +69,13 @@ public function testAllIntICU()
         $catalogue = new MessageCatalogue('en', $messages);
 
         // separated domains
-        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1+intl-icu', true));
-        $this->assertEquals(['bar' => 'foo'], $catalogue->all('domain2+intl-icu', true));
-        $this->assertEquals(['biz' => 'biz'], $catalogue->all('domain2', true));
+        $this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1+intl-icu'));
+        $this->assertEquals(['bar' => 'foo'], $catalogue->all('domain2+intl-icu'));
 
         // merged, intl-icu ignored
         $this->assertEquals(['bar' => 'foo', 'biz' => 'biz'], $catalogue->all('domain2'));
 
+        // intl-icu ignored
         $messagesExpected = [
             'domain1' => ['foo' => 'bar'],
             'domain2' => ['bar' => 'foo', 'biz' => 'biz'],