Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

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" _HAVE_LDAP_SASL_BIND_S)
-    # Fallback to deprecated ldap_simple_bind_s().
-    if(NOT _HAVE_LDAP_SASL_BIND_S)
-      check_symbol_exists(ldap_simple_bind_s "ldap.h" _HAVE_LDAP_SIMPLE_BIND_S)
+    check_symbol_exists(ldap_sasl_bind_s "ldap.h" _PHP_HAVE_LDAP_SASL_BIND_S)
+    if(NOT _PHP_HAVE_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)
     endif()
-    if(NOT _HAVE_LDAP_SASL_BIND_S AND NOT _HAVE_LDAP_SIMPLE_BIND_S)
+    if(NOT _PHP_HAVE_LDAP_SASL_BIND_S AND NOT _PHP_HAVE_LDAP_SIMPLE_BIND_S)
       message(
         FATAL_ERROR
         "LDAP sanity check failed: neither 'ldap_sasl_bind_s()' nor "
@@ -118,7 +118,7 @@ if(TARGET LDAP::LDAP)
 
       int main(void)
       {
-        ldap_set_rebind_proc(0,0,0);
+        ldap_set_rebind_proc(0, 0, 0);
         return 0;
       }
     ]] HAVE_3ARG_SETREBINDPROC)
@@ -130,16 +130,16 @@ if(TARGET LDAP::LDAP)
 
     # Solaris 2.8 claims to be 2004 API, but doesn't have ldap_parse_reference()
     # nor ldap_start_tls_s().
-    check_symbol_exists(ldap_parse_result "ldap.h" HAVE_LDAP_PARSE_RESULT)
-    check_symbol_exists(ldap_parse_reference "ldap.h" HAVE_LDAP_PARSE_REFERENCE)
-    check_symbol_exists(ldap_start_tls_s "ldap.h" HAVE_LDAP_START_TLS_S)
     check_symbol_exists(ldap_control_find "ldap.h" HAVE_LDAP_CONTROL_FIND)
-    check_symbol_exists(ldap_parse_extended_result "ldap.h" HAVE_LDAP_PARSE_EXTENDED_RESULT)
     check_symbol_exists(ldap_extended_operation "ldap.h" HAVE_LDAP_EXTENDED_OPERATION)
     check_symbol_exists(ldap_extended_operation_s "ldap.h" HAVE_LDAP_EXTENDED_OPERATION_S)
+    check_symbol_exists(ldap_parse_extended_result "ldap.h" HAVE_LDAP_PARSE_EXTENDED_RESULT)
+    check_symbol_exists(ldap_parse_reference "ldap.h" HAVE_LDAP_PARSE_REFERENCE)
+    check_symbol_exists(ldap_parse_result "ldap.h" HAVE_LDAP_PARSE_RESULT)
     check_symbol_exists(ldap_passwd "ldap.h" HAVE_LDAP_PASSWD)
-    check_symbol_exists(ldap_whoami_s "ldap.h" HAVE_LDAP_WHOAMI_S)
     check_symbol_exists(ldap_refresh_s "ldap.h" HAVE_LDAP_REFRESH_S)
+    check_symbol_exists(ldap_start_tls_s "ldap.h" HAVE_LDAP_START_TLS_S)
+    check_symbol_exists(ldap_whoami_s "ldap.h" HAVE_LDAP_WHOAMI_S)
   cmake_pop_check_state()
 endif()