Update PHP versions and patches

Author: petk

bin/init.cmake

@@ -16,6 +16,9 @@ Usage:
 
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
+# The PHP MAJOR.MINOR version currently in development (the master branch).
+set(PHP_DEVELOPMENT_VERSION "8.5")
+
 # Check if git command is available.
 find_program(GIT_EXECUTABLE git DOC "Path to the Git executable")
 
@@ -109,7 +112,7 @@ message(STATUS "Applying patches to ${PHP_SOURCE_DIR_NAME}")
 
 # Apply patches for php-src.
 if(GIT_BRANCH STREQUAL "master")
-  set(PHP_VERSION "8.4")
+  set(PHP_VERSION "${PHP_DEVELOPMENT_VERSION}")
 else()
   string(REGEX MATCH [[([0-9]+\.[0-9]+).*$]] PHP_VERSION "${GIT_BRANCH}")
 endif()

bin/init.sh

@@ -10,6 +10,9 @@ generator=""
 branch=""
 debug=0
 
+# The PHP MAJOR.MINOR version currently in development (the master branch).
+phpVersionDev="8.5"
+
 # Go to project root.
 cd $(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P)
 
@@ -177,7 +180,7 @@ cp -r cmake/* php-src/
 
 # Apply patches to php-src from the patches directory.
 if test ${branch} = "master"; then
-  php_version=8.4
+  php_version=$phpVersionDev
 else
   php_version=$(echo $branch | sed 's/PHP-\([0-9.]*\).*$/\1/')
 fi

bin/make-patches.sh

@@ -17,18 +17,25 @@ patch-cmake-8.3-zend-vm-gen
 patch-cmake-8.4
 patch-cmake-8.4-asm
 patch-cmake-8.4-dmalloc
-patch-cmake-8.4-docs
 patch-cmake-8.4-php-config
 patch-cmake-8.4-phpdbg-prompt
 patch-cmake-8.4-timelib
 patch-cmake-8.4-zend-vm-gen
+patch-cmake-8.5
+patch-cmake-8.5-asm
+patch-cmake-8.5-dmalloc
+patch-cmake-8.5-docs
+patch-cmake-8.5-php-config
+patch-cmake-8.5-phpdbg-prompt
+patch-cmake-8.5-timelib
+patch-cmake-8.5-zend-vm-gen
 "
 
 # A list of supported PHP versions.
-phpVersions="8.3 8.4"
+phpVersions="8.3 8.4 8.5"
 
-# The PHP MAJOR.MINOR version currently in development
-phpVersionDev="8.4"
+# The PHP MAJOR.MINOR version currently in development (the master branch).
+phpVersionDev="8.5"
 
 # Whether to rebase the patch branches against their tracked origins.
 refresh=0

bin/php.cmake

@@ -39,8 +39,8 @@ cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 # Set default variables.
 ################################################################################
 
-# The MAJOR.MINOR version currently in development.
-set(PHP_VERSION_DEV "8.4")
+# The PHP MAJOR.MINOR version currently in development (the master branch).
+set(PHP_VERSION_DEV "8.5")
 # The latest stable PHP version as a fallback when version cannot be discovered
 # from remote JSON output.
 set(PHP_VERSION_FALLBACK "8.3.4")

patches/8.4/cmake.patch

@@ -1,124 +1,12 @@
 Subject: Add CMake changes for PHP-8.4 branch
 
-- EditorConfig adjustments for code style support in editors and IDEs
-- CMake build system files added to .gitignore
-- CMake added to run-tests.php for info about failing tests and checks
-- CMakeLists.txt template and modifications added to ext/skeleton
+* CMake added to run-tests.php for info about failing tests and checks
 ---
- .editorconfig              |  2 +-
- .gitignore                 | 43 ++++++++++++++++++++++++++++++++++++++
- ext/ext_skel.php           |  1 +
- ext/skeleton/.gitignore.in | 21 +++++++++++++++++++
- run-tests.php              | 24 +++++++++++++++------
- 5 files changed, 84 insertions(+), 7 deletions(-)
+ run-tests.php | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
 
-diff --git a/.editorconfig b/.editorconfig
-index 7911bf8490..0ca142015f 100644
---- a/.editorconfig
-+++ b/.editorconfig
-@@ -17,7 +17,7 @@ indent_style             = tab
- indent_size              = 4
- indent_style             = space
- 
--[*.{ac,m4,sh,yml}]
-+[{CMakeLists.txt,*.{ac,cmake,json,m4,sh,yml}}]
- indent_size              = 2
- indent_style             = space
- 
-diff --git a/.gitignore b/.gitignore
-index d54334f599..db362020fe 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -297,3 +297,46 @@ tmp-php.ini
- !/ext/dom/lexbor/patches/*.patch
- !/ext/pcre/pcre2lib/config.h
- !/win32/build/Makefile
-+
-+# ------------------------------------------------------------------------------
-+# CMake-based build system files
-+# ------------------------------------------------------------------------------
-+cmake_install.cmake
-+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
-diff --git a/ext/ext_skel.php b/ext/ext_skel.php
-index ae7a3a987c..648e3728b8 100755
---- a/ext/ext_skel.php
-+++ b/ext/ext_skel.php
-@@ -302,6 +302,7 @@ function copy_config_scripts() {
-         $files[] = 'config.w32';
-     }
- 
-+    $files[] = 'CMakeLists.txt';
-     $files[] = '.gitignore';
- 
-     foreach($files as $config_script) {
-diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
-index e691bd3964..fff9fc09d0 100644
---- a/ext/skeleton/.gitignore.in
-+++ b/ext/skeleton/.gitignore.in
-@@ -45,3 +45,24 @@ tests/**/*.db
- tests/**/*.mem
- tmp-php.ini
- *~
-+
-+# ------------------------------------------------------------------------------
-+# CMake-based build system files
-+# ------------------------------------------------------------------------------
-+/_deps/
-+/.ninja*
-+/*.dependers
-+/*.dot
-+/build.ninja
-+/CMakeUserPresets.json
-+/compile-commands.json
-+/CTestTestfile.cmake
-+/install_manifest.txt
-+/profile.json
-+/Testing/
-+cmake_install.cmake
-+CMakeCache.txt
-+CMakeFiles/
-+CMakeLists.txt.user
-+CMakeScripts/
-+/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
-index 1c9511130c..0341ffff4c 100755
+index 5587c6c0ae..ff5932bfde 100755
 --- a/run-tests.php
 +++ b/run-tests.php
 @@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void