fix: readd nullable type to interface for Carbon

phpstan · Nov 21, 2023 · 0c63972 · 0c63972
1 parent 6ebb026
commit 0c63972
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/src/Reflection/Php/BuiltinMethodReflection.php b/src/Reflection/Php/BuiltinMethodReflection.php
@@ -16,7 +16,7 @@ interface BuiltinMethodReflection
 
 	public function getName(): string;
 
-	public function getReflection(): ReflectionMethod;
+	public function getReflection(): ?ReflectionMethod;
 
 	public function getFileName(): ?string;
 

diff --git a/src/Reflection/Php/NativeBuiltinMethodReflection.php b/src/Reflection/Php/NativeBuiltinMethodReflection.php
@@ -23,7 +23,7 @@ public function getName(): string
 		return $this->reflection->getName();
 	}
 
-	public function getReflection(): ReflectionMethod
+	public function getReflection(): ?ReflectionMethod
 	{
 		return $this->reflection;
 	}

diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -628,18 +628,20 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 		$stubPhpDocPair = $this->findMethodPhpDocIncludingAncestors($fileDeclaringClass, $methodReflection->getName(), array_map(static fn (ReflectionParameter $parameter): string => $parameter->getName(), $methodReflection->getParameters()));
 		$phpDocBlockClassReflection = $fileDeclaringClass;
 
-		$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()),
-					$methodReflection->getName(),
-					array_map(
-						static fn (ReflectionParameter $parameter): string => $parameter->getName(),
-						$methodReflection->getParameters(),
-					),
-				);
+		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()),
+						$methodReflection->getName(),
+						array_map(
+							static fn (ReflectionParameter $parameter): string => $parameter->getName(),
+							$methodReflection->getParameters(),
+						),
+					);
+				}
 			}
 		}
 
@@ -871,6 +873,10 @@ private function findMethodTrait(
 		BuiltinMethodReflection $methodReflection,
 	): ?string
 	{
+		if ($methodReflection->getReflection() === null) {
+			return null;
+		}
+
 		$declaringClass = $methodReflection->getReflection()->getBetterReflection()->getDeclaringClass();
 		if ($declaringClass->isTrait()) {
 			if ($methodReflection->getDeclaringClass()->isTrait() && $declaringClass->getName() === $methodReflection->getDeclaringClass()->getName()) {