Skip to content

Commit d578151

Browse files
ondrejmirtesondrejmirtes
committed
[BCB] Removed some unused internal helper methods from Broker
1 parent 65efd93 commit d578151

File tree

8 files changed

+12
-216
lines changed

8 files changed

+12
-216
lines changed

‎conf/config.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,7 @@ services:
14331433
class: PHPStan\Type\Php\TypeSpecifyingFunctionsDynamicReturnTypeExtension
14341434
arguments:
14351435
treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
1436+
universalObjectCratesClasses: %universalObjectCratesClasses%
14361437
tags:
14371438
- phpstan.broker.dynamicFunctionReturnTypeExtension
14381439

‎src/Broker/Broker.php

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,32 @@
33
namespace PHPStan\Broker;
44

55
use PHPStan\Analyser\Scope;
6-
use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
7-
use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
86
use PHPStan\Reflection\ClassReflection;
97
use PHPStan\Reflection\FunctionReflection;
108
use PHPStan\Reflection\GlobalConstantReflection;
119
use PHPStan\Reflection\ReflectionProvider;
12-
use PHPStan\Type\OperatorTypeSpecifyingExtension;
13-
use PHPStan\Type\Type;
1410

1511
/** @api */
1612
class Broker implements ReflectionProvider
1713
{
1814

1915
private ReflectionProvider $reflectionProvider;
2016

21-
private DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider;
22-
23-
private \PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider $operatorTypeSpecifyingExtensionRegistryProvider;
24-
2517
/** @var string[] */
2618
private array $universalObjectCratesClasses;
2719

2820
private static ?Broker $instance = null;
2921

3022
/**
3123
* @param \PHPStan\Reflection\ReflectionProvider $reflectionProvider
32-
* @param \PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider
33-
* @param \PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider $operatorTypeSpecifyingExtensionRegistryProvider
3424
* @param string[] $universalObjectCratesClasses
3525
*/
3626
public function __construct(
3727
ReflectionProvider $reflectionProvider,
38-
DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider,
39-
OperatorTypeSpecifyingExtensionRegistryProvider $operatorTypeSpecifyingExtensionRegistryProvider,
4028
array $universalObjectCratesClasses
4129
)
4230
{
4331
$this->reflectionProvider = $reflectionProvider;
44-
$this->dynamicReturnTypeExtensionRegistryProvider = $dynamicReturnTypeExtensionRegistryProvider;
45-
$this->operatorTypeSpecifyingExtensionRegistryProvider = $operatorTypeSpecifyingExtensionRegistryProvider;
4632
$this->universalObjectCratesClasses = $universalObjectCratesClasses;
4733
}
4834

@@ -122,56 +108,4 @@ public function getUniversalObjectCratesClasses(): array
122108
return $this->universalObjectCratesClasses;
123109
}
124110

125-
/**
126-
* @param string $className
127-
* @return \PHPStan\Type\DynamicMethodReturnTypeExtension[]
128-
*/
129-
public function getDynamicMethodReturnTypeExtensionsForClass(string $className): array
130-
{
131-
return $this->dynamicReturnTypeExtensionRegistryProvider->getRegistry()->getDynamicMethodReturnTypeExtensionsForClass($className);
132-
}
133-
134-
/**
135-
* @param string $className
136-
* @return \PHPStan\Type\DynamicStaticMethodReturnTypeExtension[]
137-
*/
138-
public function getDynamicStaticMethodReturnTypeExtensionsForClass(string $className): array
139-
{
140-
return $this->dynamicReturnTypeExtensionRegistryProvider->getRegistry()->getDynamicStaticMethodReturnTypeExtensionsForClass($className);
141-
}
142-
143-
/**
144-
* @return OperatorTypeSpecifyingExtension[]
145-
*/
146-
public function getOperatorTypeSpecifyingExtensions(string $operator, Type $leftType, Type $rightType): array
147-
{
148-
return $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry()->getOperatorTypeSpecifyingExtensions($operator, $leftType, $rightType);
149-
}
150-
151-
/**
152-
* @return \PHPStan\Type\DynamicFunctionReturnTypeExtension[]
153-
*/
154-
public function getDynamicFunctionReturnTypeExtensions(): array
155-
{
156-
return $this->dynamicReturnTypeExtensionRegistryProvider->getRegistry()->getDynamicFunctionReturnTypeExtensions();
157-
}
158-
159-
/**
160-
* @internal
161-
* @return DynamicReturnTypeExtensionRegistryProvider
162-
*/
163-
public function getDynamicReturnTypeExtensionRegistryProvider(): DynamicReturnTypeExtensionRegistryProvider
164-
{
165-
return $this->dynamicReturnTypeExtensionRegistryProvider;
166-
}
167-
168-
/**
169-
* @internal
170-
* @return \PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider
171-
*/
172-
public function getOperatorTypeSpecifyingExtensionRegistryProvider(): OperatorTypeSpecifyingExtensionRegistryProvider
173-
{
174-
return $this->operatorTypeSpecifyingExtensionRegistryProvider;
175-
}
176-
177111
}

‎src/Broker/BrokerFactory.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace PHPStan\Broker;
44

55
use PHPStan\DependencyInjection\Container;
6-
use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
7-
use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
86
use PHPStan\Reflection\ReflectionProvider;
97

108
class BrokerFactory
@@ -28,8 +26,6 @@ public function create(): Broker
2826
{
2927
return new Broker(
3028
$this->container->getByType(ReflectionProvider::class),
31-
$this->container->getByType(DynamicReturnTypeExtensionRegistryProvider::class),
32-
$this->container->getByType(OperatorTypeSpecifyingExtensionRegistryProvider::class),
3329
$this->container->getParameter('universalObjectCratesClasses')
3430
);
3531
}

‎src/DependencyInjection/Type/DirectDynamicReturnTypeExtensionRegistryProvider.php

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎src/DependencyInjection/Type/DirectOperatorTypeSpecifyingExtensionRegistryProvider.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/Testing/PHPStanTestCase.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@
2222
use PHPStan\BetterReflection\SourceLocator\Type\PhpInternalSourceLocator;
2323
use PHPStan\Broker\AnonymousClassNameHelper;
2424
use PHPStan\Broker\Broker;
25-
use PHPStan\Broker\BrokerFactory;
2625
use PHPStan\Cache\Cache;
2726
use PHPStan\Cache\MemoryCacheStorage;
2827
use PHPStan\DependencyInjection\Container;
2928
use PHPStan\DependencyInjection\ContainerFactory;
3029
use PHPStan\DependencyInjection\Reflection\DirectClassReflectionExtensionRegistryProvider;
31-
use PHPStan\DependencyInjection\Type\DirectDynamicReturnTypeExtensionRegistryProvider;
32-
use PHPStan\DependencyInjection\Type\DirectOperatorTypeSpecifyingExtensionRegistryProvider;
3330
use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
3431
use PHPStan\DependencyInjection\Type\OperatorTypeSpecifyingExtensionRegistryProvider;
3532
use PHPStan\File\FileHelper;
@@ -164,22 +161,10 @@ public function createReflectionProvider(): ReflectionProvider
164161
);
165162
$setterReflectionProviderProvider->setReflectionProvider($reflectionProvider);
166163

167-
$dynamicReturnTypeExtensionRegistryProvider = new DirectDynamicReturnTypeExtensionRegistryProvider(
168-
self::getContainer()->getServicesByTag(BrokerFactory::DYNAMIC_METHOD_RETURN_TYPE_EXTENSION_TAG),
169-
self::getContainer()->getServicesByTag(BrokerFactory::DYNAMIC_STATIC_METHOD_RETURN_TYPE_EXTENSION_TAG),
170-
self::getContainer()->getServicesByTag(BrokerFactory::DYNAMIC_FUNCTION_RETURN_TYPE_EXTENSION_TAG)
171-
);
172-
$operatorTypeSpecifyingExtensionRegistryProvider = new DirectOperatorTypeSpecifyingExtensionRegistryProvider([]);
173-
174164
$broker = new Broker(
175165
$reflectionProvider,
176-
$dynamicReturnTypeExtensionRegistryProvider,
177-
$operatorTypeSpecifyingExtensionRegistryProvider,
178166
self::getContainer()->getParameter('universalObjectCratesClasses')
179167
);
180-
$dynamicReturnTypeExtensionRegistryProvider->setBroker($broker);
181-
$dynamicReturnTypeExtensionRegistryProvider->setReflectionProvider($reflectionProvider);
182-
$operatorTypeSpecifyingExtensionRegistryProvider->setBroker($broker);
183168
$this->getClassReflectionExtensionRegistryProvider()->setBroker($broker);
184169

185170
return $reflectionProvider;

‎src/Type/Php/TypeSpecifyingFunctionsDynamicReturnTypeExtension.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,19 @@ class TypeSpecifyingFunctionsDynamicReturnTypeExtension implements DynamicFuncti
2525

2626
private ?\PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper $helper = null;
2727

28-
public function __construct(ReflectionProvider $reflectionProvider, bool $treatPhpDocTypesAsCertain)
28+
/** @var string[] */
29+
private array $universalObjectCratesClasses;
30+
31+
/**
32+
* @param ReflectionProvider $reflectionProvider
33+
* @param bool $treatPhpDocTypesAsCertain
34+
* @param string[] $universalObjectCratesClasses
35+
*/
36+
public function __construct(ReflectionProvider $reflectionProvider, bool $treatPhpDocTypesAsCertain, array $universalObjectCratesClasses)
2937
{
3038
$this->reflectionProvider = $reflectionProvider;
3139
$this->treatPhpDocTypesAsCertain = $treatPhpDocTypesAsCertain;
40+
$this->universalObjectCratesClasses = $universalObjectCratesClasses;
3241
}
3342

3443
public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
@@ -84,7 +93,7 @@ public function getTypeFromFunctionCall(
8493
private function getHelper(): ImpossibleCheckTypeHelper
8594
{
8695
if ($this->helper === null) {
87-
$this->helper = new ImpossibleCheckTypeHelper($this->reflectionProvider, $this->typeSpecifier, $this->reflectionProvider->getUniversalObjectCratesClasses(), $this->treatPhpDocTypesAsCertain);
96+
$this->helper = new ImpossibleCheckTypeHelper($this->reflectionProvider, $this->typeSpecifier, $this->universalObjectCratesClasses, $this->treatPhpDocTypesAsCertain);
8897
}
8998

9099
return $this->helper;

‎tests/PHPStan/Broker/BrokerTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
use PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
88
use PHPStan\Cache\Cache;
99
use PHPStan\DependencyInjection\Reflection\DirectClassReflectionExtensionRegistryProvider;
10-
use PHPStan\DependencyInjection\Type\DirectDynamicReturnTypeExtensionRegistryProvider;
11-
use PHPStan\DependencyInjection\Type\DirectOperatorTypeSpecifyingExtensionRegistryProvider;
1210
use PHPStan\File\FileHelper;
1311
use PHPStan\File\SimpleRelativePathHelper;
1412
use PHPStan\Php\PhpVersion;
@@ -39,8 +37,6 @@ protected function setUp(): void
3937
$anonymousClassNameHelper = new AnonymousClassNameHelper($fileHelper, $relativePathHelper);
4038

4139
$classReflectionExtensionRegistryProvider = new DirectClassReflectionExtensionRegistryProvider([], []);
42-
$dynamicReturnTypeExtensionRegistryProvider = new DirectDynamicReturnTypeExtensionRegistryProvider([], [], []);
43-
$operatorTypeSpecifyingExtensionRegistryProvider = new DirectOperatorTypeSpecifyingExtensionRegistryProvider([]);
4440

4541
$setterReflectionProviderProvider = new SetterReflectionProviderProvider();
4642
$reflectionProvider = new RuntimeReflectionProvider(
@@ -57,13 +53,9 @@ protected function setUp(): void
5753
$setterReflectionProviderProvider->setReflectionProvider($reflectionProvider);
5854
$this->broker = new Broker(
5955
$reflectionProvider,
60-
$dynamicReturnTypeExtensionRegistryProvider,
61-
$operatorTypeSpecifyingExtensionRegistryProvider,
6256
[]
6357
);
6458
$classReflectionExtensionRegistryProvider->setBroker($this->broker);
65-
$dynamicReturnTypeExtensionRegistryProvider->setBroker($this->broker);
66-
$operatorTypeSpecifyingExtensionRegistryProvider->setBroker($this->broker);
6759
}
6860

6961
public function testClassNotFound(): void

0 commit comments

Comments
 (0)