Merge branch 'PHP-8.4'

Author: petk

bin/check-cmake.php

@@ -283,7 +283,7 @@ function ($current, $key, $iterator) {
 /**
  * Check given CMake files for include() issues.
  */
-function checkCMakeFiles(Iterator $files, array $modules): int
+function checkCMakeInclude(Iterator $files, array $modules): int
 {
     $status = 0;
 
@@ -337,6 +337,35 @@ function checkCMakeFiles(Iterator $files, array $modules): int
     return $status;
 };
 
+/**
+ * Check for set(<variable>) usages with only one argument. These should be
+ * replaced with set(<variable> "").
+ */
+function checkCMakeSet(Iterator $files): int
+{
+    $status = 0;
+
+    foreach ($files as $file) {
+        $content = getCMakeCode($file);
+
+        preg_match_all(
+            '/^[ \t]*set[ \t]*\([ \t\n]*([^ \t\)]+)[ \t]*\)/m',
+            $content,
+            $matches,
+            PREG_SET_ORDER,
+        );
+
+        foreach ($matches as $match) {
+            $argument = (array_key_exists(1, $match)) ? trim($match[1]) : '';
+
+            $status = 1;
+            output("E: Replace set($argument) with set($argument \"\") in \n   $file \n");
+        }
+    }
+
+    return $status;
+};
+
 /**
  * Find all local Find* modules in the project.
  */
@@ -717,7 +746,10 @@ function checkAll(array $options): int
     $allCMakeFiles = getAllCMakeFiles($options['path'] . '/cmake');
 
     $projectModules = getProjectModules();
-    $status = checkCMakeFiles($allCMakeFiles, $projectModules);
+    $status = checkCMakeInclude($allCMakeFiles, $projectModules);
+
+    $newStatus = checkCMakeSet($allCMakeFiles);
+    $status = (0 === $status) ? $newStatus : $status;
 
     $findModules = getFindModules($options['path'] . '/cmake/cmake/modules');
     $newStatus = checkFindModules($findModules, $allCMakeFiles);

bin/init.cmake

@@ -123,7 +123,7 @@ endif()
 
 file(GLOB_RECURSE patches ${PHP_ROOT_DIR}/patches/${PHP_VERSION}/*.patch)
 
-foreach(patch ${patches})
+foreach(patch IN LISTS patches)
   # Apply the patch with Git.
   execute_process(
     COMMAND ${GIT_EXECUTABLE} apply --ignore-whitespace "${patch}"

bin/php.cmake

@@ -235,7 +235,7 @@ function(php_download)
 
   # Download PHP tarball.
   if(NOT EXISTS ${PHP_TARBALL})
-    foreach(url ${urls})
+    foreach(url IN LISTS urls)
       php_check_url(${url} found)
 
       if(found)
@@ -299,7 +299,7 @@ function(php_prepare_sources)
   string(REGEX MATCH [[^([0-9]+\.[0-9]+)]] _ "${PHP_VERSION}")
   file(GLOB_RECURSE patches ${PHP_ROOT_DIR}/patches/${CMAKE_MATCH_1}/*.patch)
 
-  foreach(patch ${patches})
+  foreach(patch IN LISTS patches)
     # Execute the patch command.
     execute_process(
       COMMAND ${GIT_EXECUTABLE} apply --ignore-whitespace "${patch}"

cmake/CMakeLists.txt

@@ -3,9 +3,8 @@ cmake_minimum_required(VERSION 3.25...3.31)
 # Configure CMake behavior.
 include(cmake/CMakeDefaults.cmake)
 
-message(STATUS "-----------------------------")
 message(STATUS "Initializing PHP build system")
-message(STATUS "-----------------------------\n")
+message(STATUS "=============================")
 
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 message(STATUS "CMake generator: ${CMAKE_GENERATOR}")
@@ -31,31 +30,33 @@ add_subdirectory(sapi)
 add_subdirectory(ext)
 add_subdirectory(Zend)
 
-message(STATUS "---------------")
+message(STATUS "")
+message(STATUS "")
 message(STATUS "Configuring PHP")
-message(STATUS "---------------\n")
+message(STATUS "===============")
+message(STATUS "")
 
 add_subdirectory(pear)
 add_subdirectory(win32)
 add_subdirectory(main)
 add_subdirectory(scripts)
 
-# Check thread safety.
-include(PHP/ThreadSafety)
-
 # Generate *_arginfo.h headers from *.stub.php sources.
 include(PHP/Stubs)
 
+# Check thread safety.
+include(PHP/ThreadSafety)
+
 # Execute all deferred calls. Calls are additionally sorted with natural
 # comparison method by their IDs. If call hasn't set any ID number, CMake
 # assigns it a default value of __<number>.
 block()
   cmake_language(DEFER GET_CALL_IDS ids)
   list(SORT ids COMPARE NATURAL)
-  foreach(id ${ids})
+  foreach(id IN LISTS ids)
     cmake_language(DEFER GET_CALL ${id} call)
     list(POP_FRONT call command)
-    message(STATUS "Executing deferred call: ${command}")
+    message(VERBOSE "Executing deferred call: ${command}")
     cmake_language(CALL ${command} ${call})
     cmake_language(DEFER CANCEL_CALL ${id})
   endforeach()
@@ -73,6 +74,7 @@ include(cmake/Testing.cmake)
 include(cmake/CPack.cmake)
 
 include(PHP/FeatureSummary)
+php_feature_summary()
 
 message(
   STATUS

cmake/Zend/CMakeLists.txt

@@ -30,9 +30,11 @@ CMake target properties for the `Zend::Zend` target:
   compatible with particular PHP build.
 #]=============================================================================]
 
-message(STATUS "-----------------------")
+message(STATUS "")
+message(STATUS "")
 message(STATUS "Configuring Zend Engine")
-message(STATUS "-----------------------\n")
+message(STATUS "=======================")
+message(STATUS "")
 
 include(cmake/Version.cmake)
 
@@ -526,7 +528,7 @@ endif()
 add_feature_info(
   "Zend signals"
   ZEND_SIGNALS
-  "signals handling within the Zend Engine for performance"
+  "signal handling for performance"
 )
 
 ################################################################################

cmake/cmake/Bootstrap.cmake

@@ -53,9 +53,11 @@ include(cmake/Configuration.cmake)
 # Check requirements.
 include(cmake/Requirements.cmake)
 
-message(STATUS "---------------------")
+message(STATUS "")
+message(STATUS "")
 message(STATUS "Running system checks")
-message(STATUS "---------------------\n")
+message(STATUS "=====================")
+message(STATUS "")
 
 # Run PHP configuration checks.
 include(cmake/ConfigureChecks.cmake)

cmake/cmake/ConfigureChecks.cmake

@@ -814,5 +814,5 @@ endif()
 add_feature_info(
   "Valgrind"
   PHP_VALGRIND
-  "support for dynamic analysis"
+  "dynamic analysis"
 )

cmake/cmake/Testing.cmake

@@ -17,7 +17,7 @@ block()
   endif()
 
   get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
-  foreach(extension ${extensions})
+  foreach(extension IN LISTS extensions)
     get_target_property(type php_${extension} TYPE)
     if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
       get_target_property(isZendExtension php_${extension} PHP_ZEND_EXTENSION)

cmake/cmake/modules/FindACL.cmake

@@ -134,7 +134,7 @@ if(NOT DEFINED ACL_IS_BUILT_IN)
   endblock()
 endif()
 
-set(_ACL_REQUIRED_VARS)
+set(_ACL_REQUIRED_VARS "")
 if(ACL_IS_BUILT_IN)
   set(_ACL_REQUIRED_VARS _ACL_IS_BUILT_IN_MSG)
   set(_ACL_IS_BUILT_IN_MSG "built in to C library")

cmake/cmake/modules/FindCapstone.cmake

@@ -70,7 +70,7 @@ block(PROPAGATE Capstone_VERSION)
       "^#[ \t]*define[ \t]+CS_(API_MAJOR|API_MINOR|VERSION_EXTRA)[ \t]+[0-9]+[ \t]*$"
     )
 
-    set(Capstone_VERSION)
+    set(Capstone_VERSION "")
 
     foreach(item CS_API_MAJOR CS_API_MINOR CS_VERSION_EXTRA)
       foreach(line ${results})