Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -76,7 +76,9 @@ else()
   check_include_files(resolv.h HAVE_RESOLV_H)
 endif()
 
-check_include_files(strings.h HAVE_STRINGS_H)
+check_include_files(strings.h PHP_HAVE_STRINGS_H)
+set(HAVE_STRINGS_H ${PHP_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)
@@ -363,7 +365,10 @@ endblock()
 
 check_symbol_exists(statvfs sys/statvfs.h HAVE_STATVFS)
 check_symbol_exists(std_syslog sys/syslog.h HAVE_STD_SYSLOG)
-check_symbol_exists(strcasecmp strings.h HAVE_STRCASECMP)
+
+check_symbol_exists(strcasecmp strings.h PHP_HAVE_STRCASECMP)
+set(HAVE_STRCASECMP ${PHP_HAVE_STRCASECMP})
+
 check_symbol_exists(symlink unistd.h HAVE_SYMLINK)
 check_symbol_exists(tzset time.h HAVE_TZSET)
 check_symbol_exists(unsetenv stdlib.h HAVE_UNSETENV)

cmake/cmake/platforms/Windows.cmake

@@ -30,9 +30,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # PHP has nice() emulation implemented on Windows.
   set(HAVE_NICE TRUE)
 
-  # PHP defines strcasecmp in Zend/zend_config.w32.h.
-  set(HAVE_STRCASECMP TRUE)
-
   # PHP has syslog.h emulation implemented on Windows.
   set(HAVE_SYSLOG_H TRUE)
 
@@ -48,6 +45,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # PHP has socketpair() emulation implemented on Windows.
   set(PHP_HAS_SOCKETPAIR TRUE)
 
+  # PHP defines strcasecmp in Zend/zend_config.w32.h.
+  set(PHP_HAVE_STRCASECMP TRUE)
+
   ##############################################################################
   # To speed up the Windows build experience where configuration phase takes
   # much longer compared to POSIX-based environments, the following are always
@@ -134,7 +134,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_STD_SYSLOG FALSE)
   set(HAVE_STDDEF_H TRUE) # Defined by check_type_size().
   set(HAVE_STDINT_H TRUE) # Defined by check_type_size().
-  set(HAVE_STRINGS_H FALSE)
   set(HAVE_STRLCAT FALSE)
   set(HAVE_STRLCPY FALSE)
   set(HAVE_STRNLEN TRUE)
@@ -259,6 +258,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_CREATEPROCESS TRUE)
   set(PHP_HAVE_FORK FALSE)
   set(PHP_HAVE_GRP_H FALSE)
+  set(PHP_HAVE_STRINGS_H FALSE)
   set(PHP_HAVE_UNISTD_H FALSE)
   set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)
   set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)

cmake/ext/curl/CMakeLists.txt

@@ -152,13 +152,13 @@ if(
         /* No SSL support */
         return 1;
       }
-    ]] PHP_EXT_CURL_HAS_CURL_OLD_OPENSSL)
+    ]] PHP_EXT_CURL_HAVE_CURL_OLD_OPENSSL)
   cmake_pop_check_state()
+  set(HAVE_CURL_OLD_OPENSSL ${PHP_EXT_CURL_HAVE_CURL_OLD_OPENSSL})
 
-  if(NOT PHP_EXT_CURL_HAS_CURL_OLD_OPENSSL)
+  if(NOT PHP_EXT_CURL_HAVE_CURL_OLD_OPENSSL)
     message(CHECK_FAIL "no")
   else()
-    set(HAVE_CURL_OLD_OPENSSL TRUE)
     message(CHECK_PASS "yes")
     find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
     set_package_properties(
@@ -173,7 +173,8 @@ if(
     if(TARGET OpenSSL::Crypto)
       cmake_push_check_state(RESET)
         set(CMAKE_REQUIRED_LIBRARIES OpenSSL::Crypto)
-        check_include_files(openssl/crypto.h HAVE_OPENSSL_CRYPTO_H)
+        check_include_files(openssl/crypto.h PHP_EXT_CURL_HAVE_OPENSSL_CRYPTO_H)
+        set(HAVE_OPENSSL_CRYPTO_H ${PHP_EXT_CURL_HAVE_OPENSSL_CRYPTO_H})
       cmake_pop_check_state()
     endif()
   endif()

cmake/ext/fileinfo/CMakeLists.txt

@@ -95,7 +95,7 @@ cmake_push_check_state(RESET)
   check_symbol_exists(strcasestr string.h PHP_EXT_FILEINFO_HAVE_STRCASESTR)
   set(HAVE_STRCASESTR ${PHP_EXT_FILEINFO_HAVE_STRCASESTR})
 cmake_pop_check_state()
-if(NOT HAVE_STRCASESTR)
+if(NOT PHP_EXT_FILEINFO_HAVE_STRCASESTR)
   message(STATUS "Using libmagic strcasestr implementation")
   target_sources(php_ext_fileinfo PRIVATE libmagic/strcasestr.c)
 endif()

cmake/ext/gd/CMakeLists.txt

@@ -328,6 +328,7 @@ if(NOT PHP_EXT_GD_EXTERNAL)
 
   set(HAVE_LIBPNG TRUE)
   set(HAVE_GD_PNG TRUE)
+  set(HAVE_GD_GET_INTERPOLATION TRUE)
 
   if(PHP_EXT_GD_AVIF)
     find_package(libavif 0.8.2)
@@ -486,13 +487,18 @@ else()
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES GD::GD)
 
-      check_symbol_exists(gdFontCacheShutdown gd.h HAVE_GD_FREETYPE)
-      check_symbol_exists(gdVersionString gd.h HAVE_GD_LIBVERSION)
+      check_symbol_exists(gdFontCacheShutdown gd.h PHP_EXT_GD_HAVE_GD_FREETYPE)
+      set(HAVE_GD_FREETYPE ${PHP_EXT_GD_HAVE_GD_FREETYPE})
+
+      check_symbol_exists(gdVersionString gd.h PHP_EXT_GD_HAVE_GD_LIBVERSION)
+      set(HAVE_GD_LIBVERSION ${PHP_EXT_GD_HAVE_GD_LIBVERSION})
+
       check_symbol_exists(
         gdImageGetInterpolationMethod
         gd.h
-        HAVE_GD_GET_INTERPOLATION
+        PHP_EXT_GD_HAVE_GD_GET_INTERPOLATION
       )
+      set(HAVE_GD_GET_INTERPOLATION ${PHP_EXT_GD_HAVE_GD_GET_INTERPOLATION})
     cmake_pop_check_state()
   endif()
 endif()

cmake/ext/gd/cmake/config.h.in

@@ -11,14 +11,15 @@
 /* Define to 1 if gd extension has FreeType support. */
 #cmakedefine HAVE_GD_FREETYPE 1
 
-/* Define to 1 if GD library has the 'gdImageGetInterpolationMethod' function.
-   */
+/* Define to 1 if GD library has the 'gdImageGetInterpolationMethod' function
+   (available as of libgd 2.1.1). */
 #cmakedefine HAVE_GD_GET_INTERPOLATION 1
 
 /* Define to 1 if gd extension has JPEG support. */
 #cmakedefine HAVE_GD_JPG 1
 
-/* Define to 1 if GD library has the 'gdVersionString' function. */
+/* Define to 1 if GD library has the 'gdVersionString' function (available as
+   of libgd 2.1.1). */
 #cmakedefine HAVE_GD_LIBVERSION 1
 
 /* Define to 1 if gd extension has PNG support. */

cmake/ext/ldap/CMakeLists.txt

@@ -99,12 +99,23 @@ if(TARGET LDAP::LDAP)
     set(CMAKE_REQUIRED_LIBRARIES LDAP::LDAP)
 
     # Sanity check.
-    check_symbol_exists(ldap_sasl_bind_s ldap.h PHP_EXT_LDAP_HAS_LDAP_SASL_BIND_S)
-    if(NOT PHP_EXT_LDAP_HAS_LDAP_SASL_BIND_S)
+    check_symbol_exists(
+      ldap_sasl_bind_s
+      ldap.h
+      PHP_EXT_LDAP_HAVE_LDAP_SASL_BIND_S
+    )
+    if(NOT PHP_EXT_LDAP_HAVE_LDAP_SASL_BIND_S)
       # Fallback to deprecated ldap_simple_bind_s().
-      check_symbol_exists(ldap_simple_bind_s ldap.h PHP_HAS_LDAP_SIMPLE_BIND_S)
+      check_symbol_exists(
+        ldap_simple_bind_s
+        ldap.h
+        PHP_EXT_LDAP_HAVE_LDAP_SIMPLE_BIND_S
+      )
     endif()
-    if(NOT PHP_EXT_LDAP_HAS_LDAP_SASL_BIND_S AND NOT PHP_HAS_LDAP_SIMPLE_BIND_S)
+    if(
+      NOT PHP_EXT_LDAP_HAVE_LDAP_SASL_BIND_S
+      AND NOT PHP_EXT_LDAP_HAVE_LDAP_SIMPLE_BIND_S
+    )
       message(
         FATAL_ERROR
         "LDAP sanity check failed: neither 'ldap_sasl_bind_s()' nor "

cmake/ext/mbstring/CMakeLists.txt

@@ -154,9 +154,9 @@ if(PHP_EXT_MBSTRING_MBREGEX)
         {
           return (intptr_t)(ONIG_ENCODING_KOI8 + 1);
         }
-      ]] PHP_ONIG_KOI8)
+      ]] PHP_EXT_MBSTRING_ONIG_KOI8)
     cmake_pop_check_state()
-    if(PHP_ONIG_KOI8)
+    if(PHP_EXT_MBSTRING_ONIG_KOI8)
       message(CHECK_PASS "no")
     else()
       message(CHECK_FAIL "yes")

cmake/ext/mbstring/libmbfl/CMakeLists.txt

@@ -101,8 +101,11 @@ target_compile_definitions(
 )
 
 # The libmbfl configuration header.
-check_include_files(strings.h HAVE_STRINGS_H)
-check_symbol_exists(strcasecmp strings.h HAVE_STRCASECMP)
+check_include_files(strings.h PHP_HAVE_STRINGS_H)
+set(HAVE_STRINGS ${PHP_HAVE_STRINGS_H})
+
+check_symbol_exists(strcasecmp strings.h PHP_HAVE_STRCASECMP)
+set(HAVE_STRCASECMP ${PHP_HAVE_STRCASECMP})
 
 cmake_path(
   RELATIVE_PATH