Merge branch 'PHP-8.4'

Author: petk

patches/8.3/aspell.patch

@@ -32,10 +32,10 @@ See: https://github.com/php/php-src/pull/12017
  6 files changed, 114 insertions(+), 129 deletions(-)
 
 diff --git a/.github/actions/apt-x32/action.yml b/.github/actions/apt-x32/action.yml
-index 879300f9927..de820684fb2 100644
+index 0147b15cfcf..e12dfefbb9e 100644
 --- a/.github/actions/apt-x32/action.yml
 +++ b/.github/actions/apt-x32/action.yml
-@@ -31,7 +31,6 @@ runs:
+@@ -33,7 +33,6 @@ runs:
            libonig-dev:i386 \
            libpng-dev:i386 \
            libpq-dev:i386 \
@@ -44,10 +44,10 @@ index 879300f9927..de820684fb2 100644
            libsasl2-dev:i386 \
            libsodium-dev:i386 \
 diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
-index bc2aa00df20..739abf8fe50 100644
+index 98c7003175d..145d9484465 100644
 --- a/.github/actions/apt-x64/action.yml
 +++ b/.github/actions/apt-x64/action.yml
-@@ -34,7 +34,6 @@ runs:
+@@ -36,7 +36,6 @@ runs:
            libenchant-2-dev \
            libaspell-dev \
            libbz2-dev \

patches/8.3/cmake.patch

@@ -28,18 +28,18 @@ index 7911bf8490b..1d9b530947e 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 4e95d9a9da3..c109a4296a5 100644
+index cd9ba81306f..a7f1e921dff 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -156,6 +156,7 @@ php
+@@ -157,6 +157,7 @@ php
  # ------------------------------------------------------------------------------
  /ext/json/json_parser.tab.h
  /ext/json/json_parser.tab.c
 +/ext/json/json_parser.output
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -299,9 +300,58 @@ tmp-php.ini
+@@ -300,9 +301,58 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 

patches/8.4/cmake.patch

@@ -28,18 +28,18 @@ index 7911bf8490b..1d9b530947e 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 91120a5fa6b..1af59c1eaac 100644
+index 46193d0ba02..72f9be10bca 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -155,6 +155,7 @@ php
+@@ -156,6 +156,7 @@ php
  # ------------------------------------------------------------------------------
  /ext/json/json_parser.tab.h
  /ext/json/json_parser.tab.c
 +/ext/json/json_parser.output
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -298,9 +299,58 @@ tmp-php.ini
+@@ -299,9 +300,58 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 

patches/8.5/cmake.patch

@@ -28,18 +28,18 @@ index 19be96087d9..58a83dfb688 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 1e92e88fb77..9e5d1c51cff 100644
+index b76b5a787ca..56a680b827b 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -155,6 +155,7 @@ php
+@@ -156,6 +156,7 @@ php
  # ------------------------------------------------------------------------------
  /ext/json/json_parser.tab.h
  /ext/json/json_parser.tab.c
 +/ext/json/json_parser.output
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -306,9 +307,58 @@ tmp-php.ini
+@@ -307,9 +308,58 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 
@@ -153,10 +153,10 @@ index e691bd3964b..191fcd70eb5 100644
 +CMakeLists.txt.user
 +CMakeScripts/
 diff --git a/run-tests.php b/run-tests.php
-index 03616272567..2d7558391eb 100755
+index 171f6e2e5b6..ab664630f07 100755
 --- a/run-tests.php
 +++ b/run-tests.php
-@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void
+@@ -851,10 +851,12 @@ function write_information(array $user_tests, $phpdbg): void
          <?php
          $exts = get_loaded_extensions();
          $ext_dir = ini_get('extension_dir');
@@ -173,7 +173,7 @@ index 03616272567..2d7558391eb 100755
                  }
              }
          }
-@@ -940,7 +942,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -943,7 +945,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";
@@ -182,7 +182,7 @@ index 03616272567..2d7558391eb 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
+@@ -954,7 +956,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          /* Always use the generated libtool - Mac OSX uses 'glibtool' */
@@ -193,7 +193,7 @@ index 03616272567..2d7558391eb 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
+@@ -976,9 +980,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 b7e3e5fa1be..d1c9a3ea22b 100644
+index 92c6ecbdfb5..572c23ad05f 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.5/docs.patch

@@ -8,7 +8,7 @@ with PHP.
  1 file changed, 22 insertions(+)
 
 diff --git a/README.md b/README.md
-index 39c6b89fbbd..d855768366f 100644
+index 5b8ec6f0d7d..cb4955e2cf3 100644
 --- a/README.md
 +++ b/README.md
 @@ -35,8 +35,30 @@ For other systems, see the [installation chapter](https://www.php.net/install).