Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/curl/CMakeLists.txt

@@ -29,7 +29,6 @@ project(
 
 include(CheckIncludeFiles)
 include(CheckSourceRuns)
-include(CheckSymbolExists)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
 include(FeatureSummary)
@@ -172,26 +171,6 @@ if(PHP_THREAD_SAFETY AND CURL_SSL_FOUND)
   endif()
 endif()
 
-# Sanity check.
-if(TARGET CURL::libcurl)
-  cmake_push_check_state(RESET)
-    set(CMAKE_REQUIRED_LIBRARIES CURL::libcurl)
-
-    check_symbol_exists(
-      curl_easy_perform
-      curl/curl.h
-      _PHP_HAVE_CURL_EASY_PERFORM
-    )
-  cmake_pop_check_state()
-
-  if(NOT _PHP_HAVE_CURL_EASY_PERFORM)
-    message(
-      FATAL_ERROR
-      "ext/curl sanity check failed: 'curl_easy_perform()' could not be found."
-    )
-  endif()
-endif()
-
 set(HAVE_CURL TRUE)
 
 configure_file(cmake/config.h.in config.h)

cmake/ext/gd/CMakeLists.txt

@@ -77,7 +77,6 @@ project(
   LANGUAGES C
 )
 
-include(CheckSourceCompiles)
 include(CheckSourceRuns)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
@@ -412,34 +411,6 @@ if(NOT PHP_EXT_GD_EXTERNAL)
     set(JISX0208 TRUE)
     set(USE_GD_JISX0208 TRUE)
   endif()
-
-  # Do sanity check when all required packages are found.
-  block()
-    get_target_property(libraries php_ext_gd LINK_LIBRARIES)
-    set(doSanityCheck TRUE)
-    foreach(library ${libraries})
-      if(library MATCHES "^.+::.+$" AND NOT TARGET ${library})
-        set(doSanityCheck FALSE)
-        break()
-      endif()
-    endforeach()
-
-    if(doSanityCheck)
-      cmake_push_check_state(RESET)
-        set(CMAKE_REQUIRED_LIBRARIES ${libraries})
-
-        check_source_compiles(
-          C
-          [[int main(void) { return 0; }]]
-          _PHP_GD_SANITY_CHECK_COMPILES
-        )
-      cmake_pop_check_state()
-
-      if(NOT _PHP_GD_SANITY_CHECK_COMPILES)
-        message(FATAL_ERROR "GD sanity check failed.")
-      endif()
-    endif()
-  endblock()
 else()
   find_package(GD 2.1.0)
   set_package_properties(
@@ -454,18 +425,7 @@ else()
   target_sources(php_ext_gd PRIVATE gd_compat.c)
 
   if(TARGET GD::GD)
-    # Sanity check.
-    cmake_push_check_state(RESET)
-      set(CMAKE_REQUIRED_LIBRARIES GD::GD)
-      check_symbol_exists(gdImageCreate gd.h HAVE_LIBGD)
-    cmake_pop_check_state()
-
-    if(NOT HAVE_LIBGD)
-      message(
-        FATAL_ERROR
-        "GD sanity check failed: 'gdImageCreate()' could not be found in libgd."
-      )
-    endif()
+    set(HAVE_LIBGD TRUE)
 
     # Build and run a program to determine if GD has support for the given
     # format. The first argument is the proper-noun-capitalized name of the

cmake/ext/gettext/CMakeLists.txt

@@ -83,8 +83,8 @@ if(TARGET Intl::Intl)
     set(CMAKE_REQUIRED_LIBRARIES Intl::Intl)
 
     # Sanity check.
-    check_symbol_exists(bindtextdomain libintl.h _PHP_HAVE_BINDTEXTDOMAIN)
-    if(NOT _PHP_HAVE_BINDTEXTDOMAIN)
+    check_symbol_exists(bindtextdomain libintl.h PHP_EXT_GETTEXT_SANITY_CHECK)
+    if(NOT PHP_EXT_GETTEXT_SANITY_CHECK)
       message(
         FATAL_ERROR
         "The ext/gettext sanity check for intl library failed: The "

cmake/ext/ldap/CMakeLists.txt

@@ -99,12 +99,12 @@ if(TARGET LDAP::LDAP)
     set(CMAKE_REQUIRED_LIBRARIES LDAP::LDAP)
 
     # Sanity check.
-    check_symbol_exists(ldap_sasl_bind_s ldap.h _PHP_HAVE_LDAP_SASL_BIND_S)
-    if(NOT _PHP_HAVE_LDAP_SASL_BIND_S)
+    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)
       # Fallback to deprecated ldap_simple_bind_s().
-      check_symbol_exists(ldap_simple_bind_s ldap.h _PHP_HAVE_LDAP_SIMPLE_BIND_S)
+      check_symbol_exists(ldap_simple_bind_s ldap.h PHP_HAS_LDAP_SIMPLE_BIND_S)
     endif()
-    if(NOT _PHP_HAVE_LDAP_SASL_BIND_S AND NOT _PHP_HAVE_LDAP_SIMPLE_BIND_S)
+    if(NOT PHP_EXT_LDAP_HAS_LDAP_SASL_BIND_S AND NOT PHP_HAS_LDAP_SIMPLE_BIND_S)
       message(
         FATAL_ERROR
         "LDAP sanity check failed: neither 'ldap_sasl_bind_s()' nor "

cmake/ext/pdo_firebird/CMakeLists.txt

@@ -98,11 +98,11 @@ if(TARGET Firebird::Firebird)
     check_cxx_symbol_exists(
       Firebird::fb_get_master_interface
       firebird/Interface.h
-      _PHP_EXT_PDO_FIREBIRD_SANITY_CHECK
+      PHP_EXT_PDO_FIREBIRD_SANITY_CHECK
     )
   cmake_pop_check_state()
 
-  if(NOT _PHP_EXT_PDO_FIREBIRD_SANITY_CHECK)
+  if(NOT PHP_EXT_PDO_FIREBIRD_SANITY_CHECK)
     message(
       FATAL_ERROR
       "Firebird sanity check failed: 'fb_get_master_interface()' not found."