[TASK] Use ReflectionProvider instead of native ReflectionClass

Author: sabbelasichon

src/Service/PrototypeServiceDefinitionChecker.php

@@ -5,11 +5,19 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Reflection\ReflectionProvider;
 use SaschaEgerer\PhpstanTypo3\Contract\ServiceDefinitionChecker;
 
 final class PrototypeServiceDefinitionChecker implements ServiceDefinitionChecker
 {
 
+	private ReflectionProvider $reflectionProvider;
+
+	public function __construct(ReflectionProvider $reflectionProvider)
+	{
+		$this->reflectionProvider = $reflectionProvider;
+	}
+
 	public function isPrototype(ServiceDefinition $serviceDefinition, Node $node): bool
 	{
 		return !$serviceDefinition->isHasTags() && !$serviceDefinition->isHasMethodCalls() && $this->canBePrototypeClass($node);
@@ -44,28 +52,30 @@ private function canBePrototypeClass(Node $node): bool
 			return false;
 		}
 
-		if ($firstArgument->class->isSpecialClassName()) {
-			return false;
-		}
-
-		/** @var class-string $className */
 		$className = $firstArgument->class->toString();
 
-		$reflection = new \ReflectionClass($className);
+		if (!$this->reflectionProvider->hasClass($className)) {
+			return false;
+		}
 
-		$constructorMethod = $reflection->getConstructor();
+		$classReflection = $this->reflectionProvider->getClass($className);
 
-		if ($constructorMethod === null) {
+		if (!$classReflection->hasConstructor()) {
 			return true;
 		}
 
-		$constructorParameters = $constructorMethod->getParameters();
+		$constructorMethod = $classReflection->getConstructor();
+
+		$constructorParameters = $constructorMethod->getVariants();
+
 		$hasRequiredParameter = false;
 		foreach ($constructorParameters as $constructorParameter) {
-			if ($constructorParameter->isOptional()) {
-				continue;
+			foreach ($constructorParameter->getParameters() as $parameter) {
+				if ($parameter->isOptional()) {
+					continue;
+				}
+				$hasRequiredParameter = true;
 			}
-			$hasRequiredParameter = true;
 		}
 
 		return $hasRequiredParameter === false;

tests/Unit/Fixtures/NonPrototypeClass.php

@@ -5,6 +5,9 @@
 final class NonPrototypeClass
 {
 
+	/**
+	 * @param string|mixed|null $requiredString
+	 */
 	public function __construct(string $requiredString)
 	{
 	}

tests/Unit/Fixtures/PrototypeClassWithoutConstructor.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace SaschaEgerer\PhpstanTypo3\Tests\Unit\Fixtures;
+
+final class PrototypeClassWithoutConstructor
+{
+
+}

tests/Unit/Service/PrototypeServiceDefinitionCheckerTest.php

@@ -4,13 +4,14 @@
 
 use PhpParser\BuilderFactory;
 use PhpParser\Node\Expr\StaticCall;
-use PHPUnit\Framework\TestCase;
+use PHPStan\Testing\PHPStanTestCase;
 use SaschaEgerer\PhpstanTypo3\Service\PrototypeServiceDefinitionChecker;
 use SaschaEgerer\PhpstanTypo3\Service\ServiceDefinition;
 use SaschaEgerer\PhpstanTypo3\Tests\Unit\Fixtures\NonPrototypeClass;
 use SaschaEgerer\PhpstanTypo3\Tests\Unit\Fixtures\PrototypeClass;
+use SaschaEgerer\PhpstanTypo3\Tests\Unit\Fixtures\PrototypeClassWithoutConstructor;
 
-final class PrototypeServiceDefinitionCheckerTest extends TestCase
+final class PrototypeServiceDefinitionCheckerTest extends PHPStanTestCase
 {
 
 	private PrototypeServiceDefinitionChecker $subject;
@@ -40,17 +41,22 @@ public static function provideNonPrototypes(): \Generator
 	public static function providePrototypes(): \Generator
 	{
 		$builderFactory = new BuilderFactory();
-		$prototypeClass = $builderFactory->classConstFetch(PrototypeClass::class, 'class');
+		$prototypeClass = $builderFactory->classConstFetch(self::class, 'class');
+		$prototypeClassWithoutConstructor = $builderFactory->classConstFetch(PrototypeClassWithoutConstructor::class, 'class');
 
 		yield 'Service definition has no tags, no method calls and class has no required constructor arguments' => [
 			$builderFactory->staticCall('Foo', 'foo', [$prototypeClass]),
 			new ServiceDefinition('foo', 'bar', false, false, null, false, false, false),
 		];
+		yield 'Service definition has no tags, no method calls and class has no constructor at all' => [
+			$builderFactory->staticCall('Foo', 'foo', [$prototypeClassWithoutConstructor]),
+			new ServiceDefinition('foo', 'bar', false, false, null, false, false, false),
+		];
 	}
 
 	protected function setUp(): void
 	{
-		$this->subject = new PrototypeServiceDefinitionChecker();
+		$this->subject = self::getContainer()->getByType(PrototypeServiceDefinitionChecker::class);
 	}
 
 	/**
@@ -69,4 +75,11 @@ public function testIsPrototypeIsFalse(StaticCall $node, ServiceDefinition $serv
 		self::assertFalse($this->subject->isPrototype($serviceDefinition, $node));
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../../extension.neon',
+		];
+	}
+
 }