Merge branch 'PHP-8.3'

Author: petk

patches/8.3/cmake.patch

@@ -6,7 +6,7 @@ Subject: Add CMake changes for PHP-8.3 branch
  1 file changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/run-tests.php b/run-tests.php
-index 3f5d3563c7..9f889a4a01 100755
+index 2716f2a520..39f66088e2 100755
 --- a/run-tests.php
 +++ b/run-tests.php
 @@ -885,10 +885,12 @@ function write_information(): void

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..ae214c61fe 100644
+index 964d82ef6c..4ade8777bb 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) /* {{{ */
@@ -39,14 +39,14 @@ index 964d82ef6c..ae214c61fe 100644
 -#ifndef HAVE_LIBEDIT
 -	/* TODO: libedit doesn't seems to support coloured prompt */
 +#if !defined(HAVE_LIBEDIT) || (defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE))
- 	if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) {
--		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], "\033[%sm%s\033[0m ",
-+		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1],
 +# if defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE)
-+			"\1\033[%sm\2%s\1\033[0m\2 ",
++#  define PHPDBG_PROMPT "\1\033[%sm\2%s\1\033[0m\2 "
 +# else
-+			"\033[%sm%s\033[0m ",
++#  define PHPDBG_PROMPT "\033[%sm%s\033[0m "
 +# endif
+ 	if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) {
+-		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], "\033[%sm%s\033[0m ",
++		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], PHPDBG_PROMPT,
  			PHPDBG_G(colors)[PHPDBG_COLOR_PROMPT]->code,
  			PHPDBG_G(prompt)[0]));
  	} else

patches/8.4/cmake.patch

@@ -118,7 +118,7 @@ index e691bd3964..fff9fc09d0 100644
 +CMakeScripts/
 +/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
-index e545c302f4..af7999c6c6 100755
+index 1c9511130c..0341ffff4c 100755
 --- a/run-tests.php
 +++ b/run-tests.php
 @@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void

patches/8.4/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 329ee9a883..e72265ae8e 100644
+index 329ee9a883..1511a75bd0 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) /* {{{ */
@@ -39,14 +39,14 @@ index 329ee9a883..e72265ae8e 100644
 -#ifndef HAVE_LIBEDIT
 -	/* TODO: libedit doesn't seems to support coloured prompt */
 +#if !defined(HAVE_LIBEDIT) || (defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE))
- 	if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) {
--		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], "\033[%sm%s\033[0m ",
-+		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1],
 +# if defined(HAVE_LIBEDIT) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE)
-+			"\1\033[%sm\2%s\1\033[0m\2 ",
++#  define PHPDBG_PROMPT "\1\033[%sm\2%s\1\033[0m\2 "
 +# else
-+			"\033[%sm%s\033[0m ",
++#  define PHPDBG_PROMPT "\033[%sm%s\033[0m "
 +# endif
+ 	if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) {
+-		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], "\033[%sm%s\033[0m ",
++		ZEND_IGNORE_VALUE(asprintf(&PHPDBG_G(prompt)[1], PHPDBG_PROMPT,
  			PHPDBG_G(colors)[PHPDBG_COLOR_PROMPT]->code,
  			PHPDBG_G(prompt)[0]));
  	} else