com php-src: use api stuff here: Zend/zend_object_handlers .c
| From: | Bob Weinand | Date: | Thu, 07 Apr 2016 05:46:05 +0000 |
| Subject: | com php-src: use api stuff here: Zend/zend_object_handlers .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95565@lists.php.net to get a copy of this message | ||
Commit: 3f8430e87b4a14520597599aeddea6022ace37c3
Author: Joe Watkins <krakjoe@php.net> Thu, 7 Apr 2016 06:46:05 +0100
Parents: 48d5aec17993e92163fce239c7a210fb0f5c6623
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f8430e87b4a14520597599aeddea6022ace37c3
Log:
use api stuff here
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cc423e7...861c744 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -621,8 +621,8 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_
}
}
if ((type != BP_VAR_IS)) {
- if (EXPECTED(!(zobj->ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS) ||
- !(prop_info = zend_hash_find_ptr(&zobj->ce->properties_info, Z_STR_P(member))) ||
+ if (EXPECTED(!ZEND_CLASS_HAS_TYPE_HINTS(zobj->ce) ||
+ !(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member), cache_slot))
||
!prop_info->type)) {
zend_error(E_NOTICE,"Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name),
Z_STRVAL_P(member));
}