fix: ignore specified words while making it singularized (#1222)

rectorphp · Nov 13, 2021 · a26ed1a · a26ed1a
1 parent 305c524
commit a26ed1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -105,7 +105,13 @@ private function singularizeCamelParts(string $currentName): string
 
         $resolvedName = '';
         foreach ($camelCases as $camelCase) {
-            $resolvedName .= $this->inflector->singularize($camelCase['camelcase']);
+            $value = $this->inflector->singularize($camelCase['camelcase']);
+
+            if (in_array($camelCase['camelcase'], ['is', 'has'])) {
+                $value = $camelCase['camelcase'];
+            }
+
+            $resolvedName .= $value;
         }
 
         return $resolvedName;

diff --git a/tests/Naming/ExpectedNameResolver/InflectorSingularResolverTest.php b/tests/Naming/ExpectedNameResolver/InflectorSingularResolverTest.php
@@ -39,5 +39,6 @@ public function provideData(): Iterator
         // news and plural
         yield ['staticCallsToNews', 'staticCallToNew'];
         yield ['newsToMethodCalls', 'newToMethodCall'];
+        yield ['hasFilters', 'hasFilter'];
     }
 }