com php-src: Merge branch 'PHP-7.0' into PHP-7.1: sapi/phpdbg/t ests/exceptions_003.phpt sapi/phpdbg/tests/next_ 001.phpt
sapi/phpdbg/tests/print_001.phpt sapi/phpdbg/tests/stepping_001.phpt sapi/phpdbg/ tests/watch_001.phpt sapi/phpdbg/tests/watch_0 02.phpt
sapi/phpdbg/tests/watch_003.phpt sa pi/phpdbg/tests/watch_004.phpt sapi/phpdbg/tests/wa tch_006.phpt

Commit: 6baaccc9b630daf4a8afd618b725cfa9450dda45 Author: Nikita Popov <nikic@php.net> Wed, 12 Oct 2016 22:43:01 +0200 Committer: Anatol Belski <ab@php.net> Fri, 14 Oct 2016 01:53:25 +0200 Parents: 0e4c1733494a948f114f1c13799d571eaedbf599 Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6baaccc9b630daf4a8afd618b725cfa9450dda45 Log: Merge branch 'PHP-7.0' into PHP-7.1 (cherry picked from commit 9669ec707ab99d33404d3132792a24ebd1130fcf) Changed paths: M sapi/phpdbg/tests/exceptions_003.phpt M sapi/phpdbg/tests/next_001.phpt M sapi/phpdbg/tests/print_001.phpt M sapi/phpdbg/tests/stepping_001.phpt M sapi/phpdbg/tests/watch_001.phpt M sapi/phpdbg/tests/watch_002.phpt M sapi/phpdbg/tests/watch_003..phpt M sapi/phpdbg/tests/watch_004.phpt M sapi/phpdbg/tests/watch_006.phpt Diff: diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt index 2a982bc..ab26bb4 100644 --- a/sapi/phpdbg/tests/exceptions_003.phpt +++ b/sapi/phpdbg/tests/exceptions_003.phpt @@ -35,8 +35,8 @@ prompt> [L10 %s ECHO "caught " 00011: } 00012: prompt> caught -[L10 %s RETURN 1 %s] -[Script ended normally] +[L14 %s RETURN 1 %s] +>00014: prompt> --FILE-- <?php diff --git a/sapi/phpdbg/tests/next_001..phpt b/sapi/phpdbg/tests/next_001.phpt index 3c92ceb..b07d954 100644 --- a/sapi/phpdbg/tests/next_001.phpt +++ b/sapi/phpdbg/tests/next_001.phpt @@ -23,8 +23,8 @@ prompt> [L8 %s ECHO 1 >00008: echo 1; 00009: prompt> 1 -[L8 %s RETURN 1 %s] -[Script ended normally] +[L9 %s RETURN 1 %s] +>00009: prompt> --FILE-- <?php diff --git a/sapi/phpdbg/tests/print_001.phpt b/sapi/phpdbg/tests/print_001.phpt index 1f7a5ac..94ccedc 100644 --- a/sapi/phpdbg/tests/print_001.phpt +++ b/sapi/phpdbg/tests/print_001.phpt @@ -31,7 +31,7 @@ L9-9 Foo\Bar::baz() %s - %s + 1 ops L9 #0 RETURN null prompt> [Not Executing!] prompt> [Context %s (11 ops)] -L1-19 {main}() %s - %s + 11 ops +L1-21 {main}() %s - %s + 11 ops L4 #0 NOP L14 #1 NOP L18 #2 NEW "Foo\\Bar" @1 @@ -42,7 +42,7 @@ L1-19 {main}() %s - %s + 11 ops L19 #7 INIT_FCALL%s %d %s "foo" L19 #8 SEND_VAL "test" 1 L19 #9 DO_FCALL - L19 #10 RETURN 1 + L21 #10 RETURN 1 prompt> --FILE-- <?php diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt index 9366550..76577b2 100644 --- a/sapi/phpdbg/tests/stepping_001.phpt +++ b/sapi/phpdbg/tests/stepping_001.phpt @@ -48,10 +48,8 @@ prompt> ... ok >00011: } finally { 00012: echo " ... ok"; 00013: } -prompt> [L12 %s RETURN 1 %s] ->00012: echo " ... ok"; - 00013: } - 00014: +prompt> [L14 %s RETURN 1 %s] +>00014: prompt> --FILE-- <?php diff --git a/sapi/phpdbg/tests/watch_001.phpt b/sapi/phpdbg/tests/watch_001.phpt index 966c301..e16681b 100644 --- a/sapi/phpdbg/tests/watch_001.phpt +++ b/sapi/phpdbg/tests/watch_001.phpt @@ -33,8 +33,7 @@ New value: prompt> [Breaking on watchpoint $b] Old value: New value: 2 ->00007: $b = 2; - 00008: +>00008: prompt> [$b has been removed, removing watchpoint recursively] [Script ended normally] prompt> diff --git a/sapi/phpdbg/tests/watch_002.phpt b/sapi/phpdbg/tests/watch_002.phpt index a12400e..b57ca0a 100644 --- a/sapi/phpdbg/tests/watch_002.phpt +++ b/sapi/phpdbg/tests/watch_002.phpt @@ -17,8 +17,7 @@ prompt> [Breakpoint #0 at %s:6, hits: 1] prompt> [Added watchpoint #0 for $a[]] prompt> [Breaking on watchpoint $a[]] 1 elements were added to the array ->00008: $a = [0 => 3, 1 => 4]; - 00009: +>00009: prompt> [$a[] has been removed, removing watchpoint] [Script ended normally] prompt> diff --git a/sapi/phpdbg/tests/watch_003.phpt b/sapi/phpdbg/tests/watch_003.phpt index cb09bd4..08868ae 100644 --- a/sapi/phpdbg/tests/watch_003.phpt +++ b/sapi/phpdbg/tests/watch_003.phpt @@ -24,8 +24,7 @@ New value: 2 prompt> [Breaking on watchpoint $a[0]] Old value: 2 New value: 3 ->00008: $a = [0 => 3, 1 => 4]; - 00009: +>00009: prompt> [$a[0] has been removed, removing watchpoint] [Script ended normally] prompt> diff --git a/sapi/phpdbg/tests/watch_004.phpt b/sapi/phpdbg/tests/watch_004.phpt index 98c8afd..8785429 100644 --- a/sapi/phpdbg/tests/watch_004.phpt +++ b/sapi/phpdbg/tests/watch_004.phpt @@ -26,8 +26,7 @@ New value: aa prompt> [Breaking on watchpoint $a] Old value: aa New value: ab ->00005: $a[1] = "b"; - 00006: +>00006: prompt> [$a has been removed, removing watchpoint] [Script ended normally] prompt> diff --git a/sapi/phpdbg/tests/watch_006.phpt b/sapi/phpdbg/tests/watch_006.phpt index b8f6206..bf38b8e 100644 --- a/sapi/phpdbg/tests/watch_006.phpt +++ b/sapi/phpdbg/tests/watch_006.phpt @@ -54,8 +54,7 @@ New value (reference): Array ([0] => 2,[1] => 3) prompt> [Breaking on watchpoint $b] Old value inaccessible or destroyed New value (reference): Array ([0] => 1) ->00009: $b = &$c; - 00010: +>00010: prompt> [$b has been removed, removing watchpoint recursively] [$a[0] has been removed, removing watchpoint] [Script ended normally]