summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-07-31 14:39:06 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-07-31 18:22:04 +0200
commit624bedcadc87038a37e1295ede781d3eaf37d24a (patch)
tree1f14400704b7e44ec35d96aa0a8f1ac9307d3541
parent716387288e48f6fab6782e2591025f35e93dd9d9 (diff)
downloadphp-git-624bedcadc87038a37e1295ede781d3eaf37d24a.tar.gz
Fix tests
-rw-r--r--sapi/phpdbg/tests/exceptions_001.phpt4
-rw-r--r--sapi/phpdbg/tests/exceptions_002.phpt4
-rw-r--r--sapi/phpdbg/tests/phpdbg_oplog_001.phpt6
-rw-r--r--sapi/phpdbg/tests/print_001.phpt4
-rw-r--r--sapi/phpdbg/tests/print_002.phpt2
5 files changed, 11 insertions, 9 deletions
diff --git a/sapi/phpdbg/tests/exceptions_001.phpt b/sapi/phpdbg/tests/exceptions_001.phpt
index fca94f512c..d5646ad40d 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 9d3d805a5f..6c11c58db6 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 15eeea5ebe..e4e558b9fa 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 5bcc08184b..b8e4043a8a 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 8225c4e0a5..3134850a19 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" %s]
prompt>
--FILE--