Merge branch 'PHP-8.4'

Author: petk

bin/check-cmake.php

@@ -359,7 +359,7 @@ function checkCMakeSet(Iterator $files): int
             $argument = (array_key_exists(1, $match)) ? trim($match[1]) : '';
 
             $status = 1;
-            output("E: Replace set($argument) with set($argument \"\") in \n   $file \n");
+            output("E: Replace set($argument) with set($argument \"\")\n   in $file\n");
         }
     }
 

cmake/cmake/modules/PHP/ThreadSafety.cmake

@@ -80,9 +80,9 @@ target_compile_definitions(php_configuration INTERFACE ZTS)
 set_target_properties(php_configuration PROPERTIES PHP_THREAD_SAFETY ON)
 
 # Add compile definitions for POSIX threads conformance.
-# TODO: Recheck these definitions since many of them are deprecated or
-# obsolete in favor of the compiler automatic definitions when using threading
-# flag on such system.
+# TODO: Recheck these definitions since many of them are deprecated or obsolete
+# in favor of the compiler automatic definitions when using threading flag on
+# such system.
 target_compile_definitions(
   php_configuration
   INTERFACE

cmake/ext/bcmath/CMakeLists.txt

@@ -88,4 +88,4 @@ target_compile_definitions(php_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 set(HAVE_BCMATH TRUE)
 
-configure_file(config.cmake.h.in config.h)
+configure_file(cmake/config.h.in config.h)

cmake/ext/bcmath/config.cmake.h.in renamed to cmake/ext/bcmath/cmake/config.h.in

@@ -97,4 +97,4 @@ endif()
 
 set(HAVE_BZ2 TRUE)
 
-configure_file(config.cmake.h.in config.h)
+configure_file(cmake/config.h.in config.h)

cmake/ext/bz2/CMakeLists.txt

@@ -70,4 +70,4 @@ target_sources(
 
 set(HAVE_CALENDAR TRUE)
 
-configure_file(config.cmake.h.in config.h)
+configure_file(cmake/config.h.in config.h)

cmake/ext/bz2/config.cmake.h.in renamed to cmake/ext/bz2/cmake/config.h.in

@@ -93,4 +93,4 @@ check_include_file(mscoree.h HAVE_MSCOREE_H)
 
 set(HAVE_COM_DOTNET TRUE)
 
-configure_file(config.cmake.h.in config.h)
+configure_file(cmake/config.h.in config.h)