Skip to content

Commit

Permalink
Revert "Make ReflectionUnionType final"
Browse files Browse the repository at this point in the history
This reverts commit ef6adb4.

Per Ondrej's comment, this is already being used by BetterReflection
adaptors, ugh.
  • Loading branch information
nikic committed Oct 26, 2020
1 parent ef6adb4 commit 7f462c9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion ext/reflection/php_reflection.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/php_reflection.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ public function getName() {}
public function isBuiltin() {}
}

final class ReflectionUnionType extends ReflectionType
class ReflectionUnionType extends ReflectionType
{
public function getTypes(): array {}
}
Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/php_reflection_arginfo.h
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 7f462c9

Please sign in to comment.