Merge pull request #1062 from spiral/fix-indexer

spiral · Jan 15, 2024 · c87ea20 · c87ea20
1 parent e03ffd1
commit c87ea20
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Indexer.php b/src/Indexer.php
@@ -44,7 +44,9 @@ public function registerMessage(string $domain, string $string, bool $resolveDom
         }
 
         //Automatically registering
-        $this->catalogue->set($domain, $string, $string);
+        if (!$this->catalogue->has($domain, $string)) {
+            $this->catalogue->set($domain, $string, $string);
+        }
 
         $this->getLogger()->debug(
             \sprintf('[%s]: `%s`', $domain, $string),

diff --git a/tests/IndexerTest.php b/tests/IndexerTest.php
@@ -72,6 +72,21 @@ public function testIndexClasses(): void
         $this->assertTrue($catalogue->has('spiral', 'new-mess'));
     }
 
+    public function testRegisterMessageShouldNotOverrideMessages(): void
+    {
+        $catalogue = new Catalogue('fr');
+        $catalogue->set('messages', 'hello', 'Bonjour');
+
+        $indexer = new Indexer(new TranslatorConfig([
+            'domains' => ['spiral' => ['spiral-*'], 'messages' => ['*']]
+        ]), $catalogue);
+
+        $indexer->indexInvocations($this->tContainer()->get(InvocationsInterface::class));
+
+        $this->assertTrue($catalogue->has('messages', 'hello'));
+        $this->assertSame('Bonjour', $catalogue->get('messages', 'hello'));
+    }
+
     protected function tContainer(): Container
     {
         $container = new Container();