diff --git a/src/functions.php b/src/functions.php index df50eb33..96106016 100644 --- a/src/functions.php +++ b/src/functions.php @@ -342,33 +342,58 @@ function _checkTypehint(callable $callback, \Throwable $reason): bool return true; } - $type = $parameters[0]->getType(); - - if (!$type) { - return true; + $expectedException = $parameters[0]; + + // Extract the type of the argument and handle different possibilities + $type = $expectedException->getType(); + + $isTypeUnion = true; + $types = []; + + switch (true) { + case $type === null: + break; + case $type instanceof \ReflectionNamedType: + $types = [$type]; + break; + case $type instanceof \ReflectionIntersectionType: + $isTypeUnion = false; + case $type instanceof \ReflectionUnionType; + $types = $type->getTypes(); + break; + default: + throw new \LogicException('Unexpected return value of ReflectionParameter::getType'); } - $types = [$type]; - - if ($type instanceof \ReflectionUnionType) { - $types = $type->getTypes(); + // If there is no type restriction, it matches + if (empty($types)) { + return true; } - $mismatched = false; - foreach ($types as $type) { - if (!$type || $type->isBuiltin()) { - continue; + if (!$type instanceof \ReflectionNamedType) { + throw new \LogicException('This implementation does not support groups of intersection or union types'); } - $expectedClass = $type->getName(); - - if ($reason instanceof $expectedClass) { - return true; + // A named-type can be either a class-name or a built-in type like string, int, array, etc. + $matches = ($type->isBuiltin() && \gettype($reason) === $type->getName()) + || (new \ReflectionClass($type->getName()))->isInstance($reason); + + + // If we look for a single match (union), we can return early on match + // If we look for a full match (intersection), we can return early on mismatch + if ($matches) { + if ($isTypeUnion) { + return true; + } + } else { + if (!$isTypeUnion) { + return false; + } } - - $mismatched = true; } - return !$mismatched; + // If we look for a single match (union) and did not return early, we matched no type and are false + // If we look for a full match (intersection) and did not return early, we matched all types and are true + return $isTypeUnion ? false : true; } diff --git a/tests/FunctionCheckTypehintTest.php b/tests/FunctionCheckTypehintTest.php index b6f8aef5..b263473e 100644 --- a/tests/FunctionCheckTypehintTest.php +++ b/tests/FunctionCheckTypehintTest.php @@ -85,7 +85,37 @@ public function shouldAcceptStaticClassCallbackWithUnionTypehint() self::assertFalse(_checkTypehint([CallbackWithUnionTypehintClass::class, 'testCallbackStatic'], new Exception())); } -/** @test */ + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptInvokableObjectCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint(new CallbackWithIntersectionTypehintClass(), new \RuntimeException())); + self::assertTrue(_checkTypehint(new CallbackWithIntersectionTypehintClass(), new CountableException())); + } + + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptObjectMethodCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint([new CallbackWithIntersectionTypehintClass(), 'testCallback'], new \RuntimeException())); + self::assertTrue(_checkTypehint([new CallbackWithIntersectionTypehintClass(), 'testCallback'], new CountableException())); + } + + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptStaticClassCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint([CallbackWithIntersectionTypehintClass::class, 'testCallbackStatic'], new \RuntimeException())); + self::assertTrue(_checkTypehint([CallbackWithIntersectionTypehintClass::class, 'testCallbackStatic'], new CountableException())); + } + + /** @test */ public function shouldAcceptClosureCallbackWithoutTypehint() { self::assertTrue(_checkTypehint(function (InvalidArgumentException $e) { diff --git a/tests/fixtures/CallbackWithIntersectionTypehintClass.php b/tests/fixtures/CallbackWithIntersectionTypehintClass.php new file mode 100644 index 00000000..3e733476 --- /dev/null +++ b/tests/fixtures/CallbackWithIntersectionTypehintClass.php @@ -0,0 +1,21 @@ +