Merge branch 'PHP-8.4'

Author: petk

bin/make-docs.php

@@ -45,7 +45,7 @@ function generateModuleDocs(
     }
 }
 
-$docs = __DIR__ . '/../docs/cmake-modules';
+$docs = __DIR__ . '/../docs/cmake/modules';
 if (!file_exists($docs)) {
     mkdir($docs, 0777, true);
 }

cmake/Zend/CMakeLists.txt

@@ -48,20 +48,34 @@ endblock()
 include(CheckIncludeFile)
 include(CheckSourceCompiles)
 include(CheckSymbolExists)
+include(CMakeDependentOption)
 include(CMakePushCheckState)
+include(FeatureSummary)
 include(PHP/AddCustomCommand)
 
 ################################################################################
 # Configuration.
 ################################################################################
 
-option(ZEND_GCC_GLOBAL_REGS "Enable GCC global register variables" ON)
-mark_as_advanced(ZEND_GCC_GLOBAL_REGS)
-
-option(ZEND_FIBER_ASM "Enable the use of Boost fiber assembly files" ON)
+cmake_dependent_option(
+  ZEND_FIBER_ASM
+  "Enable the use of Boost fiber assembly files"
+  ON
+  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+  ON
+)
 mark_as_advanced(ZEND_FIBER_ASM)
 
-option(ZEND_SIGNALS "Enable Zend signal handling" ON)
+option(ZEND_GLOBAL_REGISTER_VARIABLES "Enable global register variables" ON)
+mark_as_advanced(ZEND_GLOBAL_REGISTER_VARIABLES)
+
+cmake_dependent_option(
+  ZEND_SIGNALS
+  "Enable Zend signal handling"
+  ON
+  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+  OFF
+)
 mark_as_advanced(ZEND_SIGNALS)
 
 ################################################################################
@@ -412,13 +426,23 @@ endif()
 # Check Zend signals.
 message(CHECK_START "Checking whether to enable Zend signal handling")
 check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
-if(NOT HAVE_SIGACTION OR NOT ZEND_SIGNALS)
-  message(CHECK_FAIL "no")
-  set_property(CACHE ZEND_SIGNALS PROPERTY VALUE 0)
-else()
+if(HAVE_SIGACTION AND ZEND_SIGNALS)
   message(CHECK_PASS "yes")
-  set_property(CACHE ZEND_SIGNALS PROPERTY VALUE 1)
+
+  set_property(CACHE ZEND_SIGNALS PROPERTY VALUE ON)
+
+  # zend_config.h (or its parent php_config.h) isn't included in some zend_*
+  # files, therefore also compilation definitions are added.
+  target_compile_definitions(zend PRIVATE ZEND_SIGNALS)
+else()
+  set_property(CACHE ZEND_SIGNALS PROPERTY VALUE OFF)
+  message(CHECK_FAIL "no")
 endif()
+add_feature_info(
+  "Zend signals"
+  ZEND_SIGNALS
+  "signals handling within the Zend Engine for performance"
+)
 
 # Check Zend max execution timers.
 include(Zend/MaxExecutionTimers)
@@ -430,8 +454,8 @@ endif()
 include(Zend/CheckMMAlignment)
 
 # Check for global register variables.
-if(ZEND_GCC_GLOBAL_REGS)
-  include(Zend/CheckGlobalRegisterVars)
+if(ZEND_GLOBAL_REGISTER_VARIABLES)
+  include(Zend/CheckGlobalRegisterVariables)
 endif()
 
 # Check if stack grows downward.
@@ -440,12 +464,6 @@ include(Zend/CheckStackLimit)
 # Check float precision.
 include(Zend/CheckFloatPrecision)
 
-# zend_config.h (or its parent php_config.h) isn't included in some zend_*
-# files, therefore also compilation definitions need to be added.
-if(ZEND_SIGNALS)
-  target_compile_definitions(zend PRIVATE ZEND_SIGNALS)
-endif()
-
 ################################################################################
 # Generate lexers and parsers.
 ################################################################################

cmake/cmake/modules/Zend/CheckGlobalRegisterVars.cmake renamed to cmake/cmake/modules/Zend/CheckGlobalRegisterVariables.cmake

@@ -1,10 +1,15 @@
 #[=============================================================================[
-Check for global register variables support.
+Check whether the compiler and target system support global register variables.
 
-Cache variables:
+Global register variables are relevant for the GNU C compatible compilers.
+
+See also: [GCC global register variables](https://gcc.gnu.org/onlinedocs/gcc/Global-Register-Variables.html)
+
+## Cache variables
 
 * `HAVE_GCC_GLOBAL_REGS`
-  Whether the target system has support for global register variables.
+
+  Whether global register variables are supported.
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/cmake/modules/Zend/Fibers.cmake

@@ -4,20 +4,24 @@ Check if Fibers can be used.
 This module adds Boost fiber assembly files support if available for the
 platform, otherwise it checks if ucontext can be used.
 
-Interface library:
+## Control variables
 
-* `Zend::Fibers`
-  Library using Boost fiber assembly files if available.
+* `ZEND_FIBER_ASM`
 
-Cache variables:
+  Whether to use Boost fiber assembly files.
+
+## Cache variables
 
 * `ZEND_FIBER_UCONTEXT`
+
   Whether `<ucontext.h>` header file is available and should be used.
 
-Control variables:
+## Interface library
 
-* `ZEND_FIBER_ASM`
-  Whether to use Boost fiber assembly files.
+* `Zend::Fibers`
+
+  Interface library using Boost fiber assembly files and compile options if
+  available.
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/cmake/modules/Zend/MaxExecutionTimers.cmake

@@ -3,7 +3,7 @@ Check whether to enable Zend max execution timers.
 
 ## Cache variables
 
-* [`ZEND_MAX_EXECUTION_TIMERS`](/docs/cmake/ZEND_MAX_EXECUTION_TIMERS.md)
+* [`ZEND_MAX_EXECUTION_TIMERS`](/docs/cmake/variables/ZEND_MAX_EXECUTION_TIMERS.md)
 
 * `HAVE_TIMER_CREATE`
 
@@ -101,7 +101,7 @@ if(libraryForTimerCreate)
 endif()
 
 # The configuration header with ZEND_MAX_EXECUTION_TIMERS might not be included
-# in some source files, therefore also compilation definitions is added.
+# in some source files, therefore also compilation definitions are added.
 if(ZEND_MAX_EXECUTION_TIMERS)
   target_compile_definitions(
     Zend::MaxExecutionTimers

cmake/sapi/phpdbg/CMakeLists.txt

@@ -260,7 +260,6 @@ block()
   configure_file(phpdbg.1.in phpdbg.1 @ONLY)
 endblock()
 
-# TODO: Add prefix and suffix to installed executable file.
 install(
   TARGETS php_phpdbg
   RUNTIME

cmake/scripts/CMakeLists.txt

@@ -49,6 +49,13 @@ block()
 
   message(STATUS "Creating scripts/php-config")
 
+  get_cmake_property(sapis PHP_SAPIS)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
+    set(sapis "$<JOIN:$<LIST:SORT,${sapis}>, >")
+  else()
+    set(sapis "$<JOIN:${sapis}, >")
+  endif()
+
   # Replace the upstream php-config script hardcoded php include directory to a
   # template placeholder.
   file(READ "${CMAKE_CURRENT_SOURCE_DIR}/php-config.in" content)
@@ -82,8 +89,7 @@ block()
       EXEEXT "${CMAKE_EXECUTABLE_SUFFIX}"
       # TODO:
       CONFIGURE_OPTIONS ""
-      # TODO:
-      PHP_INSTALLED_SAPIS ""
+      PHP_INSTALLED_SAPIS "${sapis}"
       EXPANDED_PHP_CONFIG_FILE_SCAN_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_SCAN_DIR},$<INSTALL_PREFIX>>"
       EXPANDED_PHP_CONFIG_FILE_PATH "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},$<INSTALL_PREFIX>>"
       bindir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},$<INSTALL_PREFIX>>"