UniversalProvider: fixed getting of cyclic reference

inteve · Jul 26, 2023 · 266f18b · 266f18b
1 parent 299808a
commit 266f18b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/src/Providers/UniversalProvider.php b/src/Providers/UniversalProvider.php
@@ -63,6 +63,7 @@ public function getMessage(
 					return $this->messagesCache[$langTagKey][$messageIdKey] = NULL;
 
 				} elseif (Strings::startsWith($message, '@') && MessageId::isValid($tmp = Strings::substring($message, 1))) {
+					$this->messagesCache[$langTagKey][$messageIdKey] = NULL;
 					$message = $this->getMessage(
 						$locale,
 						new MessageId($tmp),

diff --git a/tests/Translator/Providers.UniversalMessageProvider.phpt b/tests/Translator/Providers.UniversalMessageProvider.phpt
@@ -27,3 +27,41 @@ test('Missing message', function () {
 	Assert::null($provider->getMessage($locale, new MessageId('missing.message'), []));
 	Assert::null($provider->getMessage($locale, new MessageId('missing.message'), []), 'Missing message loaded from memory cache');
 });
+
+
+test('Message reference', function () {
+	$provider = new UniversalProvider(
+		new ArrayLoader(LanguageTag::fromString('en'), [
+			'page1.title' => 'Message 1',
+			'page2.title' => '@page1.title',
+			'page3.title' => '@page2.title',
+			'page4.title' => '@page3.title',
+		]),
+		new TagProcessor
+	);
+	$locale = new UniversalLocale(LanguageTag::fromString('en'));
+
+	$message = $provider->getMessage($locale, new MessageId('page2.title'), []);
+	assert($message !== NULL);
+	Assert::same(['Message 1'], $message->getElements());
+
+	$message = $provider->getMessage($locale, new MessageId('page4.title'), []);
+	assert($message !== NULL);
+	Assert::same(['Message 1'], $message->getElements());
+});
+
+
+test('Message cyclic reference', function () {
+	$provider = new UniversalProvider(
+		new ArrayLoader(LanguageTag::fromString('en'), [
+			'page1.title' => '@page4.title',
+			'page2.title' => '@page1.title',
+			'page3.title' => '@page2.title',
+			'page4.title' => '@page3.title',
+		]),
+		new TagProcessor
+	);
+	$locale = new UniversalLocale(LanguageTag::fromString('en'));
+
+	Assert::null($provider->getMessage($locale, new MessageId('page4.title'), []));
+});