Skip to content

Commit 5f16b59

Browse files
authored
[TypeDeclaration] Skip type-guarded trait methods in StrictArrayParamDimFetchRector (#8139)
1 parent f1aefb6 commit 5f16b59

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace Rector\Tests\TypeDeclaration\TypeGuardedClasses\Fixture;
4+
5+
trait SkipGuardedTrait
6+
{
7+
public function resolveItem($item)
8+
{
9+
return $item['name'];
10+
}
11+
}

‎rules-tests/TypeDeclaration/TypeGuardedClasses/config/configured_rule.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@
77
use Rector\Config\RectorConfig;
88
use Rector\Tests\TypeDeclaration\TypeGuardedClasses\Source\GuardedRepository;
99
use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector;
10+
use Rector\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector;
1011
use Rector\TypeDeclaration\ValueObject\AddReturnTypeDeclaration;
1112

1213
return static function (RectorConfig $rectorConfig): void {
13-
$rectorConfig->typeGuardedClasses([GuardedRepository::class]);
14+
$rectorConfig->typeGuardedClasses([
15+
GuardedRepository::class,
16+
'Rector\Tests\TypeDeclaration\TypeGuardedClasses\Fixture\SkipGuardedTrait',
17+
]);
18+
19+
$rectorConfig->rule(StrictArrayParamDimFetchRector::class);
1420

1521
$rectorConfig->ruleWithConfiguration(AddReturnTypeDeclarationRector::class, [
1622
new AddReturnTypeDeclaration(

‎rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ public function refactor(Node $node): ?Node
9595
return null;
9696
}
9797

98+
if ($node instanceof ClassMethod && $this->parentClassMethodTypeOverrideGuard->isTypeGuardedClass($node)) {
99+
return null;
100+
}
101+
98102
foreach ($node->getParams() as $param) {
99103
if ($param->type instanceof Node) {
100104
continue;

0 commit comments

Comments
 (0)