Merge branch 'master' into uri-construct-leak-modify

Author: TimWolla

NEWS

@@ -1,6 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.5.0beta3
+?? ??? ????, PHP 8.5.0RC1
+
+
+11 Sep 2025, PHP 8.5.0beta3
 
 - Core:
   . Destructing non-array values (other than NULL) using [] or list() now
@@ -13,6 +16,8 @@ PHP                                                                        NEWS
     deprecated. (alexandre-daubois)
   . Fixed bug GH-19681 (PHP_EXPAND_PATH broken with bash 5.3.0). (Remi)
   . Marks the stack as non-executable on Haiku. (David Carlier)
+  . Deriving $_SERVER['argc'] and $_SERVER['argv'] from the query string is
+    now deprecated. (timwolla, nicolasgrekas)
 
 - CLI:
   . Fixed bug GH-19461 (Improve error message on listening error with IPv6
@@ -39,6 +44,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-11952 (Fix locale strings canonicalization for IntlDateFormatter
     and NumberFormatter). (alexandre-daubois)
 
+- ODBC:
+  . Removed driver-specific build flags and support. (Calvin Buckley)
+
 - Opcache:
   . Fixed bug GH-19486 (Incorrect opline after deoptimization). (Arnaud)
   . Fixed bug GH-19601 (Wrong JIT stack setup on aarch64/clang). (Arnaud)
@@ -87,6 +95,8 @@ PHP                                                                        NEWS
     (timwolla)
   . Return null instead of 0 for Uri\Rfc3986\Uri::getPort() when the
     URI contains an empty port. (timwolla)
+  . Fixed creation of the InvalidUrlException when not passing an
+    errors zval to the internal whatwg parser. (timwolla)
   . Clean up naming of internal API. (timwolla)
 
 28 Aug 2025, PHP 8.5.0beta2

UPGRADING

@@ -91,6 +91,9 @@ PHP 8.5 UPGRADE NOTES
 - ODBC:
   . ODBC now assumes that at least ODBC 3.5 functionality is available. The
     ODBCVER definition and build system flags to control it have been removed.
+  . ODBC no longer has build flags to build against specific drivers (except
+    for DB2) and removes special cases for those drivers. It is strongly
+    recommended to use a driver manager like iODBC or unixODBC on non-Windows.
 
 - Opcache:
   . The Opcache extension is now always built into the PHP binary and is always
@@ -384,6 +387,11 @@ PHP 8.5 UPGRADE NOTES
   . Using null as an array offset or when calling array_key_exists() is now
     deprecated. Instead an empty string should be used.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_using_values_null_as_an_array_offset_and_when_calling_array_key_exists
+  . Deriving $_SERVER['argc'] and $_SERVER['argv'] from the query string for non-CLI
+    SAPIs has been deprecated. Configure register_argc_argv=0 and switch to either
+    $_GET or $_SERVER['QUERY_STRING'] to access the information, after verifying
+    that the usage is safe.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_register_argc_argv_ini_directive
 
 - Curl:
   . The curl_close() function has been deprecated, as CurlHandle objects are

ext/intl/dateformat/dateformat_create.cpp

@@ -115,8 +115,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	locale = Locale::createFromName(final_locale);
 	/* get*Name accessors being set does not preclude being bogus */
 	if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') || (locale_len > 1 && strlen(locale.getISO3Language()) == 0))) {
-        zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
-		return FAILURE;
+		zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
+		goto error;
 	}
 
 	/* process calendar */

ext/intl/tests/gh11942_datefmt_locale_canonicalization.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Fix GH-11942: IntlDateFormatter should canonicalize locale strings
+GH-11942 (IntlDateFormatter should canonicalize locale strings)
 --EXTENSIONS--
 intl
 --FILE--

ext/intl/tests/gh11942_numfmt_locale_canonicalization.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Fix GH-11942: NumberFormatter should canonicalize locale strings
+GH-11942 (NumberFormatter should canonicalize locale strings)
 --EXTENSIONS--
 intl
 --FILE--