Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/Configuration.cmake

@@ -133,10 +133,9 @@ mark_as_advanced(PHP_DMALLOC)
 option(PHP_DTRACE "Enable DTrace support" OFF)
 mark_as_advanced(PHP_DTRACE)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(PHP_FD_SETSIZE "256" CACHE STRING "Size of descriptor sets")
-else()
-  set(PHP_FD_SETSIZE "" CACHE STRING "Size of descriptor sets")
+set(PHP_FD_SETSIZE "" CACHE STRING "Size of file descriptor sets")
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND PHP_FD_SETSIZE STREQUAL "")
+  set_property(CACHE PHP_FD_SETSIZE PROPERTY VALUE "256")
 endif()
 mark_as_advanced(PHP_FD_SETSIZE)
 
@@ -145,7 +144,7 @@ mark_as_advanced(PHP_VALGRIND)
 
 option(
   PHP_MEMORY_SANITIZER
-  "Enable the memory sanitizer compiler options (clang only)"
+  "Enable the memory sanitizer compiler options (Clang only)"
   OFF
 )
 mark_as_advanced(PHP_MEMORY_SANITIZER)

cmake/cmake/ConfigureChecks.cmake

@@ -427,15 +427,19 @@ include(PHP/CheckWrite)
 
 # Checking file descriptor sets.
 message(CHECK_START "Checking file descriptor sets size")
-if(PHP_FD_SETSIZE GREATER 0)
+if(PHP_FD_SETSIZE MATCHES "^[0-9]+$" AND PHP_FD_SETSIZE GREATER 0)
   message(CHECK_PASS "using FD_SETSIZE=${PHP_FD_SETSIZE}")
   target_compile_definitions(
     php_configuration
     INTERFACE
       $<$<COMPILE_LANGUAGE:ASM,C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
   )
-elseif(NOT PHP_FD_SETSIZE STREQUAL "" AND NOT PHP_FD_SETSIZE GREATER 0)
-  message(FATAL_ERROR "Invalid value PHP_FD_SETSIZE=${PHP_FD_SETSIZE}")
+elseif(NOT PHP_FD_SETSIZE STREQUAL "")
+  message(
+    FATAL_ERROR
+    "Invalid value of PHP_FD_SETSIZE=${PHP_FD_SETSIZE}. Pass integer greater "
+    "than 0."
+  )
 else()
   message(CHECK_PASS "using system default")
 endif()

cmake/cmake/Flags.cmake

@@ -382,7 +382,7 @@ if(PHP_UNDEFINED_SANITIZER)
       NOT DEFINED PHP_HAVE_UBSAN_EXITCODE
       AND CMAKE_CROSSCOMPILING
       AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-      AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      AND CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang"
       AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 17
     )
       # When cross-compiling without emulator and using Clang 17 and greater,

cmake/cmake/modules/PHP/CheckAttribute.cmake

@@ -106,7 +106,7 @@ function(_php_check_attribute what attribute result)
   cmake_push_check_state(RESET)
     # Compilers by default may not treat attribute warnings as errors, so some
     # error flag needs to be set to make the check certain (-Werror=attributes,
-    # clang's -Werror=unknown-attributes, -Werror...). Use the internal CMake
+    # Clang's -Werror=unknown-attributes, -Werror...). Use the internal CMake
     # compiler-agnostic variable CMAKE_C_COMPILE_OPTIONS_WARNING_AS_ERROR
     # (-Werror or other compiler-based option), if available.
     list(JOIN CMAKE_C_COMPILE_OPTIONS_WARNING_AS_ERROR " " CMAKE_REQUIRED_FLAGS)

cmake/main/CMakeLists.txt

@@ -183,6 +183,11 @@ if(PHP_DTRACE)
     message(CHECK_FAIL "no")
   endif()
 endif()
+add_feature_info(
+  "DTrace"
+  PHP_DTRACE
+  "performance analysis and troubleshooting"
+)
 
 # Add Dmalloc.
 if(PHP_DMALLOC)

cmake/sapi/cli/CMakeLists.txt

@@ -11,14 +11,6 @@ add_feature_info(
   "Command-line interface SAPI executable"
 )
 
-message(CHECK_START "Checking cli SAPI")
-if(SAPI_CLI)
-  message(CHECK_PASS "enabled")
-else()
-  message(CHECK_FAIL "disabled")
-  return()
-endif()
-
 cmake_dependent_option(
   SAPI_CLI_WIN_NO_CONSOLE
   "Build console-less CLI SAPI"
@@ -32,6 +24,14 @@ add_feature_info(
   "[Windows only] Same as CLI SAPI but without console (no output is given)"
 )
 
+message(CHECK_START "Checking cli SAPI")
+if(SAPI_CLI)
+  message(CHECK_PASS "enabled")
+else()
+  message(CHECK_FAIL "disabled")
+  return()
+endif()
+
 check_symbol_exists(setproctitle "unistd.h;stdlib.h" HAVE_SETPROCTITLE)
 check_include_file(sys/pstat.h HAVE_SYS_PSTAT_H)
 

cmake/sapi/fpm/CMakeLists.txt

@@ -21,7 +21,7 @@ option(SAPI_FPM "Enable the FPM SAPI module" OFF)
 add_feature_info(
   "sapi/fpm"
   SAPI_FPM
-  "FPM SAPI module"
+  "FastCGI Process Manager (FPM) SAPI module"
 )
 
 if(SAPI_FPM)