From: Nikita Popov Date: Mon, 26 Oct 2020 07:51:06 +0000 (+0100) Subject: Revert "Make ReflectionUnionType final" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f462c97f90fab7160b972c8a4f6c364e3814724;p=php Revert "Make ReflectionUnionType final" This reverts commit ef6adb4e27853eb19bf50bad6486311920d6af7b. Per Ondrej's comment, this is already being used by BetterReflection adaptors, ugh. --- diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index d1957521c0..7adcfc506a 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -6529,7 +6529,6 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */ INIT_CLASS_ENTRY(_reflection_entry, "ReflectionUnionType", class_ReflectionUnionType_methods); reflection_init_class_handlers(&_reflection_entry); - _reflection_entry.ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; reflection_union_type_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_type_ptr); INIT_CLASS_ENTRY(_reflection_entry, "ReflectionMethod", class_ReflectionMethod_methods); diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php index 8ad269031f..7e2f061142 100644 --- a/ext/reflection/php_reflection.stub.php +++ b/ext/reflection/php_reflection.stub.php @@ -568,7 +568,7 @@ class ReflectionNamedType extends ReflectionType public function isBuiltin() {} } -final class ReflectionUnionType extends ReflectionType +class ReflectionUnionType extends ReflectionType { public function getTypes(): array {} } diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h index 5206c90480..591a160ed3 100644 --- a/ext/reflection/php_reflection_arginfo.h +++ b/ext/reflection/php_reflection_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 4b759a151e33cdd91e414ac332e3a2760534a1d6 */ + * Stub hash: ec7607b8087ddd4297bf51cc4072465d2a0f27af */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)