Remove unneded abstraction

phpstan · Sep 29, 2024 · f302c90 · f302c90
1 parent e75996b
commit f302c90
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 251 deletions.
diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -2,13 +2,13 @@
 
 namespace PHPStan\Reflection\Native;
 
+use PHPStan\BetterReflection\Reflection\Adapter\ReflectionMethod;
 use PHPStan\Reflection\Assertions;
 use PHPStan\Reflection\ClassMemberReflection;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\MethodPrototypeReflection;
 use PHPStan\Reflection\ParametersAcceptorWithPhpDocs;
-use PHPStan\Reflection\Php\BuiltinMethodReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
@@ -28,7 +28,7 @@ final class NativeMethodReflection implements ExtendedMethodReflection
 	public function __construct(
 		private ReflectionProvider $reflectionProvider,
 		private ClassReflection $declaringClass,
-		private BuiltinMethodReflection $reflection,
+		private ReflectionMethod $reflection,
 		private array $variants,
 		private ?array $namedArgumentsVariants,
 		private TrinaryLogic $hasSideEffects,
@@ -133,7 +133,7 @@ public function getDeprecatedDescription(): ?string
 
 	public function isDeprecated(): TrinaryLogic
 	{
-		return $this->reflection->isDeprecated();
+		return TrinaryLogic::createFromBoolean($this->reflection->isDeprecated());
 	}
 
 	public function isInternal(): TrinaryLogic
@@ -212,7 +212,7 @@ public function getSelfOutType(): ?Type
 
 	public function returnsByReference(): TrinaryLogic
 	{
-		return $this->reflection->returnsByReference();
+		return TrinaryLogic::createFromBoolean($this->reflection->returnsReference());
 	}
 
 }
diff --git a/src/Reflection/Php/BuiltinMethodReflection.php b/src/Reflection/Php/BuiltinMethodReflection.php
diff --git a/src/Reflection/Php/NativeBuiltinMethodReflection.php b/src/Reflection/Php/NativeBuiltinMethodReflection.php
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -10,6 +10,7 @@
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\ScopeContext;
 use PHPStan\Analyser\ScopeFactory;
+use PHPStan\BetterReflection\Reflection\Adapter\ReflectionMethod;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionParameter;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionProperty;
 use PHPStan\Parser\Parser;
@@ -384,7 +385,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
 			return $this->methodsIncludingAnnotations[$classReflection->getCacheKey()][$methodName];
 		}
 
-		$nativeMethodReflection = new NativeBuiltinMethodReflection($classReflection->getNativeReflection()->getMethod($methodName));
+		$nativeMethodReflection = $classReflection->getNativeReflection()->getMethod($methodName);
 		if (!isset($this->methodsIncludingAnnotations[$classReflection->getCacheKey()][$nativeMethodReflection->getName()])) {
 			$method = $this->createMethod($classReflection, $nativeMethodReflection, true);
 			$this->methodsIncludingAnnotations[$classReflection->getCacheKey()][$nativeMethodReflection->getName()] = $method;
@@ -411,8 +412,7 @@ public function getNativeMethod(ClassReflection $classReflection, string $method
 			throw new ShouldNotHappenException();
 		}
 
-		$reflectionMethod = $classReflection->getNativeReflection()->getMethod($methodName);
-		$nativeMethodReflection = new NativeBuiltinMethodReflection($reflectionMethod);
+		$nativeMethodReflection = $classReflection->getNativeReflection()->getMethod($methodName);
 
 		if (!isset($this->nativeMethods[$classReflection->getCacheKey()][$nativeMethodReflection->getName()])) {
 			$method = $this->createMethod($classReflection, $nativeMethodReflection, false);
@@ -424,7 +424,7 @@ public function getNativeMethod(ClassReflection $classReflection, string $method
 
 	private function createMethod(
 		ClassReflection $classReflection,
-		BuiltinMethodReflection $methodReflection,
+		ReflectionMethod $methodReflection,
 		bool $includingAnnotations,
 	): ExtendedMethodReflection
 	{
@@ -642,27 +642,25 @@ private function createMethod(
 		);
 	}
 
-	public function createUserlandMethodReflection(ClassReflection $fileDeclaringClass, ClassReflection $actualDeclaringClass, BuiltinMethodReflection $methodReflection, ?string $declaringTraitName): PhpMethodReflection
+	public function createUserlandMethodReflection(ClassReflection $fileDeclaringClass, ClassReflection $actualDeclaringClass, ReflectionMethod $methodReflection, ?string $declaringTraitName): PhpMethodReflection
 	{
 		$resolvedPhpDoc = null;
 		$stubPhpDocPair = $this->findMethodPhpDocIncludingAncestors($fileDeclaringClass, $fileDeclaringClass, $methodReflection->getName(), array_map(static fn (ReflectionParameter $parameter): string => $parameter->getName(), $methodReflection->getParameters()));
 		$phpDocBlockClassReflection = $fileDeclaringClass;
 
-		if ($methodReflection->getReflection() !== null) {
-			$methodDeclaringClass = $methodReflection->getReflection()->getBetterReflection()->getDeclaringClass();
-
-			if ($stubPhpDocPair === null && $methodDeclaringClass->isTrait()) {
-				if (! $methodReflection->getDeclaringClass()->isTrait() || $methodDeclaringClass->getName() !== $methodReflection->getDeclaringClass()->getName()) {
-					$stubPhpDocPair = $this->findMethodPhpDocIncludingAncestors(
-						$this->reflectionProviderProvider->getReflectionProvider()->getClass($methodDeclaringClass->getName()),
-						$this->reflectionProviderProvider->getReflectionProvider()->getClass($methodReflection->getDeclaringClass()->getName()),
-						$methodReflection->getName(),
-						array_map(
-							static fn (ReflectionParameter $parameter): string => $parameter->getName(),
-							$methodReflection->getParameters(),
-						),
-					);
-				}
+		$methodDeclaringClass = $methodReflection->getBetterReflection()->getDeclaringClass();
+
+		if ($stubPhpDocPair === null && $methodDeclaringClass->isTrait()) {
+			if (! $methodReflection->getDeclaringClass()->isTrait() || $methodDeclaringClass->getName() !== $methodReflection->getDeclaringClass()->getName()) {
+				$stubPhpDocPair = $this->findMethodPhpDocIncludingAncestors(
+					$this->reflectionProviderProvider->getReflectionProvider()->getClass($methodDeclaringClass->getName()),
+					$this->reflectionProviderProvider->getReflectionProvider()->getClass($methodReflection->getDeclaringClass()->getName()),
+					$methodReflection->getName(),
+					array_map(
+						static fn (ReflectionParameter $parameter): string => $parameter->getName(),
+						$methodReflection->getParameters(),
+					),
+				);
 			}
 		}
 
@@ -671,7 +669,7 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 		}
 
 		if ($resolvedPhpDoc === null) {
-			$docComment = $methodReflection->getDocComment();
+			$docComment = $methodReflection->getDocComment() !== false ? $methodReflection->getDocComment() : null;
 			$positionalParameterNames = array_map(static fn (ReflectionParameter $parameter): string => $parameter->getName(), $methodReflection->getParameters());
 
 			$resolvedPhpDoc = $this->phpDocInheritanceResolver->resolvePhpDocForMethod(
@@ -694,10 +692,7 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 		}
 
 		$phpDocParameterTypes = [];
-		if (
-			$methodReflection instanceof NativeBuiltinMethodReflection
-			&& $methodReflection->isConstructor()
-		) {
+		if ($methodReflection->isConstructor()) {
 			foreach ($methodReflection->getParameters() as $parameter) {
 				if (!$parameter->isPromoted()) {
 					continue;
@@ -922,14 +917,10 @@ private function findPropertyTrait(ReflectionProperty $propertyReflection): ?str
 	}
 
 	private function findMethodTrait(
-		BuiltinMethodReflection $methodReflection,
+		ReflectionMethod $methodReflection,
 	): ?string
 	{
-		if ($methodReflection->getReflection() === null) {
-			return null;
-		}
-
-		$declaringClass = $methodReflection->getReflection()->getBetterReflection()->getDeclaringClass();
+		$declaringClass = $methodReflection->getBetterReflection()->getDeclaringClass();
 		if ($declaringClass->isTrait()) {
 			if ($methodReflection->getDeclaringClass()->isTrait() && $declaringClass->getName() === $methodReflection->getDeclaringClass()->getName()) {
 				return null;