Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/Zend/CMakeLists.txt

@@ -13,18 +13,18 @@ CMake target properties for the PHP::Zend target:
 * VERSION
   Zend Engine version as defined in the Zend/zend.h file.
 
-* ZEND_EXTENSION_API_NO
+* PHP_ZEND_EXTENSION_API_NO
   Custom target property with internal API version number for PHP extensions
   (dynamically loaded with the 'extension' INI directive). This is the
-  ZEND_MODULE_API_NO number from the Zend/zend_modules.h and ensures that built
-  extension is compatible with particular PHP build.
+  ZEND_EXTENSION_API_NO number from the Zend/zend_extensions.h and ensures that
+  built extension is compatible with particular PHP build.
 
-* ZEND_MODULE_API_NO
+* PHP_ZEND_MODULE_API_NO
   Custom target property with internal API version number for Zend extensions in
   PHP (dynamically loaded with the 'zend_extension' INI directive), such as
-  opcache, debuggers, profilers, etc. This is the ZEND_EXTENSION_API_NO number
-  from the Zend/zend_extensions.h and ensures that built extension is compatible
-  with particular PHP build.
+  opcache, debuggers, profilers, etc. This is the ZEND_MODULE_API_NO number from
+  the Zend/zend_modules.h and ensures that built extension is compatible with
+  particular PHP build.
 #]=============================================================================]
 
 message(STATUS "")
@@ -350,8 +350,8 @@ set_target_properties(
   php_zend
   PROPERTIES
     VERSION ${PHP_ZEND_VERSION}
-    ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
-    ZEND_MODULE_API_NO ${PHP_ZEND_VERSION_MODULE_API_NO}
+    PHP_ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
+    PHP_ZEND_MODULE_API_NO ${PHP_ZEND_VERSION_MODULE_API_NO}
 )
 
 ################################################################################

cmake/cmake/Configuration.cmake

@@ -238,13 +238,13 @@ if(NOT PHP_EXTENSION_DIR)
     CACHE PHP_EXTENSION_DIR
     PROPERTY
       VALUE
-        "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
+        "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
   )
 
   # This would resemble the PHP Autotools --with-layout=GNU:
-  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
+  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
   # This would resemble the PHP Autotools --with-layout=PHP (default):
-  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>")
+  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>")
 endif()
 
 ################################################################################

cmake/cmake/Summary.cmake

@@ -53,8 +53,8 @@ function(_php_summary_preamble result)
 
   if(TARGET PHP::Zend)
     get_target_property(zend_version PHP::Zend VERSION)
-    get_target_property(zend_extension_api PHP::Zend ZEND_EXTENSION_API_NO)
-    get_target_property(zend_module_api PHP::Zend ZEND_MODULE_API_NO)
+    get_target_property(zend_extension_api PHP::Zend PHP_ZEND_EXTENSION_API_NO)
+    get_target_property(zend_module_api PHP::Zend PHP_ZEND_MODULE_API_NO)
     _php_summary_preamble_add_item(
       "Zend Engine version"
       "${zend_version}"

cmake/sapi/embed/CMakeLists.txt

@@ -102,8 +102,8 @@ php_pkgconfig_generate_pc(
     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:PHP::Zend,ZEND_EXTENSION_API_NO>"
-    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
+    PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
+    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
 )
 
 install(

cmake/sapi/phpdbg/CMakeLists.txt

@@ -297,8 +297,8 @@ if(TARGET php_sapi_phpdbg_shared)
       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:PHP::Zend,ZEND_EXTENSION_API_NO>"
-      PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
+      PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
+      PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
   )
 
   install(

cmake/scripts/CMakeLists.txt

@@ -21,8 +21,8 @@ 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_API_VERSION "${PHP_API_VERSION}"
-    PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_EXTENSION_API_NO>"
-    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>"
+    PHP_ZEND_EXTENSION_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_EXTENSION_API_NO>"
+    PHP_ZEND_MODULE_API_NO "$<TARGET_PROPERTY:PHP::Zend,PHP_ZEND_MODULE_API_NO>"
 )
 
 install(