Add the zend_vm_gen.php patch to CMake directly and fix CS

Author: petk

bin/make-patches.sh

@@ -13,22 +13,19 @@ patch-cmake-8.3-aspell
 patch-cmake-8.3-dmalloc
 patch-cmake-8.3-php-config
 patch-cmake-8.3-phpdbg-prompt
-patch-cmake-8.3-zend-vm-gen
 patch-cmake-8.4
 patch-cmake-8.4-asm
 patch-cmake-8.4-dmalloc
 patch-cmake-8.4-php-config
 patch-cmake-8.4-phpdbg-prompt
 patch-cmake-8.4-timelib
-patch-cmake-8.4-zend-vm-gen
 patch-cmake-8.5
 patch-cmake-8.5-asm
 patch-cmake-8.5-dmalloc
 patch-cmake-8.5-docs
 patch-cmake-8.5-php-config
 patch-cmake-8.5-phpdbg-prompt
 patch-cmake-8.5-timelib
-patch-cmake-8.5-zend-vm-gen
 "
 
 # A list of supported PHP versions.

cmake/Zend/CMakeLists.txt

@@ -455,29 +455,35 @@ endif()
 # Create files and set installation.
 ################################################################################
 
-if(PHPSystem_EXECUTABLE)
-  set(PHP_EXECUTABLE ${PHPSystem_EXECUTABLE})
-elseif(NOT CMAKE_CROSSCOMPILING)
-  set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
-elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-  set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
-endif()
-
-if(PHP_EXECUTABLE)
-  # Run the Zend/zend_vm_gen.php script.
-  add_custom_command(
-    OUTPUT zend_vm
-    COMMAND ${PHP_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_gen.php
-    DEPENDS
-      php_cli
-      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.skl
-    COMMENT "[Zend] Regenerating zend_vm_execute.h and zend_vm_opcodes.{h,c}"
-    VERBATIM
-  )
-
-  add_custom_target(zend_generate_vm ALL DEPENDS zend_vm)
+# On 32-bit targets the zend_vm_gen.php script outputs deprecation warnings. As
+# 32-bit targets are not considered development oriented environments, where the
+# files need to be regenerated, executing this script is skipped.
+# See: https://github.com/php/php-src/issues/15899
+if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
+  if(PHPSystem_EXECUTABLE)
+    set(PHP_EXECUTABLE ${PHPSystem_EXECUTABLE})
+  elseif(NOT CMAKE_CROSSCOMPILING)
+    set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
+  elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
+    set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
+  endif()
 
-  set_property(SOURCE zend_vm PROPERTY SYMBOLIC TRUE)
+  if(PHP_EXECUTABLE)
+    # Run the Zend/zend_vm_gen.php script.
+    add_custom_command(
+      OUTPUT zend_vm
+      COMMAND ${PHP_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_gen.php
+      DEPENDS
+        php_cli
+        ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.skl
+      COMMENT "[Zend] Regenerating zend_vm_execute.h and zend_vm_opcodes.{h,c}"
+      VERBATIM
+    )
+
+    add_custom_target(zend_generate_vm ALL DEPENDS zend_vm)
+
+    set_property(SOURCE zend_vm PROPERTY SYMBOLIC TRUE)
+  endif()
 endif()
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")

cmake/cmake/modules/PHP/Install.cmake

@@ -1,13 +1,16 @@
 #[=============================================================================[
 Set the `CMAKE_INSTALL_*` variables inside the `install(CODE|SCRIPT)`.
 
-This is built on top of the CMake's `GNUInstallDirs` module. At the time of
-writing, CMake documentation mentions special cases where, for example, the
-`CMAKE_INSTALL_FULL_SYSCONFDIR` variable becomes the `/etc`, when the install
-prefix is `/usr`, and similar.
+This is built on top of the CMake's
+[`GNUInstallDirs`](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html)
+module and the
+[`install()`](https://cmake.org/cmake/help/latest/command/install.html) command.
+At the time of writing, CMake documentation mentions special cases where, for
+example, the `CMAKE_INSTALL_FULL_SYSCONFDIR` variable becomes the `/etc`, when
+the install prefix is `/usr`, and similar.
 
 However, some of these special cases aren't taken into account when using the
-`install()` commands.
+`install()` commands. See: https://gitlab.kitware.com/cmake/cmake/-/issues/25852
 
 This module exposes the following function:
 
@@ -24,11 +27,6 @@ php_install(CODE "
   message(STATUS \"CMAKE_INSTALL_SYSCONFDIR=\${CMAKE_INSTALL_SYSCONFDIR}\")
 ")
 ```
-
-See:
-
-* https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
-* https://cmake.org/cmake/help/latest/command/install.html
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/sapi/fpm/CMakeLists.txt

@@ -472,7 +472,7 @@ php_configure_file(
     EXPANDED_SYSCONFDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )
 
-install(TARGETS php_fpm DESTINATION ${CMAKE_INSTALL_SBINDIR})
+install(TARGETS php_fpm RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
 php_install(CODE "
   # Create log and run directories on installation.

cmake/sapi/phpdbg/CMakeLists.txt

@@ -285,7 +285,6 @@ install(
 
 # Create log and run directories on installation.
 php_install(CODE "
-  # Create log and run directories on installation.
   file(
     MAKE_DIRECTORY
     \"\$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log\"

patches/8.3/aspell.patch

@@ -43,7 +43,7 @@ index 879300f992..de820684fb 100644
            libsasl2-dev:i386 \
            libsodium-dev:i386 \
 diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
-index 8f2f608278..c3ae0ada63 100644
+index bc2aa00df2..739abf8fe5 100644
 --- a/.github/actions/apt-x64/action.yml
 +++ b/.github/actions/apt-x64/action.yml
 @@ -34,7 +34,6 @@ runs: