Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

.github/workflows/check.yaml

@@ -50,5 +50,5 @@ jobs:
         run: |
           normalizer.cmake -- \
             --set normalize_indent_style=false \
-            --set normalize_cmake_minimum_required=3.29...4.2 \
+            --set normalize_cmake_minimum_required=4.2...4.3 \
             -j

CMakeLists.txt

@@ -55,7 +55,7 @@ See build system documentation for available PHP configuration variables and
 further information.
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.29...4.2)
+cmake_minimum_required(VERSION 4.2...4.3)
 
 if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_LIST_DIR)
   message(
@@ -198,15 +198,7 @@ file(
 
     find_package(Git QUIET)
     if(NOT Git_FOUND)
-      # See: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10164
-      if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.0)
-        find_package(Patch QUIET)
-      else()
-        find_program(Patch_EXECUTABLE patch)
-        if(Patch_EXECUTABLE)
-          set(Patch_FOUND TRUE)
-        endif()
-      endif()
+      find_package(Patch QUIET)
     endif()
 
     if(NOT Git_FOUND AND NOT Patch_FOUND)

README.md

@@ -1,7 +1,7 @@
 # PHP build system
 
 [![PHP version](https://img.shields.io/badge/PHP-8.5-777BB4?logo=php&labelColor=17181B)](https://www.php.net/)
-[![CMake version](https://img.shields.io/badge/CMake-3.29-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
+[![CMake version](https://img.shields.io/badge/CMake-4.2-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
 [![C99](https://img.shields.io/badge/standard-C99-A8B9CC?logo=C&labelColor=17181B)](https://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf)
 
 > [!IMPORTANT]

cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.29...4.2)
+cmake_minimum_required(VERSION 4.2...4.3)
 
 # Configure CMake behavior.
 include(cmake/CMakeDefaults.cmake)

cmake/cmake/modules/FindBZip2.cmake

@@ -2,11 +2,7 @@
 # FindIconv
 
 This module overrides the upstream CMake `FindIconv` module with few
-customizations:
-
-* Included a customization for Alpine where GNU libiconv headers are located in
-  `/usr/include/gnu-libiconv` (fixed in CMake 3.31):
-  https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9774
+customizations.
 
 * Added adjustment when the iconv library installation path is manually set,
   otherwise Iconv is first searched in the C library.

cmake/cmake/modules/FindIconv.cmake

@@ -11,7 +11,7 @@ Expected variables:
 * COMMENT
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.29...4.2)
+cmake_minimum_required(VERSION 4.2...4.3)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE OR NOT PHP_EXECUTABLE OR NOT PHP_COMMAND)
   return()