diff --git a/src/functions.php b/src/functions.php index 68763db3..429f0e73 100644 --- a/src/functions.php +++ b/src/functions.php @@ -341,43 +341,67 @@ function _checkTypehint(callable $callback, $object) return true; } - if (\PHP_VERSION_ID < 70100 || \defined('HHVM_VERSION')) { - $expectedException = $parameters[0]; + $expectedException = $parameters[0]; + // PHP before v8 used an easy API: + if (\PHP_VERSION_ID < 70100 || \defined('HHVM_VERSION')) { if (!$expectedException->getClass()) { return true; } return $expectedException->getClass()->isInstance($object); - } else { - $type = $parameters[0]->getType(); + } - if (!$type) { - return true; - } + // 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 there is no type restriction, it matches + if (empty($types)) { + return true; + } - if ($type instanceof \ReflectionUnionType) { - $types = $type->getTypes(); + foreach ($types as $type) { + if (!$type instanceof \ReflectionNamedType) { + throw new \LogicException('This implementation does not support groups of intersection or union types'); } - $mismatched = false; - - foreach ($types as $type) { - if (!$type || $type->isBuiltin()) { - continue; - } + // A named-type can be either a class-name or a built-in type like string, int, array, etc. + $matches = ($type->isBuiltin() && \gettype($object) === $type->getName()) + || (new \ReflectionClass($type->getName()))->isInstance($object); - $expectedClass = $type->getName(); - if ($object instanceof $expectedClass) { + // 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; } - - $mismatched = true; + } else { + if (!$isTypeUnion) { + return false; + } } - - 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 5c78ab36..b8d3fbe7 100644 --- a/tests/FunctionCheckTypehintTest.php +++ b/tests/FunctionCheckTypehintTest.php @@ -84,6 +84,39 @@ public function shouldAcceptStaticClassCallbackWithUnionTypehint() self::assertFalse(_checkTypehint(['React\Promise\CallbackWithUnionTypehintClass', 'testCallbackStatic'], new \Exception())); } + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptInvokableObjectCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint(new CallbackWithIntersectionTypehintClass(), new \RuntimeException())); + self::assertFalse(_checkTypehint(new CallbackWithIntersectionTypehintClass(), new CountableNonException())); + self::assertTrue(_checkTypehint(new CallbackWithIntersectionTypehintClass(), new CountableException())); + } + + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptObjectMethodCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint([new CallbackWithIntersectionTypehintClass(), 'testCallback'], new \RuntimeException())); + self::assertFalse(_checkTypehint([new CallbackWithIntersectionTypehintClass(), 'testCallback'], new CountableNonException())); + self::assertTrue(_checkTypehint([new CallbackWithIntersectionTypehintClass(), 'testCallback'], new CountableException())); + } + + /** + * @test + * @requires PHP 8.1 + */ + public function shouldAcceptStaticClassCallbackWithIntersectionTypehint() + { + self::assertFalse(_checkTypehint(['React\Promise\CallbackWithIntersectionTypehintClass', 'testCallbackStatic'], new \RuntimeException())); + self::assertFalse(_checkTypehint(['React\Promise\CallbackWithIntersectionTypehintClass', 'testCallbackStatic'], new CountableNonException())); + self::assertTrue(_checkTypehint(['React\Promise\CallbackWithIntersectionTypehintClass', 'testCallbackStatic'], new CountableException())); + } + /** @test */ public function shouldAcceptClosureCallbackWithoutTypehint() { 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 @@ +