Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/FindBZip2.cmake

@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindBZip2
+
+This module overrides the upstream CMake `FindBZip2` module with few
+customizations:
+
+* Added BZip2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindBZip2.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindBZip2.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(BZip2_VERSION "${BZIP2_VERSION}")
+endif()

cmake/cmake/modules/FindLibXml2.cmake

@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindLibXml2
+
+This module overrides the upstream CMake `FindLibXml2` module with few
+customizations:
+
+* Added LibXml2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindLibXml2.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindLibXml2.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(LibXml2_VERSION "${LIBXML2_VERSION_STRING}")
+endif()

cmake/cmake/modules/FindPostgreSQL.cmake

@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindPostgreSQL
+
+This module overrides the upstream CMake `FindPostgreSQL` module with few
+customizations:
+
+* Added PostgreSQL_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindPostgreSQL.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindPostgreSQL.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(PostgreSQL_VERSION "${PostgreSQL_VERSION_STRING}")
+endif()

cmake/ext/bz2/CMakeLists.txt

@@ -90,7 +90,7 @@ if(TARGET BZip2::BZip2)
     # the FILE definition. BZ2_bzerror() is available as of 1.0.0.
     block()
       set(headers "bzlib.h")
-      if(BZIP2_VERSION VERSION_LESS 1.0.2)
+      if(BZip2_VERSION VERSION_LESS 1.0.2)
         list(PREPEND headers "stdio.h")
       endif()
       check_symbol_exists(BZ2_bzerror "${headers}" PHP_EXT_BZ2_SANITY_CHECK)

cmake/ext/libxml/CMakeLists.txt

@@ -75,7 +75,7 @@ set_package_properties(
 )
 
 # HAVE_WIN32_THREADS is not needed on newer libxml2 versions anymore.
-if(LIBXML2_VERSION_STRING VERSION_LESS 2.10)
+if(LibXml2_VERSION VERSION_LESS 2.10)
   target_compile_definitions(
     php_ext_libxml
     PRIVATE

cmake/ext/pdo_pgsql/CMakeLists.txt

@@ -97,7 +97,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 12.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
         libpq-fe.h
@@ -106,7 +106,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 17.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQclosePrepared, PQclosePortal, etc.
       check_symbol_exists(
         LIBPQ_HAS_CLOSE_PREPARED

cmake/ext/pgsql/CMakeLists.txt

@@ -101,7 +101,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 12.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
         libpq-fe.h
@@ -115,7 +115,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 17.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQchangePassword.
       check_symbol_exists(
         LIBPQ_HAS_CHANGE_PASSWORD