Support plural of matrix #10056

Author: PowerKiKi

src/Api/Plural.php

@@ -23,12 +23,14 @@ public static function make(string $name): string
         }
 
         $plural = $name . 's';
-        $plural = preg_replace('/ys$/', 'ies', $plural);
-        if ($plural === null) {
-            throw new Exception('Error while making plural');
-        }
 
-        $plural = preg_replace('/ss$/', 'ses', $plural);
+        $replacements = [
+            '/ys$/' => 'ies',
+            '/ss$/' => 'ses',
+            '/xs$/' => 'xes',
+        ];
+
+        $plural = preg_replace(array_keys($replacements), $replacements, $plural);
         if ($plural === null) {
             throw new Exception('Error while making plural');
         }

tests/Api/PluralTest.php

@@ -127,7 +127,7 @@ public function providerMake(): iterable
         yield ['RiskClassification', 'RiskClassifications'];
         yield ['RiskFrequency', 'RiskFrequencies'];
         yield ['RiskLevel', 'RiskLevels'];
-        yield ['RiskMatrix', 'RiskMatrixs'];
+        yield ['RiskMatrix', 'RiskMatrixes'];
         yield ['RiskSeverity', 'RiskSeverities'];
         yield ['Rite', 'Rites'];
         yield ['RoleContextInterface', 'RoleContextInterfaces'];