[Naming] Remove single- prefix from RenameForeachValueVariableToMatch…

…ExprVariableRector, creates weird names (#2756)
rectorphp · Aug 12, 2022 · da9fab1 · da9fab1
1 parent 8c07d67
commit da9fab1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 49 deletions.
diff --git a/...oreach_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/single_prefix.php.inc b/...oreach_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/single_prefix.php.inc
diff --git a/...h_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/skip_single_prefix.php.inc b/...h_/RenameForeachValueVariableToMatchExprVariableRector/Fixture/skip_single_prefix.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;
+
+final class SkipSinglePrefix
+{
+    public function run($variable)
+    {
+        $array = [];
+        foreach ($variable as $property) {
+            $array[] = $property;
+        }
+    }
+}
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -32,11 +32,6 @@ final class InflectorSingularResolver
      */
     private const BY_MIDDLE_REGEX = '#(?<by>By[A-Z][a-zA-Z]+)#';
 
-    /**
-     * @var string
-     */
-    private const SINGLE = 'single';
-
     /**
      * @var string
      */
@@ -59,23 +54,12 @@ public function resolve(string $currentName): string
             return $resolvedValue;
         }
 
-        if (str_starts_with($currentName, self::SINGLE)) {
-            return $currentName;
-        }
-
         $singularValueVarName = $this->singularizeCamelParts($currentName);
 
         if (in_array($singularValueVarName, ['', '_'], true)) {
             return $currentName;
         }
 
-        $singularValueVarName = $singularValueVarName === $currentName
-            ? self::SINGLE . ucfirst($singularValueVarName)
-            : $singularValueVarName;
-        if (! str_starts_with($singularValueVarName, self::SINGLE)) {
-            return $singularValueVarName;
-        }
-
         $length = strlen($singularValueVarName);
         if ($length < 40) {
             return $singularValueVarName;

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