Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/CMakeLists.txt

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

cmake/cmake/Version.cmake

@@ -1,56 +1,69 @@
 #[=============================================================================[
 Set PHP version variables.
 
-PHP version variables are read from the configure.ac file, and PHP_VERSION_API
-number is retrieved from main/php.h header file.
+PHP version is read from the php-src configure.ac file, and PHP_VERSION_API
+number is retrieved from the php-src main/php.h header file.
 
 Variables:
 
-  PHP_VERSION
-  PHP_VERSION_MAJOR
-  PHP_VERSION_MINOR
-  PHP_VERSION_PATCH
-  PHP_VERSION_LABEL
-  PHP_API_VERSION
-
+* `PHP_API_VERSION`
+* `PHP_VERSION`
+* `PHP_VERSION_LABEL`
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
-# Set the PHP_VERSION_* variables from configure.ac.
-file(READ ${CMAKE_CURRENT_LIST_DIR}/../configure.ac _)
-string(REGEX MATCH "AC_INIT\\(\\[PHP\\],\\[([0-9]+\.[0-9]+\.[0-9]+)([^\]]*)" _ "${_}")
+block(PROPAGATE PHP_VERSION)
+  # Set the PHP_VERSION_* variables from configure.ac.
+  set(regex "^AC_INIT\\(\\[PHP\\],\\[([0-9]+\.[0-9]+\.[0-9]+)([^\]]*)")
+  file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/../configure.ac _ REGEX "${regex}")
+
+  cmake_policy(GET CMP0159 policy)
+  if(CMAKE_VERSION VERSION_LESS 3.29 OR NOT policy STREQUAL NEW)
+    string(REGEX MATCH "${regex}" _ "${_}")
+  endif()
 
-set(PHP_VERSION "${CMAKE_MATCH_1}")
+  set(PHP_VERSION "${CMAKE_MATCH_1}")
 
-set(
-  PHP_VERSION_LABEL "${CMAKE_MATCH_2}"
-  CACHE STRING "Extra PHP version label suffix, e.g. '-dev', 'rc1', '-acme'"
-)
-mark_as_advanced(PHP_VERSION_LABEL)
+  set(
+    PHP_VERSION_LABEL "${CMAKE_MATCH_2}"
+    CACHE STRING "Extra PHP version label suffix, e.g. '-dev', 'rc1', '-acme'"
+  )
+  mark_as_advanced(PHP_VERSION_LABEL)
+endblock()
 
 # This is automatically executed with the project(PHP...) invocation.
-macro(_php_post_project)
-  if(NOT DEFINED PHP_VERSION_ID)
-    # Append extra version label suffix to PHP_VERSION.
-    string(APPEND PHP_VERSION "${PHP_VERSION_LABEL}")
-    message(STATUS "PHP version: ${PHP_VERSION}")
-
-    # Set PHP version ID.
-    math(
-      EXPR
-      PHP_VERSION_ID
-      "${PHP_VERSION_MAJOR} * 10000 \
-      + ${PHP_VERSION_MINOR} * 100 \
-      + ${PHP_VERSION_PATCH}"
-    )
-    message(STATUS "PHP version ID: ${PHP_VERSION_ID}")
-
-    # Read PHP API version.
-    file(READ main/php.h _)
-    string(REGEX MATCH "#[ \t]*define[ \t]+PHP_API_VERSION[ \t]+([0-9]+)" _ "${_}")
-    set(PHP_API_VERSION "${CMAKE_MATCH_1}")
-    message(STATUS "PHP API version: ${PHP_API_VERSION}")
+function(_php_post_project)
+  if(DEFINED PHP_VERSION_ID)
+    return()
+  endif()
+
+  # Append extra version label suffix to PHP_VERSION.
+  string(APPEND PHP_VERSION "${PHP_VERSION_LABEL}")
+  message(STATUS "PHP version: ${PHP_VERSION}")
+
+  # Set PHP version ID.
+  math(
+    EXPR
+    PHP_VERSION_ID
+    "${PHP_VERSION_MAJOR} * 10000 \
+    + ${PHP_VERSION_MINOR} * 100 \
+    + ${PHP_VERSION_PATCH}"
+  )
+  message(STATUS "PHP version ID: ${PHP_VERSION_ID}")
+
+  # Read PHP API version.
+  set(regex "^[ \t]*#[ \t]*define[ \t]+PHP_API_VERSION[ \t]+([0-9]+)")
+  file(STRINGS main/php.h _ REGEX "^${regex}")
+
+  cmake_policy(GET CMP0159 policy)
+  if(CMAKE_VERSION VERSION_LESS 3.29 OR NOT policy STREQUAL NEW)
+    string(REGEX MATCH "${regex}" _ "${_}")
   endif()
-endmacro()
+
+  set(PHP_API_VERSION "${CMAKE_MATCH_1}")
+  message(STATUS "PHP API version: ${PHP_API_VERSION}")
+
+  return(PROPAGATE PHP_VERSION PHP_VERSION_ID PHP_API_VERSION)
+endfunction()
 variable_watch(PHP_HOMEPAGE_URL _php_post_project)

cmake/cmake/modules/FindApache.cmake

@@ -158,7 +158,11 @@ block()
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
     )
-    if(IS_EXECUTABLE ${path})
+    if(CMAKE_VERSION VERSION_LESS 3.29)
+      if(EXISTS ${path})
+        set_property(CACHE Apache_APR_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
+      endif()
+    elseif(IS_EXECUTABLE ${path})
       set_property(CACHE Apache_APR_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
     endif()
   endif()
@@ -238,7 +242,11 @@ block()
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_QUIET
     )
-    if(IS_EXECUTABLE ${path})
+    if(CMAKE_VERSION VERSION_LESS 3.29)
+      if(EXISTS ${path})
+        set_property(CACHE Apache_APU_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
+      endif()
+    elseif(IS_EXECUTABLE ${path})
       set_property(CACHE Apache_APU_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
     endif()
   endif()

cmake/pear/InstallPear.cmake

@@ -66,7 +66,7 @@ if(NOT EXISTS ${phpPearCurrentBinaryDir}/install-pear-nozlib.phar)
     STATUS downloadStatus
   )
 
-  if(IS_EXECUTABLE "${phpPearPhpExecutable}" AND NOT downloadStatus)
+  if(phpPearPhpExecutable AND NOT downloadStatus)
     # Download using fetch.php.
     execute_process(
       COMMAND ${phpPearPhpExecutable}
@@ -83,7 +83,7 @@ if(NOT EXISTS ${phpPearCurrentBinaryDir}/install-pear-nozlib.phar)
   endif()
 endif()
 
-if(NOT IS_EXECUTABLE "${phpPearPhpExecutable}")
+if(NOT phpPearPhpExecutable)
   message(
     WARNING
     "The PEAR installation is not complete.\n"