diff options
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 | ||||
| -rw-r--r-- | ext/reflection/tests/bug43926.phpt | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index eb3dc48310..82b2f3eda4 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3481,7 +3481,7 @@ ZEND_METHOD(reflection_class, isInstance) return; } GET_REFLECTION_OBJECT_PTR(ce); - RETURN_BOOL(ce == Z_OBJCE_P(object)); + RETURN_BOOL(HAS_CLASS_ENTRY(*object) && instanceof_function(Z_OBJCE_P(object), ce)); } /* }}} */ diff --git a/ext/reflection/tests/bug43926.phpt b/ext/reflection/tests/bug43926.phpt new file mode 100644 index 0000000000..373f9f1ba3 --- /dev/null +++ b/ext/reflection/tests/bug43926.phpt @@ -0,0 +1,37 @@ +--TEST-- +Bug#43926 - isInstance() isn't equivalent to instanceof operator +--FILE-- +<?php + +class E { +} +class D extends E { +} + +class A extends D { +} + +class C extends A { +} + +$ra = new ReflectionClass('A'); +$rc = new ReflectionClass('C'); +$rd = new ReflectionClass('D'); +$re = new ReflectionClass('E'); + +$ca = $ra->newInstance(); +$cc = $rc->newInstance(); +$cd = $rd->newInstance(); +$ce = $re->newInstance(); + +print("Is? A ". ($ra->isInstance($ca) ? 'true' : 'false') .", instanceof: ". (($ca instanceof A) ? 'true' : 'false') ."\n"); +print("Is? C ". ($ra->isInstance($cc) ? 'true' : 'false') .", instanceof: ". (($ca instanceof C) ? 'true' : 'false') ."\n"); +print("Is? D ". ($ra->isInstance($cd) ? 'true' : 'false') .", instanceof: ". (($ca instanceof D) ? 'true' : 'false') ."\n"); +print("Is? E ". ($ra->isInstance($ce) ? 'true' : 'false') .", instanceof: ". (($ca instanceof E) ? 'true' : 'false') ."\n"); + +?> +--EXPECT-- +Is? A true, instanceof: true +Is? C false, instanceof: false +Is? D true, instanceof: true +Is? E true, instanceof: true
\ No newline at end of file |