php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 02:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)

Browse Source
This commit is contained in:
Dmitry Stogov
2011-07-04 14:55:39 +00:00
parent aba5ecbad9
commit adabdede5e
4 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/tests/bug53727.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
Bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)
--FILE--
<?php
interface MyInterface {
const TEST_CONSTANT = true;
}
class ParentClass implements MyInterface { }
class ChildClass extends ParentClass { }
echo (is_subclass_of('ChildClass', 'MyInterface') ? 'true' : 'false') . "\n";
echo (defined('ChildClass::TEST_CONSTANT') ? 'true' : 'false') . "\n";
echo (is_subclass_of('ParentClass', 'MyInterface') ? 'true' : 'false') . "\n";
echo (defined('ParentClass::TEST_CONSTANT') ? 'true' : 'false') . "\n";
--EXPECT--
true
true
true
true

2
Zend/tests/is_a.phpt
View File

@@ -38,6 +38,6 @@ bool(true)
bool(false)
bool(false)
bool(true)
bool(false)
bool(true)
AUTOLOAD 'X1'
bool(false)

31
Zend/zend_builtin_functions.c
View File

@@ -845,45 +845,26 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
return;
}
if (only_subclass && Z_TYPE_P(obj) == IS_STRING) {
if (Z_TYPE_P(obj) == IS_STRING) {
zend_class_entry **the_ce;
if (zend_lookup_class(Z_STRVAL_P(obj), Z_STRLEN_P(obj), &the_ce TSRMLS_CC) == FAILURE) {
zend_error(E_WARNING, "Unknown class passed as parameter");
RETURN_FALSE;
}
instance_ce = *the_ce;
} else if (Z_TYPE_P(obj) != IS_OBJECT) {
RETURN_FALSE;
} else if (Z_TYPE_P(obj) == IS_OBJECT && HAS_CLASS_ENTRY(*obj)) {
instance_ce = Z_OBJCE_P(obj);
} else {
instance_ce = NULL;
}
/* TBI!! new object handlers */
if (Z_TYPE_P(obj) == IS_OBJECT && !HAS_CLASS_ENTRY(*obj)) {
RETURN_FALSE;
}
if (zend_lookup_class_ex(class_name, class_name_len, NULL, 0, &ce TSRMLS_CC) == FAILURE) {
retval = 0;
} else {
if (only_subclass) {
if (!instance_ce) {
instance_ce = Z_OBJCE_P(obj)->parent;
} else {
instance_ce = instance_ce->parent;
}
} else {
instance_ce = Z_OBJCE_P(obj);
}
if (!instance_ce) {
RETURN_FALSE;
}
if (instanceof_function(instance_ce, *ce TSRMLS_CC)) {
retval = 1;
} else {
if (only_subclass && instance_ce == *ce) {
retval = 0;
} else {
retval = instanceof_function(instance_ce, *ce TSRMLS_CC);
}
}

8
ext/standard/tests/class_object/is_a_variation_001.phpt
View File

@@ -144,15 +144,23 @@ Arg value
bool(false)
Arg value
Warning: Unknown class passed as parameter in %sis_a_variation_001.php on line %d
bool(false)
Arg value
Warning: Unknown class passed as parameter in %sis_a_variation_001.php on line %d
bool(false)
Arg value string
Warning: Unknown class passed as parameter in %sis_a_variation_001.php on line %d
bool(false)
Arg value String
Warning: Unknown class passed as parameter in %sis_a_variation_001.php on line %d
bool(false)
Arg value