Fix ClosureTypeFactory

Author: ondrejmirtes

build/baseline-8.0.neon

@@ -1,26 +1,37 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Strict comparison using \\=\\=\\= between list<callable\\(string\\): void> and false will always evaluate to false\\.$#"
+			message: '#^Strict comparison using \=\=\= between list\<callable\(string\)\: void\> and false will always evaluate to false\.$#'
+			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between list\\<non\\-falsy\\-string\\> and false will always evaluate to false\\.$#"
+			message: '#^Call to function method_exists\(\) with ReflectionFunction and ''getClosureCalledCla…'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: ../src/Type/ClosureTypeFactory.php
+
+		-
+			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
+			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Type/Php/MbFunctionsReturnTypeExtension.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between int<0, max> and false will always evaluate to false\\.$#"
+			message: '#^Strict comparison using \=\=\= between int\<0, max\> and false will always evaluate to false\.$#'
+			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between list\\<non\\-falsy\\-string\\> and false will always evaluate to false\\.$#"
+			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
+			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between list\\<non\\-falsy\\-string\\> and false will always evaluate to false\\.$#"
+			message: '#^Strict comparison using \=\=\= between list\<non\-falsy\-string\> and false will always evaluate to false\.$#'
+			identifier: identical.alwaysFalse
 			count: 1
 			path: ../src/Type/Php/StrSplitFunctionReturnTypeExtension.php

src/Type/ClosureTypeFactory.php

@@ -24,6 +24,7 @@
 use ReflectionFunction;
 use function array_map;
 use function count;
+use function method_exists;
 use function str_replace;
 
 /**
@@ -121,12 +122,18 @@ public function getDefaultValue(): ?Type
 		}, $betterReflectionFunction->getParameters());
 
 		$selfClass = null;
-		if ($closureReflectionFunction->getClosureCalledClass() !== null) {
+		if (method_exists($closureReflectionFunction, 'getClosureCalledClass') && $closureReflectionFunction->getClosureCalledClass() !== null) {
 			$potentialSelfClassName = $closureReflectionFunction->getClosureCalledClass()->getName();
 			$reflectionProvider = $this->reflectionProviderProvider->getReflectionProvider();
 			if ($reflectionProvider->hasClass($potentialSelfClassName)) {
 				$selfClass = $reflectionProvider->getClass($potentialSelfClassName);
 			}
+		} elseif ($closureReflectionFunction->getClosureScopeClass() !== null) {
+			$potentialSelfClassName = $closureReflectionFunction->getClosureScopeClass()->getName();
+			$reflectionProvider = $this->reflectionProviderProvider->getReflectionProvider();
+			if ($reflectionProvider->hasClass($potentialSelfClassName)) {
+				$selfClass = $reflectionProvider->getClass($potentialSelfClassName);
+			}
 		}
 
 		return new ClosureType($parameters, TypehintHelper::decideTypeFromReflection(ReflectionType::fromTypeOrNull($betterReflectionFunction->getReturnType()), selfClass: $selfClass), $betterReflectionFunction->isVariadic());