Skip to content

Commit dce2e78

Browse files
committed
Fix tests
1 parent 0a88cef commit dce2e78

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

Zend/tests/partial_application/magic_005.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object(Closure)#%d (%d) {
1717
["file"]=>
1818
string(%d) "%smagic_005.php"
1919
["line"]=>
20-
int(8)
20+
int(7)
2121
["this"]=>
2222
object(Foo)#%d (0) {
2323
}

Zend/tests/partial_application/pipe_optimization_014.phpt

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,31 @@ try {
2626
?>
2727
--EXPECTF--
2828
$_main:
29-
; (lines=11, args=0, vars=0, tmps=2)
29+
; (lines=20, args=0, vars=1, tmps=2)
3030
; (after optimizer)
31-
; %s:1-12
31+
; %s:1-16
3232
0000 INIT_FCALL 0 %d string("time")
33-
0001 V1 = DO_ICALL
34-
0002 T0 = IS_SMALLER int(0) V1
35-
0003 JMPZ T0 0005
33+
0001 V2 = DO_ICALL
34+
0002 T1 = IS_SMALLER int(0) V2
35+
0003 JMPZ T1 0005
3636
0004 DECLARE_FUNCTION string("foo") 0
3737
0005 INIT_FCALL_BY_NAME 1 string("foo")
3838
0006 SEND_VAL_EX int(1) 1
3939
0007 SEND_VAL_EX int(2) string("unknown")
4040
0008 CHECK_UNDEF_ARGS
4141
0009 DO_FCALL_BY_NAME
4242
0010 RETURN int(1)
43+
0011 CV0($e) = CATCH string("Error")
44+
0012 T1 = FETCH_CLASS_NAME CV0($e)
45+
0013 ECHO T1
46+
0014 ECHO string(": ")
47+
0015 INIT_METHOD_CALL 0 CV0($e) string("getMessage")
48+
0016 V1 = DO_FCALL
49+
0017 ECHO V1
50+
0018 ECHO string("\n")
51+
0019 RETURN int(1)
52+
EXCEPTION TABLE:
53+
0005, 0011, -, -
4354

4455
foo:
4556
; (lines=9, args=3, vars=3, tmps=0)
@@ -54,8 +65,4 @@ foo:
5465
0006 SEND_VAR CV2($c) 3
5566
0007 DO_ICALL
5667
0008 RETURN null
57-
58-
Fatal error: Uncaught Error: Unknown named parameter $unknown in %s:%d
59-
Stack trace:
60-
#0 {main}
61-
thrown in %s on line %d
68+
Error: Unknown named parameter $unknown

0 commit comments

Comments
 (0)