Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

patches/8.3/dmalloc.patch

@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
-index a09f273a70..dac2bbc5f1 100644
+index aa54cf9c7b..0c91b9f890 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
-index a720ce32e3..bbda7e8cfd 100644
+index 654f3ee680..723b443434 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.5/cmake.patch

@@ -118,7 +118,7 @@ index e691bd3964..fff9fc09d0 100644
 +CMakeScripts/
 +/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
-index 5587c6c0ae..ff5932bfde 100755
+index 0dee752d32..b6eb316fa0 100755
 --- a/run-tests.php
 +++ b/run-tests.php
 @@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void
@@ -127,12 +127,12 @@ index 5587c6c0ae..ff5932bfde 100755
          $ext_dir = ini_get('extension_dir');
 -        foreach (scandir($ext_dir) as $file) {
 -            if (preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
--                if (!extension_loaded($matches[1]) && @dl($matches[1])) {
+-                if (!extension_loaded($matches[1])) {
 -                    $exts[] = $matches[1];
 +        if (is_dir($ext_dir)) {
 +            foreach (scandir($ext_dir) as $file) {
 +                if (preg_match('/^(?:php_)?([_a-zA-Z0-9]+)\.(?:so|dll)$/', $file, $matches)) {
-+                    if (!extension_loaded($matches[1]) && @dl($matches[1])) {
++                    if (!extension_loaded($matches[1])) {
 +                        $exts[] = $matches[1];
 +                    }
                  }

patches/8.5/dmalloc.patch

@@ -9,7 +9,7 @@ See: https://github.com/php/php-src/pull/8465
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
-index a720ce32e3..bbda7e8cfd 100644
+index 654f3ee680..723b443434 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@