diff options
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg_help.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/breakpoints_001.phpt | 22 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/breakpoints_002.phpt | 28 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/breakpoints_003.phpt | 14 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/breakpoints_004.phpt | 28 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/exceptions_003.phpt | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/stepping_001.phpt | 2 |
8 files changed, 51 insertions, 49 deletions
diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index a99191d510..a0dd457324 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -810,7 +810,7 @@ phpdbg_help_text_t phpdbg_help_text[] = { {"run", "Enter the vm, startinging execution. Execution will then continue until the next breakpoint " -"or completion of the script. Add parameters you want to use as $argv" +"or completion of the script. Add parameters you want to use as $argv" CR CR "**Examples**" CR CR " $P run" CR " $P r" CR diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 44170c8c9e..a792090275 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -121,7 +121,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op) /*{{{ */ case ZEND_FAST_CALL: case ZEND_FAST_RET: if (op->extended_value != 0) { - spprintf(&decode[2], 0, "J%" PRIu32, op->op2.opline_num); + spprintf(&decode[2], 0, "%" PRIu32, op->op2.num); } break; diff --git a/sapi/phpdbg/tests/breakpoints_001.phpt b/sapi/phpdbg/tests/breakpoints_001.phpt index 934f0d3554..17e7c65cbf 100644 --- a/sapi/phpdbg/tests/breakpoints_001.phpt +++ b/sapi/phpdbg/tests/breakpoints_001.phpt @@ -11,23 +11,23 @@ q [Successful compilation of %s] prompt> [Breakpoint #0 added at %s:3] prompt> [Breakpoint #0 at %s:3, hits: 1] ->00003: echo 1; - 00004: echo 2; - 00005: echo 3; +>00003: echo $i++; + 00004: echo $i++; + 00005: echo $i++; prompt> [Breakpoint #1 added at %s:4] prompt> 1 [Breakpoint #1 at %s:4, hits: 1] ->00004: echo 2; - 00005: echo 3; - 00006: echo 4; +>00004: echo $i++; + 00005: echo $i++; + 00006: echo $i++; prompt> 234 [Script ended normally] prompt> --FILE-- <?php - -echo 1; -echo 2; -echo 3; -echo 4; +$i = 1; +echo $i++; +echo $i++; +echo $i++; +echo $i++; diff --git a/sapi/phpdbg/tests/breakpoints_002.phpt b/sapi/phpdbg/tests/breakpoints_002.phpt index 18aaef1f36..96c98194b1 100644 --- a/sapi/phpdbg/tests/breakpoints_002.phpt +++ b/sapi/phpdbg/tests/breakpoints_002.phpt @@ -14,27 +14,27 @@ q prompt> [Breakpoint #0 added at %s:4] prompt> 1 [Breakpoint #0 at %s:4, hits: 1] ->00004: echo 2; - 00005: echo 3; - 00006: echo 4; +>00004: echo $i++; + 00005: echo $i++; + 00006: echo $i++; prompt> [Breakpoint #1 added at %s:3] prompt> Do you really want to restart execution? (type y or n): [Breakpoint #1 at %s:3, hits: 1] ->00003: echo 1; - 00004: echo 2; - 00005: echo 3; +>00003: echo $i++; + 00004: echo $i++; + 00005: echo $i++; prompt> 1 [Breakpoint #0 at %s:4, hits: 1] ->00004: echo 2; - 00005: echo 3; - 00006: echo 4; +>00004: echo $i++; + 00005: echo $i++; + 00006: echo $i++; prompt> 234 [Script ended normally] prompt> --FILE-- <?php - -echo 1; -echo 2; -echo 3; -echo 4; +$i = 1; +echo $i++; +echo $i++; +echo $i++; +echo $i++; diff --git a/sapi/phpdbg/tests/breakpoints_003.phpt b/sapi/phpdbg/tests/breakpoints_003.phpt index 8caa64632b..12b2504487 100644 --- a/sapi/phpdbg/tests/breakpoints_003.phpt +++ b/sapi/phpdbg/tests/breakpoints_003.phpt @@ -16,8 +16,8 @@ prompt> [Deleted breakpoint #0] prompt> [Breakpoint #1 added at %s:5] prompt> 12 [Breakpoint #1 at %s:5, hits: 1] ->00005: echo 3; - 00006: echo 4; +>00005: echo $i++; + 00006: echo $i++; 00007: prompt> [Deleted breakpoint #1] prompt> Do you really want to restart execution? (type y or n): 1234 @@ -25,9 +25,9 @@ prompt> Do you really want to restart execution? (type y or n): 1234 prompt> --FILE-- <?php - -echo 1; -echo 2; -echo 3; -echo 4; +$i = 1; +echo $i++; +echo $i++; +echo $i++; +echo $i++; diff --git a/sapi/phpdbg/tests/breakpoints_004.phpt b/sapi/phpdbg/tests/breakpoints_004.phpt index 27ebd0bea2..917e908efb 100644 --- a/sapi/phpdbg/tests/breakpoints_004.phpt +++ b/sapi/phpdbg/tests/breakpoints_004.phpt @@ -12,30 +12,30 @@ q [Successful compilation of %s] prompt> [Breakpoint #0 added at ZEND_ECHO] prompt> [Breakpoint #0 in ZEND_ECHO at %s:3, hits: 1] ->00003: echo 1; - 00004: echo 2; - 00005: echo 3; +>00003: echo $i++; + 00004: echo $i++; + 00005: echo $i++; prompt> 1 [Breakpoint #0 in ZEND_ECHO at %s:4, hits: 2] ->00004: echo 2; - 00005: echo 3; - 00006: echo 4; +>00004: echo $i++; + 00005: echo $i++; + 00006: echo $i++; prompt> 2 [Breakpoint #0 in ZEND_ECHO at %s:5, hits: 3] ->00005: echo 3; - 00006: echo 4; +>00005: echo $i++; + 00006: echo $i++; 00007: prompt> 3 [Breakpoint #0 in ZEND_ECHO at %s:6, hits: 4] ->00006: echo 4; +>00006: echo $i++; 00007: prompt> 4 [Script ended normally] prompt> --FILE-- <?php - -echo 1; -echo 2; -echo 3; -echo 4; +$i = 1; +echo $i++; +echo $i++; +echo $i++; +echo $i++; diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt index fffe7a9296..c83eb7517a 100644 --- a/sapi/phpdbg/tests/exceptions_003.phpt +++ b/sapi/phpdbg/tests/exceptions_003.phpt @@ -25,7 +25,7 @@ prompt> [L7 %s ECHO "ok " 00008: } 00009: } catch (Error $e) { prompt> ok -[L7 %s FAST_RET<TO_CATCH> ~%d J7 %s] +[L7 %s FAST_RET<TO_CATCH> ~%d 0 %s] [L9 %s CATCH "Error" $e 1 %s] >00005: x(); 00006: } finally { diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt index 5c92ba2f0b..9366550f56 100644 --- a/sapi/phpdbg/tests/stepping_001.phpt +++ b/sapi/phpdbg/tests/stepping_001.phpt @@ -1,5 +1,7 @@ --TEST-- Stepping with exceptions must not be stuck at CATCH +--INI-- +opcache.enable=0 --PHPDBG-- b ZEND_THROW r |