Revert "Bleeding edge - BetterReflectionProvider"

ondrejmirtes · ondrejmirtes · commit 62bd362b432f · 2023-03-17T15:57:03.000+01:00
This reverts commit 8c22f24.
diff --git a/extension.neon b/extension.neon
@@ -96,7 +96,6 @@ services:
 		class: PHPStan\Type\Doctrine\ObjectMetadataResolver
 		arguments:
 			objectManagerLoader: %doctrine.objectManagerLoader%
-			bleedingEdge: %featureToggles.bleedingEdge%
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetDqlDynamicReturnTypeExtension
 		arguments:
diff --git a/phpcs.xml b/phpcs.xml
@@ -33,7 +33,6 @@
 	</rule>
 	<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
 		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
-		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint"/>
 		<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.UselessAnnotation">
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Method PHPStan\\\\Doctrine\\\\Mapping\\\\BetterReflectionService\\:\\:getParentClasses\\(\\) should return array\\<class\\-string\\> but returns array\\<string\\>\\.$#"
-			count: 1
-			path: src/Doctrine/Mapping/BetterReflectionService.php
-
-		-
-			message: "#^PHPDoc tag @var with type ReflectionClass\\<T of object\\> is not subtype of type PHPStan\\\\BetterReflection\\\\Reflection\\\\Adapter\\\\ReflectionClass\\|PHPStan\\\\BetterReflection\\\\Reflection\\\\Adapter\\\\ReflectionEnum\\.$#"
-			count: 1
-			path: src/Doctrine/Mapping/BetterReflectionService.php
-
 		-
 			message: "#^Calling PHPStan\\\\Type\\\\ParserNodeTypeToPHPStanType\\:\\:resolve\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
 			count: 1
diff --git a/src/Doctrine/Mapping/BetterReflectionService.php b/src/Doctrine/Mapping/BetterReflectionService.php
diff --git a/src/Doctrine/Mapping/ClassMetadataFactory.php b/src/Doctrine/Mapping/ClassMetadataFactory.php
@@ -9,8 +9,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
-use Doctrine\Persistence\Mapping\ReflectionService;
-use PHPStan\Reflection\ReflectionProvider;
 use ReflectionClass;
 use function class_exists;
 use function count;
@@ -19,21 +17,6 @@
 class ClassMetadataFactory extends \Doctrine\ORM\Mapping\ClassMetadataFactory
 {
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
-
-	/** @var bool */
-	private $bleedingEdge;
-
-	/** @var BetterReflectionService|null */
-	private $reflectionService = null;
-
-	public function __construct(ReflectionProvider $reflectionProvider, bool $bleedingEdge)
-	{
-		$this->reflectionProvider = $reflectionProvider;
-		$this->bleedingEdge = $bleedingEdge;
-	}
-
 	protected function initialize(): void
 	{
 		$parentReflection = new ReflectionClass(parent::class);
@@ -69,19 +52,6 @@ protected function initialize(): void
 		$targetPlatformProperty->setValue($this, $platform);
 	}
 
-	public function getReflectionService(): ReflectionService
-	{
-		if (!$this->bleedingEdge) {
-			return parent::getReflectionService();
-		}
-
-		if ($this->reflectionService === null) {
-			$this->reflectionService = new BetterReflectionService($this->reflectionProvider);
-		}
-
-		return $this->reflectionService;
-	}
-
 	/**
 	 * @template T of object
 	 * @param class-string<T> $className
diff --git a/src/Type/Doctrine/ObjectMetadataResolver.php b/src/Type/Doctrine/ObjectMetadataResolver.php
@@ -7,7 +7,6 @@
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Persistence\ObjectManager;
 use PHPStan\Doctrine\Mapping\ClassMetadataFactory;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use ReflectionException;
 use function class_exists;
@@ -18,30 +17,20 @@
 final class ObjectMetadataResolver
 {
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
-
 	/** @var string|null */
 	private $objectManagerLoader;
 
-	/** @var bool */
-	private $bleedingEdge;
-
 	/** @var ObjectManager|false|null */
 	private $objectManager;
 
 	/** @var ClassMetadataFactory|null */
 	private $metadataFactory;
 
 	public function __construct(
-		ReflectionProvider $reflectionProvider,
-		?string $objectManagerLoader,
-		bool $bleedingEdge
+		?string $objectManagerLoader
 	)
 	{
-		$this->reflectionProvider = $reflectionProvider;
 		$this->objectManagerLoader = $objectManagerLoader;
-		$this->bleedingEdge = $bleedingEdge;
 	}
 
 	public function hasObjectManagerLoader(): bool
@@ -108,7 +97,7 @@ private function getMetadataFactory(): ?ClassMetadataFactory
 			return null;
 		}
 
-		return $this->metadataFactory = new ClassMetadataFactory($this->reflectionProvider, $this->bleedingEdge);
+		return $this->metadataFactory = new ClassMetadataFactory();
 	}
 
 	/**
diff --git a/tests/Rules/Doctrine/ORM/DqlRuleTest.php b/tests/Rules/Doctrine/ORM/DqlRuleTest.php
@@ -14,7 +14,7 @@ class DqlRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new DqlRule(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true));
+		return new DqlRule(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php'));
 	}
 
 	public function testRule(): void
diff --git a/tests/Rules/Doctrine/ORM/EntityColumnRuleTest.php b/tests/Rules/Doctrine/ORM/EntityColumnRuleTest.php
@@ -56,7 +56,7 @@ protected function getRule(): Rule
 		}
 
 		return new EntityColumnRule(
-			new ObjectMetadataResolver($this->createReflectionProvider(), $this->objectManagerLoader, true),
+			new ObjectMetadataResolver($this->objectManagerLoader),
 			new DescriptorRegistry([
 				new ArrayType(),
 				new BigIntType(),
diff --git a/tests/Rules/Doctrine/ORM/EntityMappingExceptionRuleTest.php b/tests/Rules/Doctrine/ORM/EntityMappingExceptionRuleTest.php
@@ -16,7 +16,7 @@ class EntityMappingExceptionRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new EntityMappingExceptionRule(
-			new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true)
+			new ObjectMetadataResolver(__DIR__ . '/entity-manager.php')
 		);
 	}
 
diff --git a/tests/Rules/Doctrine/ORM/EntityNotFinalRuleTest.php b/tests/Rules/Doctrine/ORM/EntityNotFinalRuleTest.php
@@ -19,7 +19,7 @@ class EntityNotFinalRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new EntityNotFinalRule(
-			new ObjectMetadataResolver($this->createReflectionProvider(), $this->objectManagerLoader, true)
+			new ObjectMetadataResolver($this->objectManagerLoader)
 		);
 	}
 
diff --git a/tests/Rules/Doctrine/ORM/EntityRelationRuleTest.php b/tests/Rules/Doctrine/ORM/EntityRelationRuleTest.php
@@ -23,7 +23,7 @@ class EntityRelationRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new EntityRelationRule(
-			new ObjectMetadataResolver($this->createReflectionProvider(), $this->objectManagerLoader, true),
+			new ObjectMetadataResolver($this->objectManagerLoader),
 			$this->allowNullablePropertyForRequiredField,
 			true
 		);
diff --git a/tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleSlowTest.php b/tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleSlowTest.php
@@ -14,7 +14,7 @@ class QueryBuilderDqlRuleSlowTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new QueryBuilderDqlRule(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true), true);
+		return new QueryBuilderDqlRule(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php'), true);
 	}
 
 	public function testRule(): void
diff --git a/tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php b/tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php
@@ -14,7 +14,7 @@ class QueryBuilderDqlRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new QueryBuilderDqlRule(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true), true);
+		return new QueryBuilderDqlRule(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php'), true);
 	}
 
 	public function testRule(): void
diff --git a/tests/Rules/Doctrine/ORM/RepositoryMethodCallRuleTest.php b/tests/Rules/Doctrine/ORM/RepositoryMethodCallRuleTest.php
@@ -14,7 +14,7 @@ class RepositoryMethodCallRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new RepositoryMethodCallRule(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true));
+		return new RepositoryMethodCallRule(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php'));
 	}
 
 	/**
diff --git a/tests/Rules/Doctrine/ORM/RepositoryMethodCallRuleWithoutObjectManagerLoaderTest.php b/tests/Rules/Doctrine/ORM/RepositoryMethodCallRuleWithoutObjectManagerLoaderTest.php
@@ -14,7 +14,7 @@ class RepositoryMethodCallRuleWithoutObjectManagerLoaderTest extends RuleTestCas
 
 	protected function getRule(): Rule
 	{
-		return new RepositoryMethodCallRule(new ObjectMetadataResolver($this->createReflectionProvider(), null, true));
+		return new RepositoryMethodCallRule(new ObjectMetadataResolver(null));
 	}
 
 	/**
diff --git a/tests/Rules/Properties/MissingGedmoByPhpDocPropertyAssignRuleTest.php b/tests/Rules/Properties/MissingGedmoByPhpDocPropertyAssignRuleTest.php
@@ -23,7 +23,7 @@ protected function getRule(): Rule
 	protected function getReadWritePropertiesExtensions(): array
 	{
 		return [
-			new PropertiesExtension(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true)),
+			new PropertiesExtension(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php')),
 		];
 	}
 
diff --git a/tests/Rules/Properties/MissingGedmoPropertyAssignRuleTest.php b/tests/Rules/Properties/MissingGedmoPropertyAssignRuleTest.php
@@ -24,7 +24,7 @@ protected function getRule(): Rule
 	protected function getReadWritePropertiesExtensions(): array
 	{
 		return [
-			new PropertiesExtension(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true)),
+			new PropertiesExtension(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php')),
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ services:`
`96`	`96`	`class: PHPStan\Type\Doctrine\ObjectMetadataResolver`
`97`	`97`	`arguments:`
`98`	`98`	`objectManagerLoader: %doctrine.objectManagerLoader%`
`99`		`- bleedingEdge: %featureToggles.bleedingEdge%`
`100`	`99`	`-`
`101`	`100`	`class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetDqlDynamicReturnTypeExtension`
`102`	`101`	`arguments:`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class DqlRuleTest extends RuleTestCase`
`14`	`14`
`15`	`15`	`protected function getRule(): Rule`
`16`	`16`	`{`
`17`		`- return new DqlRule(new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true));`
	`17`	`+ return new DqlRule(new ObjectMetadataResolver(__DIR__ . '/entity-manager.php'));`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public function testRule(): void`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected function getRule(): Rule`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return new EntityColumnRule(`
`59`		`- new ObjectMetadataResolver($this->createReflectionProvider(), $this->objectManagerLoader, true),`
	`59`	`+ new ObjectMetadataResolver($this->objectManagerLoader),`
`60`	`60`	`new DescriptorRegistry([`
`61`	`61`	`new ArrayType(),`
`62`	`62`	`new BigIntType(),`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class EntityMappingExceptionRuleTest extends RuleTestCase`
`16`	`16`	`protected function getRule(): Rule`
`17`	`17`	`{`
`18`	`18`	`return new EntityMappingExceptionRule(`
`19`		`- new ObjectMetadataResolver($this->createReflectionProvider(), __DIR__ . '/entity-manager.php', true)`
	`19`	`+ new ObjectMetadataResolver(__DIR__ . '/entity-manager.php')`
`20`	`20`	`);`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class EntityNotFinalRuleTest extends RuleTestCase`
`19`	`19`	`protected function getRule(): Rule`
`20`	`20`	`{`
`21`	`21`	`return new EntityNotFinalRule(`
`22`		`- new ObjectMetadataResolver($this->createReflectionProvider(), $this->objectManagerLoader, true)`
	`22`	`+ new ObjectMetadataResolver($this->objectManagerLoader)`
`23`	`23`	`);`
`24`	`24`	`}`
`25`	`25`