diff --git a/packages/Architecture/src/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector.php b/packages/Architecture/src/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector.php index ada3b238dc3..67903a0ab1d 100644 --- a/packages/Architecture/src/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector.php +++ b/packages/Architecture/src/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector.php @@ -70,7 +70,7 @@ CODE_SAMPLE } /** - * @param Node\Stmt\Class_ $node + * @param Class_ $node */ public function refactor(Node $node): ?Node { diff --git a/packages/CodeQuality/src/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php b/packages/CodeQuality/src/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php index 31f1c524510..938d377dac9 100644 --- a/packages/CodeQuality/src/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php +++ b/packages/CodeQuality/src/Rector/FuncCall/IsAWithStringWithThirdArgumentRector.php @@ -3,6 +3,7 @@ namespace Rector\CodeQuality\Rector\FuncCall; use PhpParser\Node; +use PhpParser\Node\Arg; use PhpParser\Node\Expr\FuncCall; use PHPStan\Type\StringType; use Rector\Rector\AbstractRector; @@ -64,7 +65,7 @@ CODE_SAMPLE return null; } - $node->args[2] = new Node\Arg($this->createTrue()); + $node->args[2] = new Arg($this->createTrue()); return $node; } diff --git a/packages/CodeQuality/src/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector.php b/packages/CodeQuality/src/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector.php index 8cb5a76c654..7a1dea13e28 100644 --- a/packages/CodeQuality/src/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector.php +++ b/packages/CodeQuality/src/Rector/FuncCall/StrlenZeroToIdenticalEmptyStringRector.php @@ -3,8 +3,10 @@ namespace Rector\CodeQuality\Rector\FuncCall; use PhpParser\Node; +use PhpParser\Node\Expr; use PhpParser\Node\Expr\BinaryOp\Identical; use PhpParser\Node\Expr\FuncCall; +use PhpParser\Node\Scalar\String_; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; @@ -76,7 +78,7 @@ CODE_SAMPLE $variable = $node->right->args[0]->value; } - /** @var Node\Expr $variable */ - return new Identical($variable, new Node\Scalar\String_('')); + /** @var Expr $variable */ + return new Identical($variable, new String_('')); } } diff --git a/packages/NodeTypeResolver/src/PerNodeTypeResolver/NameTypeResolver.php b/packages/NodeTypeResolver/src/PerNodeTypeResolver/NameTypeResolver.php index 99cb1b4e1b0..1ea1359ed2f 100644 --- a/packages/NodeTypeResolver/src/PerNodeTypeResolver/NameTypeResolver.php +++ b/packages/NodeTypeResolver/src/PerNodeTypeResolver/NameTypeResolver.php @@ -65,6 +65,7 @@ final class NameTypeResolver implements PerNodeTypeResolverInterface return $class; } + /** @var Name|null $resolvedNameNode */ $resolvedNameNode = $nameNode->getAttribute(AttributeKey::RESOLVED_NAME); if ($resolvedNameNode instanceof Name) { return $resolvedNameNode->toString(); diff --git a/packages/PHPStan/src/Rector/Node/RemoveNonExistingVarAnnotationRector.php b/packages/PHPStan/src/Rector/Node/RemoveNonExistingVarAnnotationRector.php index 1793a3caded..05cc7a50cd5 100644 --- a/packages/PHPStan/src/Rector/Node/RemoveNonExistingVarAnnotationRector.php +++ b/packages/PHPStan/src/Rector/Node/RemoveNonExistingVarAnnotationRector.php @@ -6,6 +6,16 @@ use Nette\Utils\Strings; use PhpParser\Node; use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\AssignRef; +use PhpParser\Node\Stmt\Echo_; +use PhpParser\Node\Stmt\Expression; +use PhpParser\Node\Stmt\Foreach_; +use PhpParser\Node\Stmt\If_; +use PhpParser\Node\Stmt\Nop; +use PhpParser\Node\Stmt\Return_; +use PhpParser\Node\Stmt\Static_; +use PhpParser\Node\Stmt\Switch_; +use PhpParser\Node\Stmt\Throw_; +use PhpParser\Node\Stmt\While_; use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwareVarTagValueNode; use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockManipulator; use Rector\PHPStan\Tests\Rector\Node\RemoveNonExistingVarAnnotationRector\RemoveNonExistingVarAnnotationRectorTest; @@ -93,16 +103,16 @@ CODE_SAMPLE { return ! $node instanceof Assign && ! $node instanceof AssignRef - && ! $node instanceof Node\Stmt\Foreach_ - && ! $node instanceof Node\Stmt\Static_ - && ! $node instanceof Node\Stmt\Echo_ - && ! $node instanceof Node\Stmt\Return_ - && ! $node instanceof Node\Stmt\Expression - && ! $node instanceof Node\Stmt\Throw_ - && ! $node instanceof Node\Stmt\If_ - && ! $node instanceof Node\Stmt\While_ - && ! $node instanceof Node\Stmt\Switch_ - && ! $node instanceof Node\Stmt\Nop; + && ! $node instanceof Foreach_ + && ! $node instanceof Static_ + && ! $node instanceof Echo_ + && ! $node instanceof Return_ + && ! $node instanceof Expression + && ! $node instanceof Throw_ + && ! $node instanceof If_ + && ! $node instanceof While_ + && ! $node instanceof Switch_ + && ! $node instanceof Nop; } private function getVarTagVariableName(Node $node): ?string diff --git a/packages/Php/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php b/packages/Php/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php index 4a931e83e2f..56ea32b94e7 100644 --- a/packages/Php/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php +++ b/packages/Php/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php @@ -4,6 +4,7 @@ namespace Rector\Php\Rector\FuncCall; use PhpParser\Node; use PhpParser\Node\Expr\FuncCall; +use PhpParser\Node\Name; use Rector\Rector\AbstractRector; use Rector\RectorDefinition\CodeSample; use Rector\RectorDefinition\RectorDefinition; @@ -63,7 +64,7 @@ CODE_SAMPLE return null; } - $node->name = new Node\Name('time'); + $node->name = new Name('time'); return $node; } diff --git a/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php b/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php index 22fee31d74f..42cfc5eb835 100644 --- a/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php +++ b/packages/TypeDeclaration/src/Rector/FunctionLike/ParamTypeDeclarationRector.php @@ -3,6 +3,7 @@ namespace Rector\TypeDeclaration\Rector\FunctionLike; use PhpParser\Node; +use PhpParser\Node\Name; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassLike; use PhpParser\Node\Stmt\ClassMethod; @@ -153,7 +154,7 @@ CODE_SAMPLE $paramNode->type = $paramTypeInfo->getTypeNode(); // "resource" is valid phpdoc type, but it's not implemented in PHP - if ($paramNode->type instanceof Node\Name && reset($paramNode->type->parts) === 'resource') { + if ($paramNode->type instanceof Name && reset($paramNode->type->parts) === 'resource') { $paramNode->type = null; continue; diff --git a/rector.yaml b/rector.yaml index 10d9c2b65b8..399369c358b 100644 --- a/rector.yaml +++ b/rector.yaml @@ -17,5 +17,4 @@ parameters: php_version_features: '7.1' services: - Rector\PHPStan\Rector\Node\RemoveNonExistingVarAnnotationRector: -# Rector\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector: ~ + Rector\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector: ~ diff --git a/src/PhpParser/Node/Manipulator/ClassManipulator.php b/src/PhpParser/Node/Manipulator/ClassManipulator.php index 73d394aaad8..c91ccd6c446 100644 --- a/src/PhpParser/Node/Manipulator/ClassManipulator.php +++ b/src/PhpParser/Node/Manipulator/ClassManipulator.php @@ -264,7 +264,7 @@ final class ClassManipulator public function removeProperty(Class_ $class, string $propertyName): void { foreach ($class->stmts as $key => $classStmt) { - if (! $classStmt instanceof Node\Stmt\Property) { + if (! $classStmt instanceof Property) { continue; }