Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

bin/check-cmake.php

@@ -708,7 +708,7 @@ function checkAll(array $options): int
 {
     $status = 0;
 
-    output($options['script'] . ': Working tree ' . $options['path']);
+    output($options['script'] . ': Working tree ' . realpath($options['path']));
 
     output($options['script'] . ': Checking CMake modules');
     $allCMakeFiles = getAllCMakeFiles($options['path']);

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -12,8 +12,8 @@ The following function is exposed:
 
 ```cmake
 php_configure_file(
-  <template-file>
-  <output-file>
+  <INPUT <template-file>|CONTENT <template-content>>
+  OUTPUT <output-file>
   [VARIABLES [<variable> <value>] ...]
 )
 ```
@@ -138,23 +138,31 @@ endfunction()
 function(php_configure_file)
   cmake_parse_arguments(
     PARSE_ARGV
-    2
-    parsed      # prefix
-    ""          # options
-    ""          # one-value keywords
-    "VARIABLES" # multi-value keywords
+    0
+    parsed                 # prefix
+    ""                     # options
+    "INPUT;CONTENT;OUTPUT" # one-value keywords
+    "VARIABLES"            # multi-value keywords
   )
 
   if(parsed_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "Bad arguments: ${parsed_UNPARSED_ARGUMENTS}")
   endif()
 
-  if(NOT ARGV0)
-    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects a template filename")
+  if(NOT parsed_INPUT AND NOT parsed_CONTENT)
+    message(
+      FATAL_ERROR
+      "${CMAKE_CURRENT_FUNCTION} expects either INPUT or CONTENT keyword to "
+      "specify template."
+    )
   endif()
 
-  if(NOT ARGV1)
-    message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} expects an output filename")
+  if(NOT parsed_OUTPUT)
+    message(
+      FATAL_ERROR
+      "${CMAKE_CURRENT_FUNCTION} expects OUTPUT keyword to specify output "
+      "filename."
+    )
   endif()
 
   # Check for even number of keyword values.
@@ -168,15 +176,24 @@ function(php_configure_file)
     )
   endif()
 
-  set(___phpConfigureFileTemplate "${ARGV0}")
-  if(NOT IS_ABSOLUTE "${___phpConfigureFileTemplate}")
+  if(parsed_INPUT)
+    set(___phpConfigureFileTemplate "${parsed_INPUT}")
+    if(NOT IS_ABSOLUTE "${___phpConfigureFileTemplate}")
+      set(
+        ___phpConfigureFileTemplate
+        "${CMAKE_CURRENT_SOURCE_DIR}/${___phpConfigureFileTemplate}"
+      )
+    endif()
+  else()
+    cmake_path(GET parsed_OUTPUT FILENAME ___phpConfigureFileTemplate)
     set(
       ___phpConfigureFileTemplate
-      "${CMAKE_CURRENT_SOURCE_DIR}/${___phpConfigureFileTemplate}"
+      "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${___phpConfigureFileTemplate}.in"
     )
+    file(WRITE ${___phpConfigureFileTemplate} "${parsed_CONTENT}")
   endif()
 
-  set(___phpConfigureFileOutput "${ARGV1}")
+  set(___phpConfigureFileOutput "${parsed_OUTPUT}")
   if(NOT IS_ABSOLUTE "${___phpConfigureFileOutput}")
     set(
       ___phpConfigureFileOutput

cmake/main/CMakeLists.txt

@@ -389,8 +389,8 @@ function(_php_main_create_files)
     phase. Needs to be adjusted further to rebuild PHP at such case.
     include(PHP/ConfigureFile)
     php_configure_file(
-      ${PHP_SOURCE_DIR}/main/build-defs.h.in
-      ${PHP_BINARY_DIR}/main/build-defs.h
+      INPUT ${PHP_SOURCE_DIR}/main/build-defs.h.in
+      OUTPUT ${PHP_BINARY_DIR}/main/build-defs.h
       VARIABLES
         CONFIGURE_COMMAND "cmake"
         ODBC_CFLAGS "${ODBC_CFLAGS}"

cmake/sapi/fpm/CMakeLists.txt

@@ -389,11 +389,23 @@ endif()
 ################################################################################
 
 # Man documentation.
+
+# Replace the hardcoded runstatedir with a template placeholder.
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/php-fpm.8.in" content)
+string(
+  REPLACE
+  [[@php_fpm_localstatedir@/run/php-fpm.pid]]
+  [[@php_fpm_runstatedir@/php-fpm.pid]]
+  content
+  "${content}"
+)
 php_configure_file(
-  php-fpm.8.in
-  php-fpm.8
+  CONTENT "${content}"
+  OUTPUT php-fpm.8
   VARIABLES
     php_fpm_localstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    # TODO: Fix the GNU standard adjustment issue with /etc, /var, and /var/run.
+    php_fpm_runstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_RUNSTATEDIR},$<INSTALL_PREFIX>>"
     php_fpm_sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
     php_fpm_prefix "$<INSTALL_PREFIX>"
     PHP_VERSION "${PHP_VERSION}"
@@ -405,17 +417,17 @@ install(
 )
 
 php_configure_file(
-  php-fpm.conf.in
-  php-fpm.conf
+  INPUT php-fpm.conf.in
+  OUTPUT php-fpm.conf
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     EXPANDED_LOCALSTATEDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
     php_fpm_sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )
 
 php_configure_file(
-  www.conf.in
-  www.conf
+  INPUT www.conf.in
+  OUTPUT www.conf
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     php_fpm_prefix "$<INSTALL_PREFIX>"
@@ -424,23 +436,44 @@ php_configure_file(
     EXPANDED_DATADIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATADIR},$<INSTALL_PREFIX>>"
 )
 
+# Replace the hardcoded runstatedir with a template placeholder.
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.d.php-fpm.in" content)
+string(
+  REPLACE
+  [[php_fpm_PID=@localstatedir@/run/php-fpm.pid]]
+  [[php_fpm_PID=@runstatedir@/php-fpm.pid]]
+  content
+  "${content}"
+)
+
 php_configure_file(
-  init.d.php-fpm.in
-  init.d.php-fpm
+  CONTENT "${content}"
+  OUTPUT init.d.php-fpm
   VARIABLES
     prefix "$<INSTALL_PREFIX>"
     exec_prefix "$<INSTALL_PREFIX>"
     sbindir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},$<INSTALL_PREFIX>>"
+    # TODO: Fix the GNU standard adjustment issue with /etc, /var, and /var/run.
     sysconfdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
-    localstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    runstatedir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_RUNSTATEDIR},$<INSTALL_PREFIX>>"
+)
+
+# Replace the hardcoded runstatedir with a template placeholder.
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/php-fpm.service.in" content)
+string(
+  REPLACE
+  [[PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid]]
+  [[PIDFile=@EXPANDED_RUNSTATEDIR@/php-fpm.pid]]
+  content
+  "${content}"
 )
 
 php_configure_file(
-  php-fpm.service.in
-  php-fpm.service
+  CONTENT "${content}"
+  OUTPUT php-fpm.service
   VARIABLES
     php_fpm_systemd "${PHP_FPM_SYSTEMD}"
-    EXPANDED_LOCALSTATEDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LOCALSTATEDIR},$<INSTALL_PREFIX>>"
+    EXPANDED_RUNSTATEDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_RUNSTATEDIR},$<INSTALL_PREFIX>>"
     EXPANDED_SBINDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},$<INSTALL_PREFIX>>"
     EXPANDED_SYSCONFDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"
 )

cmake/scripts/CMakeLists.txt

@@ -59,15 +59,10 @@ block()
     content
     "${content}"
   )
-  file(
-    WRITE
-    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php-config.cmake.in"
-    "${content}"
-  )
 
   php_configure_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php-config.cmake.in
-    php-config
+    CONTENT "${content}"
+    OUTPUT php-config
     VARIABLES
       SED "${SED}"
       prefix "$<INSTALL_PREFIX>"
@@ -118,15 +113,10 @@ block()
     content
     "${content}"
   )
-  file(
-    WRITE
-    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/phpize.cmake.in"
-    "${content}"
-  )
 
   php_configure_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/phpize.cmake.in
-    phpize
+    CONTENT "${content}"
+    OUTPUT phpize
     VARIABLES
       prefix "$<INSTALL_PREFIX>"
       datarootdir "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATAROOTDIR},$<INSTALL_PREFIX>>"