Merge branch 'php:master' into zend-stub-types

Author: alexandre-daubois

CODEOWNERS renamed to .github/CODEOWNERS

@@ -16,21 +16,24 @@
 /ext/dba @Girgias
 /ext/dom @nielsdos
 /ext/ffi @dstogov
+/ext/gettext @devnexen
 /ext/gmp @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
 /ext/libxml @nielsdos
 /ext/mbstring @alexdowad
+/ext/odbc @NattyNarwhal
 /ext/opcache @dstogov @iluuu1994
 /ext/openssl @bukka
-/ext/odbc @NattyNarwhal
+/ext/pdo_odbc @NattyNarwhal
 /ext/pdo_pgsql @devnexen
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/xmlreader @nielsdos
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka

.github/actions/brew/action.yml

@@ -5,6 +5,12 @@ runs:
     - shell: bash
       run: |
         set -x
+
+        # Patch brew to overwrite always
+        formula_installer="$(brew --repo)"/Library/Homebrew/formula_installer.rb
+        code=" keg.link\(verbose: verbose\?"
+        sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
+
         brew install \
           pkg-config \
           autoconf \

.github/actions/setup-caddy/action.yml

@@ -10,3 +10,4 @@ runs:
         gh release -R caddyserver/caddy download --pattern 'caddy_*_linux_amd64.tar.gz' -O - | sudo tar -xz -C /usr/bin caddy
         sudo chmod +x /usr/bin/caddy
         sudo caddy start --config ext/curl/tests/Caddyfile
+      continue-on-error: true

.github/actions/test-libmysqlclient/action.yml

@@ -14,7 +14,6 @@ runs:
         export PDO_MYSQL_TEST_HOST=127.0.0.1
         export PDO_MYSQL_TEST_USER=root
         export PDO_MYSQL_TEST_PASS=root
-        export REPORT_EXIT_STATUS=no
         sapi/cli/php run-tests.php -P -q \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \

NEWS

@@ -13,7 +13,9 @@ PHP                                                                        NEWS
     array to hashed). (ilutov)
   . Fixed zend fiber build for solaris default mode (32 bits). (David Carlier)
   . Fixed zend call stack size for macOs/arm64. (David Carlier)
-  . Added support for Zend Max Execution Timers on FreeBSD (Kévin Dunglas)
+  . Added support for Zend Max Execution Timers on FreeBSD. (Kévin Dunglas)
+  . Ensure fiber stack is not backed by THP. (crrodriguez)
+  . Implement GH-13609 (Dump wrapped object in WeakReference class). (nielsdos)
 
 - Curl:
   . Deprecated the CURLOPT_BINARYTRANSFER constant. (divinity76)
@@ -22,7 +24,7 @@ PHP                                                                        NEWS
 
 - Date:
   . Added DateTime[Immutable]::createFromTimestamp. (Marc Bennewitz)
-  . Added DateTime[Immutable]::[get|set]Microseconds. (Marc Bennewitz)
+  . Added DateTime[Immutable]::[get|set]Microsecond. (Marc Bennewitz)
 
 - DOM:
   . Added DOMNode::compareDocumentPosition(). (nielsdos)
@@ -34,6 +36,7 @@ PHP                                                                        NEWS
   . Handle OOM more consistently. (nielsdos)
   . Implemented "Improve callbacks in ext/dom and ext/xsl" RFC. (nielsdos)
   . Added DOMXPath::quote() static method. (divinity76)
+  . Implemented opt-in ext/dom spec compliance RFC. (nielsdos)
 
 - Fileinfo:
   . Update to libmagic 5.45. (nielsdos)
@@ -47,6 +50,13 @@ PHP                                                                        NEWS
 - FTP:
   . Removed the deprecated inet_ntoa call support. (David Carlier)
 
+- Gettext:
+  . bind_textdomain_codeset now throws an exception on empty domain.
+    (David Carlier)
+
+- Hash:
+  . Changed return type of hash_update() to true. (nielsdos)
+
 - IMAP:
   . Moved to PECL. (Derick Rethans)
 
@@ -80,6 +90,9 @@ PHP                                                                        NEWS
 - MBString:
   . Added mb_trim, mb_ltrim and mb_rtrim. (Yuya Hamada)
 
+- MySQLnd:
+  . Fixed bug GH-13440 (PDO quote bottleneck). (nielsdos)
+
 - Opcache:
   . Added large shared segments support for FreeBSD. (David Carlier)
   . If JIT is enabled, PHP will now exit with a fatal error on startup in case
@@ -100,6 +113,7 @@ PHP                                                                        NEWS
 
 - PCRE:
   . Upgrade bundled pcre2lib to version 10.43. (nielsdos)
+  . Add "/r" modifier. (Ayesh)
 
 - PDO:
   . Fixed setAttribute and getAttribute. (SakiTakamachi)
@@ -118,9 +132,6 @@ PHP                                                                        NEWS
 - PDO_MYSQL:
   . Fixed setAttribute and getAttribute. (SakiTakamachi)
   . Added class PdoMysql. (danack, kocsismate)
-  . Fixed binding of Stringable objects. (SakiTakamachi)
-  . Added an error message when a non-scalar value is bound with PARAM_INT.
-    (SakiTakamachi)
 
 - PDO_ODBC:
   . Added class PdoOdbc. (danack, kocsismate)
@@ -198,10 +209,16 @@ PHP                                                                        NEWS
   . Changed return type of long2ip to string from string|false. (Jorg Sowa)
   . Fix GH-12143 (Extend the maximum precision round can handle by one digit).
     (SakiTakamachi)
+  . Added the http_get_last_response_headers() and
+    http_clear_last_response_headers() that allows retrieving the same content
+    as the magic $http_response_header variable.
 
 - XML:
   . Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)
 
+- XMLReader:
+  . Declares class constant types. (Ayesh)
+
 - XSL:
   . Implement request #64137 (XSLTProcessor::setParameter() should allow both
     quotes to be used). (nielsdos)

README.md

@@ -132,8 +132,8 @@ contribute:
 - [Contributing to PHP](/CONTRIBUTING.md)
 - [PHP coding standards](/CODING_STANDARDS.md)
 - [Internal documentation](https://php.github.io/php-src/)
-- [Mailing list rules](/docs-old/mailinglist-rules.md)
-- [PHP release process](/docs-old/release-process.md)
+- [Mailing list rules](/docs/mailinglist-rules.md)
+- [PHP release process](/docs/release-process.md)
 
 ## Credits
 

TSRM/threads.m4

@@ -126,7 +126,7 @@ if test "$pthreads_working" != "yes"; then
 fi
 ])
 
-if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
+if test "x$ac_cv_pthreads_cflags" != "x" || test "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
 fi
 ])

UPGRADING

@@ -164,13 +164,20 @@ PHP 8.4 UPGRADE NOTES
   . Added request_parse_body() function that allows parsing RFC1867 (multipart)
     requests in non-POST HTTP requests.
     RFC: https://wiki.php.net/rfc/rfc1867-non-post
+  . Getting the debug info for WeakReference will now also output the object
+    it references, or null if the reference is no longer valid.
+
+- Curl:
+  . curl_version() returns an additional feature_list value, which is an
+    associative array of all known Curl features, and whether they are
+    supported (true) or not (false).
 
 - Date:
   . Added static methods
     DateTime[Immutable]::createFromTimestamp(int|float $timestamp): static.
-  . Added method DateTime[Immutable]::getMicroseconds(): int.
+  . Added method DateTime[Immutable]::getMicrosecond(): int.
   . Added method
-    DateTime[Immutable]::setMicroseconds(int $microseconds): static.
+    DateTime[Immutable]::setMicrosecond(int $microsecond): static.
 
 - DOM:
   . Added constant DOMNode::DOCUMENT_POSITION_DISCONNECTED.
@@ -179,20 +186,16 @@ PHP 8.4 UPGRADE NOTES
   . Added constant DOMNode::DOCUMENT_POSITION_CONTAINS.
   . Added constant DOMNode::DOCUMENT_POSITION_CONTAINED_BY.
   . Added constant DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC.
-  . Implemented DOM HTML5 parsing and serialization.
-    RFC: https://wiki.php.net/rfc/domdocument_html5_parser.
-    This RFC adds the new DOM namespace along with class and constant aliases.
-    There are two new classes to handle HTML and XML documents:
-    DOM\HTMLDocument and DOM\XMLDocument.
-    These classes provide a cleaner API to handle HTML and XML documents.
-    Furthermore, the DOM\HTMLDocument class implements spec-compliant HTML5
-    parsing and serialization.
   . It is now possible to pass any callable to registerPhpFunctions().
     RFC: https://wiki.php.net/rfc/improve_callbacks_dom_and_xsl
 
 - FPM:
   . Flushing headers without a body will now succeed. See GH-12785.
 
+- Intl:
+  . NumberFormatter::ROUND_HALFODD added to complement existing
+    NumberFormatter::ROUND_HALFEVEN functionality.
+
 - Phar:
   . Added support for the unix timestamp extension for zip archives.
 
@@ -201,6 +204,10 @@ PHP 8.4 UPGRADE NOTES
     As a consequence, LoongArch JIT support has been added, spaces
     are now allowed between braces in Perl-compatible items, and
     variable-length lookbehind assertions are now supported.
+  . Added support for the "r" (PCRE2_EXTRA_CASELESS_RESTRICT) modifier, as well
+    as the (?r) mode modifier. When enabled along with the case-insensitive
+    modifier ("i"), the expression locks out mixing of ASCII and non-ASCII
+    characters.
 
 - PDO:
   . Added support for driver-specific subclasses.
@@ -211,8 +218,7 @@ PHP 8.4 UPGRADE NOTES
     or by invoking their constructor directly.
 
 - PDO_DBLIB:
-  . Fixed setAttribute and getAttribute (SakiTakamachi)
-  . Added PdoDbLib class (danack, kocsismate)
+  . Added class PdoDbLib.
 
 - PDO_FIREBIRD:
   . Added class PdoFirebird.
@@ -264,9 +270,6 @@ PHP 8.4 UPGRADE NOTES
 
 - Curl:
   . The CURLOPT_BINARYTRANSFER constant is deprecated.
-  . curl_version() returns an additional feature_list value, which is an
-    associative array of all known Curl features, and whether they are
-    supported (true) or not (false).
 
 - Date:
   . Calling DatePeriod::__construct(string $isostr, int $options = 0) is
@@ -319,15 +322,20 @@ PHP 8.4 UPGRADE NOTES
   . DOMDocument::registerNodeClass() now has a tentative return type of true.
     Previously, the return type was bool but only true could be returned in practice.
 
+- Gettext:
+  . bind_textdomain_codeset now throws an exception if the domain's argument is empty.
+
+- Hash:
+  . Changed the return type of hash_update() to true. It was already the case that only
+    true could be returned, but the stub was not updated yet.
+
 - Intl:
   . IntlDateFormatter::__construct() throws a ValueError if the locale is invalid.
   . NumberFormatter::__construct() throws a ValueError if the locale is invalid.
   . NumberFormatter::ROUND_TOWARD_ZERO and NumberFormatter::ROUND_AWAY_FROM_ZERO
     have been added as aliases for NumberFormatter::ROUND_DOWN and
     NumberFormatter::ROUND_UP to be consistent with the new PHP_ROUND_* modes.
     RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function
-  . NumberFormatter::ROUND_HALFODD added to complement existing
-    NumberFormatter::ROUND_HALFEVEN functionality.
   . ResourceBundle::get() now has a tentative return type of:
     ResourceBundle|array|string|int|null
 
@@ -428,6 +436,11 @@ PHP 8.4 UPGRADE NOTES
   . sodium_crypto_aead_aes256gcm_*() functions are now enabled on aarch64 CPUs
     with the ARM cryptographic extensions.
 
+- Standard:
+  . Added the http_get_last_response_headers() and
+    http_clear_last_response_headers() that allows retrieving the same content
+    as the magic $http_response_header variable.
+
 - XSL:
   . Added XSLTProcessor::registerPhpFunctionNS().
     RFC: https://wiki.php.net/rfc/improve_callbacks_dom_and_xsl
@@ -436,6 +449,22 @@ PHP 8.4 UPGRADE NOTES
 7. New Classes and Interfaces
 ========================================
 
+- DOM:
+  . Implemented DOM HTML5 parsing and serialization.
+    RFC: https://wiki.php.net/rfc/domdocument_html5_parser.
+    This RFC adds the new DOM namespace along with new classes and
+    constant aliases.
+    There are two new classes to handle HTML and XML documents:
+    DOM\HTMLDocument and DOM\XMLDocument.
+    These classes provide a cleaner API to handle HTML and XML documents.
+    Furthermore, the DOM\HTMLDocument class implements spec-compliant HTML5
+    parsing and serialization.
+  . Implemented opt-in ext/dom spec compliance RFC.
+    This adds new classes in the DOM namespace that correspond to modern
+    equivalents to the old DOM classes in the global namespaces.
+    The new classes follow the DOM living spec.
+    RFC: https://wiki.php.net/rfc/opt_in_dom_spec_compliance
+
 ========================================
 8. Removed Extensions and SAPIs
 ========================================
@@ -470,6 +499,9 @@ PHP 8.4 UPGRADE NOTES
 - Sqlite:
   . The class constants are typed now.
 
+- XMLReader:
+  . The class constants are typed now.
+
 - XSL:
   . The typed properties XSLTProcessor::$cloneDocument and
     XSLTProcessor::$doXInclude are now declared.
@@ -537,10 +569,14 @@ PHP 8.4 UPGRADE NOTES
 * The performance of strspn() and strcspn() is greatly improved.
   They now run in linear time instead of being bounded by quadratic time.
 
+* Improved the performance of strpbrk().
+
 * mb_strcut() is much faster now for UTF-8 and UTF-16 strings.
 
 * Looking up mbstring encoding names is much faster now.
 
 * The performance of converting SJIS-win to unicode is greatly improved.
 
 * get_browser() is much faster now, up to 1.5x - 2.5x for some test cases.
+
+* Improved the performance of MySQLnd quoting.

UPGRADING.INTERNALS

@@ -116,6 +116,8 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - M4 macro PHP_STRUCT_FLOCK has been removed (use AC_CHECK_TYPES).
    - M4 macro PHP_SOCKADDR_CHECKS has been removed (use AC_CHECK_TYPES and
      AC_CHECK_MEMBERS).
+   - M4 macro PHP_CHECK_GCC_ARG has been removed since PHP 8.0 (use
+     AX_CHECK_COMPILE_FLAG).
 
  c. Windows build system changes
    - The configure options --with-oci8-11g, --with-oci8-12c, --with-oci8-19 have
@@ -127,6 +129,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - FIBER_ASSEMBLER and FIBER_ASM_ARCH Makefile variables removed in favor of
      PHP_ASSEMBLER and FIBER_ASM_ABI.
    - HAVE_PHP_SOAP symbol renamed to HAVE_SOAP.
+   - Unused symbols CONFIGURATION_FILE_PATH, DISCARD_PATH, HAVE_ERRMSG_H,
+     HAVE_REGCOMP, HAVE_RINT, NEED_ISBLANK, PHP_URL_FOPEN, REGEX, HSREGEX,
+     USE_CONFIG_FILE have been removed.
 
 ========================
 3. Module changes
@@ -138,6 +143,12 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - The macros DOM_NO_ARGS() and DOM_NOT_IMPLEMENTED() have been removed.
    - New public APIs are available to handle callbacks from XPath, see
      xpath_callbacks.h.
+   - Added public APIs to manipulate namespace data, see namespace_compat.h.
+   - php_dom_create_object() now no longer accepts a NULL obj argument.
+   - Removed the `ret` argument from the DOM_RET_OBJ macro, use the return
+     value instead.
+   - Removed DOM_XMLNS_NAMESPACE from xml_common.h. Use DOM_XMLNS_NS_URI
+     from namespace_compat.h instead.
 
  b. ext/random
    - The macro RAND_RANGE_BADSCALING() has been removed. The implementation
@@ -154,6 +165,11 @@ PHP 8.4 INTERNALS UPGRADE NOTES
      single php_random_algo_with_state struct by value, making it easier to
      pass around the state with its associated algorithm and thus reducing
      the chance for mistakes.
+   - The seed member of a php_random_algo has been removed. As a replacement
+     engine-specific seeding functions are now exposed. This change allows
+     users to better take engine-specific behavior into account. As an example
+     Mt19937 ignored the upper half of the seed parameter of the generic
+     seeding function.
    - The CSPRNG API (php_random_(bytes|int)_*) is now provided by the new
      and much smaller php_random_csprng.h header. The new header is included
      in php_random.h for compatibility with existing users.
@@ -166,6 +182,8 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - Added php_libxml_pretend_ctx_error_ex() to emit errors as if they had come
      from libxml.
    - Removed the "properties" HashTable field from php_libxml_node_object.
+   - Added a way to attached private data to a php_libxml_ref_obj.
+   - Added a way to fix a class type onto php_libxml_ref_obj.
 
  e. ext/date
    - Added the php_format_date_ex() API to format instances of php_date_obj.
@@ -178,6 +196,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
      When flags should be ignored, pass 0 to the flags argument.
    - php_pcre_match_impl() and pcre_get_compiled_regex_cache_ex() now use
      proper boolean argument types instead of integer types.
+   - pcre_get_compiled_regex_cache_ex() now provides an option to collect extra
+     options (from modifiers used in the expression, for example), and calls
+     pcre2_set_compile_extra_options() with those options.
 
 ========================
 4. OpCode changes