Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -1,33 +1,30 @@
 #[=============================================================================[
 Zend Engine.
 
-## Targets
+Targets:
 
-* OBJECT library `zend` (ALIAS `Zend::Zend`) holds all Zend Engine objects
-  and compile properties.
+* OBJECT library 'zend' (ALIAS Zend::Zend) holds all Zend Engine objects and
+  compile properties.
 
-## Target properties
+Target properties:
 
-CMake target properties for the `Zend::Zend` target:
+CMake target properties for the Zend::Zend target:
 
-* `VERSION`
-
-  Zend Engine version as defined in the `Zend/zend.h` file.
-
-* `ZEND_EXTENSION_API_NO`
+* VERSION
+  Zend Engine version as defined in the Zend/zend.h file.
 
+* 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_MODULE_API_NO`
+  (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_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.
+  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.
 #]=============================================================================]
 
 message(STATUS "")

cmake/cmake/Version.cmake

@@ -6,9 +6,9 @@ number from the php-src main/php.h header file.
 
 Variables:
 
-* `PHP_API_VERSION`
-* `PHP_VERSION`
-* `PHP_VERSION_LABEL`
+* PHP_API_VERSION
+* PHP_VERSION
+* PHP_VERSION_LABEL
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/ext/standard/CMakeLists.txt

@@ -503,6 +503,16 @@ target_sources(
 add_dependencies(php_ext_standard_functions php_ext_standard)
 add_dependencies(php_ext_standard_functions_cli php_ext_standard)
 
+################################################################################
+# ext/standard depends on ext/zlib for SWC images and transitively depends on
+# the zlib library.
+# TODO: https://github.com/php/php-src/pull/4681
+################################################################################
+
+if(PHP_EXT_ZLIB)
+  add_dependencies(php_ext_standard php_ext_zlib)
+endif()
+
 ################################################################################
 # Configuration header
 ################################################################################

cmake/ext/zlib/CMakeLists.txt

@@ -85,7 +85,8 @@ set_package_properties(
     PURPOSE "Necessary to enable the zlib extension."
 )
 
-target_link_libraries(php_ext_zlib PRIVATE ZLIB::ZLIB)
+# Link publicly for internal_functions files.
+target_link_libraries(php_ext_zlib PUBLIC ZLIB::ZLIB)
 
 set(HAVE_ZLIB TRUE)
 

cmake/main/CMakeLists.txt

@@ -158,6 +158,7 @@ target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:PHP::main>)
 # Add FastCGI target with objects for use in PHP SAPIs such as CGI and FPM.
 ################################################################################
 add_library(php_main_fastcgi OBJECT fastcgi.c)
+add_dependencies(php_main_fastcgi php_main)
 
 target_sources(
   php_sapi
@@ -172,6 +173,8 @@ target_sources(
 
 add_library(php_main_internal_functions OBJECT internal_functions.c)
 add_library(php_main_internal_functions_cli OBJECT internal_functions_cli.c)
+add_dependencies(php_main_internal_functions php_main)
+add_dependencies(php_main_internal_functions_cli php_main)
 
 target_sources(
   php_sapi
@@ -257,6 +260,18 @@ file(CONFIGURE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/php_version.h CONTENT [[
 #define PHP_VERSION_ID @PHP_VERSION_ID@
 ]])
 
+################################################################################
+# When building external libraries with ExternalProject module, the library (and
+# its accompanying extension) should be built before the main target so the
+# internal functions files have possible library headers available when used in
+# extension headers (for example, php_openssl.h, php_zlib.h, etc.).
+################################################################################
+
+get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
+foreach(extension IN LISTS extensions)
+  add_dependencies(php_main PHP::ext::${extension})
+endforeach()
+
 ################################################################################
 # Generate configuration headers.
 ################################################################################