Skip to content

Commit 017cf41

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix opcache dump varying tmps
2 parents 5daf080 + 97162e9 commit 017cf41

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

sapi/phpdbg/tests/print_001.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ q
1313
prompt> [User Function foo (8 ops)]
1414

1515
foo:
16-
; (lines=8, args=1, vars=1, tmps=2)
16+
; (lines=8, args=1, vars=1, tmps=%d)
1717
; %s:14-16
1818
L0014 0000 CV0($baz) = RECV 1
1919
L0015 0001 INIT_FCALL %d %d string("var_dump")
@@ -26,7 +26,7 @@ L0016 0007 RETURN null
2626
prompt> [User Class: Foo\Bar (2 methods)]
2727

2828
Foo\Bar::Foo:
29-
; (lines=5, args=1, vars=1, tmps=1)
29+
; (lines=5, args=1, vars=1, tmps=%d)
3030
; %s:5-7
3131
L0005 0000 CV0($bar) = RECV 1
3232
L0006 0001 INIT_NS_FCALL_BY_NAME 1 string("Foo\\var_dump")
@@ -35,14 +35,14 @@ L0006 0003 DO_FCALL
3535
L0007 0004 RETURN null
3636

3737
Foo\Bar::baz:
38-
; (lines=1, args=0, vars=0, tmps=0)
38+
; (lines=1, args=0, vars=0, tmps=%d)
3939
; %s:9-9
4040
L0009 0000 RETURN null
4141
prompt> [Not Executing!]
4242
prompt> [Context %s (9 ops)]
4343

4444
$_main:
45-
; (lines=9, args=0, vars=0, tmps=4)
45+
; (lines=9, args=0, vars=0, tmps=%d)
4646
; %s:1-21
4747
L0018 0000 V0 = NEW 0 string("Foo\\Bar")
4848
L0018 0001 DO_FCALL

sapi/phpdbg/tests/print_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ prompt> string(4) "test"
1919
prompt> [Stack in foo() (8 ops)]
2020

2121
foo:
22-
; (lines=8, args=1, vars=1, tmps=2)
22+
; (lines=8, args=1, vars=1, tmps=%d)
2323
; %s:14-16
2424
L0014 0000 CV0($baz) = RECV 1
2525
L0015 0001 INIT_FCALL %d %d string("var_dump")

0 commit comments

Comments
 (0)