Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

CMakeLists.txt

@@ -76,7 +76,7 @@ project(
 )
 
 # Configuration.
-block(PROPAGATE phpUrl)
+block(PROPAGATE php_url)
   set(
     CACHE{PHP_VERSION_DOWNLOAD}
     TYPE STRING
@@ -86,7 +86,7 @@ block(PROPAGATE phpUrl)
   mark_as_advanced(PHP_VERSION_DOWNLOAD)
 
   # PHP <major>.<minor> version currently in development (the master branch).
-  set(phpDevelopmentBranch 8.6)
+  set(php_development_branch 8.6)
 
   # Validate PHP version.
   if(NOT PHP_VERSION_DOWNLOAD MATCHES [[^[0-9]+\.[0-9]+(\.[0-9]+|-dev|$)]])
@@ -109,12 +109,12 @@ block(PROPAGATE phpUrl)
   set(branch "")
   set(version "")
 
-  if(PHP_VERSION_DOWNLOAD MATCHES "^${phpDevelopmentBranch}(-dev)?(.*)$")
+  if(PHP_VERSION_DOWNLOAD MATCHES "^${php_development_branch}(-dev)?(.*)$")
     if(CMAKE_MATCH_2)
       message(
         WARNING
-        "PHP ${phpDevelopmentBranch} is marked as development branch. Version "
-        "has been set to ${phpDevelopmentBranch}-dev"
+        "PHP ${php_development_branch} is marked as development branch. "
+        "Version has been set to ${php_development_branch}-dev"
       )
     endif()
     set(branch "master")
@@ -154,9 +154,12 @@ block(PROPAGATE phpUrl)
   endif()
 
   if(branch)
-    set(phpUrl https://github.com/php/php-src/archive/refs/heads/${branch}.tar.gz)
+    set(
+      php_url
+      https://github.com/php/php-src/archive/refs/heads/${branch}.tar.gz
+    )
   elseif(version)
-    set(phpUrl https://www.php.net/distributions/php-${version}.tar.gz)
+    set(php_url https://www.php.net/distributions/php-${version}.tar.gz)
   else()
     message(FATAL_ERROR "Something went wrong.")
   endif()
@@ -166,7 +169,7 @@ include(FetchContent)
 
 FetchContent_Declare(
   php
-  URL ${phpUrl}
+  URL ${php_url}
   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/php-src
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/php
   PATCH_COMMAND
@@ -271,9 +274,9 @@ cmake_path(
   RELATIVE_PATH
   CMAKE_CURRENT_BINARY_DIR
   BASE_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE relativeDir
+  OUTPUT_VARIABLE relative_dir
 )
-message(STATUS "Downloading ${phpUrl} to ${relativeDir}")
+message(STATUS "Downloading ${php_url} to ${relative_dir}")
 FetchContent_MakeAvailable(php)
 
 enable_testing()

cmake/Zend/CMakeLists.txt

@@ -562,9 +562,9 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
     RELATIVE_PATH
     CMAKE_CURRENT_BINARY_DIR
     BASE_DIRECTORY ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE relativeDir
+    OUTPUT_VARIABLE relative_dir
   )
-  message(STATUS "Creating ${relativeDir}/zend_config.h")
+  message(STATUS "Creating ${relative_dir}/zend_config.h")
   file(
     CONFIGURE
     OUTPUT zend_config.h

cmake/Zend/cmake/Fibers.cmake

@@ -71,10 +71,10 @@ endfunction()
 
 block()
   set(cpu "")
-  set(asmFile "")
+  set(asm_file "")
   set(prefix "")
-  set(compileOptions "")
-  set(compileDefinitions "")
+  set(compile_options "")
+  set(compile_definitions "")
 
   # Determine files based on the architecture and platform.
   if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "x86_64")
@@ -105,76 +105,76 @@ block()
   endif()
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(asmFile "combined_sysv_macho_gas.S")
+    set(asm_file "combined_sysv_macho_gas.S")
   elseif(CMAKE_SYSTEM_NAME STREQUAL "AIX")
     # AIX uses a different calling convention (shared with non-_CALL_ELF Linux).
     # The AIX assembler isn't GNU, but the file is compatible.
-    set(asmFile "${prefix}_xcoff_gas.S")
+    set(asm_file "${prefix}_xcoff_gas.S")
   elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     if(NOT cpu STREQUAL "i386")
-      set(asmFile "${prefix}_elf_gas.S")
+      set(asm_file "${prefix}_elf_gas.S")
     endif()
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(x86_64|x64)")
-      set(asmFile "x86_64_ms_pe_masm.asm")
+      set(asm_file "x86_64_ms_pe_masm.asm")
     elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(X86|i[3456]86)")
-      set(asmFile "i386_ms_pe_masm.asm")
+      set(asm_file "i386_ms_pe_masm.asm")
     elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
-      set(asmFile "arm64_aapcs_pe_armasm.asm")
-      set(compileOptions /nologo -machine ARM64)
+      set(asm_file "arm64_aapcs_pe_armasm.asm")
+      set(compile_options /nologo -machine ARM64)
     endif()
 
-    if(asmFile AND NOT CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
-      set(compileOptions /nologo)
+    if(asm_file AND NOT CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "(ARM64|aarch64)")
+      set(compile_options /nologo)
 
-      set(compileDefinitions "BOOST_CONTEXT_EXPORT=EXPORT")
+      set(compile_definitions "BOOST_CONTEXT_EXPORT=EXPORT")
     endif()
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Midipix")
     if(CMAKE_C_COMPILER_ARCHITECTURE_ID MATCHES "x86_64")
-      set(asmFile "x86_64_ms_pe_gas.S")
+      set(asm_file "x86_64_ms_pe_gas.S")
     endif()
   elseif(prefix)
-    set(asmFile "${prefix}_elf_gas.S")
+    set(asm_file "${prefix}_elf_gas.S")
   endif()
 
-  if(asmFile)
+  if(asm_file)
     set(
-      asmSources
-      ${CMAKE_CURRENT_SOURCE_DIR}/asm/jump_${asmFile}
-      ${CMAKE_CURRENT_SOURCE_DIR}/asm/make_${asmFile}
+      asm_sources
+      ${CMAKE_CURRENT_SOURCE_DIR}/asm/jump_${asm_file}
+      ${CMAKE_CURRENT_SOURCE_DIR}/asm/make_${asm_file}
     )
 
     if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
       list(
         APPEND
-        asmSources
+        asm_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/asm/save_xmm_x86_64_ms_masm.asm
       )
     endif()
 
-    if(compileOptions)
+    if(compile_options)
       set_source_files_properties(
-        ${asmSources}
+        ${asm_sources}
         PROPERTIES
-          COMPILE_OPTIONS ${compileOptions}
+          COMPILE_OPTIONS ${compile_options}
       )
     endif()
 
-    if(compileDefinitions)
+    if(compile_definitions)
       set_source_files_properties(
-        ${asmSources}
+        ${asm_sources}
         PROPERTIES
-          COMPILE_DEFINITIONS ${compileDefinitions}
+          COMPILE_DEFINITIONS ${compile_definitions}
       )
     endif()
   endif()
 
   message(CHECK_START "Checking for fibers switching context support")
 
-  if(PHP_ZEND_FIBER_ASM AND asmFile)
-    message(CHECK_PASS "yes, Zend/asm/*.${asmFile}")
+  if(PHP_ZEND_FIBER_ASM AND asm_file)
+    message(CHECK_PASS "yes, Zend/asm/*.${asm_file}")
 
-    target_sources(zend_fibers INTERFACE ${asmSources})
+    target_sources(zend_fibers INTERFACE ${asm_sources})
 
     _php_zend_fibers_shadow_stack_syscall()
   else()

cmake/Zend/cmake/GenerateGrammar.cmake

@@ -49,15 +49,15 @@ block()
           REPLACE
           "int zendparse"
           "ZEND_API int zendparse"
-          patchedContent
+          patched_content
           "${content}"
         )
         if(
           NOT content MATCHES "ZEND_API int zendparse"
-          AND NOT content STREQUAL "${patchedContent}"
+          AND NOT content STREQUAL "${patched_content}"
         )
           message(STATUS "[Zend] Patching ${file}")
-          file(WRITE "@CMAKE_CURRENT_SOURCE_DIR@/${file}" "${patchedContent}")
+          file(WRITE "@CMAKE_CURRENT_SOURCE_DIR@/${file}" "${patched_content}")
         endif()
       endforeach()
     ]]

cmake/cmake/BuildTypes.cmake

@@ -5,42 +5,43 @@ Configure CMake build types.
 include_guard(GLOBAL)
 
 block()
-  get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
   # Set default build type for single-config generators.
-  if(NOT isMultiConfig AND NOT CMAKE_BUILD_TYPE)
+  if(NOT is_multi_config AND NOT CMAKE_BUILD_TYPE)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE "Debug")
   endif()
 
   if(PROJECT_IS_TOP_LEVEL)
-    if(isMultiConfig)
+    if(is_multi_config)
       if(NOT "DebugAssertions" IN_LIST CMAKE_CONFIGURATION_TYPES)
         list(APPEND CMAKE_CONFIGURATION_TYPES DebugAssertions)
       endif()
     else()
       set(
-        allowedBuildTypes
-          Debug           # Not optimized, debug info, assertions.
-          DebugAssertions # Custom PHP debug build type based on RelWithDebInfo:
-                          # optimized, debug info, assertions.
-          MinSizeRel      # Same as Release but optimized for size rather than
-                          # speed.
-          Release         # Optimized, no debug info, no assertions.
-          RelWithDebInfo  # Optimized, debug info, no assertions.
+        allowed_build_types
+        Debug           # Not optimized, debug info, assertions.
+        DebugAssertions # Custom PHP debug build type based on RelWithDebInfo:
+                        # optimized, debug info, assertions.
+        MinSizeRel      # Same as Release but optimized for size rather than
+                        # speed.
+        Release         # Optimized, no debug info, no assertions.
+        RelWithDebInfo  # Optimized, debug info, no assertions.
       )
 
       set_property(
         CACHE CMAKE_BUILD_TYPE
-        PROPERTY STRINGS "${allowedBuildTypes}"
+        PROPERTY STRINGS "${allowed_build_types}"
       )
 
       set_property(
         CACHE CMAKE_BUILD_TYPE
-        PROPERTY HELPSTRING
-        "Choose the type of build, options are: ${allowedBuildTypes}"
+        PROPERTY
+          HELPSTRING
+            "Choose the type of build, options are: ${allowed_build_types}"
       )
 
-      if(NOT CMAKE_BUILD_TYPE IN_LIST allowedBuildTypes)
+      if(NOT CMAKE_BUILD_TYPE IN_LIST allowed_build_types)
         message(FATAL_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE}")
       endif()
     endif()
@@ -63,6 +64,5 @@ endforeach()
 
 target_compile_definitions(
   php_config
-  INTERFACE
-    $<IF:$<CONFIG:Debug,DebugAssertions>,ZEND_DEBUG=1,ZEND_DEBUG=0>
+  INTERFACE $<IF:$<CONFIG:Debug,DebugAssertions>,ZEND_DEBUG=1,ZEND_DEBUG=0>
 )