Use intersection

Author: VincentLanglet

src/Type/IntersectionType.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\Internal\CombinationsHelper;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
@@ -16,6 +17,7 @@
 use PHPStan\Reflection\MissingConstantFromReflectionException;
 use PHPStan\Reflection\MissingMethodFromReflectionException;
 use PHPStan\Reflection\MissingPropertyFromReflectionException;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\Type\IntersectionTypeUnresolvedMethodPrototypeReflection;
 use PHPStan\Reflection\Type\IntersectionTypeUnresolvedPropertyPrototypeReflection;
 use PHPStan\Reflection\Type\UnresolvedMethodPrototypeReflection;
@@ -1141,14 +1143,20 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
 		}
 
 		if (count($yesAcceptors) > 0) {
-			return array_merge(...$yesAcceptors);
+			$acceptors = $yesAcceptors;
+		} elseif(count($maybeAcceptors) > 0) {
+			$acceptors = $maybeAcceptors;
+		} else {
+			throw new ShouldNotHappenException();
 		}
 
-		if (count($maybeAcceptors) > 0) {
-			return array_merge(...$maybeAcceptors);
+		$result = [];
+		$combinations = CombinationsHelper::combinations($acceptors);
+		foreach ($combinations as $combination) {
+			$result[] = ParametersAcceptorSelector::combineAcceptors($combination);
 		}
 
-		throw new ShouldNotHappenException();
+		return $result;
 	}
 
 	public function isCloneable(): TrinaryLogic

tests/PHPStan/Analyser/nsrt/bug-14362.php

@@ -37,23 +37,28 @@ public function __invoke(B $b): int {
 }
 
 interface E
+{
+	public function __invoke(B $b, bool $option = true): int;
+}
+
+interface F
 {
 
 }
 
 class G {
-	public static function u(): A&B&E {
-		return new class() implements A, B, E {
-			public function __invoke(B $b): int {
+	public static function u(): A&E {
+		return new class() implements A, E {
+			public function __invoke(B $b, bool $option = true): int {
 				return 1;
 			}
 		};
 	}
 }
 
 class H {
-	public static function u(): B&E {
-		return new class() implements B, E {
+	public static function u(): B&F {
+		return new class() implements B, F {
 		};
 	}
 }
@@ -63,7 +68,7 @@ function doBar() : void {
 	assertType('Closure(Bug14362\B): int', D::u()(...));
 
 	// Intersection with one yes-callable and multiple maybe-callable types
-	assertType('Closure(Bug14362\B): int', G::u()(...));
+	assertType('Closure(Bug14362\B, bool=): int', G::u()(...));
 
 	// Intersection with only maybe-callable types (neither has __invoke)
 	assertType('Closure', H::u()(...));