Merge branch 'PHP-8.4'

Author: petk

patches/8.3/cmake.patch

@@ -28,7 +28,7 @@ index 7911bf8490..1d9b530947 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 449963153f..913ed3d96d 100644
+index b9e60cc6b5..f31fe9faa7 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -153,6 +153,7 @@ php
@@ -39,9 +39,9 @@ index 449963153f..913ed3d96d 100644
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -291,9 +292,58 @@ tmp-php.ini
- /junit.out.xml
- /.ccache/
+@@ -296,9 +297,58 @@ tmp-php.ini
+ # ------------------------------------------------------------------------------
+ /ext/standard/tests/helpers/bad_cmd.exe
 
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files

patches/8.3/php-config.patch

@@ -59,7 +59,7 @@ index 61ee5c1675..1a8d67a783 100644
 
  dnl
 diff --git a/configure.ac b/configure.ac
-index ee039a0bad..42fa6c9458 100644
+index 0e98613854..e4710e6418 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1480,6 +1480,9 @@ exec_prefix=$old_exec_prefix

patches/8.3/re2c.patch

@@ -52,7 +52,7 @@ index 25e1ecbca6..3ea51fe7c9 100644
  }
 
 diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
-index 6245262a00..bcfefcba81 100644
+index 60d995526e..ba1423c5a4 100644
 --- a/sapi/phpdbg/phpdbg_lexer.l
 +++ b/sapi/phpdbg/phpdbg_lexer.l
 @@ -77,7 +77,7 @@ T_IF        'if'

patches/8.4/cmake.patch

@@ -28,7 +28,7 @@ index 7911bf8490..1d9b530947 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 52dde98ed4..d698b5a19c 100644
+index d8cb25a1a1..9c58a3c847 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -152,6 +152,7 @@ php
@@ -39,9 +39,9 @@ index 52dde98ed4..d698b5a19c 100644
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -290,9 +291,58 @@ tmp-php.ini
- /junit.out.xml
- /.ccache/
+@@ -295,9 +296,58 @@ tmp-php.ini
+ # ------------------------------------------------------------------------------
+ /ext/standard/tests/helpers/bad_cmd.exe
 
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files

patches/8.4/php-config.patch

@@ -58,7 +58,7 @@ index e45b22b766..74f0e25b01 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index dd68b78047..afd580e2b3 100644
+index 63a30a9def..d479ed1bb9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.4/re2c.patch

@@ -52,7 +52,7 @@ index 7ae7387592..988ec6366a 100644
  }
 
 diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
-index 6245262a00..bcfefcba81 100644
+index 60d995526e..ba1423c5a4 100644
 --- a/sapi/phpdbg/phpdbg_lexer.l
 +++ b/sapi/phpdbg/phpdbg_lexer.l
 @@ -77,7 +77,7 @@ T_IF        'if'

patches/8.5/cmake.patch

@@ -28,7 +28,7 @@ index 19be96087d..58a83dfb68 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 52dde98ed4..d698b5a19c 100644
+index d8cb25a1a1..9c58a3c847 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -152,6 +152,7 @@ php
@@ -39,9 +39,9 @@ index 52dde98ed4..d698b5a19c 100644
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -290,9 +291,58 @@ tmp-php.ini
- /junit.out.xml
- /.ccache/
+@@ -295,9 +296,58 @@ tmp-php.ini
+ # ------------------------------------------------------------------------------
+ /ext/standard/tests/helpers/bad_cmd.exe
 
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files
@@ -153,10 +153,10 @@ index e691bd3964..191fcd70eb 100644
 +CMakeLists.txt.user
 +CMakeScripts/
 diff --git a/run-tests.php b/run-tests.php
-index 0ff11c2c95..f64002f185 100755
+index 0db6937c7a..47118f6a3f 100755
 --- a/run-tests.php
 +++ b/run-tests.php
-@@ -847,10 +847,12 @@ function write_information(array $user_tests, $phpdbg): void
+@@ -848,10 +848,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 0ff11c2c95..f64002f185 100755
                  }
              }
          }
-@@ -939,7 +941,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -940,7 +942,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 0ff11c2c95..f64002f185 100755
 
      if (!IS_WINDOWS) {
          /* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */
-@@ -950,7 +952,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -951,7 +953,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 0ff11c2c95..f64002f185 100755
 
          /* Use shtool to find out if there is glibtool present (MacOSX) */
          $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool');
-@@ -972,9 +976,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -973,9 +977,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          $ldd = shell_exec("ldd $php 2>/dev/null");

patches/8.5/re2c.patch

@@ -52,7 +52,7 @@ index 7ae7387592..988ec6366a 100644
  }
 
 diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
-index 6245262a00..bcfefcba81 100644
+index 60d995526e..ba1423c5a4 100644
 --- a/sapi/phpdbg/phpdbg_lexer.l
 +++ b/sapi/phpdbg/phpdbg_lexer.l
 @@ -77,7 +77,7 @@ T_IF        'if'