Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  PHPDBG: fix bug parsing 3-word opcodes

Author: nikic

sapi/phpdbg/phpdbg_lexer.l

@@ -81,7 +81,7 @@ DIGITS      [-]?[0-9\.]+
 ID          [^ \r\n\t:#\000]+
 GENERIC_ID  ([^ \r\n\t:#\000"']|":\\")+|["]([^\n\000"\\]|"\\\\"|"\\"["])+["]|[']([^\n\000'\\]|"\\\\"|"\\"['])+[']
 ADDR        [0][x][a-fA-F0-9]+
-OPCODE      (ZEND_|zend_)([A-Za-z])+
+OPCODE      (ZEND_|zend_)([A-Z_a-z])+
 INPUT       ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])+["]|[']("\\"[']|"\\\\"|[^\n\000'])+[']|[^\n\000#"'])+
 
 <!*> := yyleng = (size_t) YYCURSOR - (size_t) yytext;

sapi/phpdbg/tests/breakpoints_009.phpt

@@ -0,0 +1,41 @@
+--TEST--
+Test parsing longer opcode
+--PHPDBG--
+b ZEND_POST_INC
+r
+c
+
+
+
+q
+--EXPECTF--
+[Successful compilation of %s]
+prompt> [Breakpoint #0 added at ZEND_POST_INC]
+prompt> [Breakpoint #0 in ZEND_POST_INC at %s:3, hits: 1]
+>00003: echo $i++;
+ 00004: echo $i++;
+ 00005: echo $i++;
+prompt> 1
+[Breakpoint #0 in ZEND_POST_INC at %s:4, hits: 2]
+>00004: echo $i++;
+ 00005: echo $i++;
+ 00006: echo $i++;
+prompt> 2
+[Breakpoint #0 in ZEND_POST_INC at %s:5, hits: 3]
+>00005: echo $i++;
+ 00006: echo $i++;
+ 00007: 
+prompt> 3
+[Breakpoint #0 in ZEND_POST_INC at %s:6, hits: 4]
+>00006: echo $i++;
+ 00007: 
+prompt> 4
+[Script ended normally]
+prompt>
+--FILE--
+<?php
+$i = 1;
+echo $i++;
+echo $i++;
+echo $i++;
+echo $i++;