Fix more potential for infinite recursion

phpstan · May 15, 2024 · 1d02c4f · 1d02c4f
1 parent bb3da26
commit 1d02c4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -1248,10 +1248,13 @@ public function getEnumCases(): array
 
 	public function isCallable(): TrinaryLogic
 	{
-		$parametersAcceptors = $this->findCallableParametersAcceptors();
+		$parametersAcceptors = RecursionGuard::run($this, fn () => $this->findCallableParametersAcceptors());
 		if ($parametersAcceptors === null) {
 			return TrinaryLogic::createNo();
 		}
+		if ($parametersAcceptors instanceof ErrorType) {
+			return TrinaryLogic::createNo();
+		}
 
 		if (
 			count($parametersAcceptors) === 1

diff --git a/src/Type/RecursionGuard.php b/src/Type/RecursionGuard.php
@@ -9,10 +9,11 @@ class RecursionGuard
 	private static array $context = [];
 
 	/**
-	 * @param callable(): Type $callback
-	 *
+	 * @template T
+	 * @param callable(): T $callback
+	 * @return T|ErrorType
 	 */
-	public static function run(Type $type, callable $callback): Type
+	public static function run(Type $type, callable $callback)
 	{
 		$key = $type->describe(VerbosityLevel::value());
 		if (isset(self::$context[$key])) {