Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/FindCdb.cmake

@@ -27,7 +27,8 @@ find_package(Cdb)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -69,10 +70,16 @@ if(NOT Cdb_LIBRARY)
 endif()
 
 # Sanity check.
-if(Cdb_LIBRARY)
-  check_library_exists("${Cdb_LIBRARY}" cdb_read "" _cdb_sanity_check)
+if(Cdb_INCLUDE_DIR AND Cdb_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${Cdb_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${Cdb_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
 
-  if(NOT _cdb_sanity_check)
+    check_symbol_exists(cdb_read cdb.h _Cdb_SANITY_CHECK)
+  cmake_pop_check_state()
+
+  if(NOT _Cdb_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: cdb_read not found. ")
   endif()
 endif()
@@ -97,7 +104,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     Cdb_LIBRARY
     Cdb_INCLUDE_DIR
-    _cdb_sanity_check
+    _Cdb_SANITY_CHECK
   VERSION_VAR Cdb_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/FindFreeTDS.cmake

@@ -26,7 +26,8 @@ find_package(FreeTDS)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -61,10 +62,16 @@ if(NOT FreeTDS_LIBRARY)
 endif()
 
 # Sanity check.
-if(FreeTDS_LIBRARY)
-  check_library_exists("${FreeTDS_LIBRARY}" dbsqlexec "" _freetds_sanity_check)
+if(FreeTDS_INCLUDE_DIR AND FreeTDS_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${FreeTDS_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${FreeTDS_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
 
-  if(NOT _freetds_sanity_check)
+    check_symbol_exists(dbsqlexec sybdb.h _FreeTDS_SANITY_CHECK)
+  cmake_pop_check_state()
+
+  if(NOT _FreeTDS_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: dbsqlexec not found. ")
   endif()
 endif()
@@ -76,7 +83,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     FreeTDS_LIBRARY
     FreeTDS_INCLUDE_DIR
-    _freetds_sanity_check
+    _FreeTDS_SANITY_CHECK
   REASON_FAILURE_MESSAGE "${_reason}"
 )
 

cmake/cmake/modules/FindLMDB.cmake

@@ -27,14 +27,15 @@ find_package(LMDB)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
 set_package_properties(
   LMDB
   PROPERTIES
-    URL "https://www.symas.com/lmdb"
+    URL "https://www.symas.com/mdb"
     DESCRIPTION "Lightning Memory-Mapped Database library"
 )
 
@@ -69,10 +70,16 @@ if(NOT LMDB_LIBRARY)
 endif()
 
 # Sanity check.
-if(LMDB_LIBRARY)
-  check_library_exists("${LMDB_LIBRARY}" mdb_env_open "" _lmdb_sanity_check)
+if(LMDB_INCLUDE_DIR AND LMDB_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${LMDB_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${LMDB_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
 
-  if(NOT _lmdb_sanity_check)
+    check_symbol_exists(mdb_env_open lmdb.h _LMDB_SANITY_CHECK)
+  cmake_pop_check_state()
+
+  if(NOT _LMDB_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: mdb_env_open not found. ")
   endif()
 endif()
@@ -111,7 +118,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     LMDB_LIBRARY
     LMDB_INCLUDE_DIR
-    _lmdb_sanity_check
+    _LMDB_SANITY_CHECK
   VERSION_VAR LMDB_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/FindTokyoCabinet.cmake

@@ -27,7 +27,8 @@ find_package(TokyoCabinet)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -69,15 +70,16 @@ if(NOT TokyoCabinet_LIBRARY)
 endif()
 
 # Sanity check.
-if(TokyoCabinet_LIBRARY)
-  check_library_exists(
-    "${TokyoCabinet_LIBRARY}"
-    tcadbopen
-    ""
-    _tokyocabinet_sanity_check
-  )
+if(TokyoCabinet_INCLUDE_DIR AND TokyoCabinet_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${TokyoCabinet_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${TokyoCabinet_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(tcadbopen tcadb.h _TokyoCabinet_SANITY_CHECK)
+  cmake_pop_check_state()
 
-  if(NOT _tokyocabinet_sanity_check)
+  if(NOT _TokyoCabinet_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: tcadbopen not found. ")
   endif()
 endif()
@@ -102,7 +104,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     TokyoCabinet_LIBRARY
     TokyoCabinet_INCLUDE_DIR
-    _tokyocabinet_sanity_check
+    _TokyoCabinet_SANITY_CHECK
   VERSION_VAR TokyoCabinet_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/PHP/SearchLibraries.cmake

@@ -49,10 +49,10 @@ If `<variable>` is given, check result is stored in an internal cache variable.
 * `LIBRARIES`
 
   If symbol is not found in the default libraries (C library), then the
-  `LIBRARIES` list is iterated. Instead of using the `check_library_exists()` or
-  `check_function_exists()`, the `check_symbol_exists()` is used, since it also
-  works when symbol might be a macro definition. It would not be found using the
-  other two commands because they don't include required headers.
+  `LIBRARIES` list is iterated. Instead of using the `check_function_exists()`,
+  the `check_symbol_exists()` is used, since it also works when symbol might be
+  a macro definition. It would not be found using the other two commands because
+  they don't include required headers.
 
 * `VARIABLE`
 

cmake/ext/hash/CMakeLists.txt

@@ -105,6 +105,12 @@ target_sources(
         xxhash/xxhash.h
 )
 
+target_compile_definitions(
+  php_ext_hash
+  PRIVATE
+    ZEND_ENABLE_STATIC_TSRMLS_CACHE
+)
+
 if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
   set(HAVE_SLOW_HASH3 TRUE)
   message(WARNING "Using slow SHA3 implementation on big-endian")
@@ -118,9 +124,9 @@ else()
       php_check_compiler_flag(
         C
         -Wno-implicit-fallthrough
-        _HAVE_WNO_IMPLICIT_FALLTHROUGH_C
+        _PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C
       )
-      if(_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
+      if(_PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
         set_property(
           SOURCE ${sha3Dir}/KeccakP-1600-inplace32BI.c
           APPEND
@@ -153,7 +159,6 @@ else()
       KeccakP200_excluded
       KeccakP400_excluded
       KeccakP800_excluded
-      ZEND_ENABLE_STATIC_TSRMLS_CACHE
   )
 endif()
 

cmake/ext/pcre/CMakeLists.txt

@@ -193,9 +193,9 @@ else()
   php_check_compiler_flag(
     C
     -Wno-implicit-fallthrough
-    _HAVE_WNO_IMPLICIT_FALLTHROUGH_C
+    _PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C
   )
-  if(_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
+  if(_PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
     set_property(
       SOURCE pcre2lib/pcre2_jit_compile.c
       APPEND

patches/8.5/php-config.patch

@@ -58,10 +58,10 @@ index 640f0100800..de89ceb45b1 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index 61d1c350a82..a4b41411d1b 100644
+index e4bd8162a2e..5195ff85b1d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1382,6 +1382,9 @@ exec_prefix=$old_exec_prefix
+@@ -1386,6 +1386,9 @@ exec_prefix=$old_exec_prefix
  libdir=$old_libdir
  datadir=$old_datadir
 
@@ -71,7 +71,7 @@ index 61d1c350a82..a4b41411d1b 100644
  AC_SUBST([INCLUDE_PATH])
  AC_SUBST([EXPANDED_PEAR_INSTALLDIR])
  AC_SUBST([EXPANDED_EXTENSION_DIR])
-@@ -1400,6 +1403,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
+@@ -1404,6 +1407,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
  AC_SUBST([PHP_VERSION])
  AC_SUBST([PHP_VERSION_ID])
  AC_SUBST([PHP_LDFLAGS])