com php-src: Merge branch 'master' of git.php.net:php-src: ext/reflection/php_reflection.c

Commit: 977cf1dc11da0363692374951088696855ae293d Author: Anatol Belski <ab@php.net> Sun, 17 Aug 2014 12:04:05 +0200 Parents: 864172d9a49a6201513d83c06b77b5d309dc50ab 87afa6bdc9b310ebafec5d965734c4e467e27c6d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=977cf1dc11da0363692374951088696855ae293d Log: Merge branch 'master' of git.php.net:php-src # By Tjerk Meesters # Via Tjerk Meesters * 'master' of git.php.net:php-src: Fixes missing Reflector interface constraints being enforced by the engine Changed paths: MM ext/reflection/php_reflection.c Diff: diff --cc ext/reflection/php_reflection.c index f5eb473,e4ad941..fa94785 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@@ -6126,12 -6116,12 +6116,12 @@@ PHP_MINIT_FUNCTION(reflection) /* {{{ * INIT_CLASS_ENTRY(_reflection_entry, "ReflectionClass", reflection_class_functions); _reflection_entry.create_object = reflection_objects_new; reflection_class_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC); - reflection_register_implement(reflection_class_ptr, reflector_ptr TSRMLS_CC); + zend_class_implements(reflection_class_ptr TSRMLS_CC, 1, reflector_ptr); zend_declare_property_string(reflection_class_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC); - REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS); - REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_EXPLICIT_ABSTRACT", ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); - REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_FINAL", ZEND_ACC_FINAL_CLASS); + REGISTER_REFLECTION_CLASS_CONST_INT(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS); + REGISTER_REFLECTION_CLASS_CONST_INT(class, "IS_EXPLICIT_ABSTRACT", ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + REGISTER_REFLECTION_CLASS_CONST_INT(class, "IS_FINAL", ZEND_ACC_FINAL_CLASS); INIT_CLASS_ENTRY(_reflection_entry, "ReflectionObject", reflection_object_functions); _reflection_entry.create_object = reflection_objects_new;