Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/Flags.cmake

@@ -219,12 +219,8 @@ endif()
 if(PHP_MEMORY_SANITIZER)
   message(CHECK_START "Checking memory sanitizer compiler options")
 
-  cmake_push_check_state(RESET)
-    set(
-      CMAKE_REQUIRED_LINK_OPTIONS
-      -fsanitize=memory
-      -fsanitize-memory-track-origins
-    )
+  block()
+    set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 
     php_check_compiler_flag(
       C
@@ -239,19 +235,19 @@ if(PHP_MEMORY_SANITIZER)
         PHP_HAS_MEMORY_SANITIZER_CXX
       )
     endif()
-  cmake_pop_check_state()
+  endblock()
 
   if(PHP_HAS_MEMORY_SANITIZER_C OR PHP_HAS_MEMORY_SANITIZER_CXX)
     target_compile_options(
       php_config
       INTERFACE
-        $<$<COMPILE_LANGUAGE:ASM,C,CXX>:-fsanitize=memory;-fsanitize-memory-track-origins>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-fsanitize=memory;-fsanitize-memory-track-origins>
     )
 
     target_link_options(
       php_config
       INTERFACE
-        $<$<COMPILE_LANGUAGE:ASM,C,CXX>:-fsanitize=memory;-fsanitize-memory-track-origins>
+        $<$<LINK_LANGUAGE:C,CXX>:-fsanitize=memory;-fsanitize-memory-track-origins>
     )
 
     message(CHECK_PASS "Success")

cmake/cmake/modules/PHP/CheckCompilerFlag.cmake

@@ -25,27 +25,25 @@ Bypasses:
 Module exposes the following function:
 
 ```cmake
-php_check_compiler_flag(<lang> <flag> <result_var>)
+php_check_compiler_flag(<lang> <flags> <result_var>)
 ```
 
-Check that the <flag> is accepted by the <lang> compiler without issuing any
-diagnostic message. The result is stored in an internal cache entry named
-`<result_var>`. The language `<lang>` can be one of the supported languages by
-the CMake's `CheckCompilerFlag` module.
+Check that the given flag(s) specified in `<flags>` are accepted by the `<lang>`
+compiler without issuing any diagnostic message. The result is stored in an
+internal cache entry named `<result_var>`. The language `<lang>` can be one of
+the supported languages by the CMake's `CheckCompilerFlag` module. Multiple
+flags can be passed as a semicolon-separated list.
 
-For example:
+# Examples
 
-```cmake
-include(PHP/CheckCompilerFlag)
-
-php_check_compiler_flag(C -Wno-clobbered PHP_HAVE_WNO_CLOBBERED)
-```
-
-## Usage
+Usage example:
 
 ```cmake
 # CMakeLists.txt
+
 include(PHP/CheckCompilerFlag)
+
+php_check_compiler_flag(C -Wno-clobbered PHP_HAS_WNO_CLOBBERED)
 ```
 #]=============================================================================]
 
@@ -54,7 +52,7 @@ include_guard(GLOBAL)
 include(CheckCompilerFlag)
 include(CMakePushCheckState)
 
-function(php_check_compiler_flag lang flag result)
+function(php_check_compiler_flag lang flags result)
   cmake_parse_arguments(
     PARSE_ARGV
     3
@@ -78,27 +76,37 @@ function(php_check_compiler_flag lang flag result)
   endif()
 
   if(NOT CMAKE_REQUIRED_QUIET)
-    message(CHECK_START "Checking whether the ${lang} compiler accepts ${flag}")
+    message(CHECK_START "Checking whether the ${lang} compiler accepts ${flags}")
   endif()
 
   cmake_push_check_state()
     set(CMAKE_REQUIRED_QUIET TRUE)
 
     # Bypass the '-Wno-*' compile options for all compilers except those known
     # to emit diagnostic messages for unknown -Wno-* flags.
-    if(
-      NOT CMAKE_${lang}_COMPILER_ID MATCHES "^(AppleClang|Clang|MSVC)$"
-      AND flag MATCHES "^-Wno-"
-      # Exclude the '-Wno-error' and '-Wno-attributes=*' flags.
-      AND NOT flag MATCHES "^-Wno-error(=|$)|^-Wno-attributes="
-    )
-      string(REGEX REPLACE "^-Wno-" "-W" flag ${flag})
-    endif()
+    set(processedFlags "")
+    foreach(flag IN LISTS flags)
+      if(
+        NOT CMAKE_${lang}_COMPILER_ID MATCHES "^(AppleClang|Clang|MSVC)$"
+        AND flag MATCHES "^-Wno-"
+        # Exclude the '-Wno-error' and '-Wno-attributes=*' flags.
+        AND NOT flag MATCHES "^-Wno-error(=|$)|^-Wno-attributes="
+      )
+        string(REGEX REPLACE "^-Wno-" "-W" flag "${flag}")
+      endif()
+
+      list(APPEND processedFlags "${flag}")
+    endforeach()
+    set(flags ${processedFlags})
 
     # Append -Wunknown-warning-option option if compiler supports it (Clang or
     # similar) and was by any chance configured with -Wno-unknown-warning-option
     # (via environment CFLAGS or CMAKE_C_FLAGS).
-    if(flag MATCHES "^-W")
+    foreach(flag IN LISTS flags)
+      if(NOT flag MATCHES "^-W")
+        continue()
+      endif()
+
       check_compiler_flag(
         ${lang}
         -Wunknown-warning-option
@@ -108,9 +116,11 @@ function(php_check_compiler_flag lang flag result)
       if(_php_check_compiler_flag_${lang}_unknown_warning_option)
         string(APPEND CMAKE_REQUIRED_FLAGS " -Wunknown-warning-option")
       endif()
-    endif()
 
-    check_compiler_flag(${lang} ${flag} ${result})
+      break()
+    endforeach()
+
+    check_compiler_flag(${lang} "${flags}" ${result})
   cmake_pop_check_state()
 
   if(NOT CMAKE_REQUIRED_QUIET)

cmake/sapi/cgi/CMakeLists.txt

@@ -45,11 +45,9 @@ target_link_libraries(
     $<$<PLATFORM_ID:Windows>:ws2_32;kernel32;advapi32>
 )
 
-target_link_options(
-  php_sapi_cgi
-  PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:67108864>
-)
+if(MSVC)
+  target_link_options(php_sapi_cgi PRIVATE /stack:67108864)
+endif()
 
 set_target_properties(
   php_sapi_cgi

cmake/sapi/cli/CMakeLists.txt

@@ -114,11 +114,9 @@ target_link_libraries(
     $<$<PLATFORM_ID:Windows>:ws2_32;shell32>
 )
 
-target_link_options(
-  php_sapi_cli
-  PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:67108864>
-)
+if(MSVC)
+  target_link_options(php_sapi_cli PRIVATE /stack:67108864)
+endif()
 
 set_target_properties(
   php_sapi_cli
@@ -188,11 +186,9 @@ if(PHP_SAPI_CLI_WIN_NO_CONSOLE)
       shell32
   )
 
-  target_link_options(
-    php_sapi_cli_win
-    PRIVATE
-      $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:67108864>
-  )
+  if(MSVC)
+    target_link_options(php_sapi_cli_win PRIVATE /stack:67108864)
+  endif()
 endif()
 
 ################################################################################

cmake/sapi/embed/CMakeLists.txt

@@ -102,6 +102,9 @@ php_pkgconfig_generate_pc(
     PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
     PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
     PHP_EMBED_SAPI_NAME "$<GENEX_EVAL:$<TARGET_PROPERTY:php_sapi_embed_shared,OUTPUT_NAME>>"
+    PHP_API_VERSION "${PHP_API_VERSION}"
+    PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_EXTENSION_API_NO>"
+    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>"
 )
 
 install(

cmake/sapi/embed/php-embed.pc.in

@@ -14,19 +14,40 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 php_include_prefix=@php_include_prefix@
 libdir=@libdir@
+
 # The extension_dir PHP INI directive absolute path.
 extensiondir=@PHP_EXTENSION_DIR@
+
 # PHP version as integer.
 php_vernum=@PHP_VERSION_ID@
+
 # The path where to scan for additional INI configuration files.
 php_ini_dir=@PHP_CONFIG_FILE_SCAN_DIR@
+
 # The path in which to look for php.ini.
 php_ini_path=@PHP_CONFIG_FILE_PATH@
+
 # Whether PHP is built in debug mode (yes) or not (no).
 php_debug=@PHP_DEBUG@
+
 # Whether PHP is built with thread safety (yes) or not (no).
 php_zts=@PHP_THREAD_SAFETY@
 
+# Internal PHP API version number.
+php_api_version=@PHP_API_VERSION@
+
+# Internal API version number for Zend extensions in PHP (dynamically loaded
+# with zend_extension INI directive), such as opcache, debuggers, profilers,
+# etc. This is the ZEND_EXTENSION_API_NO number in Zend/zend_extensions.h and
+# ensures that built extension is compatible with particular PHP build.
+php_zend_extension_api_no=@PHP_ZEND_EXTENSION_API_NO@
+
+# Internal API version number for PHP extensions (dynamically loaded with
+# extension INI directive). This is the ZEND_MODULE_API_NO number in
+# Zend/zend_modules.h and ensures that built extension is compatible with
+# particular PHP build.
+php_zend_module_api_no=@PHP_ZEND_MODULE_API_NO@
+
 Name: PHP Embed SAPI
 Description: A lightweight SAPI to embed PHP into application using C bindings
 URL: https://www.php.net

cmake/sapi/phpdbg/CMakeLists.txt

@@ -169,11 +169,9 @@ foreach(target IN ITEMS php_sapi_phpdbg php_sapi_phpdbg_shared)
   )
 endforeach()
 
-target_link_options(
-  php_sapi_phpdbg
-  PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:8388608>
-)
+if(MSVC)
+  target_link_options(php_sapi_phpdbg PRIVATE /stack:8388608)
+endif()
 
 set_target_properties(
   php_sapi_phpdbg
@@ -305,6 +303,9 @@ if(TARGET php_sapi_phpdbg_shared)
       PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
       PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
       PHP_PHPDBG_SAPI_NAME "$<GENEX_EVAL:$<TARGET_PROPERTY:php_sapi_phpdbg_shared,OUTPUT_NAME>>"
+      PHP_API_VERSION "${PHP_API_VERSION}"
+      PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_EXTENSION_API_NO>"
+      PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>"
   )
 
   install(

cmake/sapi/phpdbg/phpdbg.pc.in

@@ -14,19 +14,40 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 php_include_prefix=@php_include_prefix@
 libdir=@libdir@
+
 # The extension_dir PHP INI directive absolute path.
 extensiondir=@PHP_EXTENSION_DIR@
+
 # PHP version as integer.
 php_vernum=@PHP_VERSION_ID@
+
 # The path where to scan for additional INI configuration files.
 php_ini_dir=@PHP_CONFIG_FILE_SCAN_DIR@
+
 # The path in which to look for php.ini.
 php_ini_path=@PHP_CONFIG_FILE_PATH@
+
 # Whether PHP is built in debug mode (yes) or not (no).
 php_debug=@PHP_DEBUG@
+
 # Whether PHP is built with thread safety (yes) or not (no).
 php_zts=@PHP_THREAD_SAFETY@
 
+# Internal PHP API version number.
+php_api_version=@PHP_API_VERSION@
+
+# Internal API version number for Zend extensions in PHP (dynamically loaded
+# with zend_extension INI directive), such as opcache, debuggers, profilers,
+# etc. This is the ZEND_EXTENSION_API_NO number in Zend/zend_extensions.h and
+# ensures that built extension is compatible with particular PHP build.
+php_zend_extension_api_no=@PHP_ZEND_EXTENSION_API_NO@
+
+# Internal API version number for PHP extensions (dynamically loaded with
+# extension INI directive). This is the ZEND_MODULE_API_NO number in
+# Zend/zend_modules.h and ensures that built extension is compatible with
+# particular PHP build.
+php_zend_module_api_no=@PHP_ZEND_MODULE_API_NO@
+
 Name: PHP debugger
 Description: Interactive PHP debugger
 URL: https://www.php.net

cmake/scripts/CMakeLists.txt

@@ -20,6 +20,9 @@ php_pkgconfig_generate_pc(
     PHP_CONFIG_FILE_PATH "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},$<INSTALL_PREFIX>>"
     PHP_DEBUG "$<IF:$<CONFIG:Debug,DebugAssertions>,yes,no>"
     PHP_THREAD_SAFETY "$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,yes,no>"
+    PHP_API_VERSION "${PHP_API_VERSION}"
+    PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_EXTENSION_API_NO>"
+    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>"
 )
 
 install(

cmake/scripts/php.pc.in

@@ -1,4 +1,4 @@
-# The pkg-config .pc file for PHP Embed SAPI.
+# The pkg-config .pc file for PHP installation.
 # https://en.wikipedia.org/wiki/Pkg-config
 #
 # Usage:
@@ -14,19 +14,40 @@ exec_prefix=@exec_prefix@
 includedir=@includedir@
 php_include_prefix=@php_include_prefix@
 libdir=@libdir@
+
 # The extension_dir PHP INI directive absolute path.
 extensiondir=@PHP_EXTENSION_DIR@
+
 # PHP version as integer.
 php_vernum=@PHP_VERSION_ID@
+
 # The path where to scan for additional INI configuration files.
 php_ini_dir=@PHP_CONFIG_FILE_SCAN_DIR@
+
 # The path in which to look for php.ini.
 php_ini_path=@PHP_CONFIG_FILE_PATH@
+
 # Whether PHP is built in debug mode (yes) or not (no).
 php_debug=@PHP_DEBUG@
+
 # Whether PHP is built with thread safety (yes) or not (no).
 php_zts=@PHP_THREAD_SAFETY@
 
+# Internal PHP API version number.
+php_api_version=@PHP_API_VERSION@
+
+# Internal API version number for Zend extensions in PHP (dynamically loaded
+# with zend_extension INI directive), such as opcache, debuggers, profilers,
+# etc. This is the ZEND_EXTENSION_API_NO number in Zend/zend_extensions.h and
+# ensures that built extension is compatible with particular PHP build.
+php_zend_extension_api_no=@PHP_ZEND_EXTENSION_API_NO@
+
+# Internal API version number for PHP extensions (dynamically loaded with
+# extension INI directive). This is the ZEND_MODULE_API_NO number in
+# Zend/zend_modules.h and ensures that built extension is compatible with
+# particular PHP build.
+php_zend_module_api_no=@PHP_ZEND_MODULE_API_NO@
+
 Name: PHP
 Description: Build extension for a PHP general-purpose scripting language
 URL: https://www.php.net