Merge branch 'PHP-7.1'

This commit is contained in:
Nikita Popov 2016-10-12 22:46:40 +02:00
commit 0fc787cfb8
9 changed files with 13 additions and 20 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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]