1
0
mirror of https://github.com/php/php-src.git synced 2026-04-08 00:22:52 +02:00

Merge branch 'PHP-8.0'

* PHP-8.0:
  Revert "Make ReflectionUnionType final"
This commit is contained in:
Nikita Popov
2020-10-26 08:52:50 +01:00
3 changed files with 2 additions and 3 deletions

View 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);

View 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 {}
}

View 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)