[Naming] Skip RenameForeachValueVariableToMatchExprVariableRector on empty singular value name result (#5978)

This commit is contained in:
Abdul Malik Ikhsan 2021-03-25 05:36:11 +07:00 committed by GitHub
parent 2e8d6091c4
commit cee8046e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,13 @@
<?php
namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;
class SkipEmptySingularValue
{
public function run()
{
foreach ($_FOO as $file) {
}
}
}

View File

@ -64,6 +64,10 @@ final class InflectorSingularResolver
$singularValueVarName .= $this->inflector->singularize($camelCase['camelcase']);
}
if ($singularValueVarName === '') {
return $currentName;
}
$singularValueVarName = $singularValueVarName === $currentName
? self::SINGLE . ucfirst($singularValueVarName)
: $singularValueVarName;

View File

@ -99,6 +99,10 @@ CODE_SAMPLE
}
$singularValueVarName = $this->inflectorSingularResolver->resolve($exprName);
if ($singularValueVarName === $exprName) {
return null;
}
if ($this->shouldSkip($valueVarName, $singularValueVarName, $node)) {
return null;
}