Merge branch '5.4' into 6.0

* 5.4: [FrameworkBundle][HttpKernel] Add the ability to enable the profiler using a parameter [FrameworkBundle] Trigger deprecations on stderr instead of using trigger_deprecation call Add PhpStanExtractor [Messenger] allow processing messages in batches [Console] Fix backslash escaping in bash completion Add missing validators translation add suggestions for debug:firewall, debug:form, debug:messenger, debug:router [SecurityBundle] Deprecate not configuring explicitly a provider for custom_authenticators when there is more than one registered provider [Inflector] Fix inflector for "zombies" [Config] Add some cache on SelfCheckingResourceChecker fix AJAX request unit spacing fix ErrorExcception in CacheWarmerAggregate Prevent FormLoginAuthenticator from responding to requests that should be handled by JsonLoginAuthenticator Fix wait duration for fixed window policy Add exact command used to trigger invocation to the completion debug log [Translation] correctly handle intl domains with TargetOperation Allow using param as connection atribute in `*.event_subscriber` and `*.event_listener` tags
symfony · Oct 30, 2021 · 31fcc0c · 31fcc0c
2 parents 104d77d + 1bbbed9
commit 31fcc0c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/Catalogue/TargetOperation.php b/Catalogue/TargetOperation.php
@@ -49,7 +49,7 @@ protected function processDomain(string $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/Tests/Catalogue/TargetOperationTest.php b/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()