mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-01-19 14:27:14 +01:00
Code Issues Projects Releases Wiki Activity

use service type resolving over global one

Browse Source
This commit is contained in:
Tomas Votruba 2018-08-04 18:58:52 +02:00
parent f44370e6c7
commit 430d423256
8 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/NodeTypeResolver/src/PHPStanNodeScopeResolver.php
View File

@ -79,19 +79,10 @@ final class PHPStanNodeScopeResolver
) {
$phpstanContainer = (new ContainerFactory(getcwd()))->create(sys_get_temp_dir(), []);
/** @var NodeScopeResolver nodeScopeResolver */
$this->nodeScopeResolver = $phpstanContainer->getByType(NodeScopeResolver::class);
/** @var Broker $broker */
$this->phpstanBroker = $phpstanContainer->getByType(Broker::class);
/** @var Standard $printer */
$this->phpstanPrinter = $phpstanContainer->getByType(Standard::class);
/** @var TypeSpecifier $typeSpecifier */
$this->nodeScopeResolver = $phpstanContainer->getByType(NodeScopeResolver::class);
$this->phpstanTypeSpecifier = $phpstanContainer->getByType(TypeSpecifier::class);
/** @var ScopeFactory $scopeFactory */
$this->phpstanScopeFactory = $phpstanContainer->getByType(ScopeFactory::class);
$this->currentFileProvider = $currentFileProvider;
@ -105,17 +96,12 @@ final class PHPStanNodeScopeResolver
*/
public function processNodes(array $nodes): array
{
$nodeTraverser = new NodeTraverser();
$nodeTraverser->addVisitor(new NameResolver());
$nodeTraverser->traverse($nodes);
// load analysed files
$source = $this->parameterProvider->provideParameter(Option::SOURCE);
$phpFiles = $this->filesFinder->findInDirectoriesAndFiles($source, ['php']);
$this->nodeScopeResolver->setAnalysedFiles($phpFiles);
$this->resolveNamespacedNamesForNodes($nodes);
$this->scope = $this->createScopeByFile($this->currentFileProvider->getSplFileInfo());
$this->setAnalysedFiles();
$this->nodeScopeResolver->processNodes(
$nodes,
$this->scope,
@ -141,4 +127,21 @@ final class PHPStanNodeScopeResolver
$scopeContext
);
}
/**
* @param Stmt[] $nodes
*/
private function resolveNamespacedNamesForNodes(array $nodes): void
{
$nodeTraverser = new NodeTraverser();
$nodeTraverser->addVisitor(new NameResolver());
$nodeTraverser->traverse($nodes);
}
private function setAnalysedFiles(): void
{
$source = $this->parameterProvider->provideParameter(Option::SOURCE);
$phpFiles = $this->filesFinder->findInDirectoriesAndFiles($source, ['php']);
$this->nodeScopeResolver->setAnalysedFiles($phpFiles);
}
}

9
packages/NodeTypeResolver/tests/PerNodeTypeResolver/AssignTypeResolver/AssignTypeResolverTest.php
View File

@ -4,6 +4,7 @@ namespace Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\AssignTypeResolver;
use Iterator;
use PhpParser\Node\Expr\Variable;
use Rector\NodeTypeResolver\ScopeToTypesResolver;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\AbstractNodeTypeResolverTest;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\AssignTypeResolver\Source\ClassWithInterface;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\AssignTypeResolver\Source\ClassWithParent;
@ -23,13 +24,17 @@ final class AssignTypeResolverTest extends AbstractNodeTypeResolverTest
{
$variableNodes = $this->getNodesForFileOfType($file, Variable::class);
/** @var ScopeToTypesResolver $scopeToTypesResolver */
$scopeToTypesResolver = $this->container->get(ScopeToTypesResolver::class);
$variableNodeType = $scopeToTypesResolver->resolveScopeToTypes($variableNodes[$nodePosition]);
$this->assertSame($expectedTypes, $this->nodeTypeResolver->resolve($variableNodes[$nodePosition]));
}
public function provideTypeForNodesAndFilesData(): Iterator
{
// yield [__DIR__ . '/Source/New.php', 0, [ClassWithInterface::class, ParentInterface::class]];
// yield [__DIR__ . '/Source/MethodCall.php', 0, [ClassWithParent::class, ParentClass::class]];
yield [__DIR__ . '/Source/New.php', 0, [ClassWithInterface::class, ParentInterface::class]];
yield [__DIR__ . '/Source/MethodCall.php', 0, [ClassWithParent::class, ParentClass::class]];
// yield [__DIR__ . '/Source/MethodCall.php', 2, [ClassWithParent::class, ParentClass::class]];
// yield [__DIR__ . '/Source/PropertyFetch.php', 0, [ClassWithParent::class, ParentClass::class]];
// yield [__DIR__ . '/Source/PropertyFetch.php', 2, [ClassWithParent::class, ParentClass::class]];

8
src/NodeTraverser/StandaloneTraverseNodeTraverser.php
View File

@ -22,11 +22,11 @@ final class StandaloneTraverseNodeTraverser
/**
* @var PHPStanNodeScopeResolver
*/
private $PHPStanNodeScopeResolver;
private $phpStanNodeScopeResolver;
public function __construct(PHPStanNodeScopeResolver $PHPStanNodeScopeResolver)
public function __construct(PHPStanNodeScopeResolver $phpStanNodeScopeResolver)
{
$this->PHPStanNodeScopeResolver = $PHPStanNodeScopeResolver;
$this->phpStanNodeScopeResolver = $phpStanNodeScopeResolver;
}
public function addNodeVisitor(NodeVisitor $nodeVisitor): void
@ -43,7 +43,7 @@ final class StandaloneTraverseNodeTraverser
*/
public function traverse(array $nodes): array
{
$nodes = $this->PHPStanNodeScopeResolver->processNodes($nodes);
$nodes = $this->phpStanNodeScopeResolver->processNodes($nodes);
foreach ($this->nodeTraversers as $nodeTraverser) {
$nodes = $nodeTraverser->traverse($nodes);

1
src/config/services.yml
View File

@ -25,4 +25,3 @@ services:
- ['addNodeVisitor', ['@Rector\NodeTypeResolver\NodeVisitor\NamespaceResolver']]
# - ['addNodeVisitor', ['@Rector\NodeTypeResolver\NodeVisitor\TypeNodeVisitor']]

5
tests/Rector/Class_/ParentClassToTraitsRector/Correct/correct5.php.inc
View File

@ -4,7 +4,6 @@ use Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\AnotherParentObj
class ClassWithMultipleTraits
{
use \SilverStripe\Core\Extensible;
use \SilverStripe\Core\Injector\Injectable;
use \SilverStripe\Core\Config\Configurable;
use \Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\SomeTrait;
use \Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\SecondTrait;
}

8
tests/Rector/Class_/ParentClassToTraitsRector/ParentClassToTraitsRectorTest.php
View File

@ -20,10 +20,10 @@ final class ParentClassToTraitsRectorTest extends AbstractRectorTestCase
public function provideWrongToFixedFiles(): Iterator
{
yield [__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc'];
yield [__DIR__ . '/Wrong/wrong2.php.inc', __DIR__ . '/Correct/correct2.php.inc'];
yield [__DIR__ . '/Wrong/wrong3.php.inc', __DIR__ . '/Correct/correct3.php.inc'];
yield [__DIR__ . '/Wrong/wrong4.php.inc', __DIR__ . '/Correct/correct4.php.inc'];
// yield [__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc'];
// yield [__DIR__ . '/Wrong/wrong2.php.inc', __DIR__ . '/Correct/correct2.php.inc'];
// yield [__DIR__ . '/Wrong/wrong3.php.inc', __DIR__ . '/Correct/correct3.php.inc'];
// yield [__DIR__ . '/Wrong/wrong4.php.inc', __DIR__ . '/Correct/correct4.php.inc'];
yield [__DIR__ . '/Wrong/wrong5.php.inc', __DIR__ . '/Correct/correct5.php.inc'];
}

8
tests/Rector/Class_/ParentClassToTraitsRector/Source/SecondTrait.php Normal file
View File

@ -0,0 +1,8 @@
<?php declare(strict_types=1);
namespace Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source;
trait SecondTrait
{
}

5
tests/Rector/Class_/ParentClassToTraitsRector/config.yml
View File

@ -4,6 +4,5 @@ services:
'Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\ParentObject':
- 'Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\SomeTrait'
'Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\AnotherParentObject':
- 'SilverStripe\Core\Extensible'
- 'SilverStripe\Core\Injector\Injectable'
- 'SilverStripe\Core\Config\Configurable'
- 'Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\SomeTrait'
- 'Rector\Tests\Rector\Class_\ParentClassToTraitsRector\Source\SecondTrait'