Commit 8d12f66

authored

Fix registration of internal readonly child classes (#15459)

Currently, internal classes are registered with the following code: INIT_CLASS_ENTRY(ce, "InternalClass", class_InternalClass_methods); class_entry = zend_register_internal_class_ex(&ce, NULL); class_entry->ce_flags |= ...; This has worked well so far, except if InternalClass is readonly. It is because some inheritance checks are run by zend_register_internal_class_ex before ZEND_ACC_READONLY_CLASS is added to ce_flags. The issue is fixed by adding a zend_register_internal_class_with_flags() zend API function that stubs can use from now on. This function makes sure to add the flags before running any checks. Since the new API is not available in lower PHP versions, gen_stub.php has to keep support for the existing API for PHP 8.3 and below.

1 parent 6351468 commit 8d12f66Copy full SHA for 8d12f66

File tree

96 files changed

+405

-446

lines changed

Zend
build
- gen_stub.php
ext
- com_dotnet
  - com_extension_arginfo.h
  - com_persist_arginfo.h
- curl
  - curl_arginfo.h
  - curl_file_arginfo.h
- date
  - php_date_arginfo.h
- dba
  - dba_arginfo.h
- dom
  - php_dom_arginfo.h
- enchant
  - enchant_arginfo.h
- ffi
  - ffi_arginfo.h
- fileinfo
  - fileinfo_arginfo.h
- ftp
  - ftp_arginfo.h
- gd
  - gd_arginfo.h
- gmp
  - gmp_arginfo.h
- hash
  - hash_arginfo.h
- intl
  - breakiterator
    - breakiterator_arginfo.h
    - breakiterator_iterators_arginfo.h
  - calendar
    - calendar_arginfo.h
  - collator
    - collator_arginfo.h
  - common
    - common_arginfo.h
  - converter
    - converter_arginfo.h
  - dateformat
    - dateformat_arginfo.h
    - datepatterngenerator_arginfo.h
  - formatter
    - formatter_arginfo.h
  - locale
    - locale_arginfo.h
  - msgformat
    - msgformat_arginfo.h
  - normalizer
    - normalizer_arginfo.h
  - php_intl_arginfo.h
  - resourcebundle
    - resourcebundle_arginfo.h
  - spoofchecker
    - spoofchecker_arginfo.h
  - timezone
    - timezone_arginfo.h
  - transliterator
    - transliterator_arginfo.h
  - uchar
    - uchar_arginfo.h
- json
  - json_arginfo.h
- ldap
  - ldap_arginfo.h
- libxml
  - libxml_arginfo.h
- mysqli
  - mysqli_arginfo.h
- odbc
  - odbc_arginfo.h
- openssl
  - openssl_arginfo.h
- pdo_dblib
  - pdo_dblib_arginfo.h
- pdo_firebird
  - pdo_firebird_arginfo.h
- pdo_mysql
  - pdo_mysql_arginfo.h
- pdo_odbc
  - pdo_odbc_arginfo.h
- pdo_pgsql
  - pdo_pgsql_arginfo.h
- pdo_sqlite
  - pdo_sqlite_arginfo.h
- pdo
  - pdo_arginfo.h
  - pdo_dbh_arginfo.h
  - pdo_stmt_arginfo.h
- pgsql
  - pgsql_arginfo.h
- phar
  - phar_object_arginfo.h
- random
  - random_arginfo.h
- reflection
  - php_reflection_arginfo.h
- session
  - session_arginfo.h
- shmop
  - shmop_arginfo.h
- simplexml
  - simplexml_arginfo.h
- snmp
  - snmp_arginfo.h
- soap
  - soap_arginfo.h
- sockets
  - sockets_arginfo.h
- sodium
  - libsodium_arginfo.h
- spl
  - spl_array_arginfo.h
  - spl_directory_arginfo.h
  - spl_dllist_arginfo.h
  - spl_exceptions_arginfo.h
  - spl_fixedarray_arginfo.h
  - spl_heap_arginfo.h
  - spl_iterators_arginfo.h
  - spl_observer_arginfo.h
- sqlite3
  - sqlite3_arginfo.h
- standard
  - basic_functions_arginfo.h
  - dir_arginfo.h
  - user_filters_arginfo.h
- sysvmsg
  - sysvmsg_arginfo.h
- sysvsem
  - sysvsem_arginfo.h
- sysvshm
  - sysvshm_arginfo.h
- tidy
  - tidy_arginfo.h
- tokenizer
  - tokenizer_arginfo.h
- xmlreader
  - php_xmlreader_arginfo.h
- xmlwriter
  - php_xmlwriter_arginfo.h
- xml
  - xml_arginfo.h
- xsl
  - php_xsl_arginfo.h
- zend_test
  - fiber_arginfo.h
  - iterators_arginfo.h
  - object_handlers_arginfo.h
  - test_arginfo.h
- zip
  - php_zip_arginfo.h
- zlib
  - zlib_arginfo.h

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+405

-446

lines changed

`‎Zend/zend_API.c‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3493,9 +3493,16 @@ static zend_class_entry do_register_internal_class(zend_class_entry orig_class`
`3493`	`3493`	`*/`
`3494`	`3494`	`ZEND_API zend_class_entry zend_register_internal_class_ex(zend_class_entry class_entry, zend_class_entry parent_ce) / {{{ */`
`3495`	`3495`	`{`
`3496`		`- zend_class_entry *register_class;`
	`3496`	`+ return zend_register_internal_class_with_flags(class_entry, parent_ce, 0);`
	`3497`	`+}`
	`3498`	`+/* }}} */`
`3497`	`3499`
`3498`		`- register_class = zend_register_internal_class(class_entry);`
	`3500`	`+ZEND_API zend_class_entry *zend_register_internal_class_with_flags(`
	`3501`	`+ zend_class_entry *class_entry,`
	`3502`	`+ zend_class_entry *parent_ce,`
	`3503`	`+ uint32_t ce_flags`
	`3504`	`+) {`
	`3505`	`+ zend_class_entry *register_class = do_register_internal_class(class_entry, ce_flags);`
`3499`	`3506`
`3500`	`3507`	`if (parent_ce) {`
`3501`	`3508`	`zend_do_inheritance(register_class, parent_ce);`
`@@ -3504,7 +3511,6 @@ ZEND_API zend_class_entry zend_register_internal_class_ex(zend_class_entry cla`
`3504`	`3511`
`3505`	`3512`	`return register_class;`
`3506`	`3513`	`}`
`3507`		`-/* }}} */`
`3508`	`3514`
`3509`	`3515`	`ZEND_API void zend_class_implements(zend_class_entry class_entry, int num_interfaces, ...) / {{{ */`
`3510`	`3516`	`{`

`‎Zend/zend_API.h‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,7 @@ ZEND_API void zend_add_magic_method(zend_class_entry ce, zend_function fptr, z`
`390`	`390`
`391`	`391`	`ZEND_API zend_class_entry zend_register_internal_class(zend_class_entry class_entry);`
`392`	`392`	`ZEND_API zend_class_entry zend_register_internal_class_ex(zend_class_entry class_entry, zend_class_entry *parent_ce);`
	`393`	`+ZEND_API zend_class_entry zend_register_internal_class_with_flags(zend_class_entry class_entry, zend_class_entry *parent_ce, uint32_t flags);`
`393`	`394`	`ZEND_API zend_class_entry zend_register_internal_interface(zend_class_entry orig_class_entry);`
`394`	`395`	`ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...);`
`395`	`396`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8d12f66

File tree

96 files changed

Some content is hidden

96 files changed

`‎Zend/zend_API.c‎`

`‎Zend/zend_API.h‎`

`‎Zend/zend_attributes_arginfo.h‎`

`‎Zend/zend_builtin_functions_arginfo.h‎`

`‎Zend/zend_closures_arginfo.h‎`

`‎Zend/zend_exceptions_arginfo.h‎`

`‎Zend/zend_fibers_arginfo.h‎`

`‎Zend/zend_generators_arginfo.h‎`

`‎Zend/zend_interfaces_arginfo.h‎`

`‎Zend/zend_weakrefs_arginfo.h‎`

0 commit comments