Merge branch 'master' into internal_vm_interrupt

Author: morrisonlevi

.github/scripts/windows/test_task.bat

@@ -50,7 +50,7 @@ set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXP
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem setup Firebird related exts
-curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0-x64.zip
 7z x -oC:\Firebird Firebird.zip
 set PDO_FIREBIRD_TEST_DATABASE=C:\test.fdb
 set PDO_FIREBIRD_TEST_DSN=firebird:dbname=%PDO_FIREBIRD_TEST_DATABASE%

.github/workflows/nightly.yml

@@ -474,7 +474,7 @@ jobs:
           # Test causes a heap-buffer-overflow but I cannot reproduce it locally...
           php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "/** @group skip */\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
           # Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
-          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("*/\n    public function testCastNonTrailingCharPointer()", "* @group skip\n     */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
+          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "/** @group skip */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
           export SYMFONY_DEPRECATIONS_HELPER=max[total]=999
           X=0
           for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do
@@ -888,7 +888,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php_downloads_server_migration_v1
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
       PHP_BUILD_CRT: vs16
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"

.github/workflows/push.yml

@@ -241,7 +241,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php_downloads_server_migration_v1
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
       PHP_BUILD_CRT: vs16
       PLATFORM: x64
       THREAD_SAFE: "1"

.gitignore

@@ -167,6 +167,7 @@ php
 # ------------------------------------------------------------------------------
 
 # Miscellaneous extensions files
+/ext/fileinfo/libmagic.orig/
 /ext/opcache/jit/zend_jit_x86.c
 /ext/opcache/jit/zend_jit_arm64.c
 /ext/opcache/minilua

CODING_STANDARDS.md

@@ -9,9 +9,12 @@ rewritten to comply with these rules.
 
 1. Document your code in source files and the manual. (tm)
 
-1. PHP is implemented in C99.  The optional fixed-width integers from
+1. PHP is implemented in C99.
+    For instance, the optional fixed-width integers from
     stdint.h (int8_t, int16_t, int32_t, int64_t and their unsigned
-    counterparts) must be available.
+    counterparts) are supposed to be available.
+    However, some features (most notably variable-length arrays) which are not
+    supported by all relevant compilers, must not be used.
 
 1. Functions that are given pointers to resources should not free them.
 

NEWS

@@ -1,7 +1,90 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.4.0alpha2
+?? ??? ????, PHP 8.4.0alpha3
 
+- Core:
+  . Fix GH-14978 (The xmlreader extension phpize build). (Peter Kokot)
+  . Throw Error exception when encountering recursion during comparison, rather
+    than fatal error. (ilutov)
+
+- BCMath:
+  . Adjust bcround()'s $mode parameter to only accept the RoundingMode
+    enum. (timwolla, saki)
+
+- DOM:
+  . Fix trampoline leak in xpath callables. (nielsdos)
+  . Throw instead of silently failing when creating a too long text node in
+    (DOM)ParentNode and (DOM)ChildNode. (nielsdos)
+
+- FPM:
+  . /dev/poll events.mechanism for Solaris/Illumos setting had been retired.
+    (David Carlier)
+
+- Intl:
+  . Added SpoofChecker::setAllowedChars to set unicode chars ranges.
+    (David Carlier)
+
+- Opcache:
+  . Fixed bug GH-13775 (Memory leak possibly related to opcache SHM placement).
+    (Arnaud)
+
+- OpenSSL:
+  . Bumped minimum required OpenSSL version to 1.1.0. (cmb)
+
+- PDO_FIREBIRD:
+  . Added Pdo\Firebird::ATTR_API_VERSION. (SakiTakamachi)
+  . Added getApiVersion() and removed from getAttribute().
+    (SakiTakamachi)
+  . Supported Firebird 4.0 datatypes. (sim1984)
+
+- PGSQL:
+  . pg_convert/pg_insert/pg_update/pg_delete ; regexes are now cached.
+    (David Carlier)
+
+- Standard:
+  . Fix references in request_parse_body() options array. (nielsdos)
+  . Add RoundingMode enum. (timwolla, saki)
+
+- Tidy:
+  . Failures in the constructor now throw exceptions rather than emitting
+    warnings and having a broken object. (nielsdos)
+
+- XSL:
+  . Fix trampoline leak in xpath callables. (nielsdos)
+
+18 Jul 2024, PHP 8.4.0alpha2
+
+- Core:
+  . Fixed bug GH-14801 (Fix build for armv7). (andypost)
+  . Implemented property hooks RFC. (ilutov)
+
+- DOM:
+  . Improve support for template elements. (nielsdos)
+
+- GD:
+  . Check overflow/underflow for imagescale/imagefilter. (David Carlier)
+
+- LibXML:
+  . Added LIBXML_NO_XXE constant. (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-14873 (PHP 8.4 min function fails on typed integer).
+    (nielsdos)
+
+- PDO:
+  . Fixed bug GH-14792 (Compilation failure on pdo_* extensions).
+    (Peter Kokot)
+
+- Standard:
+  . Change highlight_string() and print_r() return type to string|true. (Ayesh)
+
+- Windows:
+  . Update the icon of the Windows executables, e.g. php.exe. (Ayesh,
+    Nurudin Imširović)
+
+- XML:
+  . Fixed bug #81481 (xml_get_current_byte_index limited to 32-bit numbers on
+    64-bit builds). (nielsdos)
 
 04 Jul 2024, PHP 8.4.0alpha1
 
@@ -177,6 +260,7 @@ PHP                                                                        NEWS
   . Added pcntl_getqos_class/pcntl_setqos_class for macOs. (David Carlier)
   . Added SIGCKPT/SIGCKPTEXIT constants for DragonFlyBSD. (David Carlier)
   . Added FreeBSD's SIGTRAP handling to pcntl_siginfo_to_zval. (David Carlier)
+  . Added POSIX pcntl_waitid. (Vladimir Vrzić)
 
 - PCRE:
   . Upgrade bundled pcre2lib to version 10.43. (nielsdos)

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <a href="https://php.net">
+    <a href="https://www.php.net">
         <img
             alt="PHP"
             src="https://www.php.net/images/logos/new-php-logo.svg"
@@ -20,7 +20,7 @@ blog to the most popular websites in the world. PHP is distributed under the
 
 ## Documentation
 
-The PHP manual is available at [php.net/docs](https://php.net/docs).
+The PHP manual is available at [php.net/docs](https://www.php.net/docs).
 
 ## Installation
 
@@ -32,7 +32,7 @@ For Windows, the PHP binaries can be obtained from
 [windows.php.net](https://windows.php.net). After extracting the archive the
 `*.exe` files are ready to use.
 
-For other systems, see the [installation chapter](https://php.net/install).
+For other systems, see the [installation chapter](https://www.php.net/install).
 
 ### Building PHP source code
 
@@ -138,4 +138,4 @@ contribute:
 ## Credits
 
 For the list of people who've put work into PHP, please see the
-[PHP credits page](https://php.net/credits.php).
+[PHP credits page](https://www.php.net/credits.php).

TSRM/tsrm.m4

@@ -31,6 +31,8 @@ PHP 8.4 UPGRADE NOTES
   . The type of PHP_DEBUG and PHP_ZTS constants changed to bool.
   . The name of uploaded files and files created by the tempnam() function are
     now 13 bytes longer. Total length is platform-dependent.
+  . Encountering recursion during comparison now results in a Error exception,
+    rather than a fatal error.
 
 - DOM:
   . Added DOMNode::compareDocumentPosition() and DOMNode::DOCUMENT_POSITION_*
@@ -167,6 +169,10 @@ PHP 8.4 UPGRADE NOTES
   . strcspn() with empty $characters now returns the length of the string instead
     of incorrectly stopping at the first NUL character. See GH-12592.
 
+- Tidy:
+  . Failures in the constructor now throw exceptions rather than emitting
+    warnings and having a broken object.
+
 - XML:
   . The xml_set_*_handler() functions now declare and check for an effective
     signature of callable|string|null for the $handler parameters.
@@ -215,6 +221,8 @@ PHP 8.4 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/new_without_parentheses
   . Added the #[\Deprecated] attribute.
     RFC: https://wiki.php.net/rfc/deprecated_attribute
+  . Implemented property hooks.
+    RFC: https://wiki.php.net/rfc/property-hooks
 
 - Curl:
   . curl_version() returns an additional feature_list value, which is an
@@ -342,6 +350,9 @@ PHP 8.4 UPGRADE NOTES
   . stream_bucket_make_writeable() and stream_bucket_new() will now return a
     StreamBucket instance instead of an stdClass instance.
     RFC: https://wiki.php.net/rfc/dedicated_stream_bucket
+  . Added a new RoundingMode enum with clearer naming and improved discoverability
+    compared to the PHP_ROUND_* constants.
+    RFC: https://wiki.php.net/rfc/correctly_name_the_rounding_mode_and_make_it_an_enum
 
 - SOAP:
   . Added support for clark notation for namespaces in class map.
@@ -365,6 +376,13 @@ PHP 8.4 UPGRADE NOTES
 3. Changes in SAPI modules
 ========================================
 
+- apache2handler
+  . Support for EOL Apache 2.0 and 2.2 has been removed. Minimum required Apache
+    version is now 2.4.
+
+- FPM:
+  . /dev/poll events.mechanism setting for Solaris/Illumos had been retired.
+
 ========================================
 4. Deprecated Functionality
 ========================================
@@ -438,6 +456,10 @@ PHP 8.4 UPGRADE NOTES
   . imagejpeg/imagewebp/imagepng/imageavif throws an exception if an invalid
     quality parameter value is passed. In addition, imageavif will throw an exception
     if an invalid speed parameter value is passed.
+  . imagescale throws an exception if the width/height argument underflows/overflows or
+    if the mode argument is invalid.
+    imagefilter with IMG_FILTER_SCATTER throws an exception if the sub/plus arguments
+    underflows/overflows.
 
 - Gettext:
   . bind_textdomain_codeset, textdomain and d(*)gettext functions now throw an exception
@@ -494,11 +516,16 @@ PHP 8.4 UPGRADE NOTES
   . getAttribute, enabled to get values of FB_ATTR_DATE_FORMAT, FB_ATTR_TIME_FORMAT,
     FB_ATTR_TIMESTAMP_FORMAT.
   . Added new attributes to specify transaction isolation level and access mode.
-    Along with these, five constants (PDO::FB_TRANSACTION_ISOLATION_LEVEL,
-    PDO::FB_READ_COMMITTED, PDO::FB_REPEATABLE_READ, PDO::FB_SERIALIZABLE,
-    PDO::FB_WRITABLE_TRANSACTION) have been added.
+    Along with these, five constants (Pdo\Firebird::TRANSACTION_ISOLATION_LEVEL,
+    Pdo\Firebird::READ_COMMITTED, Pdo\Firebird::REPEATABLE_READ,
+    Pdo\Firebird::SERIALIZABLE, Pdo\Firebird::WRITABLE_TRANSACTION) have been added.
   . When using persistent connections, there is now a liveness check in the
     constructor.
+  . The content that is built changes depending on the value of FB_API_VER in
+    ibase.h, so added static method Pdo\Firebird::getApiVersion() to obtain that
+    value. This value can also be referenced from phpinfo.
+  . Five new data types are now available: INT128, DEC16, DEC34, TIMESTAMP_TZ, TIME_TZ.
+    These are available starting with Firebird 4.0.
 
 - PDO_MYSQL:
   . getAttribute, enabled to get the value of ATTR_FETCH_TABLE_NAMES.
@@ -536,25 +563,31 @@ PHP 8.4 UPGRADE NOTES
     would have resulted in 1.0 instead of the correct result 0.0. Additional
     inputs might also be affected and result in different outputs compared to
     earlier PHP versions.
-  . The default value of the 'cost' option for PASSWORD_BCRYPT for password_hash()
-    has been increased from '10' to '12'.
+  . The $mode parameter of the round() function has been widened to RoundingMode|int,
+    accepting instances of a new RoundingMode enum.
 
-    RFC: https://wiki.php.net/rfc/bcrypt_cost_2023
-  . Four new modes have been added to the round() function: PHP_ROUND_CEILING,
-    PHP_ROUND_FLOOR, PHP_ROUND_TOWARD_ZERO, PHP_ROUND_AWAY_FROM_ZERO.
+    RFC: https://wiki.php.net/rfc/correctly_name_the_rounding_mode_and_make_it_an_enum
+  . Four new modes have been added to the round() function: RoundingMode::PositiveInfinity,
+    RoundingMode::NegativeInfinity, RoundingMode::TowardsZero, RoundingMode::AwayFromZero.
 
     RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function
-  . debug_zval_dump() now indicates whether an array is packed.
   . Fixed a bug caused by "pre-rounding" of the round() function. Previously, using
     "pre-rounding" to treat a value like 0.285 (actually 0.28499999999999998) as a
     decimal number and round it to 0.29. However, "pre-rounding" incorrectly rounds
     certain numbers, so this fix removes "pre-rounding" and changes the way numbers
     are compared, so that the values are correctly rounded as decimal numbers.
-  . long2ip() now returns string instead of string|false.
   . The maximum precision that can be handled by round() has been extended by
     one digit.
+  . The default value of the 'cost' option for PASSWORD_BCRYPT for password_hash()
+    has been increased from '10' to '12'.
+
+    RFC: https://wiki.php.net/rfc/bcrypt_cost_2023
+  . debug_zval_dump() now indicates whether an array is packed.
+  . long2ip() now returns string instead of string|false.
   . output_add_rewrite_var() now uses url_rewriter.hosts instead of
     session.trans_sid_hosts for selecting hosts that will be rewritten.
+  . highlight_string() now has a return type of string|true instead of string|bool.
+  . print_r() now has a return type of string|true instead of string|bool.
 
 ========================================
 6. New Functions
@@ -578,6 +611,8 @@ PHP 8.4 UPGRADE NOTES
     Selectors.
   . Added IntlDateFormatter::parseToCalendar which behaves like
     IntlDateFormatter::parse except the time zone is updated.
+  . Added SpoofChecker::setAllowedChars to limit the range of unicode
+    chars.
 
 - MBString:
   . Added mb_trim, mb_ltrim and mb_rtrim functions.
@@ -594,6 +629,8 @@ PHP 8.4 UPGRADE NOTES
   . Added pcntl_getcpu to get the cpu id from where the current process runs.
   . Added pcntl_getqos_class to get the QoS level (aka performance and related
     energy consumption) of the current process and pcntl_setqos_class to set it.
+  . Added pcntl_waitid to obtain status information pertaining to termination, stop,
+    and/or continue events in one of the caller's child processes.
 
 - PDO_PGSQL:
   . Added Pdo\Pgsql::setNoticeCallback() to allow a callback to be triggered on
@@ -763,25 +800,34 @@ PHP 8.4 UPGRADE NOTES
 
 - LibXML:
   . LIBXML_RECOVER.
+  . LIBXML_NO_XXE.
+    This is used together with LIBXML_NOENT for when you want to perform entity
+    substitution, but want to disallow external entity loading.
+    This constant is available as of libxml2 2.13.
 
 - OpenSSL:
   . X509_PURPOSE_OCSP_HELPER.
   . X509_PURPOSE_TIMESTAMP_SIGN.
 
 - PCNTL:
-  . QosClass::Background (macOs only).
-  . QosClass::Default (macOs only).
-  . QosClass::UserInteractive (macOs only).
-  . QosClass::UserInitiated (macOs only).
-  . QosClass::Utility (macOs only).
+  . Pcntl\QosClass::Background (macOs only).
+  . Pcntl\QosClass::Default (macOs only).
+  . Pctnl\QosClass::UserInteractive (macOs only).
+  . Pcntl\QosClass::UserInitiated (macOs only).
+  . Pcntl\QosClass::Utility (macOs only).
   . SIGCKPT (DragonFlyBSD only).
   . SIGCKPTEXIT (DragonFlyBSD only).
-
-- Standard:
-  . PHP_ROUND_CEILING.
-  . PHP_ROUND_FLOOR.
-  . PHP_ROUND_TOWARD_ZERO.
-  . PHP_ROUND_AWAY_FROM_ZERO.
+  . WEXITED.
+  . WSTOPPED.
+  . WNOWAIT.
+  . P_ALL.
+  . P_PID.
+  . P_PGID.
+  . P_PIDFD (Linux only).
+  . P_UID (NetBSD/FreeBSD only).
+  . P_GID (NetBSD/FreeBSD only).
+  . P_SID (NetBSD/FreeBSD only).
+  . P_JAILID (FreeBSD only).
 
 - Sockets:
   . SO_EXCLUSIVEADDRUSE (Windows only).