Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/cmake/CMakeDefaults.cmake

@@ -7,6 +7,17 @@ https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html
 
 include_guard(GLOBAL)
 
+# Disable in-source builds.
+if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_SOURCE_DIR)
+  message(
+    FATAL_ERROR
+    "In-source builds are disabled. Please, set the build directory.\n"
+    "For example:\n"
+    "  cmake -B php-build\n"
+    "  cmake --build php-build -j"
+  )
+endif()
+
 # Add paths where include() and find_package() look for modules.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
 

patches/8.3/cmake.patch

@@ -8,11 +8,11 @@ Subject: Add CMake changes for PHP-8.3 branch
   and ext/ext_skel.php script
 ---
  .editorconfig              |  2 +-
- .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
+ .gitignore                 | 14 +++++++++++
  ext/ext_skel.php           |  7 ++++++
- ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
- run-tests.php              | 24 +++++++++++++-----
- 5 files changed, 99 insertions(+), 7 deletions(-)
+ ext/skeleton/.gitignore.in | 49 ++++++++++++++++++++++++++++++++++++++
+ run-tests.php              | 24 ++++++++++++++-----
+ 5 files changed, 89 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
 index 7911bf8490b..1d9b530947e 100644
@@ -28,7 +28,7 @@ index 7911bf8490b..1d9b530947e 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index cd9ba81306f..a7f1e921dff 100644
+index cd9ba81306f..6ee80170008 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -157,6 +157,7 @@ php
@@ -39,56 +39,20 @@ index cd9ba81306f..a7f1e921dff 100644
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -300,9 +301,58 @@ tmp-php.ini
+@@ -300,9 +301,22 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files
 +# ------------------------------------------------------------------------------
-+cmake_install.cmake
++
++# General generated CMake files
 +CMakeCache.txt
 +CMakeFiles/
 +
-+# Generated by FetchContent
-+/_deps/
-+
-+# Graphviz generated files
-+/*.dependers
-+/*.dot
-+
-+# Generated by the Ninja build system
-+/.ninja*
-+/build.ninja
-+
 +# Local user presets
 +/CMakeUserPresets.json
-+
-+# Generated when CMAKE_EXPORT_COMPILE_COMMANDS is enabled
-+/compile-commands.json
-+
-+# Generated by ctest
-+/CTestTestfile.cmake
-+/Testing/
-+
-+# CMake script profiling data output (--profiling-output <path>)
-+/profile.json
-+
-+# Generated by QT Creator
-+CMakeLists.txt.user
-+
-+# Generated by XCode
-+CMakeScripts/
-+
-+# Generated by cmake --install
-+/install_manifest.txt
-+
-+# Generated by cmake when cross-compiling if missing cache variables are found
-+/TryRunResults.cmake
-+
-+# pkg-config .pc files
-+/sapi/embed/php-embed.pc
-+/scripts/php.pc
 +
  # ------------------------------------------------------------------------------
  # Special cases to invert previous ignore patterns
@@ -122,36 +86,62 @@ index ae7a3a987c0..a67901a2c98 100755
              error('Unable to copy config script: ' . $config_script);
          }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
-index ae434fef976..87545d9162e 100644
+index ae434fef976..22b086f1cb5 100644
 --- a/ext/skeleton/.gitignore.in
 +++ b/ext/skeleton/.gitignore.in
-@@ -39,3 +39,26 @@ tests/**/*.sh
+@@ -39,3 +39,52 @@ tests/**/*.sh
  tests/**/*.db
  tests/**/*.mem
  tmp-php.ini
 +
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files
 +# ------------------------------------------------------------------------------
++
++# Invert previous rules
 +!**/cmake/config.h.in
 +!**/cmake/modules/
++
++# General generated CMake files
++cmake_install.cmake
++CMakeCache.txt
++CMakeFiles/
++
++# Generated by FetchContent
 +/_deps/
++
++# Generated by the Ninja build system
 +/.ninja*
++/build.ninja
++
++# Graphviz generated files
 +/*.dependers
 +/*.dot
-+/build.ninja
++
++# Local user presets
 +/CMakeUserPresets.json
++
++# Generated when CMAKE_EXPORT_COMPILE_COMMANDS is enabled
 +/compile-commands.json
++
++# Generated by ctest
 +/CTestTestfile.cmake
-+/install_manifest.txt
-+/profile.json
 +/Testing/
-+/TryRunResults.cmake
-+cmake_install.cmake
-+CMakeCache.txt
-+CMakeFiles/
++
++# CMake script profiling data output (--profiling-output <path>)
++/profile.json
++
++# Generated by QT Creator
 +CMakeLists.txt.user
++
++# Generated by XCode
 +CMakeScripts/
++
++# Generated by cmake --install
++/install_manifest.txt
++
++# Generated by cmake when cross-compiling if missing cache variables are found
++/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
 index a06f0958d1b..1a566d392e5 100755
 --- a/run-tests.php

patches/8.4/cmake.patch

@@ -8,11 +8,11 @@ Subject: Add CMake changes for PHP-8.4 branch
   and ext/ext_skel.php script
 ---
  .editorconfig              |  2 +-
- .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
+ .gitignore                 | 14 +++++++++++
  ext/ext_skel.php           |  7 ++++++
- ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
- run-tests.php              | 24 +++++++++++++-----
- 5 files changed, 99 insertions(+), 7 deletions(-)
+ ext/skeleton/.gitignore.in | 49 ++++++++++++++++++++++++++++++++++++++
+ run-tests.php              | 24 ++++++++++++++-----
+ 5 files changed, 89 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
 index 7911bf8490b..1d9b530947e 100644
@@ -28,7 +28,7 @@ index 7911bf8490b..1d9b530947e 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index 46193d0ba02..72f9be10bca 100644
+index 46193d0ba02..3e3e8b48976 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -156,6 +156,7 @@ php
@@ -39,56 +39,20 @@ index 46193d0ba02..72f9be10bca 100644
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -299,9 +300,58 @@ tmp-php.ini
+@@ -299,9 +300,22 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files
 +# ------------------------------------------------------------------------------
-+cmake_install.cmake
++
++# General generated CMake files
 +CMakeCache.txt
 +CMakeFiles/
 +
-+# Generated by FetchContent
-+/_deps/
-+
-+# Graphviz generated files
-+/*.dependers
-+/*.dot
-+
-+# Generated by the Ninja build system
-+/.ninja*
-+/build.ninja
-+
 +# Local user presets
 +/CMakeUserPresets.json
-+
-+# Generated when CMAKE_EXPORT_COMPILE_COMMANDS is enabled
-+/compile-commands.json
-+
-+# Generated by ctest
-+/CTestTestfile.cmake
-+/Testing/
-+
-+# CMake script profiling data output (--profiling-output <path>)
-+/profile.json
-+
-+# Generated by QT Creator
-+CMakeLists.txt.user
-+
-+# Generated by XCode
-+CMakeScripts/
-+
-+# Generated by cmake --install
-+/install_manifest.txt
-+
-+# Generated by cmake when cross-compiling if missing cache variables are found
-+/TryRunResults.cmake
-+
-+# pkg-config .pc files
-+/sapi/embed/php-embed.pc
-+/scripts/php.pc
 +
  # ------------------------------------------------------------------------------
  # Special cases to invert previous ignore patterns
@@ -122,36 +86,62 @@ index ae7a3a987c0..a67901a2c98 100755
              error('Unable to copy config script: ' . $config_script);
          }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
-index e691bd3964b..191fcd70eb5 100644
+index e691bd3964b..e728d405a8f 100644
 --- a/ext/skeleton/.gitignore.in
 +++ b/ext/skeleton/.gitignore.in
-@@ -45,3 +45,26 @@ tests/**/*.db
+@@ -45,3 +45,52 @@ tests/**/*.db
  tests/**/*.mem
  tmp-php.ini
  *~
 +
 +# ------------------------------------------------------------------------------
 +# CMake-based build system files
 +# ------------------------------------------------------------------------------
++
++# Invert previous rules
 +!**/cmake/config.h.in
 +!**/cmake/modules/
++
++# General generated CMake files
++cmake_install.cmake
++CMakeCache.txt
++CMakeFiles/
++
++# Generated by FetchContent
 +/_deps/
++
++# Generated by the Ninja build system
 +/.ninja*
++/build.ninja
++
++# Graphviz generated files
 +/*.dependers
 +/*.dot
-+/build.ninja
++
++# Local user presets
 +/CMakeUserPresets.json
++
++# Generated when CMAKE_EXPORT_COMPILE_COMMANDS is enabled
 +/compile-commands.json
++
++# Generated by ctest
 +/CTestTestfile.cmake
-+/install_manifest.txt
-+/profile.json
 +/Testing/
-+/TryRunResults.cmake
-+cmake_install.cmake
-+CMakeCache.txt
-+CMakeFiles/
++
++# CMake script profiling data output (--profiling-output <path>)
++/profile.json
++
++# Generated by QT Creator
 +CMakeLists.txt.user
++
++# Generated by XCode
 +CMakeScripts/
++
++# Generated by cmake --install
++/install_manifest.txt
++
++# Generated by cmake when cross-compiling if missing cache variables are found
++/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
 index e437487f4d1..6cb36a92153 100755
 --- a/run-tests.php