Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;

class RenameToSingularAnonymous
{
public function run(array $anonymousClassNodes)
{
foreach ($anonymousClassNodes as $node) {
echo $node;
}
}
}

?>
-----
<?php

namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;

class RenameToSingularAnonymous
{
public function run(array $anonymousClassNodes)
{
foreach ($anonymousClassNodes as $anonymousClassNode) {
echo $anonymousClassNode;
}
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Rector\Tests\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector\Fixture;

class SkipValidSingularAnonymous
{
public function run(array $anonymousClassNodes)
{
foreach ($anonymousClassNodes as $anonymousClassNode) {
echo $anonymousClassNode;
}
}
}
12 changes: 9 additions & 3 deletions rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,16 @@ private function singularizeCamelParts(string $currentName): string

$resolvedName = '';
foreach ($camelCases as $camelCase) {
if (in_array($camelCase[self::CAMELCASE], ['is', 'has', 'cms', 'this'], true)) {
$value = $camelCase[self::CAMELCASE];
$camelCaseValue = (string) $camelCase[self::CAMELCASE];

// words ending in "ous" are adjectives, not plurals, e.g. "anonymous", "previous"
if (in_array($camelCaseValue, ['is', 'has', 'cms', 'this'], true) || str_ends_with(
$camelCaseValue,
'ous'
)) {
$value = $camelCaseValue;
} else {
$value = $this->inflector->singularize((string) $camelCase[self::CAMELCASE]);
$value = $this->inflector->singularize($camelCaseValue);
}

$resolvedName .= $value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,10 @@ public static function provideData(): Iterator
yield ['staticCallsToNews', 'staticCallToNew'];
yield ['newsToMethodCalls', 'newToMethodCall'];
yield ['hasFilters', 'hasFilter'];

// "ous" adjectives must be kept as is
yield ['anonymousClassNodes', 'anonymousClassNode'];
yield ['previousItems', 'previousItem'];
yield ['anonymous', 'anonymous'];
}
}
Loading