Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

patches/8.6/cmake.patch

@@ -136,7 +136,7 @@ index 12aa02005c2..abfcbcbfc12 100644
  #  define HAVE__CONTROLFP_S
  #endif /* _MSC_VER */
 diff --git a/configure.ac b/configure.ac
-index 6c517ecc0a1..dba894ff00f 100644
+index 7b1fc3af784..1d3ca45c079 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1616,7 +1616,7 @@ else

patches/8.6/swc.patch

@@ -4,7 +4,7 @@ Subject: Enable linking with zlib for SWC files
 See https://github.com/php/php-src/issues/20868
 ---
  ext/standard/basic_functions.stub.php         |   2 +-
- ext/standard/basic_functions_arginfo.h        | Bin 175547 -> 175581 bytes
+ ext/standard/basic_functions_arginfo.h        | Bin 176145 -> 176179 bytes
  ext/standard/basic_functions_decl.h           | Bin 918 -> 918 bytes
  ext/standard/config.m4                        |   5 +++++
  ext/standard/config.w32                       |   7 +++++++
@@ -16,7 +16,7 @@ See https://github.com/php/php-src/issues/20868
  10 files changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
-index 1999c9b92be..891be5e92f4 100644
+index 7f7e0de0f65..77f46c862bd 100644
 --- a/ext/standard/basic_functions.stub.php
 +++ b/ext/standard/basic_functions.stub.php
 @@ -593,7 +593,7 @@ enum SortDirection {
@@ -29,17 +29,17 @@ index 1999c9b92be..891be5e92f4 100644
   * @var int
   * @cvalue IMAGE_FILETYPE_SWC
 diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
-index e51a837ffa4..dcc342a3c56 100644
+index a17efc6961d..50d531d9d12 100644
 --- a/ext/standard/basic_functions_arginfo.h
 +++ b/ext/standard/basic_functions_arginfo.h
 @@ -1,5 +1,5 @@
  /* This is a generated file, edit basic_functions.stub.php instead.
-- * Stub hash: 36b71aa7bbfe478a5e4af400b2822a77067efa2f
-+ * Stub hash: 440bdd4fd760a9f9eaf74f483b41a9c631645b9e
+- * Stub hash: d997420d0668e5b6ac26c43a8f86cff64891aced
++ * Stub hash: 33c87523b7fbd1a37d86a78a54210bf276a16ed1
   * Has decl header: yes */
 
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
-@@ -3659,7 +3659,7 @@ static void register_basic_functions_symbols(int module_number)
+@@ -3673,7 +3673,7 @@ static void register_basic_functions_symbols(int module_number)
  	REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_PERSISTENT);
  	REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_PERSISTENT);
@@ -49,27 +49,27 @@ index e51a837ffa4..dcc342a3c56 100644
  #endif
  	REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_PERSISTENT);
 diff --git a/ext/standard/basic_functions_decl.h b/ext/standard/basic_functions_decl.h
-index b3eb25c5d98..f40cdb34710 100644
+index 067959c8b5f..2d1930129a2 100644
 --- a/ext/standard/basic_functions_decl.h
 +++ b/ext/standard/basic_functions_decl.h
 @@ -1,8 +1,8 @@
  /* This is a generated file, edit basic_functions.stub.php instead.
-- * Stub hash: 36b71aa7bbfe478a5e4af400b2822a77067efa2f */
-+ * Stub hash: 440bdd4fd760a9f9eaf74f483b41a9c631645b9e */
+- * Stub hash: d997420d0668e5b6ac26c43a8f86cff64891aced */
++ * Stub hash: 33c87523b7fbd1a37d86a78a54210bf276a16ed1 */
 
--#ifndef ZEND_BASIC_FUNCTIONS_DECL_36b71aa7bbfe478a5e4af400b2822a77067efa2f_H
--#define ZEND_BASIC_FUNCTIONS_DECL_36b71aa7bbfe478a5e4af400b2822a77067efa2f_H
-+#ifndef ZEND_BASIC_FUNCTIONS_DECL_440bdd4fd760a9f9eaf74f483b41a9c631645b9e_H
-+#define ZEND_BASIC_FUNCTIONS_DECL_440bdd4fd760a9f9eaf74f483b41a9c631645b9e_H
+-#ifndef ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H
+-#define ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H
++#ifndef ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H
++#define ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H
 
  typedef enum zend_enum_SortDirection {
  	ZEND_ENUM_SortDirection_Ascending = 1,
 @@ -20,4 +20,4 @@ typedef enum zend_enum_RoundingMode {
  	ZEND_ENUM_RoundingMode_PositiveInfinity = 8,
  } zend_enum_RoundingMode;
 
--#endif /* ZEND_BASIC_FUNCTIONS_DECL_36b71aa7bbfe478a5e4af400b2822a77067efa2f_H */
-+#endif /* ZEND_BASIC_FUNCTIONS_DECL_440bdd4fd760a9f9eaf74f483b41a9c631645b9e_H */
+-#endif /* ZEND_BASIC_FUNCTIONS_DECL_d997420d0668e5b6ac26c43a8f86cff64891aced_H */
++#endif /* ZEND_BASIC_FUNCTIONS_DECL_33c87523b7fbd1a37d86a78a54210bf276a16ed1_H */
 diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
 index 1d64c7ff696..6101dfed35a 100644
 --- a/ext/standard/config.m4