Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

patches/8.3/asm.patch

@@ -18,7 +18,7 @@ repository.
  7 files changed, 54 insertions(+), 66 deletions(-)
 
 diff --git a/Zend/asm/jump_i386_sysv_elf_gas.S b/Zend/asm/jump_i386_sysv_elf_gas.S
-index 47be9e7782..ed83717ce2 100644
+index 47be9e77822..ed83717ce2b 100644
 --- a/Zend/asm/jump_i386_sysv_elf_gas.S
 +++ b/Zend/asm/jump_i386_sysv_elf_gas.S
 @@ -24,6 +24,10 @@
@@ -39,7 +39,7 @@ index 47be9e7782..ed83717ce2 100644
 +
 +#endif
 diff --git a/Zend/asm/jump_s390x_sysv_elf_gas.S b/Zend/asm/jump_s390x_sysv_elf_gas.S
-index c2a578b266..fa71467756 100644
+index c2a578b2663..fa71467756d 100644
 --- a/Zend/asm/jump_s390x_sysv_elf_gas.S
 +++ b/Zend/asm/jump_s390x_sysv_elf_gas.S
 @@ -49,11 +49,12 @@
@@ -81,7 +81,7 @@ index c2a578b266..fa71467756 100644
  use_return_slot:
  	/* Save the two fields in transfer_t.  When calling a
 diff --git a/Zend/asm/jump_x86_64_sysv_elf_gas.S b/Zend/asm/jump_x86_64_sysv_elf_gas.S
-index 40f8734dae..ff303bfa0e 100644
+index 40f8734daee..ff303bfa0e2 100644
 --- a/Zend/asm/jump_x86_64_sysv_elf_gas.S
 +++ b/Zend/asm/jump_x86_64_sysv_elf_gas.S
 @@ -31,13 +31,16 @@
@@ -128,7 +128,7 @@ index 40f8734dae..ff303bfa0e 100644
  .section .note.GNU-stack,"",%progbits
 +# endif
 diff --git a/Zend/asm/make_i386_sysv_elf_gas.S b/Zend/asm/make_i386_sysv_elf_gas.S
-index 9261e566c0..c6e0b36558 100644
+index 9261e566c0d..c6e0b36558a 100644
 --- a/Zend/asm/make_i386_sysv_elf_gas.S
 +++ b/Zend/asm/make_i386_sysv_elf_gas.S
 @@ -24,6 +24,10 @@
@@ -149,7 +149,7 @@ index 9261e566c0..c6e0b36558 100644
 +
 +#endif
 diff --git a/Zend/asm/make_ppc64_sysv_macho_gas.S b/Zend/asm/make_ppc64_sysv_macho_gas.S
-index fb5cada265..dd7bf2c5c0 100644
+index fb5cada265a..dd7bf2c5c0c 100644
 --- a/Zend/asm/make_ppc64_sysv_macho_gas.S
 +++ b/Zend/asm/make_ppc64_sysv_macho_gas.S
 @@ -64,6 +64,7 @@
@@ -161,7 +161,7 @@ index fb5cada265..dd7bf2c5c0 100644
  .text
  .globl _make_fcontext
 diff --git a/Zend/asm/make_s390x_sysv_elf_gas.S b/Zend/asm/make_s390x_sysv_elf_gas.S
-index e7e2d5f6e0..4dd423e2a4 100644
+index e7e2d5f6e0c..4dd423e2a44 100644
 --- a/Zend/asm/make_s390x_sysv_elf_gas.S
 +++ b/Zend/asm/make_s390x_sysv_elf_gas.S
 @@ -49,12 +49,12 @@
@@ -193,7 +193,7 @@ index e7e2d5f6e0..4dd423e2a4 100644
  	/* Allocate stack space for the context.  */
  	aghi	%r2,-CONTEXT_SIZE
 diff --git a/Zend/asm/make_x86_64_sysv_elf_gas.S b/Zend/asm/make_x86_64_sysv_elf_gas.S
-index 3358a27d84..df9472433c 100644
+index 3358a27d844..df9472433cf 100644
 --- a/Zend/asm/make_x86_64_sysv_elf_gas.S
 +++ b/Zend/asm/make_x86_64_sysv_elf_gas.S
 @@ -31,13 +31,16 @@

patches/8.3/aspell.patch

@@ -32,7 +32,7 @@ See: https://github.com/php/php-src/pull/12017
  6 files changed, 114 insertions(+), 129 deletions(-)
 
 diff --git a/.github/actions/apt-x32/action.yml b/.github/actions/apt-x32/action.yml
-index 879300f992..de820684fb 100644
+index 879300f9927..de820684fb2 100644
 --- a/.github/actions/apt-x32/action.yml
 +++ b/.github/actions/apt-x32/action.yml
 @@ -31,7 +31,6 @@ runs:
@@ -44,7 +44,7 @@ index 879300f992..de820684fb 100644
            libsasl2-dev:i386 \
            libsodium-dev:i386 \
 diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
-index bc2aa00df2..739abf8fe5 100644
+index bc2aa00df20..739abf8fe50 100644
 --- a/.github/actions/apt-x64/action.yml
 +++ b/.github/actions/apt-x64/action.yml
 @@ -34,7 +34,6 @@ runs:
@@ -56,7 +56,7 @@ index bc2aa00df2..739abf8fe5 100644
            libxpm-dev \
            libzip-dev \
 diff --git a/.travis.yml b/.travis.yml
-index 817bef0003..39e4991e2f 100644
+index 817bef00036..39e4991e2fd 100644
 --- a/.travis.yml
 +++ b/.travis.yml
 @@ -24,7 +24,6 @@ addons:
@@ -68,7 +68,7 @@ index 817bef0003..39e4991e2f 100644
        - libsqlite3-dev
        - libsodium-dev
 diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4
-index db49b4fd86..2356ad7d51 100644
+index db49b4fd86b..2356ad7d51a 100644
 --- a/ext/pspell/config.m4
 +++ b/ext/pspell/config.m4
 @@ -1,7 +1,7 @@
@@ -108,7 +108,7 @@ index db49b4fd86..2356ad7d51 100644
  	dnl Add -laspell to LIBS if it exists
  	PHP_CHECK_LIBRARY(aspell,new_aspell_config,
 diff --git a/ext/pspell/config.w32 b/ext/pspell/config.w32
-index d88ea1d30c..83a8413846 100644
+index d88ea1d30c5..83a84138467 100644
 --- a/ext/pspell/config.w32
 +++ b/ext/pspell/config.w32
 @@ -1,10 +1,10 @@
@@ -125,7 +125,7 @@ index d88ea1d30c..83a8413846 100644
  		EXTENSION('pspell', 'pspell.c');
  		AC_DEFINE('HAVE_PSPELL', 1);
 diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
-index 7c15472ed0..6937dc7752 100644
+index 7c15472ed0e..6937dc77525 100644
 --- a/ext/pspell/pspell.c
 +++ b/ext/pspell/pspell.c
 @@ -25,12 +25,8 @@

patches/8.3/cmake.patch

@@ -15,7 +15,7 @@ Subject: Add CMake changes for PHP-8.3 branch
  5 files changed, 99 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
-index 7911bf8490..1d9b530947 100644
+index 7911bf8490b..1d9b530947e 100644
 --- a/.editorconfig
 +++ b/.editorconfig
 @@ -17,7 +17,7 @@ indent_style             = tab
@@ -28,18 +28,18 @@ index 7911bf8490..1d9b530947 100644
  indent_style             = space
 
 diff --git a/.gitignore b/.gitignore
-index b9e60cc6b5..f31fe9faa7 100644
+index 4e95d9a9da3..c109a4296a5 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -153,6 +153,7 @@ php
+@@ -156,6 +156,7 @@ php
  # ------------------------------------------------------------------------------
  /ext/json/json_parser.tab.h
  /ext/json/json_parser.tab.c
 +/ext/json/json_parser.output
  /sapi/phpdbg/phpdbg_parser.c
  /sapi/phpdbg/phpdbg_parser.h
  /sapi/phpdbg/phpdbg_parser.output
-@@ -296,9 +297,58 @@ tmp-php.ini
+@@ -299,9 +300,58 @@ tmp-php.ini
  # ------------------------------------------------------------------------------
  /ext/standard/tests/helpers/bad_cmd.exe
 
@@ -99,7 +99,7 @@ index b9e60cc6b5..f31fe9faa7 100644
  !/ext/fileinfo/libmagic/config.h
  !/ext/fileinfo/libmagic.patch
 diff --git a/ext/ext_skel.php b/ext/ext_skel.php
-index ae7a3a987c..a67901a2c9 100755
+index ae7a3a987c0..a67901a2c98 100755
 --- a/ext/ext_skel.php
 +++ b/ext/ext_skel.php
 @@ -302,11 +302,18 @@ function copy_config_scripts() {
@@ -122,7 +122,7 @@ index ae7a3a987c..a67901a2c9 100755
              error('Unable to copy config script: ' . $config_script);
          }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
-index ae434fef97..87545d9162 100644
+index ae434fef976..87545d9162e 100644
 --- a/ext/skeleton/.gitignore.in
 +++ b/ext/skeleton/.gitignore.in
 @@ -39,3 +39,26 @@ tests/**/*.sh
@@ -153,7 +153,7 @@ index ae434fef97..87545d9162 100644
 +CMakeLists.txt.user
 +CMakeScripts/
 diff --git a/run-tests.php b/run-tests.php
-index d51ab99a20..9211cbb3e2 100755
+index d51ab99a205..9211cbb3e27 100755
 --- a/run-tests.php
 +++ b/run-tests.php
 @@ -885,10 +885,12 @@ function write_information(): void

patches/8.3/dba.patch

@@ -14,7 +14,7 @@ Subject: Fix ext/dba tests when ndbm and dbm handlers are enabled
  3 files changed, 30 insertions(+), 61 deletions(-)
 
 diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
-index 3840359343..79bb82a94b 100644
+index 38403593430..79bb82a94ba 100644
 --- a/ext/dba/tests/dba_dbm.phpt
 +++ b/ext/dba/tests/dba_dbm.phpt
 @@ -13,8 +13,8 @@
@@ -79,7 +79,7 @@ index 3840359343..79bb82a94b 100644
 +  string(16) "Content String 9"
  }
 diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
-index 730932966c..9cc4f3f481 100644
+index 730932966cf..9cc4f3f4816 100644
 --- a/ext/dba/tests/dba_ndbm.phpt
 +++ b/ext/dba/tests/dba_ndbm.phpt
 @@ -13,8 +13,7 @@
@@ -168,7 +168,7 @@ index 730932966c..9cc4f3f481 100644
 -Failed to create DB
 +SAME OUTPUT AS PREVIOUS RUN (modulo read during write due to no lock)
 diff --git a/ext/dba/tests/setup/setup_dba_tests.inc b/ext/dba/tests/setup/setup_dba_tests.inc
-index 2ffac29e69..f30bae5fdd 100644
+index 2ffac29e697..f30bae5fdd8 100644
 --- a/ext/dba/tests/setup/setup_dba_tests.inc
 +++ b/ext/dba/tests/setup/setup_dba_tests.inc
 @@ -309,4 +309,7 @@ function cleanup_standard_db(string $name): void {

patches/8.3/dmalloc.patch

@@ -10,7 +10,7 @@ See: https://github.com/php/php-src/pull/8465
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
-index 19edc0cd3e..dba4eefb18 100644
+index 19edc0cd3ee..dba4eefb18e 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@

patches/8.3/php-config.patch

@@ -44,10 +44,10 @@ Changes:
  4 files changed, 53 insertions(+), 19 deletions(-)
 
 diff --git a/build/php.m4 b/build/php.m4
-index 61ee5c1675..1a8d67a783 100644
+index 142ddf08fd9..e476c42f895 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -2146,7 +2146,9 @@ EOF
+@@ -2155,7 +2155,9 @@ EOF
    chmod +x $1
    CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS"
    PHP_SUBST_OLD(CONFIGURE_COMMAND)
@@ -59,7 +59,7 @@ index 61ee5c1675..1a8d67a783 100644
 
  dnl
 diff --git a/configure.ac b/configure.ac
-index 0e98613854..e4710e6418 100644
+index d721458a73e..b7b5208897a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1480,6 +1480,9 @@ exec_prefix=$old_exec_prefix
@@ -83,7 +83,7 @@ index 0e98613854..e4710e6418 100644
  PHP_UTILIZE_RPATHS
 
 diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
-index 8ccd171641..bd81c24df8 100644
+index 8ccd171641e..bd81c24df80 100644
 --- a/scripts/man1/php-config.1.in
 +++ b/scripts/man1/php-config.1.in
 @@ -57,6 +57,24 @@ PHP version
@@ -112,7 +112,7 @@ index 8ccd171641..bd81c24df8 100644
  .PD 1
  .P
 diff --git a/scripts/php-config.in b/scripts/php-config.in
-index 9271e87286..deab0ebd59 100644
+index 9271e872863..deab0ebd597 100644
 --- a/scripts/php-config.in
 +++ b/scripts/php-config.in
 @@ -1,6 +1,5 @@

patches/8.3/phpdbg-prompt.patch

@@ -29,7 +29,7 @@ terminals.
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
-index 964d82ef6c..944db08188 100644
+index 964d82ef6c8..944db081880 100644
 --- a/sapi/phpdbg/phpdbg_utils.c
 +++ b/sapi/phpdbg/phpdbg_utils.c
 @@ -318,10 +318,14 @@ PHPDBG_API const char *phpdbg_get_prompt(void) /* {{{ */

patches/8.3/re2c.patch

@@ -10,7 +10,7 @@ re2c version 4 enables some warnigns by default. This fixes the
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
-index 44159297a0..b87f4e33cc 100644
+index 44159297a04..b87f4e33cc8 100644
 --- a/Zend/zend_ini_scanner.l
 +++ b/Zend/zend_ini_scanner.l
 @@ -352,16 +352,16 @@ restart:
@@ -34,7 +34,7 @@ index 44159297a0..b87f4e33cc 100644
  DOLLAR_CURLY "${"
 
 diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
-index 25e1ecbca6..3ea51fe7c9 100644
+index 25e1ecbca6f..3ea51fe7c9d 100644
 --- a/Zend/zend_language_scanner.l
 +++ b/Zend/zend_language_scanner.l
 @@ -1801,11 +1801,11 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
@@ -52,7 +52,7 @@ index 25e1ecbca6..3ea51fe7c9 100644
  }
 
 diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
-index 60d995526e..ba1423c5a4 100644
+index 60d995526ea..ba1423c5a4e 100644
 --- a/sapi/phpdbg/phpdbg_lexer.l
 +++ b/sapi/phpdbg/phpdbg_lexer.l
 @@ -77,7 +77,7 @@ T_IF        'if'

patches/8.4/asm.patch

@@ -22,7 +22,7 @@ which should be resolved in the future.
  8 files changed, 38 insertions(+), 61 deletions(-)
 
 diff --git a/Zend/asm/jump_s390x_sysv_elf_gas.S b/Zend/asm/jump_s390x_sysv_elf_gas.S
-index c2a578b266..fa71467756 100644
+index c2a578b2663..fa71467756d 100644
 --- a/Zend/asm/jump_s390x_sysv_elf_gas.S
 +++ b/Zend/asm/jump_s390x_sysv_elf_gas.S
 @@ -49,11 +49,12 @@
@@ -64,7 +64,7 @@ index c2a578b266..fa71467756 100644
  use_return_slot:
  	/* Save the two fields in transfer_t.  When calling a
 diff --git a/Zend/asm/jump_sparc64_sysv_elf_gas.S b/Zend/asm/jump_sparc64_sysv_elf_gas.S
-index 727687aad8..61101fb1f6 100644
+index 727687aad80..61101fb1f62 100644
 --- a/Zend/asm/jump_sparc64_sysv_elf_gas.S
 +++ b/Zend/asm/jump_sparc64_sysv_elf_gas.S
 @@ -6,12 +6,14 @@
@@ -88,7 +88,7 @@ index 727687aad8..61101fb1f6 100644
  #define CC64FSZ 176
  #define BIAS 2047
 diff --git a/Zend/asm/jump_x86_64_ms_pe_gas.S b/Zend/asm/jump_x86_64_ms_pe_gas.S
-index 5ebc46f364..ec4ecfe946 100644
+index 5ebc46f3640..ec4ecfe946d 100644
 --- a/Zend/asm/jump_x86_64_ms_pe_gas.S
 +++ b/Zend/asm/jump_x86_64_ms_pe_gas.S
 @@ -89,6 +89,7 @@
@@ -107,7 +107,7 @@ index 5ebc46f364..ec4ecfe946 100644
 +.section .drectve
 +.ascii " -export:\"jump_fcontext\""
 diff --git a/Zend/asm/jump_x86_64_sysv_elf_gas.S b/Zend/asm/jump_x86_64_sysv_elf_gas.S
-index be264bdc2e..ff303bfa0e 100644
+index be264bdc2e2..ff303bfa0e2 100644
 --- a/Zend/asm/jump_x86_64_sysv_elf_gas.S
 +++ b/Zend/asm/jump_x86_64_sysv_elf_gas.S
 @@ -67,14 +67,6 @@ jump_fcontext:
@@ -126,7 +126,7 @@ index be264bdc2e..ff303bfa0e 100644
      /* grow the stack to reserve space for shadow stack pointer(SSP) */
      leaq  -0x8(%rsp), %rsp
 diff --git a/Zend/asm/make_s390x_sysv_elf_gas.S b/Zend/asm/make_s390x_sysv_elf_gas.S
-index e7e2d5f6e0..4dd423e2a4 100644
+index e7e2d5f6e0c..4dd423e2a44 100644
 --- a/Zend/asm/make_s390x_sysv_elf_gas.S
 +++ b/Zend/asm/make_s390x_sysv_elf_gas.S
 @@ -49,12 +49,12 @@
@@ -158,7 +158,7 @@ index e7e2d5f6e0..4dd423e2a4 100644
  	/* Allocate stack space for the context.  */
  	aghi	%r2,-CONTEXT_SIZE
 diff --git a/Zend/asm/make_sparc64_sysv_elf_gas.S b/Zend/asm/make_sparc64_sysv_elf_gas.S
-index 52ff70b996..3e7ee809c9 100644
+index 52ff70b996b..3e7ee809c91 100644
 --- a/Zend/asm/make_sparc64_sysv_elf_gas.S
 +++ b/Zend/asm/make_sparc64_sysv_elf_gas.S
 @@ -6,7 +6,7 @@
@@ -180,7 +180,7 @@ index 52ff70b996..3e7ee809c9 100644
  	 nop
 
 diff --git a/Zend/asm/make_x86_64_ms_pe_gas.S b/Zend/asm/make_x86_64_ms_pe_gas.S
-index 66a9bb3953..958a2a7b6d 100644
+index 66a9bb39535..958a2a7b6d0 100644
 --- a/Zend/asm/make_x86_64_ms_pe_gas.S
 +++ b/Zend/asm/make_x86_64_ms_pe_gas.S
 @@ -89,6 +89,7 @@
@@ -199,7 +199,7 @@ index 66a9bb3953..958a2a7b6d 100644
 +.section .drectve
 +.ascii " -export:\"make_fcontext\""
 diff --git a/Zend/asm/make_x86_64_sysv_elf_gas.S b/Zend/asm/make_x86_64_sysv_elf_gas.S
-index b0d0c0341e..df9472433c 100644
+index b0d0c0341ef..df9472433cf 100644
 --- a/Zend/asm/make_x86_64_sysv_elf_gas.S
 +++ b/Zend/asm/make_x86_64_sysv_elf_gas.S
 @@ -91,35 +91,6 @@ make_fcontext: