[Naming] Keep underscore in RenameForeachValueVariableToMatchExprVari…

…ableRector (#236)
rectorphp · Jun 17, 2021 · 6c3a521 · 6c3a521
1 parent 5e6a011
commit 6c3a521
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/...each_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/keep_underscore.php.inc b/...each_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/keep_underscore.php.inc
@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;
+
+class KeepUnderscore
+{
+    public function run()
+    {
+        $customer_names = [];
+        foreach ($customer_names as $customer_name) {
+          echo $customer_name;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;
+
+class KeepUnderscore
+{
+    public function run()
+    {
+        $customer_names = [];
+        foreach ($customer_names as $customer_name) {
+          echo $customer_name;
+        }
+    }
+}
+
+?>
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -18,9 +18,9 @@ final class InflectorSingularResolver
 
     /**
      * @var string
-     * @see https://regex101.com/r/lbQaGC/1
+     * @see https://regex101.com/r/lbQaGC/3
      */
-    private const CAMELCASE_REGEX = '#(?<camelcase>([a-z]+|[A-Z]{1,}[a-z]+))#';
+    private const CAMELCASE_REGEX = '#(?<camelcase>([a-z]+|[A-Z]{1,}[a-z]+|_))#';
 
     /**
      * @var string
@@ -64,7 +64,7 @@ public function resolve(string $currentName): string
             $singularValueVarName .= $this->inflector->singularize($camelCase['camelcase']);
         }
 
-        if ($singularValueVarName === '') {
+        if ($singularValueVarName === '' || $singularValueVarName === '_') {
             return $currentName;
         }