Merge branch 'PHP-8.4'

Author: petk

.editorconfig

@@ -26,5 +26,5 @@ trim_trailing_whitespace = false
 [COMMIT_EDITMSG]
 max_line_length          = 80
 
-[{*.cmake,CMakeLists.txt}]
+[{CMakeLists.txt,*.{cmake,cmake.in}}]
 indent_size              = 2

cmake/cmake/modules/PHP/Stubs.cmake

@@ -34,15 +34,11 @@ function(_php_stubs_get_php_command result)
     endif()
   endif()
 
-  set(command)
-
   if(NOT CMAKE_CROSSCOMPILING)
     set(command $<TARGET_FILE:php_cli>)
   elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
     set(command ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:php_cli>)
-  endif()
-
-  if(NOT command)
+  else()
     return(PROPAGATE ${result})
   endif()
 
@@ -91,13 +87,13 @@ endif()
 file(
   COPY
   ${PROJECT_SOURCE_DIR}/build/gen_stub.php
-  DESTINATION ${PROJECT_BINARY_DIR}/build
+  DESTINATION ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs
 )
 
 block()
-  _php_stubs_get_php_command(command)
+  _php_stubs_get_php_command(PHP_COMMAND)
 
-  if(NOT command)
+  if(NOT PHP_COMMAND)
     return()
   endif()
 
@@ -116,10 +112,13 @@ block()
     endif()
   endforeach()
 
+  set(PHP_SOURCES "$<JOIN:$<REMOVE_DUPLICATES:${stubs}>,$<SEMICOLON>>")
+  file(READ ${CMAKE_CURRENT_LIST_DIR}/Stubs/PHPStubsGenerator.cmake.in content)
+  string(CONFIGURE "${content}" content @ONLY)
   file(
     GENERATE
-    OUTPUT ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs.txt
-    CONTENT "$<JOIN:$<REMOVE_DUPLICATES:${stubs}>,$<SEMICOLON>>"
+    OUTPUT ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs/PHPStubsGenerator.cmake
+    CONTENT "${content}"
   )
 
   if(NOT PHPSystem_EXECUTABLE)
@@ -130,9 +129,7 @@ block()
     php_stubs ${targetOptions}
     COMMAND
       ${CMAKE_COMMAND}
-      "-DPHP_STUBS=${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs.txt"
-      "-DPHP_COMMAND=${command};${PROJECT_BINARY_DIR}/build/gen_stub.php"
-      -P ${CMAKE_CURRENT_LIST_DIR}/Stubs/RunCommand.cmake
+      -P ${PROJECT_BINARY_DIR}/CMakeFiles/php_stubs/PHPStubsGenerator.cmake
     VERBATIM
   )
 endblock()

cmake/cmake/modules/PHP/Stubs/PHPStubsGenerator.cmake.in

@@ -0,0 +1,51 @@
+#[=============================================================================[
+Script for processing PHP stub sources.
+#]=============================================================================]
+
+set(sources "@PHP_SOURCES@")
+
+# Ensure sources include only *.stub.php files.
+list(FILTER sources INCLUDE REGEX [[\.stub\.php$]])
+
+# Create a list of sources that must be parsed by the generator.
+if(@PROJECT_SOURCE_DIR@/build/gen_stub.php IS_NEWER_THAN ${CMAKE_CURRENT_LIST_FILE})
+  file(
+    COPY
+    @PROJECT_SOURCE_DIR@/build/gen_stub.php
+    DESTINATION @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs
+  )
+  set(stubs ${sources})
+  file(TOUCH ${CMAKE_CURRENT_LIST_FILE})
+else()
+  foreach(stub ${sources})
+    string(REGEX REPLACE [[\.stub\.php$]] [[_arginfo.h]] header "${stub}")
+    if("${stub}" IS_NEWER_THAN "${header}")
+      list(APPEND stubs ${stub})
+    endif()
+  endforeach()
+endif()
+
+if(NOT stubs)
+  return()
+endif()
+
+execute_process(
+COMMAND
+  ${CMAKE_COMMAND}
+  -E cmake_echo_color --blue --bold
+  "Regenerating *_arginfo.h headers from *.stub.php sources"
+)
+
+execute_process(
+COMMAND
+  @PHP_COMMAND@ @PROJECT_BINARY_DIR@/CMakeFiles/php_stubs/gen_stub.php
+  ${stubs}
+)
+
+# Ensure that *_arginfo.h headers are newer than their *.stub.php sources.
+foreach(stub ${stubs})
+  string(REGEX REPLACE [[\.stub\.php$]] [[_arginfo.h]] header "${stub}")
+  if("${stub}" IS_NEWER_THAN "${header}")
+    file(TOUCH "${header}")
+  endif()
+endforeach()

cmake/cmake/modules/PHP/Stubs/RunCommand.cmake

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

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 654f3ee680..723b443434 100644
+index bcf5af320d..0fb5537258 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

@@ -13,15 +13,15 @@ Subject: Add CMake changes for PHP-8.5 branch
  5 files changed, 84 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
-index 7911bf8490..0ca142015f 100644
+index 7911bf8490..ed6ec7a642 100644
 --- a/.editorconfig
 +++ b/.editorconfig
 @@ -17,7 +17,7 @@ indent_style             = tab
  indent_size              = 4
  indent_style             = space
 
 -[*.{ac,m4,sh,yml}]
-+[{CMakeLists.txt,*.{ac,cmake,json,m4,sh,yml}}]
++[{CMakeLists.txt,*.{ac,cmake,cmake.in,json,m4,sh,yml}}]
  indent_size              = 2
  indent_style             = space
 

patches/8.5/cmake.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 654f3ee680..723b443434 100644
+index fc2e282995..877007bd86 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@