Merge branch 'PHP-8.4'

petk · petk · commit 3f975af414a1 · 2024-10-18T17:34:32.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -26,5 +26,5 @@ trim_trailing_whitespace = false
 [COMMIT_EDITMSG]
 max_line_length          = 80
 
-[{CMakeLists.txt,*.{cmake,cmake.in}}]
+[{CMakeLists.{txt,txt.in},*.{cmake,cmake.in}}]
 indent_size              = 2
diff --git a/cmake/Zend/CMakeLists.txt b/cmake/Zend/CMakeLists.txt
@@ -81,10 +81,6 @@ mark_as_advanced(ZEND_MAX_EXECUTION_TIMERS)
 add_library(zend OBJECT)
 add_library(Zend::Zend ALIAS zend)
 
-file(GLOB _zend_headers ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-# Exclude Windows header and specify it below separately.
-list(FILTER _zend_headers EXCLUDE REGEX ".*zend_config\\.w32\\.h$")
-
 target_sources(
   zend
   PRIVATE
@@ -183,8 +179,105 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
-        ${_zend_headers}
+        zend_alloc_sizes.h
+        zend_alloc.h
+        zend_API.h
+        zend_arena.h
+        zend_ast.h
+        zend_atomic.h
+        zend_attributes_arginfo.h
+        zend_attributes.h
+        zend_bitset.h
+        zend_build.h
+        zend_builtin_functions_arginfo.h
+        zend_builtin_functions.h
+        zend_call_stack.h
+        zend_closures_arginfo.h
+        zend_closures.h
+        zend_compile.h
         $<$<PLATFORM_ID:Windows>:zend_config.w32.h>
+        zend_constants_arginfo.h
+        zend_constants.h
+        zend_cpuinfo.h
+        zend_dtrace.h
+        zend_enum_arginfo.h
+        zend_enum.h
+        zend_errors.h
+        zend_exceptions_arginfo.h
+        zend_exceptions.h
+        zend_execute.h
+        zend_extensions.h
+        zend_fibers_arginfo.h
+        zend_fibers.h
+        zend_float.h
+        zend_frameless_function.h
+        zend_gc.h
+        zend_gdb.h
+        zend_generators_arginfo.h
+        zend_generators.h
+        zend_globals_macros.h
+        zend_globals.h
+        zend_hash.h
+        zend_highlight.h
+        zend_hrtime.h
+        zend_inheritance.h
+        zend_ini_parser.h
+        zend_ini_scanner_defs.h
+        zend_ini_scanner.h
+        zend_ini.h
+        zend_interfaces_arginfo.h
+        zend_interfaces.h
+        zend_iterators.h
+        zend_language_parser.h
+        zend_language_scanner_defs.h
+        zend_language_scanner.h
+        zend_lazy_objects.h
+        zend_list.h
+        zend_llist.h
+        zend_long.h
+        zend_map_ptr.h
+        zend_max_execution_timer.h
+        zend_mmap.h
+        zend_modules.h
+        zend_multibyte.h
+        zend_multiply.h
+        zend_object_handlers.h
+        zend_objects_API.h
+        zend_objects.h
+        zend_observer.h
+        zend_operators.h
+        zend_portability.h
+        zend_property_hooks.h
+        zend_ptr_stack.h
+        zend_range_check.h
+        zend_signal.h
+        zend_smart_str_public.h
+        zend_smart_str.h
+        zend_smart_string_public.h
+        zend_smart_string.h
+        zend_sort.h
+        zend_stack.h
+        zend_stream.h
+        zend_string.h
+        zend_strtod_int.h
+        zend_strtod.h
+        zend_system_id.h
+        zend_type_info.h
+        zend_types.h
+        zend_variables.h
+        zend_verify_type_inference.h
+        zend_virtual_cwd.h
+        zend_vm_def.h
+        zend_vm_execute.h
+        zend_vm_handlers.h
+        zend_vm_opcodes.h
+        zend_vm_trace_handlers.h
+        zend_vm_trace_lines.h
+        zend_vm_trace_map.h
+        zend_vm.h
+        zend_weakrefs_arginfo.h
+        zend_weakrefs.h
+        zend.h
         Optimizer/zend_call_graph.h
         Optimizer/zend_cfg.h
         Optimizer/zend_dfg.h
diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt
@@ -143,8 +143,6 @@ target_sources(
 )
 
 if(NOT EXT_GD_EXTERNAL)
-  file(GLOB _php_gd_libgd_headers ${CMAKE_CURRENT_SOURCE_DIR}/libgd/*.h)
-
   target_sources(
     php_gd
     PRIVATE
@@ -191,7 +189,21 @@ if(NOT EXT_GD_EXTERNAL)
     PUBLIC
       FILE_SET HEADERS
         FILES
-          ${_php_gd_libgd_headers}
+          libgd/bmp.h
+          libgd/gd_errors.h
+          libgd/gd_intern.h
+          libgd/gd_io.h
+          libgd/gd_tga.h
+          libgd/gd.h
+          libgd/gdcache.h
+          libgd/gdfontg.h
+          libgd/gdfontl.h
+          libgd/gdfontmb.h
+          libgd/gdfonts.h
+          libgd/gdfontt.h
+          libgd/gdhelpers.h
+          libgd/jisx0208.h
+          libgd/wbmp.h
   )
 
   set(HAVE_GD_BUNDLED 1 CACHE INTERNAL "Whether the bundled libgd is used")
diff --git a/cmake/ext/mysqlnd/CMakeLists.txt b/cmake/ext/mysqlnd/CMakeLists.txt
@@ -50,10 +50,6 @@ else()
   add_library(php_mysqlnd)
 endif()
 
-file(GLOB _php_mysqlnd_headers ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-# Exclude Windows header and specify it below separately.
-list(FILTER _php_mysqlnd_headers EXCLUDE REGEX ".*config-win\\.h$")
-
 target_sources(
   php_mysqlnd
   PRIVATE
@@ -82,8 +78,33 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
-        ${_php_mysqlnd_headers}
         $<$<PLATFORM_ID:Windows>:config-win.h>
+        mysql_float_to_double.h
+        mysqlnd_alloc.h
+        mysqlnd_auth.h
+        mysqlnd_block_alloc.h
+        mysqlnd_charset.h
+        mysqlnd_commands.h
+        mysqlnd_connection.h
+        mysqlnd_debug.h
+        mysqlnd_enum_n_def.h
+        mysqlnd_ext_plugin.h
+        mysqlnd_libmysql_compat.h
+        mysqlnd_plugin.h
+        mysqlnd_portability.h
+        mysqlnd_priv.h
+        mysqlnd_protocol_frame_codec.h
+        mysqlnd_ps.h
+        mysqlnd_read_buffer.h
+        mysqlnd_result_meta.h
+        mysqlnd_result.h
+        mysqlnd_reverse_api.h
+        mysqlnd_statistics.h
+        mysqlnd_structs.h
+        mysqlnd_vio.h
+        mysqlnd_wireprotocol.h
+        mysqlnd.h
+        php_mysqlnd.h
 )
 
 target_compile_definitions(php_mysqlnd PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
diff --git a/cmake/ext/pcre/CMakeLists.txt b/cmake/ext/pcre/CMakeLists.txt
@@ -111,15 +111,6 @@ else()
   message(STATUS "Using bundled PCRE library")
 
   block()
-    file(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/pcre2lib/*.h)
-
-    # Exclude PCRE2 library config.h header as it uses the
-    # HAVE_PCRE_VALGRIND_SUPPORT provided via compile definition by generator
-    # expressions (not available in the PHP configuration headers). It isn't
-    # required to use public headers. Perhaps more could be filtered and synced
-    # with upstream PCRE installed headers.
-    list(FILTER headers EXCLUDE REGEX ".*config\\.h$")
-
     target_sources(
       php_pcre
       PRIVATE
@@ -154,7 +145,18 @@ else()
       PUBLIC
         FILE_SET HEADERS
           FILES
-            ${headers}
+            # Exclude PCRE2 library config.h header as it uses the
+            # HAVE_PCRE_VALGRIND_SUPPORT provided via compile definition by
+            # generator expressions (not available in the PHP configuration
+            # headers). It isn't required to use public headers. Perhaps more
+            # could be filtered and synced with upstream PCRE installed headers.
+            #pcre2lib/config.h
+            pcre2lib/pcre2_internal.h
+            pcre2lib/pcre2_intmodedep.h
+            pcre2lib/pcre2_jit_neon_inc.h
+            pcre2lib/pcre2_jit_simd_inc.h
+            pcre2lib/pcre2_ucp.h
+            pcre2lib/pcre2.h
     )
   endblock()
 
diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt
@@ -34,10 +34,6 @@ add_feature_info(
 
 add_library(php_standard STATIC)
 
-file(GLOB _php_standard_headers ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-# Exclude Windows header and specify it below separately.
-list(FILTER _php_standard_headers EXCLUDE REGEX ".*winver\\.h$")
-
 target_sources(
   php_standard
   PRIVATE
@@ -113,7 +109,68 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
-        ${_php_standard_headers}
+        base64.h
+        basic_functions_arginfo.h
+        basic_functions.h
+        crc32_x86.h
+        crc32.h
+        credits_ext.h
+        credits_sapi.h
+        credits.h
+        crypt_blowfish.h
+        crypt_freesec.h
+        css.h
+        datetime.h
+        dir_arginfo.h
+        dl_arginfo.h
+        dl.h
+        exec.h
+        file_arginfo.h
+        file.h
+        flock_compat.h
+        fsock.h
+        head.h
+        html_tables.h
+        html.h
+        info.h
+        md5.h
+        pack.h
+        pageinfo.h
+        password_arginfo.h
+        php_array.h
+        php_assert.h
+        php_browscap.h
+        php_crypt_r.h
+        php_crypt.h
+        php_dir_int.h
+        php_dir.h
+        php_dns.h
+        php_ext_syslog.h
+        php_filestat.h
+        php_fopen_wrappers.h
+        php_http.h
+        php_image.h
+        php_incomplete_class.h
+        php_mail.h
+        php_math_round_mode.h
+        php_math.h
+        php_net.h
+        php_password.h
+        php_smart_string_public.h
+        php_smart_string.h
+        php_standard.h
+        php_string.h
+        php_uuencode.h
+        php_var.h
+        php_versioning.h
+        proc_open.h
+        quot_print.h
+        scanf.h
+        sha1.h
+        streamsfuncs.h
+        url_scanner_ex.h
+        url.h
+        user_filters_arginfo.h
         $<$<PLATFORM_ID:Windows>:winver.h>
 )
 
diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt
@@ -4,8 +4,6 @@ include(FeatureSummary)
 add_library(php_main STATIC)
 add_library(PHP::main ALIAS php_main)
 
-file(GLOB_RECURSE _php_main_headers ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-
 target_sources(
   php_main
   PRIVATE
@@ -47,11 +45,46 @@ target_sources(
     streams/xp_socket.c
     strlcat.c
     strlcpy.c
-    ${PHP_BINARY_DIR}/main/build-defs.h
   PUBLIC
     FILE_SET HEADERS
       FILES
-        ${_php_main_headers}
+        fastcgi.h
+        fopen_wrappers.h
+        http_status_codes.h
+        main_arginfo.h
+        php_compat.h
+        php_content_types.h
+        php_getopt.h
+        php_globals.h
+        php_ini_builder.h
+        php_ini.h
+        php_main.h
+        php_memory_streams.h
+        php_network.h
+        php_odbc_utils.h
+        php_open_temporary_file.h
+        php_output.h
+        php_reentrancy.h
+        php_scandir.h
+        php_streams.h
+        php_syslog.h
+        php_ticks.h
+        php_variables.h
+        php_version.h
+        php.h
+        rfc1867.h
+        SAPI.h
+        snprintf.h
+        spprintf.h
+        streams/php_stream_context.h
+        streams/php_stream_filter_api.h
+        streams/php_stream_glob_wrapper.h
+        streams/php_stream_mmap.h
+        streams/php_stream_plain_wrapper.h
+        streams/php_stream_transport.h
+        streams/php_stream_userspace.h
+        streams/php_streams_int.h
+        streams/userspace_arginfo.h
   # A separate file set so binary dir can also be created within a source dir.
   PUBLIC
     FILE_SET HEADERS
@@ -125,12 +158,9 @@ target_link_libraries(
   # Link publicly for PHP SAPIs.
   PUBLIC
     PHP::configuration
+    $<$<TARGET_EXISTS:PHP::win32>:PHP::win32>
 )
 
-if(TARGET PHP::win32)
-  target_link_libraries(php_main PUBLIC PHP::win32)
-endif()
-
 # Add DTrace.
 if(PHP_DTRACE)
   message(CHECK_START "Checking for DTrace support")
diff --git a/patches/8.5/cmake.patch b/patches/8.5/cmake.patch
