Introduce DescriptorRegistry interface

Author: ruudk

src/Rules/Doctrine/ORM/EntityColumnRule.php

@@ -10,7 +10,7 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Doctrine\DescriptorNotRegisteredException;
-use PHPStan\Type\Doctrine\DefaultDescriptorRegistry;
+use PHPStan\Type\Doctrine\DescriptorRegistry;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
@@ -36,7 +36,7 @@ class EntityColumnRule implements Rule
 	/** @var ObjectMetadataResolver */
 	private $objectMetadataResolver;
 
-	/** @var DefaultDescriptorRegistry */
+	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
 	/** @var ReflectionProvider */
@@ -53,7 +53,7 @@ class EntityColumnRule implements Rule
 
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
-		DefaultDescriptorRegistry $descriptorRegistry,
+		DescriptorRegistry $descriptorRegistry,
 		ReflectionProvider $reflectionProvider,
 		bool $reportUnknownTypes,
 		bool $allowNullablePropertyForRequiredField,

src/Type/Doctrine/CreateQueryDynamicReturnTypeExtension.php

@@ -33,10 +33,10 @@ final class CreateQueryDynamicReturnTypeExtension implements DynamicMethodReturn
 	/** @var ObjectMetadataResolver */
 	private $objectMetadataResolver;
 
-	/** @var DefaultDescriptorRegistry */
+	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
-	public function __construct(ObjectMetadataResolver $objectMetadataResolver, DefaultDescriptorRegistry $descriptorRegistry)
+	public function __construct(ObjectMetadataResolver $objectMetadataResolver, DescriptorRegistry $descriptorRegistry)
 	{
 		$this->objectMetadataResolver = $objectMetadataResolver;
 		$this->descriptorRegistry = $descriptorRegistry;

src/Type/Doctrine/DefaultDescriptorRegistry.php

@@ -5,7 +5,7 @@
 use Doctrine\DBAL\Types\Type;
 use PHPStan\Type\Doctrine\Descriptors\DoctrineTypeDescriptor;
 
-class DefaultDescriptorRegistry
+class DefaultDescriptorRegistry implements DescriptorRegistry
 {
 
 	/** @var array<class-string<Type>, DoctrineTypeDescriptor> */

src/Type/Doctrine/DescriptorRegistry.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine;
+
+use PHPStan\Type\Doctrine\Descriptors\DoctrineTypeDescriptor;
+
+interface DescriptorRegistry
+{
+
+	public function get(string $type): DoctrineTypeDescriptor;
+
+}

src/Type/Doctrine/DescriptorRegistryFactory.php

@@ -17,7 +17,7 @@ public function __construct(Container $container)
 		$this->container = $container;
 	}
 
-	public function createRegistry(): DefaultDescriptorRegistry
+	public function createRegistry(): DescriptorRegistry
 	{
 		return new DefaultDescriptorRegistry($this->container->getServicesByTag(self::TYPE_DESCRIPTOR_TAG));
 	}

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -19,7 +19,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantTypeHelper;
 use PHPStan\Type\Doctrine\DescriptorNotRegisteredException;
-use PHPStan\Type\Doctrine\DefaultDescriptorRegistry;
+use PHPStan\Type\Doctrine\DescriptorRegistry;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\IntegerRangeType;
@@ -97,7 +97,7 @@ class QueryResultTypeWalker extends SqlWalker
 	/** @var QueryResultTypeBuilder */
 	private $typeBuilder;
 
-	/** @var DefaultDescriptorRegistry */
+	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
 	/** @var bool */
@@ -109,7 +109,7 @@ class QueryResultTypeWalker extends SqlWalker
 	/**
 	 * @param Query<mixed> $query
 	 */
-	public static function walk(Query $query, QueryResultTypeBuilder $typeBuilder, DefaultDescriptorRegistry $descriptorRegistry): void
+	public static function walk(Query $query, QueryResultTypeBuilder $typeBuilder, DescriptorRegistry $descriptorRegistry): void
 	{
 		$query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, self::class);
 		$query->setHint(self::HINT_TYPE_MAPPING, $typeBuilder);
@@ -154,11 +154,11 @@ public function __construct($query, $parserResult, array $queryComponents)
 
 		$descriptorRegistry = $this->query->getHint(self::HINT_DESCRIPTOR_REGISTRY);
 
-		if (!$descriptorRegistry instanceof DefaultDescriptorRegistry) {
+		if (!$descriptorRegistry instanceof DescriptorRegistry) {
 			throw new ShouldNotHappenException(sprintf(
 				'Expected the query hint %s to contain a %s, but got a %s',
 				self::HINT_DESCRIPTOR_REGISTRY,
-				DefaultDescriptorRegistry::class,
+				DescriptorRegistry::class,
 				is_object($descriptorRegistry) ? get_class($descriptorRegistry) : gettype($descriptorRegistry)
 			));
 		}

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -14,7 +14,7 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\Doctrine\ORM\DynamicQueryBuilderArgumentException;
 use PHPStan\Type\Doctrine\ArgumentsProcessor;
-use PHPStan\Type\Doctrine\DefaultDescriptorRegistry;
+use PHPStan\Type\Doctrine\DescriptorRegistry;
 use PHPStan\Type\Doctrine\DoctrineTypeUtils;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\Doctrine\Query\QueryResultTypeBuilder;
@@ -62,7 +62,7 @@ class QueryBuilderGetQueryDynamicReturnTypeExtension implements DynamicMethodRet
 	/** @var string|null */
 	private $queryBuilderClass;
 
-	/** @var DefaultDescriptorRegistry */
+	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
 	/** @var OtherMethodQueryBuilderParser */
@@ -72,7 +72,7 @@ public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
 		ArgumentsProcessor $argumentsProcessor,
 		?string $queryBuilderClass,
-		DefaultDescriptorRegistry $descriptorRegistry,
+		DescriptorRegistry $descriptorRegistry,
 		OtherMethodQueryBuilderParser $otherMethodQueryBuilderParser
 	)
 	{

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -17,7 +17,7 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantTypeHelper;
-use PHPStan\Type\Doctrine\DefaultDescriptorRegistry;
+use PHPStan\Type\Doctrine\DescriptorRegistry;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
@@ -58,7 +58,7 @@ final class QueryResultTypeWalkerTest extends PHPStanTestCase
 	/** @var EntityManagerInterface */
 	private static $em;
 
-	/** @var DefaultDescriptorRegistry */
+	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
 	public static function getAdditionalConfigFiles(): array
@@ -184,7 +184,7 @@ public static function tearDownAfterClass(): void
 
 	public function setUp(): void
 	{
-		$this->descriptorRegistry = self::getContainer()->getByType(DefaultDescriptorRegistry::class);
+		$this->descriptorRegistry = self::getContainer()->getByType(DescriptorRegistry::class);
 	}
 
 	/** @dataProvider getTestData */