Allow translation integer keys

.editorconfig

@@ -1,5 +1,8 @@
 root = true
 
+[*.expected]
+insert_final_newline = false
+
 [*.neon]
 charset = utf-8
 indent_style = tab

src/NamespaceTranslator/Helpers.php

@@ -10,7 +10,15 @@ class Helpers
 	use StaticClass;
 
 	/**
-	 * @param string [] $keys
+	 * @param mixed $message
+	 */
+	public static function filter($message): string
+	{
+		return (string)$message;
+	}
+
+	/**
+	 * @param int[]|string[] $keys
 	 */
 	public static function key(array $keys): string
 	{

src/NamespaceTranslator/Loaders/TranslationClass/CreateNodeArray.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
 use Wavevision\DIServiceAnnotation\DIService;
 
@@ -43,8 +44,14 @@ private function items(array $content): array
 		return $items;
 	}
 
-	private function key(string $key): Expr
+	/**
+	 * @param int|string $key
+	 */
+	private function key($key): Expr
 	{
+		if (is_int($key)) {
+			return new LNumber($key);
+		}
 		if ($this->serializeClassConstFetch->isSerialized($key)) {
 			return $this->serializeClassConstFetch->deserialize($key);
 		}

src/NamespaceTranslator/Loaders/TranslationClass/FormatTranslationArray.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
 use Wavevision\DIServiceAnnotation\DIService;
 use Wavevision\NamespaceTranslator\Exceptions\InvalidState;
@@ -48,16 +49,22 @@ private function value(ArrayItem $item)
 		}
 	}
 
-	private function key(ArrayItem $item): string
+	/**
+	 * @return int|string
+	 */
+	private function key(ArrayItem $item)
 	{
 		$key = $item->key;
+		if ($key instanceof LNumber) {
+			return $key->value;
+		}
 		if ($key instanceof String_) {
 			return $key->value;
 		}
 		if ($key instanceof ClassConstFetch) {
 			return $this->serializeClassConstFetch->serialize($key);
 		}
-		throw new InvalidState('Key should be string or class constant.');
+		throw new InvalidState('Key should be integer, string or class constant.');
 	}
 
 }

src/NamespaceTranslator/PrefixedTranslator.php

@@ -23,7 +23,7 @@ public function __construct(Translator $translator, string $prefix)
 	}
 
 	/**
-	 * @param Message|NotTranslate|string|string[] $message
+	 * @param Message|NotTranslate|int|int[]|string|string[] $message
 	 * @param mixed ...$parameters
 	 */
 	public function translate($message, ...$parameters): string
@@ -34,7 +34,7 @@ public function translate($message, ...$parameters): string
 		if (is_array($message)) {
 			$message = [$this->prefix, ...$message];
 		}
-		if (is_string($message)) {
+		if (is_int($message) || is_string($message)) {
 			$message = Helpers::key([$this->prefix, $message]);
 		}
 		return $this->translator->translate($message, ...$parameters);

src/NamespaceTranslator/Translator.php

@@ -25,7 +25,7 @@ public function __construct(ContributteTranslator $translator)
 	}
 
 	/**
-	 * @param Message|NotTranslate|string|string[] $message
+	 * @param Message|NotTranslate|int|int[]|string|string[] $message
 	 * @param mixed ...$parameters
 	 */
 	public function translate($message, ...$parameters): string
@@ -40,6 +40,7 @@ public function translate($message, ...$parameters): string
 		if (is_array($message)) {
 			$message = Helpers::key($message);
 		}
+		$message = Helpers::filter($message);
 		$count = $parameters[0] ?? null;
 		$params = $parameters[1] ?? [];
 		$domain = $parameters[2] ?? null;

tests/NamespaceTranslatorTests/App/Models/Translated/Model.php

@@ -17,6 +17,11 @@ public function process(): string
 		return $this->translator->translate(Cs::SOME_KEY);
 	}
 
+	public function processInteger(): string
+	{
+		return $this->translator->translate(1);
+	}
+
 	public function processNested(): string
 	{
 		return $this->translator->translate([Cs::SUB, Cs::NESTED]);

tests/NamespaceTranslatorTests/App/Models/Translated/Translations/Cs.php

@@ -11,6 +11,7 @@ class Cs extends Translation
 	public static function define(): array
 	{
 		return [
+			1 => 'Jedna!',
 			self::SOME_KEY => 'My chceme modele!',
 			self::SUB => [
 				self::NESTED => 'Zanořené',

tests/NamespaceTranslatorTests/App/Models/Translated/Translations/En.php

@@ -11,6 +11,7 @@ class En extends Translation
 	public static function define(): array
 	{
 		return [
+			1 => 'One!',
 			self::SOME_KEY => 'We want modele!',
 		];
 	}

tests/NamespaceTranslatorTests/App/Presenters/HomePresenter.php

@@ -19,8 +19,14 @@ public function actionDefault(): void
 				'modelTranslation' => $this->translatedModel->process(),
 				'nestedTranslation' => $this->translatedModel->processNested(),
 				'paramTranslation' => $this->translatedModel->process(),
+				'integerTranslation' => $this->translatedModel->processInteger(),
 			]
 		);
 	}
 
+	public function actionInteger(): void
+	{
+		$this->template->setParameters(['translation' => $this->translatedModel->processInteger()]);
+	}
+
 }

tests/NamespaceTranslatorTests/App/Presenters/templates/Home/integer.latte

@@ -0,0 +1,2 @@
+{block content}
+{$translation}

tests/NamespaceTranslatorTests/Transfer/Export/Writters/export.csv

@@ -1,6 +1,7 @@
 file,key,cs,en,format
 /Components/SomeComponent/translations/,message,Zpráva,Message,neon
 /Components/SomeComponent/translations/,otherMessage,"Další zpráva","Other message",neon
+/Models/Translated/Translations/,1,Jedna!,One!,php
 /Models/Translated/Translations/,c:self-SOME_KEY,"My chceme modele!","We want modele!",php
 /Models/Translated/Translations/,c:self-SUB.c:self-NESTED,Zanořené,,php
 /Models/Translated/Translations/One,c:self-HELLO,"Ahoj {c:self-NAME}!",,php

tests/NamespaceTranslatorTests/Transfer/Import/Readers/expected/Cs.expected

@@ -10,6 +10,6 @@ class Cs extends Translation
      */
     public static function define() : array
     {
-        return array(self::SOME_KEY => 'My chceme modele!', self::SUB => array(self::NESTED => 'Zanořené'));
+        return array(1 => 'Jedna!', self::SOME_KEY => 'My chceme modele!', self::SUB => array(self::NESTED => 'Zanořené'));
     }
 }

tests/NamespaceTranslatorTests/Transfer/Import/Readers/expected/En.expected

@@ -10,6 +10,6 @@ class En extends Translation
      */
     public static function define() : array
     {
-        return array(self::SOME_KEY => 'We want modele!', self::SUB => array(self::NESTED => 'nested'));
+        return array(1 => 'One!', self::SOME_KEY => 'We want modele!', self::SUB => array(self::NESTED => 'nested'));
     }
 }

tests/NamespaceTranslatorTests/TranslatedPresenterTest.php

@@ -50,4 +50,24 @@ public function testPrefixed(): void
 		);
 	}
 
+	public function testInteger(): void
+	{
+		$this->assertEquals(
+			"Jedna!\n",
+			$this->extractTextResponseContent(
+				$this->runPresenter(new PresenterRequest(HomePresenter::class, 'integer', ['locale' => 'cs']))
+			)
+		);
+	}
+
+	public function testIntegerEn(): void
+	{
+		$this->assertEquals(
+			"One!\n",
+			$this->extractTextResponseContent(
+				$this->runPresenter(new PresenterRequest(HomePresenter::class, 'integer', ['locale' => 'en']))
+			)
+		);
+	}
+
 }