Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

patches/8.3/dmalloc.patch

@@ -10,7 +10,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 585ac8ab9d..4c7cb05460 100644
+index 19edc0cd3e..dba4eefb18 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

@@ -10,7 +10,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 bcf5af320d..0fb5537258 100644
+index 492576b732..6f35eb3e17 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.4/php-config.patch

@@ -58,7 +58,7 @@ index e45b22b766..74f0e25b01 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index 6b61df11ab..0ba3ed3c3d 100644
+index cab7e839a7..0accb28496 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.5/cmake.patch

@@ -80,10 +80,10 @@ index d54334f599..b879e2a5c3 100644
 +# Generated by cmake when cross-compiling if missing cache variables are found
 +/TryRunResults.cmake
 diff --git a/ext/ext_skel.php b/ext/ext_skel.php
-index ae7a3a987c..62241fff9c 100755
+index cd82abb346..84b5fdccfe 100755
 --- a/ext/ext_skel.php
 +++ b/ext/ext_skel.php
-@@ -302,6 +302,8 @@ function copy_config_scripts() {
+@@ -289,6 +289,8 @@ function copy_config_scripts() {
          $files[] = 'config.w32';
      }
 
@@ -123,10 +123,10 @@ index e691bd3964..c4077b0a8d 100644
 +CMakeScripts/
 +/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
-index 7ab158bce5..ee1c35f2fb 100755
+index 258eae1fb2..66996c0908 100755
 --- a/run-tests.php
 +++ b/run-tests.php
-@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void
+@@ -847,10 +847,12 @@ function write_information(array $user_tests, $phpdbg): void
          <?php
          $exts = get_loaded_extensions();
          $ext_dir = ini_get('extension_dir');
@@ -143,7 +143,7 @@ index 7ab158bce5..ee1c35f2fb 100755
                  }
              }
          }
-@@ -940,7 +942,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -939,7 +941,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
 
      $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
      $failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n";
@@ -152,7 +152,7 @@ index 7ab158bce5..ee1c35f2fb 100755
 
      if (!IS_WINDOWS) {
          /* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */
-@@ -951,7 +953,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -950,7 +952,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          /* Always use the generated libtool - Mac OSX uses 'glibtool' */
@@ -163,7 +163,7 @@ index 7ab158bce5..ee1c35f2fb 100755
 
          /* Use shtool to find out if there is glibtool present (MacOSX) */
          $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool');
-@@ -973,9 +977,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -972,9 +976,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          $ldd = shell_exec("ldd $php 2>/dev/null");

patches/8.5/dmalloc.patch

@@ -10,7 +10,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 fc2e282995..877007bd86 100644
+index 9e8d8d1b8a..4c64d8d6ff 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@