[pull] master from php:master

EXTENSIONS

@@ -196,7 +196,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           lexbor
-PRIMARY MAINTAINER:  Niels Dossche <nielsdos@php.net> (2023 - 2025)
+PRIMARY MAINTAINER:  Niels Dossche <nielsdos@php.net> (2025 - 2025)
                      Mate Kocsis <kocsismate@php.net> (2025 - 2025)
 MAINTENANCE:         Maintained
 STATUS:              Working

Zend/tests/zend_ini/oss_fuzz_428983568.phpt

@@ -0,0 +1,14 @@
+--TEST--
+OSS-Fuzz #428983568
+--FILE--
+<?php
+$ini = <<<INI
+[\${zz:-x
+
+INI;
+var_dump(parse_ini_string($ini));
+?>
+--EXPECTF--
+Warning: syntax error, unexpected end of file, expecting '}' in Unknown on line 1
+ in %s on line %d
+bool(false)

Zend/zend_compile.h

@@ -886,7 +886,6 @@ ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array *op_ar
 
 #ifdef ZTS
 const char *zend_get_zendtext(void);
-int zend_get_zendleng(void);
 #endif
 
 typedef zend_result (ZEND_FASTCALL *unary_op_type)(zval *, zval *);

Zend/zend_ini_parser.y

@@ -353,7 +353,7 @@ static void normalize_value(zval *zv)
 %left '|' '&' '^'
 %precedence '~' '!'
 
-%destructor { zval_ini_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL cfg_var_ref constant_literal constant_string encapsed_list expr option_offset section_string_or_value string_or_value var_string_list var_string_list_section
+%destructor { zval_ini_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL cfg_var_ref constant_literal constant_string encapsed_list expr fallback option_offset section_string_or_value string_or_value var_string_list var_string_list_section
 
 %%
 

docs/release-process.md

@@ -474,6 +474,15 @@ slightly different steps. We'll call attention where the steps differ.
 
    Here are a few examples of non-stable release announcement emails:
 
+   > 💬 **Hint** \
+   > If you are going to base your language on one of these old announcements,
+   > remember that
+   > * `qa.php.net` has been replaced with https://www.php.net/release-candidates.php
+   > * `bugs.php.net` has been replaced with GitHub issues, use
+   >    `https://github.com/php/php-src/issues/new?template=bug_report.yml`
+   >   to link directly to the form for creating a new bug report.
+   > * Since 8.4 there have only been 4 release candidates for PHP X.Y.0, rather than 6.
+
    * [PHP 8.1.0alpha1 is available for testing](https://news-web.php.net/php.qa/69043)
    * [PHP 8.1.0beta3 available for testing](https://news-web.php.net/php.qa/69079)
    * [PHP 8.1.0RC6 available for testing](https://news-web.php.net/php.qa/69117)
@@ -1008,8 +1017,13 @@ volunteers to begin the selection process for the next release managers.
 2. Request membership to the
    [release managers group](https://github.com/orgs/php/teams/release-managers) on GitHub.
 
-3. Subscribe to the php-announce@lists.php.net mailing list by emailing
-   php-announce+subscribe@lists.php.net
+3. Make sure you are subscribed to all of the mailing lists that you will need to send
+   announcements to, since you cannot post to the lists otherwise:
+
+   * internals@lists.php.net (email internals+subscribe@lists.php.net)
+   * php-announce@lists.php.net (email php-announce+subscribe@lists.php.net)
+   * php-general@lists.php.net (email php-general+subscribe@lists.php.net)
+   * php-qa@lists.php.net (email php-qa+subscribe@lists.php.net)
 
 4. Email systems@php.net to get setup for access to downloads.php.net, to be
    added to the release-managers@php.net distribution list, and to be added to

ext/reflection/php_reflection.c

@@ -2844,7 +2844,7 @@ ZEND_METHOD(ReflectionParameter, isCallable)
 }
 /* }}} */
 
-/* {{{ Returns whether NULL is allowed as this parameters's value */
+/* {{{ Returns whether NULL is allowed as this parameter's value */
 ZEND_METHOD(ReflectionParameter, allowsNull)
 {
 	reflection_object *intern;

ext/standard/string.c

@@ -2404,7 +2404,7 @@ PHP_FUNCTION(substr_replace)
 			if (repl_idx < repl_ht->nNumUsed) {
 				repl_str = zval_get_tmp_string(tmp_repl, &tmp_repl_str);
 			} else {
-				repl_str = STR_EMPTY_ALLOC();
+				repl_str = ZSTR_EMPTY_ALLOC();
 			}
 		}