Merge branch 'php:master' into с

Author: xepozz

.github/labeler.yml

@@ -469,7 +469,6 @@
       - 'ext/pdo/php_pdo.h'
       - 'ext/pdo/php_pdo_driver.h'
       - 'ext/pdo/php_pdo_error.h'
-      - 'ext/phar/php_phar.h'
       - 'ext/random/php_random.h'
       - 'ext/random/php_random_csprng.h'
       - 'ext/random/php_random_uint128.h'

NEWS

@@ -2,6 +2,23 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0alpha2
 
+- Core:
+  . Fix OSS-Fuzz #427814452 (pipe compilation fails with assert).
+    (nielsdos, ilutov)
+
+- DOM:
+  . Make cloning DOM node lists, maps, and collections fail. (nielsdos)
+  . Added Dom\Element::getElementsByClassName(). (nielsdos)
+
+- PDO_ODBC
+  . Fetch larger block sizes and better handle SQL_NO_TOTAL when calling
+    SQLGetData. (Calvin Buckley, Saki Takamachi)
+
+- Standard:
+  . Optimized pack(). (nielsdos, divinity76)
+  . Fixed bug GH-19070 (setlocale($type, NULL) should not be deprecated).
+    (nielsdos)
+
 - URI:
   . Return the singleton UrlValidationErrorType instances from Uri\WhatWg\Url
     instead of creating new objects that are different from the singleton.
@@ -67,6 +84,8 @@ PHP                                                                        NEWS
     (DanielEScherzer)
   . Do not use RTLD_DEEPBIND if dlmopen is available. (Daniil Gentili)
   . Make `clone()` a function. (timwolla, edorian)
+  . Fixed bug GH-19081 (Wrong lineno in property error with constructor property
+    promotion). (ilutov)
 
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)
@@ -139,6 +158,11 @@ PHP                                                                        NEWS
   . Log a warning when opcache lock file permissions could not be changed.
     (Taavi Eomäe)
 
+- OpenSSL:
+  . Added openssl.libctx INI that allows to select the OpenSSL library context
+    type and convert verious parts of the extension to use the custom  libctx.
+    (Jakub Zelenka)
+
 - Output:
   . Fixed calculation of aligned buffer size. (cmb)
 

UPGRADING

@@ -45,6 +45,12 @@ PHP 8.5 UPGRADE NOTES
     change, but should more closely match user expectations, demonstrated by
     GH-15753 and GH-16198.
 
+- DOM:
+  . Cloning a DOMNamedNodeMap, DOMNodeList, Dom\NamedNodeMap, Dom\NodeList,
+    Dom\HTMLCollection, and Dom\DtdNamedNodeMap now fails.
+    This never actually resulted in a working object,
+    so the impact should actually be zero.
+
 - FileInfo:
   . finfo_file() and finfo::file() now throws a ValueError instead of a
     TypeError when $filename contains nul bytes.
@@ -259,6 +265,19 @@ PHP 8.5 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- Core:
+  . Returning a non-string from a user output handler is deprecated. The
+    deprecation warning will bypass the handler with the bad return to ensure
+    it is visible; if there are nested output handlers the next one will still
+    be used.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_4
+  . Trying to produce output (e.g. with `echo`) within a user output handler
+    is deprecated. The deprecation warning will bypass the handler producing the
+    output to ensure it is visible; if there are nested output handlers the next
+    one will still be used. If a user output handler returns a non-string and
+    produces output, the warning about producing an output is emitted first.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_4
+
 - Hash:
   . The MHASH_* constants have been deprecated.  These have been overlooked
     when the mhash*() function family has been deprecated per
@@ -389,6 +408,7 @@ PHP 8.5 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/curl_share_persistence_improvement
 
 - DOM:
+  . Added Dom\Element::getElementsByClassName().
   . Added Dom\Element::insertAdjacentHTML().
 
 - Enchant:
@@ -538,6 +558,11 @@ PHP 8.5 UPGRADE NOTES
     from being a multiple of loop iteration counts.
     It is recommended that this parameter is set to a prime number.
 
+- OpenSSL:
+  Added openssl.libctx to select the OpenSSL library context type. Either
+  custom libctx for each thread can be used or a single global (default)
+  libctx is used.
+
 ========================================
 12. Windows Support
 ========================================
@@ -586,6 +611,13 @@ PHP 8.5 UPGRADE NOTES
   . The `-z` or `--zend-extension` option has been removed as it was
     non-functional. Use `-d zend_extension=<path>` instead.
 
+- PDO_ODBC
+  . The fetch behaviour for larger columns has been changed. Rather than
+    fetching 256 byte blocks, PDO_ODBC will try to fetch a larger block size;
+    currently, this is the page size minus string overhead. Drivers that
+    return SQL_NO_TOTAL in SQLGetData are also better handled as well.
+    This should improve compatibility and performance. See GH-10809, GH-10733.
+
 ========================================
 14. Performance Improvements
 ========================================
@@ -619,6 +651,7 @@ PHP 8.5 UPGRADE NOTES
   . Improved performance of urlencode() and rawurlencode().
   . Improved unpack() performance with nameless repetitions by avoiding
     creating temporary strings and reparsing them.
+  . Improved pack() performance.
 
 - XMLReader:
   . Improved property access performance.

UPGRADING.INTERNALS

@@ -43,10 +43,29 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Added the zend_update_exception_properties() function for instantiating
     Exception child classes. It updates the $message, $code, and $previous
     properties.
+  . zend_exception_get_default() was removed, use zend_ce_exception directly.
+  . zend_get_error_exception() was removed, use zend_ce_error_exception
+    directly.
   . ZEND_IS_XDIGIT() macro was removed because it was unused and its name
     did not match its actual behavior.
+  . The following zend_string-related legacy aliases were removed:
+    * IS_INTERNED() - use ZSTR_IS_INTERNED()
+    * STR_EMPTY_ALLOC() - use ZSTR_EMPTY_ALLOC()
+    * _STR_HEADER_SIZE - use _ZSTR_HEADER_SIZE
+    * STR_ALLOCA_ALLOC() - use ZSTR_ALLOCA_ALLOC()
+    * STR_ALLOCA_INIT() - use ZSTR_ALLOCA_INIT()
+    * STR_ALLOCA_FREE() - use ZSTR_ALLOCA_FREE()
   . zend_register_constant() now returns a pointer to the added constant
     on success and NULL on failure instead of SUCCESS/FAILURE.
+    The specialized registration methods that previously had void returns
+    also return pointers to the added constants:
+    * zend_register_bool_constant()
+    * zend_register_null_constant()
+    * zend_register_long_constant()
+    * zend_register_double_constant()
+    * zend_register_string_constant()
+    * zend_register_stringl_constant()
+  . EG(fake_scope) now is a _const_ zend_class_entry*.
 
 ========================
 2. Build system changes
@@ -57,7 +76,7 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Preprocessor macro SIZEOF_INTMAX_T has been removed.
 
 - Windows build system changes
-  . SAPI() and ADD_SOURCES() now suport the optional `duplicate_sources`
+  . SAPI() and ADD_SOURCES() now support the optional `duplicate_sources`
     parameter.  If truthy, no rules to build the object files are generated.
     This allows to build additional variants of SAPIs (e.g. a DLL and EXE)
     without duplicate build rules.  It is up to the SAPI maintainers to ensure

Zend/Optimizer/zend_func_infos.h

@@ -131,9 +131,7 @@ static const func_info_t func_infos[] = {
 	F1("imagecreatefromgd", MAY_BE_OBJECT|MAY_BE_FALSE),
 	F1("imagecreatefromgd2", MAY_BE_OBJECT|MAY_BE_FALSE),
 	F1("imagecreatefromgd2part", MAY_BE_OBJECT|MAY_BE_FALSE),
-#if defined(HAVE_GD_BMP)
 	F1("imagecreatefrombmp", MAY_BE_OBJECT|MAY_BE_FALSE),
-#endif
 	F1("imagecolorsforindex", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG),
 	F1("imagegetclip", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_LONG),
 #if defined(HAVE_GD_FREETYPE)

Zend/Optimizer/zend_inference.c

@@ -2409,7 +2409,7 @@ static const zend_property_info *lookup_prop_info(const zend_class_entry *ce, ze
 	/* If the class is linked, reuse the precise runtime logic. */
 	if ((ce->ce_flags & ZEND_ACC_LINKED)
 	 && (!scope || (scope->ce_flags & ZEND_ACC_LINKED))) {
-		zend_class_entry *prev_scope = EG(fake_scope);
+		const zend_class_entry *prev_scope = EG(fake_scope);
 		EG(fake_scope) = scope;
 		prop_info = zend_get_property_info(ce, name, 1);
 		EG(fake_scope) = prev_scope;

Zend/Zend.m4

@@ -149,6 +149,7 @@ AC_CHECK_FUNCS(m4_normalize([
   pthread_get_stackaddr_np
   pthread_getattr_np
   pthread_stackseg_np
+  strnlen
 ]))
 
 AC_CHECK_DECL([clock_gettime_nsec_np],

Zend/tests/concat/bug79836.phpt

@@ -8,6 +8,7 @@ $counter = 0;
 ob_start(function ($buffer) use (&$c, &$counter) {
 	$c = 0;
 	++$counter;
+	return '';
 }, 1);
 $c .= [];
 $c .= [];

Zend/tests/concat/bug79836_1.phpt

@@ -7,6 +7,7 @@ opcache.optimization_level = 0x7FFEBFFF & ~0x400
 $x = 'non-empty';
 ob_start(function () use (&$c) {
 	$c = 0;
+	return '';
 }, 1);
 $c = [];
 $x = $c . $x;

Zend/tests/concat/bug79836_2.phpt

@@ -6,6 +6,7 @@ $c = str_repeat("abcd", 10);
 
 ob_start(function () use (&$c) {
 	$c = 0;
+	return '';
 }, 1);
 
 class X {