Fix phpdbg prompt when building with libedit integration

Author: petk

bin/make-patches.sh

@@ -12,11 +12,13 @@ patch-cmake-8.3-asm
 patch-cmake-8.3-aspell
 patch-cmake-8.3-dmalloc
 patch-cmake-8.3-php-config
+patch-cmake-8.3-phpdbg-prompt
 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
 "
 

patches/8.3/phpdbg-prompt.patch

@@ -0,0 +1,52 @@
+Subject: Fix phpdbg prompt with editline/readline integration
+
+When building phpdbg SAPI with libedit/readline integration, also start
+and end ignore characters need to be added in the prompt pattern. This
+should work now for libedit, readline, and phpdbg without
+readline/libedit.
+
+The RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE macros are checked
+there to ensure libedit has these available. Otherwise, this could be
+further improved by concatenating strings and literal strings into
+single argument or similar using these two symbols directly.
+
+Autotools:
+
+    ./configure --with-libedit --enable-phpdbg-readline
+    make
+    ./sapi/phpdbg/phpdb
+
+CMake:
+
+    cmake -DSAPI_PHPDBG_READLINE=ON .
+    cmake --build .
+    ./sapi/phpdbg/phpdbg
+
+In the phpdbg, the "prompt" should be colored (or bold) in some
+terminals.
+---
+ sapi/phpdbg/phpdbg_utils.c | 10 +++++++---
+ 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
+--- a/sapi/phpdbg/phpdbg_utils.c
++++ b/sapi/phpdbg/phpdbg_utils.c
+@@ -318,10 +318,14 @@ PHPDBG_API const char *phpdbg_get_prompt(void) /* {{{ */
+ 	}
+ 
+ 	/* create cached prompt */
+-#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 ",
++# else
++			"\033[%sm%s\033[0m ",
++# endif
+ 			PHPDBG_G(colors)[PHPDBG_COLOR_PROMPT]->code,
+ 			PHPDBG_G(prompt)[0]));
+ 	} else

patches/8.4/php-config.patch

@@ -57,10 +57,10 @@ index e45b22b766..74f0e25b01 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index c728970129..dd20f22534 100644
+index 198f04afd9..e4fd053bca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1366,6 +1366,9 @@ exec_prefix=$old_exec_prefix
+@@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix
  libdir=$old_libdir
  datadir=$old_datadir
 
@@ -70,7 +70,7 @@ index c728970129..dd20f22534 100644
  AC_SUBST([INCLUDE_PATH])
  AC_SUBST([EXPANDED_PEAR_INSTALLDIR])
  AC_SUBST([EXPANDED_EXTENSION_DIR])
-@@ -1384,6 +1387,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
+@@ -1381,6 +1384,9 @@ AC_SUBST([SAPI_LIBNAME_STATIC])
  AC_SUBST([PHP_VERSION])
  AC_SUBST([PHP_VERSION_ID])
  AC_SUBST([PHP_LDFLAGS])

patches/8.4/phpdbg-prompt.patch

@@ -0,0 +1,52 @@
+Subject: Fix phpdbg prompt with editline/readline integration
+
+When building phpdbg SAPI with libedit/readline integration, also start
+and end ignore characters need to be added in the prompt pattern. This
+should work now for libedit, readline, and phpdbg without
+readline/libedit.
+
+The RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE macros are checked
+there to ensure libedit has these available. Otherwise, this could be
+further improved by concatenating strings and literal strings into
+single argument or similar using these two symbols directly.
+
+Autotools:
+
+    ./configure --with-libedit --enable-phpdbg-readline
+    make
+    ./sapi/phpdbg/phpdb
+
+CMake:
+
+    cmake -DSAPI_PHPDBG_READLINE=ON .
+    cmake --build .
+    ./sapi/phpdbg/phpdbg
+
+In the phpdbg, the "prompt" should be colored (or bold) in some
+terminals.
+---
+ sapi/phpdbg/phpdbg_utils.c | 10 +++++++---
+ 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
+--- a/sapi/phpdbg/phpdbg_utils.c
++++ b/sapi/phpdbg/phpdbg_utils.c
+@@ -318,10 +318,14 @@ PHPDBG_API const char *phpdbg_get_prompt(void) /* {{{ */
+ 	}
+ 
+ 	/* create cached prompt */
+-#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 ",
++# else
++			"\033[%sm%s\033[0m ",
++# endif
+ 			PHPDBG_G(colors)[PHPDBG_COLOR_PROMPT]->code,
+ 			PHPDBG_G(prompt)[0]));
+ 	} else