Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -45,7 +45,7 @@ project(
   LANGUAGES C ASM
 )
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSourceCompiles)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
@@ -393,8 +393,8 @@ install(
 # Configuration checks.
 ################################################################################
 
-check_include_file(cpuid.h HAVE_CPUID_H)
-check_include_file(libproc.h HAVE_LIBPROC_H)
+check_include_files(cpuid.h HAVE_CPUID_H)
+check_include_files(libproc.h HAVE_LIBPROC_H)
 
 check_symbol_exists(clock_gettime_nsec_np "time.h" HAVE_CLOCK_GETTIME_NSEC_NP)
 check_symbol_exists(getpid "unistd.h" HAVE_GETPID)
@@ -414,7 +414,7 @@ cmake_pop_check_state()
 
 # BSD-based systems have pthread_attr_get_np in pthread_np.h.
 block()
-  check_include_file(pthread_np.h _HAVE_PTHREAD_NP_H)
+  check_include_files(pthread_np.h _HAVE_PTHREAD_NP_H)
 
   if(_HAVE_PTHREAD_NP_H)
     set(headers "pthread_np.h")

cmake/Zend/cmake/Fibers.cmake

@@ -35,7 +35,7 @@ include(cmake/Fibers.cmake)
 
 include_guard(GLOBAL)
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
@@ -202,7 +202,7 @@ block()
         )
       endif()
 
-      check_include_file(ucontext.h ZEND_FIBER_UCONTEXT)
+      check_include_files(ucontext.h ZEND_FIBER_UCONTEXT)
     cmake_pop_check_state()
 
     if(NOT ZEND_FIBER_UCONTEXT)

cmake/cmake/ConfigureChecks.cmake

@@ -5,7 +5,6 @@ Project-wide configuration checks.
 include_guard(GLOBAL)
 
 include(CheckFunctionExists)
-include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSourceCompiles)
 include(CheckStructHasMember)
@@ -20,72 +19,72 @@ include(PHP/SearchLibraries)
 # Check headers.
 ################################################################################
 
-check_include_file(alloca.h HAVE_ALLOCA_H)
-check_include_file(arpa/inet.h HAVE_ARPA_INET_H)
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_files(alloca.h HAVE_ALLOCA_H)
+check_include_files(arpa/inet.h HAVE_ARPA_INET_H)
+check_include_files(sys/types.h HAVE_SYS_TYPES_H)
 
 if(HAVE_SYS_TYPES_H)
   # On Solaris/illumos arpa/nameser.h depends on sys/types.h.
   check_include_files("sys/types.h;arpa/nameser.h" HAVE_ARPA_NAMESER_H)
 else()
-  check_include_file(arpa/nameser.h HAVE_ARPA_NAMESER_H)
+  check_include_files(arpa/nameser.h HAVE_ARPA_NAMESER_H)
 endif()
 
-check_include_file(dirent.h HAVE_DIRENT_H)
-check_include_file(dlfcn.h HAVE_DLFCN_H)
-check_include_file(dns.h HAVE_DNS_H)
-check_include_file(fcntl.h HAVE_FCNTL_H)
-check_include_file(grp.h HAVE_GRP_H)
-check_include_file(ieeefp.h HAVE_IEEEFP_H)
-check_include_file(langinfo.h HAVE_LANGINFO_H)
-check_include_file(linux/sock_diag.h HAVE_LINUX_SOCK_DIAG_H)
-check_include_file(netinet/in.h HAVE_NETINET_IN_H)
-check_include_file(poll.h HAVE_POLL_H)
-check_include_file(pty.h HAVE_PTY_H)
-check_include_file(pwd.h HAVE_PWD_H)
+check_include_files(dirent.h HAVE_DIRENT_H)
+check_include_files(dlfcn.h HAVE_DLFCN_H)
+check_include_files(dns.h HAVE_DNS_H)
+check_include_files(fcntl.h HAVE_FCNTL_H)
+check_include_files(grp.h HAVE_GRP_H)
+check_include_files(ieeefp.h HAVE_IEEEFP_H)
+check_include_files(langinfo.h HAVE_LANGINFO_H)
+check_include_files(linux/sock_diag.h HAVE_LINUX_SOCK_DIAG_H)
+check_include_files(netinet/in.h HAVE_NETINET_IN_H)
+check_include_files(poll.h HAVE_POLL_H)
+check_include_files(pty.h HAVE_PTY_H)
+check_include_files(pwd.h HAVE_PWD_H)
 
 # BSD-based systems (FreeBSD<=13) need also netinet/in.h for resolv.h to work.
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=182466
 if(HAVE_NETINET_IN_H)
   check_include_files("netinet/in.h;resolv.h" HAVE_RESOLV_H)
 else()
-  check_include_file(resolv.h HAVE_RESOLV_H)
+  check_include_files(resolv.h HAVE_RESOLV_H)
 endif()
 
-check_include_file(strings.h HAVE_STRINGS_H)
-check_include_file(sys/file.h HAVE_SYS_FILE_H)
-check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
-check_include_file(sys/ipc.h HAVE_SYS_IPC_H)
-check_include_file(sys/loadavg.h HAVE_SYS_LOADAVG_H)
-check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
-check_include_file(sys/mount.h HAVE_SYS_MOUNT_H)
-check_include_file(sys/param.h HAVE_SYS_PARAM_H)
-check_include_file(sys/poll.h HAVE_SYS_POLL_H)
-check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H)
-check_include_file(sys/select.h HAVE_SYS_SELECT_H)
-check_include_file(sys/socket.h HAVE_SYS_SOCKET_H)
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_include_file(sys/statfs.h HAVE_SYS_STATFS_H)
-check_include_file(sys/statvfs.h HAVE_SYS_STATVFS_H)
-check_include_file(sys/sysexits.h HAVE_SYS_SYSEXITS_H)
-check_include_file(sys/time.h HAVE_SYS_TIME_H)
-check_include_file(sys/uio.h HAVE_SYS_UIO_H)
-check_include_file(sys/utsname.h HAVE_SYS_UTSNAME_H)
+check_include_files(strings.h HAVE_STRINGS_H)
+check_include_files(sys/file.h HAVE_SYS_FILE_H)
+check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
+check_include_files(sys/ipc.h HAVE_SYS_IPC_H)
+check_include_files(sys/loadavg.h HAVE_SYS_LOADAVG_H)
+check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
+check_include_files(sys/mount.h HAVE_SYS_MOUNT_H)
+check_include_files(sys/param.h HAVE_SYS_PARAM_H)
+check_include_files(sys/poll.h HAVE_SYS_POLL_H)
+check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
+check_include_files(sys/select.h HAVE_SYS_SELECT_H)
+check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
+check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+check_include_files(sys/statfs.h HAVE_SYS_STATFS_H)
+check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H)
+check_include_files(sys/sysexits.h HAVE_SYS_SYSEXITS_H)
+check_include_files(sys/time.h HAVE_SYS_TIME_H)
+check_include_files(sys/uio.h HAVE_SYS_UIO_H)
+check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
 # Solaris <= 10, other systems have sys/statvfs.h.
-check_include_file(sys/vfs.h HAVE_SYS_VFS_H)
-check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
-check_include_file(sysexits.h HAVE_SYSEXITS_H)
-check_include_file(syslog.h HAVE_SYSLOG_H)
-check_include_file(unistd.h HAVE_UNISTD_H)
+check_include_files(sys/vfs.h HAVE_SYS_VFS_H)
+check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
+check_include_files(sysexits.h HAVE_SYSEXITS_H)
+check_include_files(syslog.h HAVE_SYSLOG_H)
+check_include_files(unistd.h HAVE_UNISTD_H)
 # QNX requires unix.h to allow functions in libunix to work properly.
-check_include_file(unix.h HAVE_UNIX_H)
-check_include_file(utime.h HAVE_UTIME_H)
+check_include_files(unix.h HAVE_UNIX_H)
+check_include_files(utime.h HAVE_UTIME_H)
 
 # Intel Intrinsics headers.
-check_include_file(tmmintrin.h HAVE_TMMINTRIN_H)
-check_include_file(nmmintrin.h HAVE_NMMINTRIN_H)
-check_include_file(wmmintrin.h HAVE_WMMINTRIN_H)
-check_include_file(immintrin.h HAVE_IMMINTRIN_H)
+check_include_files(tmmintrin.h HAVE_TMMINTRIN_H)
+check_include_files(nmmintrin.h HAVE_NMMINTRIN_H)
+check_include_files(wmmintrin.h HAVE_WMMINTRIN_H)
+check_include_files(immintrin.h HAVE_IMMINTRIN_H)
 
 ################################################################################
 # Check structs.
@@ -802,7 +801,7 @@ if(PHP_VALGRIND)
   if(TARGET Valgrind::Valgrind)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Valgrind::Valgrind)
-      check_include_file(valgrind/cachegrind.h HAVE_VALGRIND_CACHEGRIND_H)
+      check_include_files(valgrind/cachegrind.h HAVE_VALGRIND_CACHEGRIND_H)
     cmake_pop_check_state()
   endif()
 

cmake/cmake/modules/FindTidy.cmake

@@ -32,7 +32,7 @@ find_package(Tidy)
 ```
 #]=============================================================================]
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
@@ -89,11 +89,11 @@ if(Tidy_INCLUDE_DIR)
     # Check for tidybuffio.h (as opposed to simply buffio.h) which indicates
     # that the found library is tidy-html5 and not the legacy htmltidy. The two
     # are compatible, except the legacy doesn't have this header.
-    check_include_file(tidybuffio.h HAVE_TIDYBUFFIO_H)
+    check_include_files(tidybuffio.h HAVE_TIDYBUFFIO_H)
 
-    check_include_file(tidy.h HAVE_TIDY_H)
+    check_include_files(tidy.h HAVE_TIDY_H)
     if(NOT HAVE_TIDY_H)
-      check_include_file(tidyp.h HAVE_TIDYP_H)
+      check_include_files(tidyp.h HAVE_TIDYP_H)
     endif()
   cmake_pop_check_state()
 endif()

cmake/cmake/modules/PHP/CheckFlushIo.cmake

@@ -22,7 +22,7 @@ if(DEFINED HAVE_FLUSHIO)
   return()
 endif()
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
@@ -44,7 +44,7 @@ endif()
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
-  check_include_file(unistd.h HAVE_UNISTD_H)
+  check_include_files(unistd.h HAVE_UNISTD_H)
 
   if(HAVE_UNISTD_H)
     set(CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)

cmake/cmake/modules/PHP/CheckSysMacros.cmake

@@ -76,14 +76,14 @@ if(DEFINED _PHP_HAVE_SYS_MACROS_CHECKED)
   return()
 endif()
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSymbolExists)
 
 message(CHECK_START "Checking for major, minor and makedev")
 
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(sys/mkdev.h HAVE_SYS_MKDEV_H)
-check_include_file(sys/sysmacros.h HAVE_SYS_SYSMACROS_H)
+check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+check_include_files(sys/mkdev.h HAVE_SYS_MKDEV_H)
+check_include_files(sys/sysmacros.h HAVE_SYS_SYSMACROS_H)
 
 block()
   set(headers "")

cmake/cmake/modules/PHP/CheckWrite.cmake

@@ -24,7 +24,7 @@ if(DEFINED PHP_WRITE_STDOUT)
   return()
 endif()
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
@@ -42,7 +42,7 @@ endif()
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
-  check_include_file(unistd.h HAVE_UNISTD_H)
+  check_include_files(unistd.h HAVE_UNISTD_H)
 
   if(HAVE_UNISTD_H)
     list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)

cmake/cmake/modules/PHP/SystemExtensions.cmake

@@ -94,7 +94,7 @@ endif()
 
 include_guard(GLOBAL)
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckSourceCompiles)
 include(CheckTypeSize)
 include(CMakePushCheckState)
@@ -145,10 +145,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
       set(CMAKE_REQUIRED_QUIET TRUE)
     endif()
 
-    check_include_file(strings.h HAVE_STRINGS_H)
-    check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-    check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-    check_include_file(unistd.h HAVE_UNISTD_H)
+    check_include_files(strings.h HAVE_STRINGS_H)
+    check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+    check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+    check_include_files(unistd.h HAVE_UNISTD_H)
 
     if(HAVE_STRINGS_H)
       list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STRINGS_H)

cmake/ext/com_dotnet/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   return()
 endif()
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CMakeDependentOption)
 include(FeatureSummary)
 
@@ -91,7 +91,7 @@ target_compile_definitions(
 
 target_link_libraries(php_ext_com_dotnet PRIVATE oleaut32)
 
-check_include_file(mscoree.h HAVE_MSCOREE_H)
+check_include_files(mscoree.h HAVE_MSCOREE_H)
 
 set(HAVE_COM_DOTNET TRUE)
 

cmake/ext/curl/CMakeLists.txt

@@ -27,7 +27,7 @@ project(
   LANGUAGES C
 )
 
-include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(CheckSourceRuns)
 include(CMakeDependentOption)
@@ -158,7 +158,7 @@ if(PHP_THREAD_SAFETY AND CURL_SSL_FOUND)
     if(TARGET OpenSSL::Crypto)
       cmake_push_check_state(RESET)
         set(CMAKE_REQUIRED_LIBRARIES OpenSSL::Crypto)
-        check_include_file(openssl/crypto.h HAVE_OPENSSL_CRYPTO_H)
+        check_include_files(openssl/crypto.h HAVE_OPENSSL_CRYPTO_H)
       cmake_pop_check_state()
     endif()
   endif()