Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

bin/php.cmake

@@ -184,9 +184,9 @@ function(php_check_url url result)
   )
 
   if(status EQUAL 0)
-    set(${result} 1)
+    set(${result} TRUE)
   else()
-    set(${result} 0)
+    set(${result} FALSE)
   endif()
 
   return(PROPAGATE ${result})

cmake/Zend/CMakeLists.txt

@@ -316,7 +316,7 @@ target_include_directories(
 target_compile_definitions(
   zend
   PRIVATE
-    ZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+    ZEND_ENABLE_STATIC_TSRMLS_CACHE
   PUBLIC
     $<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
 )

cmake/Zend/cmake/CheckFloatPrecision.cmake

@@ -1,19 +1,30 @@
 #[=============================================================================[
+# CheckFloatPrecision
+
 Check for x87 floating point internal precision control.
 
 See: https://wiki.php.net/rfc/rounding
 
 ## Cache variables
 
 * `HAVE__FPU_SETCW`
+
   Whether `_FPU_SETCW` is usable.
+
 * `HAVE_FPSETPREC`
+
   Whether `fpsetprec` is present and usable.
+
 * `HAVE__CONTROLFP`
+
   Whether `_controlfp` is present and usable.
+
 * `HAVE__CONTROLFP_S`
+
   Whether `_controlfp_s` is present and usable.
+
 * `HAVE_FPU_INLINE_ASM_X86`
+
   Whether FPU control word can be manipulated by inline assembler.
 #]=============================================================================]
 

cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake

@@ -1,4 +1,6 @@
 #[=============================================================================[
+# CheckGlobalRegisterVariables
+
 Check whether the compiler and target system support global register variables.
 
 Global register variables are relevant for the GNU C compatible compilers.

cmake/Zend/cmake/CheckMMAlignment.cmake

@@ -1,8 +1,10 @@
 #[=============================================================================[
+# CheckMMAlignment
+
 Test and set the alignment defines for the Zend memory manager (`ZEND_MM`). This
 also does the logarithmic test.
 
-## Cache variables
+## Result variables
 
 * `ZEND_MM_ALIGNMENT`
 * `ZEND_MM_ALIGNMENT_LOG2`
@@ -23,7 +25,12 @@ if(
   set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 endif()
 
-block()
+block(
+  PROPAGATE
+    ZEND_MM_ALIGNMENT
+    ZEND_MM_ALIGNMENT_LOG2
+    ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+)
   try_run(
     ZEND_MM_EXITCODE
     ZEND_MM_COMPILED
@@ -82,21 +89,13 @@ block()
       "ZEND_MM alignment defines failed. Please, check CMake logs.")
   endif()
 
-  set(
-    ZEND_MM_ALIGNMENT ${zend_mm_alignment}
-    CACHE INTERNAL "Alignment for Zend memory allocator"
-  )
-  set(
-    ZEND_MM_ALIGNMENT_LOG2 ${zend_mm_alignment_log2}
-    CACHE INTERNAL "Alignment for Zend memory allocator log2"
-  )
-  set(
-    ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT ${zend_mm_need_eight_byte_realignment}
-    CACHE INTERNAL "Whether 8-byte realignment is needed"
-  )
+  set(ZEND_MM_ALIGNMENT ${zend_mm_alignment})
+  set(ZEND_MM_ALIGNMENT_LOG2 ${zend_mm_alignment_log2})
+  set(ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT ${zend_mm_need_eight_byte_realignment})
 endblock()
 
-message(VERBOSE
+message(
+  VERBOSE
   "MM alignment values:\n"
   "    ZEND_MM_ALIGNMENT=${ZEND_MM_ALIGNMENT}\n"
   "    ZEND_MM_ALIGNMENT_LOG2=${ZEND_MM_ALIGNMENT_LOG2}\n"

cmake/Zend/cmake/CheckStackLimit.cmake

@@ -1,9 +1,12 @@
 #[=============================================================================[
+# CheckStackLimit
+
 Check whether the stack grows downwards. Assumes contiguous stack.
 
 ## Cache variables
 
-* `ZEND_CHECK_STACK_LIMIT`
+* `ZEND_CHECK_STACK_LIMIT
+
   Whether checking the stack limit is supported.
 #]=============================================================================]
 

cmake/Zend/cmake/CheckStrerrorR.cmake

@@ -1,12 +1,17 @@
 #[=============================================================================[
+# CheckStrerrorR
+
 Check for `strerror_r()`, and if its a POSIX-compatible or a GNU-specific
 version.
 
 ## Cache variables
 
 * `HAVE_STRERROR_R`
+
   Whether `strerror_r()` is available.
+
 * `STRERROR_R_CHAR_P`
+
   Whether `strerror_r()` returns a `char *` message, otherwise it returns an
   `int` error number.
 #]=============================================================================]

cmake/Zend/cmake/Fibers.cmake

@@ -1,4 +1,6 @@
 #[=============================================================================[
+# Fibers
+
 Check if Fibers can be used.
 
 This module adds Boost fiber assembly files support if available for the

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -1,4 +1,6 @@
 #[=============================================================================[
+# MaxExecutionTimers
+
 Check whether to enable Zend max execution timers.
 
 ## Cache variables

cmake/cmake/CMakeDefaults.cmake

@@ -35,25 +35,23 @@ set(CMAKE_SHARED_MODULE_PREFIX_CXX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX_CXX "")
 
 # Whether to enable verbose output from Makefile builds.
-option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output from Makefile builds" OFF)
+option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output from Makefile builds")
 mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
 
 # Whether to show message context in configuration log.
 option(
   CMAKE_MESSAGE_CONTEXT_SHOW
   "Show message context in configuration log, where possible"
-  OFF
 )
 mark_as_advanced(CMAKE_MESSAGE_CONTEXT_SHOW)
 
 # Whether to build all libraries as shared.
-option(BUILD_SHARED_LIBS "Build enabled PHP extensions as shared libraries" OFF)
+option(BUILD_SHARED_LIBS "Build enabled PHP extensions as shared libraries")
 
 # Treat all compile warnings as errors at the build phase, if compiler supports
 # such compile option, like -Werror, /WX, or similar.
 option(
   CMAKE_COMPILE_WARNING_AS_ERROR
   "Treat all compile warnings as errors at the build phase"
-  OFF
 )
 mark_as_advanced(CMAKE_COMPILE_WARNING_AS_ERROR)