Skip to content

fix ImportFullyQualifiedNamesRector on multiple files #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 2 commits into from
May 5, 2019
Merged

fix ImportFullyQualifiedNamesRector on multiple files #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd87ead
fix ImportFullyQualifiedNamesRector on multiple files
TomasVotruba May 5, 2019
b9b4c5c
[cs] import namespaces
TomasVotruba May 5, 2019
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
6 changes: 4 additions & 2 deletions packages/CodeQuality/src/Rector/LogicalAnd/AndAssignsToSeparateLinesRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
namespace Rector\CodeQuality\Rector\LogicalAnd;

use PhpParser\Node;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\BinaryOp\LogicalAnd;
use PhpParser\Node\Stmt\Expression;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Rector\AbstractRector;
use Rector\RectorDefinition\CodeSample;
Expand Down Expand Up @@ -57,12 +59,12 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (! $node->left instanceof Node\Expr\Assign || ! $node->right instanceof Node\Expr\Assign) {
if (! $node->left instanceof Assign || ! $node->right instanceof Assign) {
return null;
}

$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
if (! $parentNode instanceof Node\Stmt\Expression) {
if (! $parentNode instanceof Expression) {
return null;
}

Expand Down
17 changes: 12 additions & 5 deletions packages/CodingStyle/src/Rector/Namespace_/ImportFullyQualifiedNamesRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Namespace_;
Expand Down Expand Up @@ -115,10 +116,7 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
$this->newUseStatements = [];
$this->newFunctionUseStatements = [];
$this->importsInClassCollection->reset();
$this->docBlockManipulator->resetImportedNames();
$this->resetCollectedNames();

$this->resolveAlreadyImportedUses($node);

Expand Down Expand Up @@ -263,7 +261,7 @@ private function importNamesAndCollectNewUseStatements(Namespace_ $node): array
}

if (! $this->importsInClassCollection->hasImport($fullyQualifiedName)) {
if ($node->getAttribute(AttributeKey::PARENT_NODE) instanceof Node\Expr\FuncCall) {
if ($node->getAttribute(AttributeKey::PARENT_NODE) instanceof FuncCall) {
$this->newFunctionUseStatements[$shortName] = $fullyQualifiedName;
} else {
$this->newUseStatements[$shortName] = $fullyQualifiedName;
Expand Down Expand Up @@ -342,4 +340,13 @@ private function isCurrentNamespace(string $namespaceName, string $newUseStateme

return ! Strings::contains($afterCurrentNamespace, '\\');
}

private function resetCollectedNames(): void
{
$this->newUseStatements = [];
$this->newFunctionUseStatements = [];
$this->alreadyUsedShortNames = [];
$this->importsInClassCollection->reset();
$this->docBlockManipulator->resetImportedNames();
}
}
8 changes: 5 additions & 3 deletions src/Rector/NodeFactoryTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use Rector\PhpParser\Node\NodeFactory;

/**
Expand All @@ -37,15 +39,15 @@ public function autowireNodeFactoryTrait(NodeFactory $nodeFactory): void
/**
* @param Arg[] $args
*/
protected function createStaticCall(string $class, string $method, array $args = []): Expr\StaticCall
protected function createStaticCall(string $class, string $method, array $args = []): StaticCall
{
if (in_array($class, ['self', 'parent', 'static'], true)) {
$class = new Name($class);
} else {
$class = new Name\FullyQualified($class);
$class = new FullyQualified($class);
}

return new Node\Expr\StaticCall($class, $method, $args);
return new StaticCall($class, $method, $args);
}

protected function createClassConstant(string $class, string $constant): ClassConstFetch
Expand Down