Skip to content

Future-proof ScopeFactory #3453

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 1 commit into from
May 31, 2020
Merged

Future-proof ScopeFactory #3453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions packages/node-type-resolver/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,8 @@ services:
PHPStan\Analyser\NodeScopeResolver:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createNodeScopeResolver']

PHPStan\Analyser\TypeSpecifier:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createTypeSpecifier']

PHPStan\Analyser\ScopeFactory:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createScopeFactory']

PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createDynamicReturnTypeExtensionRegistryProvider']

PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createOperatorTypeSpecifyingExtensionRegistryProvider']

PHPStan\PhpDoc\TypeNodeResolver:
factory: ['@Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory', 'createTypeNodeResolver']
58 changes: 3 additions & 55 deletions packages/node-type-resolver/src/PHPStan/Scope/ScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,25 @@

namespace Rector\NodeTypeResolver\PHPStan\Scope;

use PHPStan\Analyser\MutatingScope;
use PHPStan\Analyser\Scope;
use PHPStan\Analyser\ScopeContext;
use PHPStan\Analyser\ScopeFactory as PHPStanScopeFactory;
use PHPStan\Analyser\TypeSpecifier;
use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Rules\Properties\PropertyReflectionFinder;
use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
use Symplify\SmartFileSystem\SmartFileInfo;

final class ScopeFactory
{
/**
* @var ReflectionProvider
*/
private $reflectionProvider;

/**
* @var TypeSpecifier
*/
private $typeSpecifier;

/**
* @var PHPStanScopeFactory
*/
private $phpStanScopeFactory;

/**
* @var BetterStandardPrinter
*/
private $betterStandardPrinter;

/**
* @var DynamicReturnTypeExtensionRegistryProvider
*/
private $dynamicReturnTypeExtensionRegistryProvider;

/**
* @var OperatorTypeSpecifyingExtensionRegistryProvider
*/
private $operatorTypeSpecifyingExtensionRegistryProvider;

public function __construct(
ReflectionProvider $reflectionProvider,
TypeSpecifier $typeSpecifier,
PHPStanScopeFactory $phpStanScopeFactory,
BetterStandardPrinter $betterStandardPrinter,
DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider,
OperatorTypeSpecifyingExtensionRegistryProvider $operatorTypeSpecifyingExtensionRegistryProvider
) {
$this->reflectionProvider = $reflectionProvider;
$this->typeSpecifier = $typeSpecifier;
public function __construct(PHPStanScopeFactory $phpStanScopeFactory)
{
$this->phpStanScopeFactory = $phpStanScopeFactory;
$this->betterStandardPrinter = $betterStandardPrinter;
$this->dynamicReturnTypeExtensionRegistryProvider = $dynamicReturnTypeExtensionRegistryProvider;
$this->operatorTypeSpecifyingExtensionRegistryProvider = $operatorTypeSpecifyingExtensionRegistryProvider;
}

public function createFromFile(SmartFileInfo $fileInfo): Scope
{
return new MutatingScope(
$this->phpStanScopeFactory,
$this->reflectionProvider,
$this->dynamicReturnTypeExtensionRegistryProvider->getRegistry(),
$this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry(),
$this->betterStandardPrinter,
$this->typeSpecifier,
new PropertyReflectionFinder(),
ScopeContext::create($fileInfo->getRealPath())
);
return $this->phpStanScopeFactory->create(ScopeContext::create($fileInfo->getRealPath()));
}
}