]> granicus.if.org Git - php/commitdiff
Revert "Make ReflectionUnionType final"
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 26 Oct 2020 07:51:06 +0000 (08:51 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 26 Oct 2020 07:51:06 +0000 (08:51 +0100)
This reverts commit ef6adb4e27853eb19bf50bad6486311920d6af7b.

Per Ondrej's comment, this is already being used by BetterReflection
adaptors, ugh.

ext/reflection/php_reflection.c
ext/reflection/php_reflection.stub.php
ext/reflection/php_reflection_arginfo.h

index d1957521c04cc16c80dd67ccca7c638088044d46..7adcfc506a9966034b12b0264869dc704fd83dd0 100644 (file)
@@ -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);
index 8ad269031fdd16d2180f012331b7f24316970ee6..7e2f061142bc34af3dba1b9dc0d03ab49cee732d 100644 (file)
@@ -568,7 +568,7 @@ class ReflectionNamedType extends ReflectionType
     public function isBuiltin() {}
 }
 
-final class ReflectionUnionType extends ReflectionType
+class ReflectionUnionType extends ReflectionType
 {
     public function getTypes(): array {}
 }
index 5206c904805ffb06ca70f594deabdbdb4df8a6a8..591a160ed3150e83accad9546aeab26153c07737 100644 (file)
@@ -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)