Skip to content

Commit 867107e

Browse files
ondrejmirtesondrejmirtes
committed
Cleanup NodeScopeResolver
1 parent da3e0e6 commit 867107e

11 files changed

+0
-32
lines changed

‎src/Analyser/DirectInternalScopeFactory.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public function __construct(
3535
private PropertyReflectionFinder $propertyReflectionFinder,
3636
private Parser $parser,
3737
private NodeScopeResolver $nodeScopeResolver,
38-
private RicherScopeGetTypeHelper $richerScopeGetTypeHelper,
3938
private PhpVersion $phpVersion,
4039
private AttributeReflectionFactory $attributeReflectionFactory,
4140
private int|array|null $configPhpVersion,
@@ -82,7 +81,6 @@ public function create(
8281
$this->propertyReflectionFinder,
8382
$this->parser,
8483
$this->nodeScopeResolver,
85-
$this->richerScopeGetTypeHelper,
8684
$this->constantResolver,
8785
$context,
8886
$this->phpVersion,
@@ -120,7 +118,6 @@ public function toFiberFactory(): InternalScopeFactory
120118
$this->propertyReflectionFinder,
121119
$this->parser,
122120
$this->nodeScopeResolver,
123-
$this->richerScopeGetTypeHelper,
124121
$this->phpVersion,
125122
$this->attributeReflectionFactory,
126123
$this->configPhpVersion,
@@ -143,7 +140,6 @@ public function toMutatingFactory(): InternalScopeFactory
143140
$this->propertyReflectionFinder,
144141
$this->parser,
145142
$this->nodeScopeResolver,
146-
$this->richerScopeGetTypeHelper,
147143
$this->phpVersion,
148144
$this->attributeReflectionFactory,
149145
$this->configPhpVersion,

‎src/Analyser/DirectInternalScopeFactoryFactory.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public function __construct(
3131
private PropertyReflectionFinder $propertyReflectionFinder,
3232
private Parser $parser,
3333
private NodeScopeResolver $nodeScopeResolver,
34-
private RicherScopeGetTypeHelper $richerScopeGetTypeHelper,
3534
private PhpVersion $phpVersion,
3635
private AttributeReflectionFactory $attributeReflectionFactory,
3736
private int|array|null $configPhpVersion,
@@ -56,7 +55,6 @@ public function create(?callable $nodeCallback): DirectInternalScopeFactory
5655
$this->propertyReflectionFinder,
5756
$this->parser,
5857
$this->nodeScopeResolver,
59-
$this->richerScopeGetTypeHelper,
6058
$this->phpVersion,
6159
$this->attributeReflectionFactory,
6260
$this->configPhpVersion,

‎src/Analyser/LazyInternalScopeFactory.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ final class LazyInternalScopeFactory implements InternalScopeFactory
4545

4646
private ?NodeScopeResolver $nodeScopeResolver = null;
4747

48-
private ?RicherScopeGetTypeHelper $richerScopeGetTypeHelper = null;
49-
5048
private ?ConstantResolver $constantResolver = null;
5149

5250
private ?PhpVersion $phpVersionType = null;
@@ -99,7 +97,6 @@ public function create(
9997
$this->propertyReflectionFinder ??= $this->container->getByType(PropertyReflectionFinder::class);
10098

10199
$this->nodeScopeResolver ??= $this->container->getByType(NodeScopeResolver::class);
102-
$this->richerScopeGetTypeHelper ??= $this->container->getByType(RicherScopeGetTypeHelper::class);
103100
$this->constantResolver ??= $this->container->getByType(ConstantResolver::class);
104101

105102
$this->phpVersionType ??= $this->container->getByType(PhpVersion::class);
@@ -117,7 +114,6 @@ public function create(
117114
$this->propertyReflectionFinder,
118115
$this->currentSimpleVersionParser,
119116
$this->nodeScopeResolver,
120-
$this->richerScopeGetTypeHelper,
121117
$this->constantResolver,
122118
$context,
123119
$this->phpVersionType,

‎src/Analyser/MutatingScope.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ public function __construct(
230230
private PropertyReflectionFinder $propertyReflectionFinder,
231231
private Parser $parser,
232232
private NodeScopeResolver $nodeScopeResolver,
233-
private RicherScopeGetTypeHelper $richerScopeGetTypeHelper,
234233
private ConstantResolver $constantResolver,
235234
protected ScopeContext $context,
236235
private PhpVersion $phpVersion,

‎src/Analyser/NodeScopeResolver.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
use PHPStan\DependencyInjection\AutowiredParameter;
5858
use PHPStan\DependencyInjection\AutowiredService;
5959
use PHPStan\DependencyInjection\Container;
60-
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
6160
use PHPStan\DependencyInjection\Type\ParameterClosureThisExtensionProvider;
6261
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
6362
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
@@ -238,7 +237,6 @@ public function __construct(
238237
private readonly PhpDocInheritanceResolver $phpDocInheritanceResolver,
239238
private readonly FileHelper $fileHelper,
240239
private readonly TypeSpecifier $typeSpecifier,
241-
private readonly DynamicThrowTypeExtensionProvider $dynamicThrowTypeExtensionProvider,
242240
private readonly ReadWritePropertiesExtensionProvider $readWritePropertiesExtensionProvider,
243241
private readonly ParameterClosureThisExtensionProvider $parameterClosureThisExtensionProvider,
244242
private readonly ParameterClosureTypeExtensionProvider $parameterClosureTypeExtensionProvider,
@@ -258,8 +256,6 @@ public function __construct(
258256
private readonly bool $implicitThrows,
259257
#[AutowiredParameter]
260258
private readonly bool $treatPhpDocTypesAsCertain,
261-
#[AutowiredParameter]
262-
private readonly bool $rememberPossiblyImpureFunctionValues,
263259
)
264260
{
265261
$earlyTerminatingMethodNames = [];

‎src/Testing/PHPStanTestCase.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use PHPStan\Analyser\DirectInternalScopeFactoryFactory;
77
use PHPStan\Analyser\Error;
88
use PHPStan\Analyser\NodeScopeResolver;
9-
use PHPStan\Analyser\RicherScopeGetTypeHelper;
109
use PHPStan\Analyser\ScopeFactory;
1110
use PHPStan\Analyser\TypeSpecifier;
1211
use PHPStan\BetterReflection\Reflector\Reflector;
@@ -165,7 +164,6 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
165164
new PropertyReflectionFinder(),
166165
self::getParser(),
167166
$container->getByType(NodeScopeResolver::class),
168-
new RicherScopeGetTypeHelper($initializerExprTypeResolver, new PropertyReflectionFinder()),
169167
$container->getByType(PhpVersion::class),
170168
$container->getByType(AttributeReflectionFactory::class),
171169
$container->getParameter('phpVersion'),

‎src/Testing/RuleTestCase.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use PHPStan\Collectors\Collector;
1818
use PHPStan\Collectors\Registry as CollectorRegistry;
1919
use PHPStan\Dependency\DependencyResolver;
20-
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
2120
use PHPStan\DependencyInjection\Type\ParameterClosureThisExtensionProvider;
2221
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
2322
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
@@ -107,7 +106,6 @@ protected function createNodeScopeResolver(): NodeScopeResolver
107106
self::getContainer()->getByType(PhpDocInheritanceResolver::class),
108107
self::getContainer()->getByType(FileHelper::class),
109108
$typeSpecifier,
110-
self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
111109
$readWritePropertiesExtensions !== [] ? new DirectReadWritePropertiesExtensionProvider($readWritePropertiesExtensions) : self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
112110
self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
113111
self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
@@ -120,7 +118,6 @@ protected function createNodeScopeResolver(): NodeScopeResolver
120118
[],
121119
self::getContainer()->getParameter('exceptions')['implicitThrows'],
122120
$this->shouldTreatPhpDocTypesAsCertain(),
123-
self::getContainer()->getParameter('rememberPossiblyImpureFunctionValues'),
124121
);
125122
}
126123

‎src/Testing/TypeInferenceTestCase.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use PHPStan\Analyser\NodeScopeResolver;
1212
use PHPStan\Analyser\Scope;
1313
use PHPStan\Analyser\ScopeContext;
14-
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
1514
use PHPStan\DependencyInjection\Type\ParameterClosureThisExtensionProvider;
1615
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
1716
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
@@ -82,7 +81,6 @@ protected static function createNodeScopeResolver(): NodeScopeResolver
8281
$container->getByType(PhpDocInheritanceResolver::class),
8382
$container->getByType(FileHelper::class),
8483
$typeSpecifier,
85-
$container->getByType(DynamicThrowTypeExtensionProvider::class),
8684
$container->getByType(ReadWritePropertiesExtensionProvider::class),
8785
$container->getByType(ParameterClosureThisExtensionProvider::class),
8886
$container->getByType(ParameterClosureTypeExtensionProvider::class),
@@ -95,7 +93,6 @@ protected static function createNodeScopeResolver(): NodeScopeResolver
9593
static::getEarlyTerminatingFunctionCalls(),
9694
$container->getParameter('exceptions')['implicitThrows'],
9795
$container->getParameter('treatPhpDocTypesAsCertain'),
98-
$container->getParameter('rememberPossiblyImpureFunctionValues'),
9996
);
10097
}
10198

‎tests/PHPStan/Analyser/AnalyserTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use PHPStan\Dependency\DependencyResolver;
1313
use PHPStan\Dependency\ExportedNodeResolver;
1414
use PHPStan\DependencyInjection\Nette\NetteContainer;
15-
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
1615
use PHPStan\DependencyInjection\Type\ParameterClosureThisExtensionProvider;
1716
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
1817
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
@@ -823,7 +822,6 @@ private function createAnalyser(): Analyser
823822
$phpDocInheritanceResolver,
824823
$fileHelper,
825824
$typeSpecifier,
826-
$container->getByType(DynamicThrowTypeExtensionProvider::class),
827825
$container->getByType(ReadWritePropertiesExtensionProvider::class),
828826
$container->getByType(ParameterClosureThisExtensionProvider::class),
829827
$container->getByType(ParameterClosureTypeExtensionProvider::class),
@@ -836,7 +834,6 @@ private function createAnalyser(): Analyser
836834
[],
837835
true,
838836
$this->shouldTreatPhpDocTypesAsCertain(),
839-
true,
840837
);
841838
$lexer = new Lexer();
842839
$fileAnalyser = new FileAnalyser(

‎tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverRuleTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use PhpParser\Node;
66
use PHPStan\Analyser\NodeScopeResolver;
77
use PHPStan\Analyser\Scope;
8-
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
98
use PHPStan\DependencyInjection\Type\ParameterClosureThisExtensionProvider;
109
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
1110
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
@@ -127,7 +126,6 @@ protected function createNodeScopeResolver(): NodeScopeResolver
127126
self::getContainer()->getByType(PhpDocInheritanceResolver::class),
128127
self::getContainer()->getByType(FileHelper::class),
129128
$typeSpecifier,
130-
self::getContainer()->getByType(DynamicThrowTypeExtensionProvider::class),
131129
$readWritePropertiesExtensions !== [] ? new DirectReadWritePropertiesExtensionProvider($readWritePropertiesExtensions) : self::getContainer()->getByType(ReadWritePropertiesExtensionProvider::class),
132130
self::getContainer()->getByType(ParameterClosureThisExtensionProvider::class),
133131
self::getContainer()->getByType(ParameterClosureTypeExtensionProvider::class),
@@ -140,7 +138,6 @@ protected function createNodeScopeResolver(): NodeScopeResolver
140138
[],
141139
self::getContainer()->getParameter('exceptions')['implicitThrows'],
142140
$this->shouldTreatPhpDocTypesAsCertain(),
143-
self::getContainer()->getParameter('rememberPossiblyImpureFunctionValues'),
144141
);
145142
}
146143

0 commit comments

Comments
 (0)