[BCB] Removed Broker

Author: ondrejmirtes

UPGRADING.md

@@ -215,6 +215,14 @@ Learn more: https://phpstan.org/blog/preprocessing-ast-for-custom-rules
 
 As a replacement you can implement [`PHPStan\Type\ExpressionTypeResolverExtension`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.ExpressionTypeResolverExtension.html) interface instead and register it as a service.
 
+### Removed `PHPStan\Broker\Broker`
+
+Use [`PHPStan\Reflection\ReflectionProvider`](https://apiref.phpstan.org/2.0.x/PHPStan.Reflection.ReflectionProvider.html) instead.
+
+`BrokerAwareExtension` was also removed. Ask for `ReflectionProvider` in the extension constructor instead.
+
+Instead of `PHPStanTestCase::createBroker()`, call `PHPStanTestCase::createReflectionProvider()`.
+
 ### Minor backward compatibility breaks
 
 * Classes that were previously `@final` were made `final`

conf/config.neon

@@ -1881,15 +1881,6 @@ services:
 			parentDirectory: %currentWorkingDirectory%
 		autowired: false
 
-	broker:
-		class: PHPStan\Broker\Broker
-		factory: @brokerFactory::create
-		autowired:
-			- PHPStan\Broker\Broker
-
-	brokerFactory:
-		class: PHPStan\Broker\BrokerFactory
-
 	cacheStorage:
 		class: PHPStan\Cache\FileCacheStorage
 		arguments:

phpstan-baseline.neon

@@ -189,14 +189,6 @@ parameters:
 			count: 1
 			path: src/PhpDoc/ResolvedPhpDocBlock.php
 
-		-
-			message: """
-				#^Call to deprecated method getInstance\\(\\) of class PHPStan\\\\Broker\\\\Broker\\:
-				Use PHPStan\\\\Reflection\\\\ReflectionProviderStaticAccessor instead$#
-			"""
-			count: 1
-			path: src/PhpDoc/StubValidator.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ArrayType is error\\-prone and deprecated\\. Use Type\\:\\:isArray\\(\\) or Type\\:\\:getArrays\\(\\) instead\\.$#"
 			count: 1
@@ -1161,22 +1153,6 @@ parameters:
 			count: 3
 			path: src/Type/NullType.php
 
-		-
-			message: """
-				#^Call to deprecated method getInstance\\(\\) of class PHPStan\\\\Broker\\\\Broker\\:
-				Use PHPStan\\\\Reflection\\\\ReflectionProviderStaticAccessor instead$#
-			"""
-			count: 2
-			path: src/Type/ObjectShapeType.php
-
-		-
-			message: """
-				#^Call to deprecated method getUniversalObjectCratesClasses\\(\\) of class PHPStan\\\\Broker\\\\Broker\\:
-				Inject %%universalObjectCratesClasses%% parameter instead\\.$#
-			"""
-			count: 2
-			path: src/Type/ObjectShapeType.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IntersectionType is error\\-prone and deprecated\\.$#"
 			count: 1
@@ -1192,22 +1168,6 @@ parameters:
 			count: 1
 			path: src/Type/ObjectShapeType.php
 
-		-
-			message: """
-				#^Call to deprecated method getInstance\\(\\) of class PHPStan\\\\Broker\\\\Broker\\:
-				Use PHPStan\\\\Reflection\\\\ReflectionProviderStaticAccessor instead$#
-			"""
-			count: 1
-			path: src/Type/ObjectType.php
-
-		-
-			message: """
-				#^Call to deprecated method getUniversalObjectCratesClasses\\(\\) of class PHPStan\\\\Broker\\\\Broker\\:
-				Inject %%universalObjectCratesClasses%% parameter instead\\.$#
-			"""
-			count: 1
-			path: src/Type/ObjectType.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Enum\\\\EnumCaseObjectType is error\\-prone and deprecated\\. Use Type\\:\\:getEnumCases\\(\\) instead\\.$#"
 			count: 1

src/Broker/Broker.php

@@ -2,9 +2,6 @@
 
 namespace PHPStan\Broker;
 
-use PHPStan\DependencyInjection\Container;
-use PHPStan\Reflection\ReflectionProvider;
-
 final class BrokerFactory
 {
 
@@ -17,16 +14,4 @@ final class BrokerFactory
 	public const OPERATOR_TYPE_SPECIFYING_EXTENSION_TAG = 'phpstan.broker.operatorTypeSpecifyingExtension';
 	public const EXPRESSION_TYPE_RESOLVER_EXTENSION_TAG = 'phpstan.broker.expressionTypeResolverExtension';
 
-	public function __construct(private Container $container)
-	{
-	}
-
-	public function create(): Broker
-	{
-		return new Broker(
-			$this->container->getByType(ReflectionProvider::class),
-			$this->container->getParameter('universalObjectCratesClasses'),
-		);
-	}
-
 }

src/Broker/BrokerFactory.php

@@ -22,7 +22,6 @@
 use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
 use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
-use PHPStan\Broker\Broker;
 use PHPStan\Command\CommandHelper;
 use PHPStan\File\FileHelper;
 use PHPStan\Node\Printer\Printer;
@@ -181,8 +180,6 @@ public static function postInitializeContainer(Container $container): void
 			$container->getByType(Printer::class),
 		);
 
-		$broker = $container->getByType(Broker::class);
-		Broker::registerInstance($broker);
 		ReflectionProviderStaticAccessor::registerInstance($container->getByType(ReflectionProvider::class));
 		PhpVersionStaticAccessor::registerInstance($container->getByType(PhpVersion::class));
 		ObjectType::resetCaches();

src/DependencyInjection/ContainerFactory.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\DependencyInjection\Reflection;
 
-use PHPStan\Broker\Broker;
 use PHPStan\Broker\BrokerFactory;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;
@@ -35,7 +34,6 @@ public function getRegistry(): ClassReflectionExtensionRegistry
 			$mixinPropertiesClassReflectionExtension = $this->container->getByType(MixinPropertiesClassReflectionExtension::class);
 
 			$this->registry = new ClassReflectionExtensionRegistry(
-				$this->container->getByType(Broker::class),
 				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsPropertiesClassReflectionExtension, $mixinPropertiesClassReflectionExtension]),
 				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsMethodsClassReflectionExtension, $mixinMethodsClassReflectionExtension]),
 				$this->container->getServicesByTag(BrokerFactory::ALLOWED_SUB_TYPES_CLASS_REFLECTION_EXTENSION_TAG),

src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\DependencyInjection\Type;
 
-use PHPStan\Broker\Broker;
 use PHPStan\Broker\BrokerFactory;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\ReflectionProvider;
@@ -21,7 +20,6 @@ public function getRegistry(): DynamicReturnTypeExtensionRegistry
 	{
 		if ($this->registry === null) {
 			$this->registry = new DynamicReturnTypeExtensionRegistry(
-				$this->container->getByType(Broker::class),
 				$this->container->getByType(ReflectionProvider::class),
 				$this->container->getServicesByTag(BrokerFactory::DYNAMIC_METHOD_RETURN_TYPE_EXTENSION_TAG),
 				$this->container->getServicesByTag(BrokerFactory::DYNAMIC_STATIC_METHOD_RETURN_TYPE_EXTENSION_TAG),

src/DependencyInjection/Type/LazyDynamicReturnTypeExtensionRegistryProvider.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\DependencyInjection\Type;
 
-use PHPStan\Broker\Broker;
 use PHPStan\Broker\BrokerFactory;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Type\OperatorTypeSpecifyingExtensionRegistry;
@@ -20,7 +19,6 @@ public function getRegistry(): OperatorTypeSpecifyingExtensionRegistry
 	{
 		if ($this->registry === null) {
 			$this->registry = new OperatorTypeSpecifyingExtensionRegistry(
-				$this->container->getByType(Broker::class),
 				$this->container->getServicesByTag(BrokerFactory::OPERATOR_TYPE_SPECIFYING_EXTENSION_TAG),
 			);
 		}

src/DependencyInjection/Type/LazyOperatorTypeSpecifyingExtensionRegistryProvider.php

@@ -103,7 +103,7 @@ public function resolveTypeAlias(string $aliasName, NameScope $nameScope): ?Type
 
 						public function getRegistry(): OperatorTypeSpecifyingExtensionRegistry
 						{
-							return new OperatorTypeSpecifyingExtensionRegistry(null, []);
+							return new OperatorTypeSpecifyingExtensionRegistry([]);
 						}
 
 					}, new OversizedArrayBuilder(), true),