Skip to content

Commit 8aa7a3d

Browse files
authored
Skip parent methods in AddParamArrayDocblockFromDimFetchAccessRector (#7496)
* get param name directly, to avoid string type doc * Skip parent methods in AddParamArrayDocblockFromDimFetchAccessRector
1 parent 7371495 commit 8aa7a3d

15 files changed

Lines changed: 47 additions & 36 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector\Fixture;
4+
5+
use Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector\Source\EnforcingSomeContractInterface;
6+
7+
final class SkipContractEnforced implements EnforcingSomeContractInterface
8+
{
9+
public function process(array $data): void
10+
{
11+
}
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace Rector\Tests\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector\Source;
4+
5+
interface EnforcingSomeContractInterface
6+
{
7+
/**
8+
* @param mixed $data
9+
*/
10+
public function process(array $data): void;
11+
}

rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ private function isPromotedProperty(Class_ $class, string $propertyName): bool
221221
continue;
222222
}
223223

224-
$paramName = $this->getName($param->var);
224+
$paramName = $this->getName($param);
225225
if ($paramName === $propertyName) {
226226
return true;
227227
}

rules/CodingStyle/Rector/ClassMethod/BinaryOpStandaloneAssignsToDirectRector.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,7 @@ private function resolveParamByRefVariables(ClassMethod|Function_|Closure $node)
141141
continue;
142142
}
143143

144-
$paramName = $this->getName($param->var);
145-
if ($paramName === null) {
146-
continue;
147-
}
148-
149-
$paramByRefVariables[] = $paramName;
144+
$paramByRefVariables[] = $this->getName($param);
150145
}
151146

152147
return $paramByRefVariables;

rules/DeadCode/Rector/ClassMethod/RemoveUselessAssignFromPropertyPromotionRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function refactor(Node $node): ?Node
8282
continue;
8383
}
8484

85-
$variableNames[] = (string) $this->getName($param->var);
85+
$variableNames[] = $this->getName($param);
8686
}
8787

8888
if ($variableNames === []) {

rules/Naming/Naming/ExpectedNameResolver.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ public function resolveForParamIfNotYet(Param $param): ?string
4545
return null;
4646
}
4747

48-
/** @var string $currentName */
49-
$currentName = $this->nodeNameResolver->getName($param->var);
50-
48+
$currentName = $this->nodeNameResolver->getName($param);
5149
if ($currentName === $expectedName || str_ends_with($currentName, ucfirst($expectedName))) {
5250
return null;
5351
}

rules/Naming/ValueObjectFactory/ParamRenameFactory.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ public function createFromResolvedExpectedName(
2626
return null;
2727
}
2828

29-
$currentName = $this->nodeNameResolver->getName($param->var);
30-
if ($currentName === null) {
31-
return null;
32-
}
33-
29+
$currentName = $this->nodeNameResolver->getName($param);
3430
return new ParamRename($currentName, $expectedName, $param->var, $functionLike);
3531
}
3632
}

rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,8 @@ public function refactor(Node $node): ?Node
226226
$assignStmtPosition = $promotionCandidate->getStmtPosition();
227227
unset($constructClassMethod->stmts[$assignStmtPosition]);
228228

229-
/** @var string $oldName */
230-
$oldName = $this->getName($param->var);
231-
$this->variableRenamer->renameVariableInFunctionLike($constructClassMethod, $oldName, $propertyName, null);
229+
$oldParamName = $this->getName($param);
230+
$this->variableRenamer->renameVariableInFunctionLike($constructClassMethod, $oldParamName, $propertyName);
232231

233232
$paramTagValueNode = $constructorPhpDocInfo->getParamTagValueByName($paramName);
234233

rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function refactor(Node $node): ?Node
126126
($functionLike instanceof Closure || $functionLike instanceof ArrowFunction) &&
127127
(
128128
$this->breakingVariableRenameGuard->shouldSkipVariable(
129-
(string) $this->getName($param->var),
129+
$this->getName($param),
130130
$renameFunctionLikeParamWithinCallLikeArg->getNewParamName(),
131131
$functionLike,
132132
$param->var

rules/TypeDeclaration/Guard/ParamTypeAddGuard.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ public function __construct(
2727

2828
public function isLegal(Param $param, ClassMethod $classMethod): bool
2929
{
30-
$paramName = $this->nodeNameResolver->getName($param->var);
31-
if ($paramName === null) {
32-
return false;
33-
}
30+
$paramName = $this->nodeNameResolver->getName($param);
3431

3532
$isLegal = true;
3633

0 commit comments

Comments
 (0)