com php-src: Fix tests: sapi/phpdbg/tests/exceptions_00 1.phpt sapi/phpdbg/tests/exceptions_002.phpt sapi/phpdbg/tests/phpdbg_oplog_001.phpt
sapi/phpd bg/tests/print_001.phpt sapi/phpdbg/tests/print_ 002.phpt

Commit: 624bedcadc87038a37e1295ede781d3eaf37d24a Author: Bob Weinand <bobwei9@hotmail.com> Fri, 31 Jul 2015 14:39:06 +0200 Parents: 716387288e48f6fab6782e2591025f35e93dd9d9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=624bedcadc87038a37e1295ede781d3eaf37d24a Log: Fix tests Changed paths: M sapi/phpdbg/tests/exceptions_001.phpt M sapi/phpdbg/tests/exceptions_002.phpt M sapi/phpdbg/tests/phpdbg_oplog_001.phpt M sapi/phpdbg/tests/print_001.phpt M sapi/phpdbg/tests/print_002.phpt Diff: diff --git a/sapi/phpdbg/tests/exceptions_001.phpt b/sapi/phpdbg/tests/exceptions_001.phpt index fca94f5..d5646ad 100644 --- a/sapi/phpdbg/tests/exceptions_001.phpt +++ b/sapi/phpdbg/tests/exceptions_001.phpt @@ -14,12 +14,12 @@ prompt> handle first 00017: } catch (\Exception $e) { 00018: var_dump($e); prompt> frame #0: {closure}() at %s:16 -frame #1: {main} at %s:18 +frame #1: {main} at %s:20 prompt> 3 prompt> Uncaught Error in %s on line 16 Error: Call to undefined function foo() in %s:16 Stack trace: -#0 %s(18): {closure}() +#0 %s(20): {closure}() #1 {main} [Script ended normally] prompt> diff --git a/sapi/phpdbg/tests/exceptions_002.phpt b/sapi/phpdbg/tests/exceptions_002.phpt index 9d3d805..6c11c58 100644 --- a/sapi/phpdbg/tests/exceptions_002.phpt +++ b/sapi/phpdbg/tests/exceptions_002.phpt @@ -17,13 +17,13 @@ prompt> Fatal error: Uncaught Error: Call to undefined function next_error() in eval()'d code:1 Stack trace: #0 %s(16): unknown() -#1 %s(18): {closure}() +#1 %s(20): {closure}() #2 {main} thrown in eval()'d code on line 1 prompt> Uncaught Error in %s on line 16 Error: Call to undefined function foo() in %s:16 Stack trace: -#0 %s(18): {closure}() +#0 %s(20): {closure}() #1 {main} [Script ended normally] prompt> [The stack contains nothing !] diff --git a/sapi/phpdbg/tests/phpdbg_oplog_001.phpt b/sapi/phpdbg/tests/phpdbg_oplog_001.phpt index 15eeea5..e4e558b 100644 --- a/sapi/phpdbg/tests/phpdbg_oplog_001.phpt +++ b/sapi/phpdbg/tests/phpdbg_oplog_001.phpt @@ -22,11 +22,13 @@ prompt> halloarray(2) { int(4) } ["A::b"]=> - array(2) { + array(3) { [4]=> int(1) [5]=> - int(5) + int(3) + [8]=> + int(2) } } [Script ended normally] diff --git a/sapi/phpdbg/tests/print_001.phpt b/sapi/phpdbg/tests/print_001.phpt index 5bcc081..b8e4043 100644 --- a/sapi/phpdbg/tests/print_001.phpt +++ b/sapi/phpdbg/tests/print_001.phpt @@ -19,14 +19,14 @@ L14-16 foo() %s - %s + 8 ops L15 #4 DO_%cCALL @0 L15 #5 SEND_VAR @0 1 L15 #6 DO_%cCALL - L15 #7 RETURN null + L16 #7 RETURN null prompt> [User Class: Foo\Bar (2 methods)] L5-7 Foo\Bar::Foo() %s - %s + 5 ops L5 #0 RECV 1 $bar L6 #1 INIT_NS_FCALL_BY_NAME "Foo\\var_dump" L6 #2 SEND_VAR_EX $bar 1 L6 #3 DO_FCALL - L6 #4 RETURN null + L7 #4 RETURN null L9-9 Foo\Bar::baz() %s - %s + 1 ops L9 #0 RETURN null prompt> [Not Executing!] diff --git a/sapi/phpdbg/tests/print_002.phpt b/sapi/phpdbg/tests/print_002.phpt index 8225c4e..3134850 100644 --- a/sapi/phpdbg/tests/print_002.phpt +++ b/sapi/phpdbg/tests/print_002.phpt @@ -25,7 +25,7 @@ L14-16 foo() %s - %s + 8 ops L15 #4 DO_%cCALL @0 L15 #5 SEND_VAR @0 1 L15 #6 DO_%cCALL - L15 #7 RETURN null + L16 #7 RETURN null prompt> [L15 %s INIT_FCALL%s 112 "var_dump" prompt> %s] prompt> --FILE--