Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/CMakeLists.txt

@@ -82,6 +82,11 @@ block()
   endforeach()
 endblock()
 
+# Rebuild all targets as needed.
+if(NOT PHPSystem_EXECUTABLE)
+  include(PHP/Rebuild)
+endif()
+
 # Enable testing and configure test settings.
 include(cmake/Testing.cmake)
 

cmake/cmake/Bootstrap.cmake

@@ -46,11 +46,6 @@ include(cmake/Configuration.cmake)
 # Check requirements.
 include(cmake/Requirements.cmake)
 
-# Rebuild all targets when needed.
-if(NOT PHPSystem_EXECUTABLE)
-  include(PHP/Rebuild)
-endif()
-
 message("
 Running system checks
 ---------------------

cmake/cmake/modules/FindRE2C.cmake

@@ -62,7 +62,7 @@ re2c_target(
 * `<input>` - The re2c template file input. Relative source file path is
   interpreted as being relative to the current source directory.
 * `<output>` - The output file. Relative output file path is interpreted as
-  being relative to the current source directory.
+  being relative to the current binary directory.
 * `HEADER` - Generate a <header> file. Relative header file path is interpreted
   as being relative to the current binary directory.
 * `OPTIONS` - List of additional options to pass to re2c command-line tool.

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -18,10 +18,15 @@ php_configure_file(
 )
 ```
 
-* `VARIABLES`
+* `INPUT` or `CONTENT` specify the input template (either a file or a content
+  string). Relative <template-file> is interpreted as being relative to the
+  current source directory.
 
-  Pairs of variable names and values. Variable values support generator
-  expressions.
+* `OUTPUT` specifies the output file. Relative file path is interpreted as being
+  relative to the current binary directory.
+
+* `VARIABLES` represent the pairs of variable names and values. Variable values
+  support generator expressions.
 
   The `$<INSTALL_PREFIX>` generator expression can be used in variable values,
   which is replaced with installation prefix either set via the
@@ -155,6 +160,12 @@ function(php_configure_file)
       "${CMAKE_CURRENT_FUNCTION} expects either INPUT or CONTENT keyword to "
       "specify template."
     )
+  elseif(parsed_INPUT AND parsed_CONTENT)
+    message(
+      FATAL_ERROR
+      "${CMAKE_CURRENT_FUNCTION} requires either INPUT or CONTENT keyword. To "
+      "specify input template only one is required."
+    )
   endif()
 
   if(NOT parsed_OUTPUT)

cmake/cmake/modules/PHP/Rebuild.cmake

@@ -1,16 +1,19 @@
 #[=============================================================================[
-Rebuild all project targets.
+Ensure all project targets are rebuilt as needed.
 
-When PHP is not found on the system, PHP generates some files during development
-using the php_cli target itself, which can bring cyclic dependencies among
-targets if custom commands would depend on the php_cli target. Although not a
-good practice, this helps bringing all targets to updated state.
+When PHP is not found on the system, the `php_cli` target is used to generate
+certain files during development. This can lead to cyclic dependencies among
+targets if custom commands depend on the `php_cli` target. While such automatic
+rebuilding is not considered good practice, it ensures that all targets are kept
+up to date.
+
+TODO: This works only for a limited set of cases for now and will be refactored.
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
 # Store a list of all targets inside the given <dir> into the <result> variable.
-function(_php_get_all_targets result dir)
+function(_php_rebuild_get_all_targets result dir)
   get_property(targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
   get_property(subdirs DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
 
@@ -22,43 +25,32 @@ function(_php_get_all_targets result dir)
   set(${result} ${targets} PARENT_SCOPE)
 endfunction()
 
-# Ensure all project targets are rebuilt as needed.
-function(_php_rebuild)
-  _php_get_all_targets(targets ${CMAKE_CURRENT_SOURCE_DIR})
-  list(REMOVE_ITEM targets "php_rebuild")
-
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
-    COMMAND
-      ${CMAKE_COMMAND}
-        -E cmake_echo_color --magenta --bold "       Updating targets"
-    COMMAND
-      ${CMAKE_COMMAND}
-        -E touch ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
-    COMMAND
-      ${CMAKE_COMMAND}
-        --build . --target php_rebuild -j
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${targets}
-  )
-
-  add_custom_target(
-    php_update_targets ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
-  )
+_php_rebuild_get_all_targets(targets ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
+  COMMAND
+    ${CMAKE_COMMAND}
+      -E cmake_echo_color --magenta --bold "Updating targets"
+  COMMAND
+    ${CMAKE_COMMAND}
+      -E touch ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
+  COMMAND
+    ${CMAKE_COMMAND}
+      --build . --target php_rebuild -j
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${targets}
+)
 
-  add_custom_target(
-    php_rebuild
-    COMMAND
-      ${CMAKE_COMMAND}
-        -E rm -f ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
-    DEPENDS ${targets}
-  )
-endfunction()
+add_custom_target(
+  php_rebuild_update_targets ALL
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
+)
 
-# Run at the end of the configuration.
-cmake_language(
-  DEFER
-    DIRECTORY ${PROJECT_SOURCE_DIR}
-  CALL _php_rebuild
+add_custom_target(
+  php_rebuild
+  COMMAND
+    ${CMAKE_COMMAND}
+      -E rm -f ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/php_rebuild.timestamp
+  DEPENDS ${targets}
 )