Merge branch 'php:master' into true-async-api

Author: EdmondDantes

.gitignore

@@ -294,6 +294,13 @@ tmp-php.ini
 /junit.out.xml
 /.ccache/
 
+# ------------------------------------------------------------------------------
+# Editor configuration directories
+# ------------------------------------------------------------------------------
+/.idea/
+/.vscode/
+/.zed/
+
 # ------------------------------------------------------------------------------
 # Additional test build files
 # ------------------------------------------------------------------------------

NEWS

@@ -74,6 +74,7 @@ PHP                                                                        NEWS
 - DOM:
   . Added Dom\Element::$outerHTML. (nielsdos)
   . Added Dom\Element::insertAdjacentHTML(). (nielsdos)
+  . Added $children property to ParentNode implementations. (nielsdos)
 
 - Enchant:
   . Added enchant_dict_remove_from_session(). (nielsdos)

README.md

@@ -15,7 +15,7 @@ blog to the most popular websites in the world. PHP is distributed under the
 [PHP License v3.01](LICENSE).
 
 [![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php)
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://issues.oss-fuzz.com/issues?q=project:php)
 
 ## Documentation
 
@@ -42,28 +42,50 @@ a default build, you will additionally need libxml2 and libsqlite3.
 
 On Ubuntu, you can install these using:
 
-    sudo apt install -y pkg-config build-essential autoconf bison re2c \
-                        libxml2-dev libsqlite3-dev
+```shell
+sudo apt install -y pkg-config build-essential autoconf bison re2c libxml2-dev libsqlite3-dev
+```
 
 On Fedora, you can install these using:
 
-    sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-devel
+```shell
+sudo dnf install re2c bison autoconf make libtool ccache libxml2-devel sqlite-devel
+```
+
+On MacOS, you can install these using `brew`:
+
+```shell
+brew install autoconf bison re2c iconv libxml2 sqlite
+```
+
+or with `MacPorts`:
+
+```shell
+sudo port install autoconf bison re2c libiconv libxml2 sqlite3
+```
 
 Generate configure:
 
-    ./buildconf
+```shell
+./buildconf
+```
 
 Configure your build. `--enable-debug` is recommended for development, see
 `./configure --help` for a full list of options.
 
-    # For development
-    ./configure --enable-debug
-    # For production
-    ./configure
+```shell
+# For development
+./configure --enable-debug
+# For production
+./configure
+```
 
-Build PHP. To speed up the build, specify the maximum number of jobs using `-j`:
+Build PHP. To speed up the build, specify the maximum number of jobs using the
+`-j` argument:
 
-    make -j4
+```shell
+make -j4
+```
 
 The number of jobs should usually match the number of available cores, which
 can be determined using `nproc`.
@@ -74,23 +96,33 @@ PHP ships with an extensive test suite, the command `make test` is used after
 successful compilation of the sources to run this test suite.
 
 It is possible to run tests using multiple cores by setting `-jN` in
-`TEST_PHP_ARGS`:
+`TEST_PHP_ARGS` or `TESTS`:
 
-    make TEST_PHP_ARGS=-j4 test
+```shell
+make TEST_PHP_ARGS=-j4 test
+```
 
 Shall run `make test` with a maximum of 4 concurrent jobs: Generally the maximum
 number of jobs should not exceed the number of cores available.
 
+Use the `TEST_PHP_ARGS` or `TESTS` variable to test only specific directories:
+
+```shell
+make TESTS=tests/lang/ test
+```
+
 The [qa.php.net](https://qa.php.net) site provides more detailed info about
 testing and quality assurance.
 
 ## Installing PHP built from source
 
 After a successful build (and test), PHP may be installed with:
 
-    make install
+```shell
+make install
+```
 
-Depending on your permissions and prefix, `make install` may need super user
+Depending on your permissions and prefix, `make install` may need superuser
 permissions.
 
 ## PHP extensions

UPGRADING

@@ -185,6 +185,7 @@ PHP 8.5 UPGRADE NOTES
 
 - DOM:
   . Added Dom\Element::$outerHTML.
+  . Added $children property to Dom\ParentNode implementations.
 
 - EXIF:
   . Add OffsetTime* Exif tags.

UPGRADING.INTERNALS

@@ -50,6 +50,9 @@ PHP 8.5 INTERNALS UPGRADE NOTES
 2. Build system changes
 ========================
 
+- Abstract
+  . Preprocessor macro SIZEOF_PTRDIFF_T has been removed.
+
 - Windows build system changes
   . SAPI() and ADD_SOURCES() now suport the optional `duplicate_sources`
     parameter.  If truthy, no rules to build the object files are generated.
@@ -69,6 +72,7 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Autoconf macro PHP_DEF_HAVE has been removed (use AC_DEFINE).
   . Autoconf macro PHP_OUTPUT has been removed (use AC_CONFIG_FILES).
   . Autoconf macro PHP_TEST_BUILD has been removed (use AC_* macros).
+  . Preprocessor macro HAVE_PTRDIFF_T has been removed.
 
 ========================
 3. Module changes

Zend/zend_portability.h

@@ -496,6 +496,8 @@ extern "C++" {
 
 #ifdef ZEND_WIN32
 #define ZEND_SECURE_ZERO(var, size) RtlSecureZeroMemory((var), (size))
+#elif defined(HAVE_MEMSET_EXPLICIT)
+#define ZEND_SECURE_ZERO(var, size) memset_explicit((var), 0, (size))
 #else
 #define ZEND_SECURE_ZERO(var, size) explicit_bzero((var), (size))
 #endif

configure.ac

@@ -454,7 +454,6 @@ AC_CHECK_TYPES([socklen_t], [], [], [
 dnl These are defined elsewhere than stdio.h.
 PHP_CHECK_SIZEOF([intmax_t], [0])
 PHP_CHECK_SIZEOF([ssize_t], [8])
-PHP_CHECK_SIZEOF([ptrdiff_t], [8])
 
 dnl Check stdint types (must be after header check).
 PHP_CHECK_STDINT_TYPES
@@ -565,6 +564,7 @@ AC_CHECK_FUNCS(m4_normalize([
   memmem
   mempcpy
   memrchr
+  memset_explicit
   mkstemp
   mmap
   nice

ext/curl/curl.stub.php

@@ -13,9 +13,9 @@
 const CURLOPT_AUTOREFERER = UNKNOWN;
 /**
  * @var int
- * @deprecated has no effect since 5.1.2
  * @cvalue CURLOPT_BINARYTRANSFER
  */
+#[\Deprecated(since: '8.4', message: 'as it had no effect since 5.1.2')]
 const CURLOPT_BINARYTRANSFER = UNKNOWN;
 /**
  * @var int

ext/curl/curl_arginfo.h

@@ -65,6 +65,7 @@
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+#include "zend_attributes.h"
 #include "curl_arginfo.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(curl)