[Naming] Skip singularize "cms" on RenameForeachValueVariableToMatchE…

…xprVariableRector (#5294) * [Naming] Skip singularize "cms" on RenameForeachValueVariableToMatchExprVariableRector * clean up
rectorphp · Nov 28, 2023 · 4a2b4a6 · 4a2b4a6
1 parent b5f434b
commit 4a2b4a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/...each_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/skip_cms_middle.php.inc b/...each_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/skip_cms_middle.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;
+
+class SkipCmsMiddle
+{
+    public function run()
+    {
+        foreach ($cmsBlocks as $cmsBlock) {
+        }
+    }
+}
+
+?>
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -95,10 +95,10 @@ private function singularizeCamelParts(string $currentName): string
 
         $resolvedName = '';
         foreach ($camelCases as $camelCase) {
-            $value = $this->inflector->singularize($camelCase[self::CAMELCASE]);
-
-            if (in_array($camelCase[self::CAMELCASE], ['is', 'has'], true)) {
+            if (in_array($camelCase[self::CAMELCASE], ['is', 'has', 'cms'], true)) {
                 $value = $camelCase[self::CAMELCASE];
+            } else {
+                $value = $this->inflector->singularize($camelCase[self::CAMELCASE]);
             }
 
             $resolvedName .= $value;