octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-03 09:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PHPStan] PHPStan fixes after update symplify (#876)

Browse Source 
* [PHPStan] PHPStan fixes after update symplify

* fix

* fix

* fix
This commit is contained in:
Abdul Malik Ikhsan 2021-09-13 22:43:14 +07:00 committed by GitHub
parent 570f9b7970
commit fa63510c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php
View File

@ -59,7 +59,7 @@ final class NodeScopeAndMetadataDecorator
$smartFileInfo = $file->getSmartFileInfo();
$nodes = $this->phpStanNodeScopeResolver->processNodes($nodes, $smartFileInfo);
$nodeTraverser = new NodeTraverser();
$nodeTraverserForPreservingName = new NodeTraverser();
$preservingNameResolver = new NameResolver(null, [
self::OPTION_PRESERVE_ORIGINAL_NAMES => true,
@ -67,27 +67,27 @@ final class NodeScopeAndMetadataDecorator
self::OPTION_REPLACE_NODES => false,
]);
$nodeTraverser->addVisitor($preservingNameResolver);
$nodes = $nodeTraverser->traverse($nodes);
$nodeTraverserForPreservingName->addVisitor($preservingNameResolver);
$nodes = $nodeTraverserForPreservingName->traverse($nodes);
$nodeTraverser = new NodeTraverser();
$nodeTraverserForFormatPreservePrinting = new NodeTraverser();
// needed also for format preserving printing
$nodeTraverser->addVisitor($this->cloningVisitor);
$nodeTraverser->addVisitor($this->nodeConnectingVisitor);
$nodeTraverser->addVisitor($this->functionMethodAndClassNodeVisitor);
$nodeTraverser->addVisitor($this->namespaceNodeVisitor);
$nodeTraverser->addVisitor($this->functionLikeParamArgPositionNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->cloningVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->nodeConnectingVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->functionMethodAndClassNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->namespaceNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($this->functionLikeParamArgPositionNodeVisitor);
$fileNodeVisitor = new FileNodeVisitor($file);
$nodeTraverser->addVisitor($fileNodeVisitor);
$nodeTraverserForFormatPreservePrinting->addVisitor($fileNodeVisitor);
$nodes = $nodeTraverser->traverse($nodes);
$nodes = $nodeTraverserForFormatPreservePrinting->traverse($nodes);
// this split is needed, so nodes have names, classes and namespaces
$nodeTraverser = new NodeTraverser();
$nodeTraverser->addVisitor($this->statementNodeVisitor);
$nodeTraverserForStmtNodeVisitor = new NodeTraverser();
$nodeTraverserForStmtNodeVisitor->addVisitor($this->statementNodeVisitor);
return $nodeTraverser->traverse($nodes);
return $nodeTraverserForStmtNodeVisitor->traverse($nodes);
}
/**

12
rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php
View File

@ -99,9 +99,9 @@ CODE_SAMPLE
/** @var Assign $assign */
$assign = $this->stmtsManipulator->getUnwrappedLastStmt($node->stmts);
$return = new Return_($assign->expr);
$this->mirrorComments($return, $assign);
$node->stmts[$lastIfStmtKey] = $return;
$returnLastIf = new Return_($assign->expr);
$this->mirrorComments($returnLastIf, $assign);
$node->stmts[$lastIfStmtKey] = $returnLastIf;
$else = $node->else;
if (! $else instanceof Else_) {
@ -115,9 +115,9 @@ CODE_SAMPLE
$lastElseStmtKey = array_key_last($elseStmts);
$return = new Return_($assign->expr);
$this->mirrorComments($return, $assign);
$elseStmts[$lastElseStmtKey] = $return;
$returnLastElse = new Return_($assign->expr);
$this->mirrorComments($returnLastElse, $assign);
$elseStmts[$lastElseStmtKey] = $returnLastElse;
$node->else = null;
$this->removeNode($nextNode);

8
rules/MysqlToMysqli/Rector/Assign/MysqlAssignToMysqliRector.php
View File

@ -122,8 +122,8 @@ CODE_SAMPLE
$newAssignNode = new Assign($fetchVariable, $mysqlFetchRowFuncCall);
$this->nodesToAddCollector->addNodeAfterNode($newAssignNode, $assign);
$newAssignNode = new Assign($assign->var, new ArrayDimFetch($fetchVariable, new LNumber(0)));
$this->nodesToAddCollector->addNodeAfterNode($newAssignNode, $assign);
$newAssignNodeAfter = new Assign($assign->var, new ArrayDimFetch($fetchVariable, new LNumber(0)));
$this->nodesToAddCollector->addNodeAfterNode($newAssignNodeAfter, $assign);
return $funcCall;
}
@ -164,8 +164,8 @@ CODE_SAMPLE
$newAssignNode = new Assign($fetchVariable, $mysqlFetchArrayFuncCall);
$this->nodesToAddCollector->addNodeAfterNode($newAssignNode, $assign);
$newAssignNode = new Assign($assign->var, new ArrayDimFetch($fetchVariable, $fetchField ?? new LNumber(0)));
$this->nodesToAddCollector->addNodeAfterNode($newAssignNode, $assign);
$newAssignNodeAfter = new Assign($assign->var, new ArrayDimFetch($fetchVariable, $fetchField ?? new LNumber(0)));
$this->nodesToAddCollector->addNodeAfterNode($newAssignNodeAfter, $assign);
return $funcCall;
}