Merge branch 'PHP-8.4'

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.25...3.31 \
+            --set normalize_cmake_minimum_required=3.27...4.0 \
             -j

CMakeLists.txt

@@ -55,7 +55,7 @@ See build system documentation for available PHP configuration variables and
 further information.
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_LIST_DIR)
   message(

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.25-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
+[![CMake version](https://img.shields.io/badge/CMake-3.27-064F8C?logo=cmake&labelColor=17181B)](https://cmake.org)
 [![C11](https://img.shields.io/badge/standard-C11-A8B9CC?logo=C&labelColor=17181B)](https://port70.net/~nsz/c/c11/n1570.html)
 [![GNU](https://img.shields.io/badge/-GNU-A42E2B?logo=gnu&labelColor=17181B)](https://www.gnu.org/)
 [![Ninja](https://img.shields.io/badge/%F0%9F%A5%B7-Ninja%20build-DD6620?labelColor=17181B)](https://ninja-build.org/)

cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 # Configure CMake behavior.
 include(cmake/CMakeDefaults.cmake)

cmake/Zend/CMakeLists.txt

@@ -330,28 +330,7 @@ set_target_properties(
 # Add usage requirements to PHP interface targets.
 ################################################################################
 
-# Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
-  target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
-else()
-  target_compile_definitions(
-    php_config
-    INTERFACE
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_DEFINITIONS>
-  )
-  target_compile_options(
-    php_config
-    INTERFACE
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_OPTIONS>
-  )
-  target_include_directories(
-    php_config
-    INTERFACE
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_INCLUDE_DIRECTORIES>
-      $<TARGET_PROPERTY:Zend::Zend,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
-  )
-endif()
-
+target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
 target_link_libraries(php_sapi INTERFACE Zend::Zend)
 target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
 

cmake/cmake/modules/PHP/AddCustomCommand/RunCommand.cmake

@@ -11,7 +11,7 @@ Expected variables:
 * COMMENT
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE OR NOT PHP_EXECUTABLE OR NOT PHP_COMMAND)
   return()

cmake/cmake/modules/PHP/PkgConfig.cmake

@@ -88,25 +88,7 @@ function(_php_pkgconfig_parse_variables variables)
     list(POP_FRONT variables var value)
 
     list(APPEND resultVariables ${var})
-
-    # The resultValues are for the install(CODE) and generator expression
-    # $<INSTALL_PREFIX> works since CMake 3.27, for earlier versions the escaped
-    # variable CMAKE_INSTALL_PREFIX can be used.
-    if(
-      CMAKE_VERSION VERSION_LESS 3.27
-      AND value MATCHES [[.*\$<INSTALL_PREFIX>.*]]
-    )
-      string(
-        REPLACE
-        "$<INSTALL_PREFIX>"
-        "\${CMAKE_INSTALL_PREFIX}"
-        replacedValue
-        "${value}"
-      )
-      list(APPEND resultValues "${replacedValue}")
-    else()
-      list(APPEND resultValues "${value}")
-    endif()
+    list(APPEND resultValues "${value}")
 
     # Replace possible INSTALL_PREFIX in value for usage in add_custom_command,
     # in the resultValues above the intact genex is left for enabling the

cmake/cmake/modules/PHP/Stubs/StubsGenerator.cmake.in

@@ -2,7 +2,7 @@
 Script for processing PHP stub sources.
 #]=============================================================================]
 
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")

cmake/cmake/scripts/GenerateCredits.cmake

@@ -5,7 +5,7 @@
 #
 # Run with: `cmake -P cmake/scripts/GenerateCredits.cmake`
 
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")

cmake/cmake/scripts/GenerateGrammar.cmake

@@ -10,7 +10,7 @@
 #     [-D RE2C_EXECUTABLE=path/to/re2c] \
 #     -P cmake/scripts/GenerateGrammar.cmake
 
-cmake_minimum_required(VERSION 3.25...3.31)
+cmake_minimum_required(VERSION 3.27...4.0)
 
 if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")