Introduce ReflectionProvider interface

Author: ondrejmirtes

conf/config.neon

@@ -796,6 +796,8 @@ services:
 	broker:
 		class: PHPStan\Broker\Broker
 		factory: @brokerFactory::create
+		autowired:
+			- PHPStan\Broker\Broker
 
 	brokerFactory:
 		class: PHPStan\Broker\BrokerFactory
@@ -814,6 +816,12 @@ services:
 		class: PHPStan\Rules\Registry
 		factory: @PHPStan\Rules\RegistryFactory::create
 
+	reflectionProvider:
+		class: PHPStan\Reflection\ReflectionProvider
+		factory: @broker
+		autowired:
+			- PHPStan\Reflection\ReflectionProvider
+
 	typeNodeResolverFactory:
 		class: PHPStan\PhpDoc\TypeNodeResolverFactory
 

src/Broker/Broker.php

@@ -14,6 +14,7 @@
 use PHPStan\Reflection\FunctionVariant;
 use PHPStan\Reflection\Native\NativeFunctionReflection;
 use PHPStan\Reflection\Native\NativeParameterReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Reflection\SignatureMap\ParameterSignature;
 use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
 use PHPStan\TrinaryLogic;
@@ -30,7 +31,7 @@
 use PHPStan\Type\UnionType;
 use ReflectionClass;
 
-class Broker
+class Broker implements ReflectionProvider
 {
 
 	/** @var \PHPStan\Reflection\PropertiesClassReflectionExtension[] */
@@ -90,7 +91,7 @@ class Broker
 	/** @var \PHPStan\Reflection\Php\PhpFunctionReflection[] */
 	private $customFunctionReflections = [];
 
-	/** @var self|null */
+	/** @var ReflectionProvider|null */
 	private static $instance;
 
 	/** @var bool[] */
@@ -169,12 +170,12 @@ public function __construct(
 		$this->universalObjectCratesClasses = $universalObjectCratesClasses;
 	}
 
-	public static function registerInstance(Broker $broker): void
+	public static function registerInstance(ReflectionProvider $reflectionProvider): void
 	{
-		self::$instance = $broker;
+		self::$instance = $reflectionProvider;
 	}
 
-	public static function getInstance(): self
+	public static function getInstance(): ReflectionProvider
 	{
 		if (self::$instance === null) {
 			throw new \PHPStan\ShouldNotHappenException();

src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php

@@ -6,6 +6,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
 
 class UniversalObjectCratesClassReflectionExtension
@@ -41,19 +42,19 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 	}
 
 	/**
-	 * @param \PHPStan\Broker\Broker $broker
+	 * @param \PHPStan\Reflection\ReflectionProvider $reflectionProvider
 	 * @param string[] $classes
 	 * @param \PHPStan\Reflection\ClassReflection $classReflection
 	 * @return bool
 	 */
 	public static function isUniversalObjectCrate(
-		Broker $broker,
+		ReflectionProvider $reflectionProvider,
 		array $classes,
 		ClassReflection $classReflection
 	): bool
 	{
 		foreach ($classes as $className) {
-			if (!$broker->hasClass($className)) {
+			if (!$reflectionProvider->hasClass($className)) {
 				continue;
 			}
 

src/Reflection/ReflectionProvider.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Reflection;
+
+use PHPStan\Analyser\Scope;
+
+interface ReflectionProvider
+{
+
+	public function hasClass(string $className): bool;
+
+	public function getClass(string $className): ClassReflection;
+
+	public function getClassName(string $className): string;
+
+	public function hasFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): bool;
+
+	public function getFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): FunctionReflection;
+
+	// helper functions that do not have to do anything with reflection
+
+	/**
+	 * @return string[]
+	 */
+	public function getUniversalObjectCratesClasses(): array;
+
+}