com php-src: Merge branch 'PHP-7.0' into PHP-7.1: sapi/phpdbg/t ests/exceptions_003.phpt sapi/phpdbg/tests/stepping _001.phpt
sapi/phpdbg/tests/watch_001.php t sapi/phpdbg/tests/watch_002.phpt sapi/phpdbg/te sts/watch_003.phpt sapi/phpdbg/tests/watch_00 4.phpt
sapi/phpdbg/tests/watch_006.phpt

Commit: 9669ec707ab99d33404d3132792a24ebd1130fcf Author: Nikita Popov <nikic@php.net> Wed, 12 Oct 2016 22:43:01 +0200 Parents: 26964ccea0f52ed4d6beda3bcfd1508f6d3dad43 fe378c27cc61c07189b32c2348a6a4306823c50e Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9669ec707ab99d33404d3132792a24ebd1130fcf Log: Merge branch 'PHP-7.0' into PHP-7.1 Changed paths: MM sapi/phpdbg/tests/exceptions_003.phpt MM sapi/phpdbg/tests/stepping_001.phpt MM sapi/phpdbg/tests/watch_001.phpt MA sapi/phpdbg/tests/watch_002.phpt MA sapi/phpdbg/tests/watch_003.phpt MA sapi/phpdbg/tests/watch_004.phpt MA sapi/phpdbg/tests/watch_006.phpt Diff: diff --cc sapi/phpdbg/tests/watch_001.phpt index 966c301,ea7da1a..e16681b --- a/sapi/phpdbg/tests/watch_001.phpt +++ b/sapi/phpdbg/tests/watch_001.phpt @@@ -33,9 -31,8 +33,8 @@@ New value prompt> [Breaking on watchpoint $b] Old value: New value: 2 - >00007: $b = 2; - 00008: + >00008: -prompt> [$b was removed, removing watchpoint recursively] +prompt> [$b has been removed, removing watchpoint recursively] [Script ended normally] prompt> --FILE-- diff --cc sapi/phpdbg/tests/watch_002.phpt index a12400e,0000000..b57ca0a mode 100644,000000..100644 --- a/sapi/phpdbg/tests/watch_002.phpt +++ b/sapi/phpdbg/tests/watch_002.phpt @@@ -1,33 -1,0 +1,32 @@@ +--TEST-- +Test simple array watchpoint with replace +--PHPDBG-- +b 6 +r +w a $a +c + +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:6] +prompt> [Breakpoint #0 at %s:6, hits: 1] +>00006: $a[0] = 2; + 00007: + 00008: $a = [0 => 3, 1 => 4]; +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> +--FILE-- +<?php + +$a = []; + +$a[0] = 1; +$a[0] = 2; + +$a = [0 => 3, 1 => 4]; diff --cc sapi/phpdbg/tests/watch_003.phpt index cb09bd4,0000000..08868ae mode 100644,000000..100644 --- a/sapi/phpdbg/tests/watch_003.phpt +++ b/sapi/phpdbg/tests/watch_003.phpt @@@ -1,40 -1,0 +1,39 @@@ +--TEST-- +Test simple watchpoint with replace +--PHPDBG-- +b 6 +r +w $a[0] +c + + +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:6] +prompt> [Breakpoint #0 at %s:6, hits: 1] +>00006: $a[0] = 2; + 00007: + 00008: $a = [0 => 3, 1 => 4]; +prompt> [Added watchpoint #0 for $a[0]] +prompt> [Breaking on watchpoint $a[0]] +Old value: 1 +New value: 2 +>00008: $a = [0 => 3, 1 => 4]; + 00009: +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> +--FILE-- +<?php + +$a = []; + +$a[0] = 1; +$a[0] = 2; + +$a = [0 => 3, 1 => 4]; diff --cc sapi/phpdbg/tests/watch_004.phpt index 98c8afd,0000000..8785429 mode 100644,000000..100644 --- a/sapi/phpdbg/tests/watch_004.phpt +++ b/sapi/phpdbg/tests/watch_004.phpt @@@ -1,39 -1,0 +1,38 @@@ +--TEST-- +Test detection of inline string manipulations on zval watch +--INI-- +opcache.optimization_level=0 +--PHPDBG-- +b 3 +r +w $a +c + + +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:3] +prompt> [Breakpoint #0 at %s:3, hits: 1] +>00003: $b = "a"; + 00004: $a = $b.$b; + 00005: $a[1] = "b"; +prompt> [Added watchpoint #0 for $a] +prompt> [Breaking on watchpoint $a] +Old value: +New value: aa +>00005: $a[1] = "b"; + 00006: +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> +--FILE-- +<?php + +$b = "a"; +$a = $b.$b; +$a[1] = "b"; diff --cc sapi/phpdbg/tests/watch_006.phpt index b8f6206,0000000..bf38b8e mode 100644,000000..100644 --- a/sapi/phpdbg/tests/watch_006.phpt +++ b/sapi/phpdbg/tests/watch_006.phpt @@@ -1,72 -1,0 +1,71 @@@ +--TEST-- +Test multiple watch elements pointing to the same watchpoint +--PHPDBG-- +b 4 +r +w $a[0] +w r $b +c + + + + + + +q +--EXPECTF-- +[Successful compilation of %s] +prompt> [Breakpoint #0 added at %s:4] +prompt> [Breakpoint #0 at %s:4, hits: 1] +>00004: $a[0] = 1; + 00005: $b = &$a; + 00006: $a[0] = 2; +prompt> [Added watchpoint #0 for $a[0]] +prompt> [Added recursive watchpoint #1 for $b] +prompt> [Breaking on watchpoint $a[0]] +Old value: 0 +New value: 1 +>00005: $b = &$a; + 00006: $a[0] = 2; + 00007: $a[1] = 3; +prompt> [Breaking on watchpoint $b] +Old value: +New value (reference): Array ([0] => 1) +>00006: $a[0] = 2; + 00007: $a[1] = 3; + 00008: $c = [1]; +prompt> [Breaking on watchpoint $a[0]] +Old value: 1 +New value: 2 +>00007: $a[1] = 3; + 00008: $c = [1]; + 00009: $b = &$c; +prompt> [Element 1 has been added to watchpoint] +[Breaking on watchpoint $b[]] +1 elements were added to the array +>00008: $c = [1]; + 00009: $b = &$c; + 00010: +prompt> [Breaking on watchpoint $b] +Old value inaccessible or destroyed +New value (reference): Array ([0] => 2,[1] => 3) +>00009: $b = &$c; + 00010: +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] +prompt> +--FILE-- +<?php + +$a = [0]; +$a[0] = 1; +$b = &$a; +$a[0] = 2; +$a[1] = 3; +$c = [1]; +$b = &$c;