Fix singular of words ending in "ss" (#5198)

rectorphp · Oct 25, 2023 · 98bb858 · 98bb858
1 parent 1d3fc91
commit 98bb858
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -129,7 +129,7 @@ private function singularize(string $word): string
             '/((a)naly|(b)a|(d)iagno|empha|(p)arenthe|(p)rogno|(s)ynop|(t)he|(oa)|neuro)ses$/i' => '\\1\\2sis',
             '/([ti]|memorand|curricul)a$/i' => '\\1um',
             '/(n)ews$/i' => '\\1ews',
-            '/s$/i' => '',
+            '/(?<!s)s$/i' => '',
         ];
 
         $irregular = [

diff --git a/tests/Naming/ExpectedNameResolver/InflectorSingularResolverTest.php b/tests/Naming/ExpectedNameResolver/InflectorSingularResolverTest.php
@@ -32,6 +32,7 @@ public static function provideData(): Iterator
         yield ['news', 'new'];
         yield ['property', 'property'];
         yield ['argsOrOptions', 'argOrOption'];
+        yield ['class', 'class'];
 
         // news and plural
         yield ['staticCallsToNews', 'staticCallToNew'];