Throw InvalidArgumentException when missed "one" plural key + Fix psalm

.github/workflows/static.yml

@@ -10,6 +10,8 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.0.1 under development
 
-- no changes in this release.
+- Enh #131: Throw `InvalidArgumentException` when missed "one" plural key (@vjik) 
 
 ## 3.0.0 February 17, 2023
 

composer.json

@@ -25,11 +25,11 @@
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "rector/rector": "^1.0.0",
         "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.4",
+        "vimeo/psalm": "^4.30|^5.21",
         "yiisoft/di": "^1.2"
     },
     "suggest": {

psalm.xml

@@ -13,4 +13,8 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

psalm80.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+    </issueHandlers>
+</psalm>

src/SimpleMessageFormatter.php

@@ -83,7 +83,11 @@ private static function pluralize(mixed $value, string $options): string
             $map[$match] = $pluralMatches[3][$index];
         }
 
-        if (!in_array(self::PLURAL_OTHER, $pluralMatches[1], true)) {
+        if (!isset($map[self::PLURAL_ONE])) {
+            throw new InvalidArgumentException('Missing plural key "' . self::PLURAL_ONE . '".');
+        }
+
+        if (!isset($map[self::PLURAL_OTHER])) {
             throw new InvalidArgumentException('Missing plural key "' . self::PLURAL_OTHER . '".');
         }
 

tests/SimpleMessageFormatterTest.php

@@ -100,7 +100,7 @@ public function testFormatPluralWithNonInteger(): void
         $formatter->format('{min, plural, one{character} other{characters}}', ['min' => 'str']);
     }
 
-    public function testFormatPluralWithMissingKey(): void
+    public function testFormatPluralWithMissingOtherKey(): void
     {
         $formatter = new SimpleMessageFormatter();
 
@@ -109,6 +109,15 @@ public function testFormatPluralWithMissingKey(): void
         $formatter->format('{min, plural, one{character}}', ['min' => 1]);
     }
 
+    public function testFormatPluralWithMissingOneKey(): void
+    {
+        $formatter = new SimpleMessageFormatter();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Missing plural key "one".');
+        $formatter->format('{min, plural, other{characters}}', ['min' => 1]);
+    }
+
     public function dataFormatPluralWithMissingKeys(): array
     {
         return [