Skip to content

Commit d6258d6

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix test conflict between copy_variation2-win32-mb.phpt and copy_variation2-win32.phpt
2 parents 7a0beb4 + 186a811 commit d6258d6

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

ext/standard/tests/file/copy_variation2-win32-mb.phpt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ fclose($file_handle);
2222
$dest_files = array(
2323

2424
/* File names containing special(non-alpha numeric) characters */
25-
"_copy_variation2.tmp",
26-
"@copy_variation2.tmp",
27-
"#copy_variation2.tmp",
28-
"+copy_variation2.tmp",
29-
"?copy_variation2.tmp",
30-
">copy_variation2.tmp",
31-
"!copy_variation2.tmp",
32-
"&copy_variation2.tmp",
33-
"(copy_variation2.tmp",
34-
":copy_variation2.tmp",
35-
";copy_variation2.tmp",
36-
"=copy_variation2.tmp",
37-
"[copy_variation2.tmp",
38-
"^copy_variation2.tmp",
39-
"{copy_variation2.tmp",
40-
"|copy_variation2.tmp",
41-
"~copy_variation2.tmp",
42-
"\$copy_variation2.tmp"
25+
"_copy_variation2_mb.tmp",
26+
"@copy_variation2_mb.tmp",
27+
"#copy_variation2_mb.tmp",
28+
"+copy_variation2_mb.tmp",
29+
"?copy_variation2_mb.tmp",
30+
">copy_variation2_mb.tmp",
31+
"!copy_variation2_mb.tmp",
32+
"&copy_variation2_mb.tmp",
33+
"(copy_variation2_mb.tmp",
34+
":copy_variation2_mb.tmp",
35+
";copy_variation2_mb.tmp",
36+
"=copy_variation2_mb.tmp",
37+
"[copy_variation2_mb.tmp",
38+
"^copy_variation2_mb.tmp",
39+
"{copy_variation2_mb.tmp",
40+
"|copy_variation2_mb.tmp",
41+
"~copy_variation2_mb.tmp",
42+
"\$copy_variation2_mb.tmp"
4343
);
4444

4545
echo "Size of the source file before copy operation => ";
@@ -90,28 +90,28 @@ Size of the source file before copy operation => int(1500)
9090
-- Iteration 1 --
9191
Copy operation => bool(true)
9292
Existence of destination file => bool(true)
93-
Destination file name => %s/_copy_variation2.tmp
93+
Destination file name => %s/_copy_variation2_mb.tmp
9494
Size of source file => int(1500)
9595
Size of destination file => int(1500)
9696

9797
-- Iteration 2 --
9898
Copy operation => bool(true)
9999
Existence of destination file => bool(true)
100-
Destination file name => %s/@copy_variation2.tmp
100+
Destination file name => %s/@copy_variation2_mb.tmp
101101
Size of source file => int(1500)
102102
Size of destination file => int(1500)
103103

104104
-- Iteration 3 --
105105
Copy operation => bool(true)
106106
Existence of destination file => bool(true)
107-
Destination file name => %s/#copy_variation2.tmp
107+
Destination file name => %s/#copy_variation2_mb.tmp
108108
Size of source file => int(1500)
109109
Size of destination file => int(1500)
110110

111111
-- Iteration 4 --
112112
Copy operation => bool(true)
113113
Existence of destination file => bool(true)
114-
Destination file name => %s/+copy_variation2.tmp
114+
Destination file name => %s/+copy_variation2_mb.tmp
115115
Size of source file => int(1500)
116116
Size of destination file => int(1500)
117117

@@ -130,21 +130,21 @@ Existence of destination file => bool(false)
130130
-- Iteration 7 --
131131
Copy operation => bool(true)
132132
Existence of destination file => bool(true)
133-
Destination file name => %s/!copy_variation2.tmp
133+
Destination file name => %s/!copy_variation2_mb.tmp
134134
Size of source file => int(1500)
135135
Size of destination file => int(1500)
136136

137137
-- Iteration 8 --
138138
Copy operation => bool(true)
139139
Existence of destination file => bool(true)
140-
Destination file name => %s/&copy_variation2.tmp
140+
Destination file name => %s/&copy_variation2_mb.tmp
141141
Size of source file => int(1500)
142142
Size of destination file => int(1500)
143143

144144
-- Iteration 9 --
145145
Copy operation => bool(true)
146146
Existence of destination file => bool(true)
147-
Destination file name => %s/(copy_variation2.tmp
147+
Destination file name => %s/(copy_variation2_mb.tmp
148148
Size of source file => int(1500)
149149
Size of destination file => int(1500)
150150

@@ -157,35 +157,35 @@ Existence of destination file => bool(false)
157157
-- Iteration 11 --
158158
Copy operation => bool(true)
159159
Existence of destination file => bool(true)
160-
Destination file name => %s/;copy_variation2.tmp
160+
Destination file name => %s/;copy_variation2_mb.tmp
161161
Size of source file => int(1500)
162162
Size of destination file => int(1500)
163163

164164
-- Iteration 12 --
165165
Copy operation => bool(true)
166166
Existence of destination file => bool(true)
167-
Destination file name => %s/=copy_variation2.tmp
167+
Destination file name => %s/=copy_variation2_mb.tmp
168168
Size of source file => int(1500)
169169
Size of destination file => int(1500)
170170

171171
-- Iteration 13 --
172172
Copy operation => bool(true)
173173
Existence of destination file => bool(true)
174-
Destination file name => %s/[copy_variation2.tmp
174+
Destination file name => %s/[copy_variation2_mb.tmp
175175
Size of source file => int(1500)
176176
Size of destination file => int(1500)
177177

178178
-- Iteration 14 --
179179
Copy operation => bool(true)
180180
Existence of destination file => bool(true)
181-
Destination file name => %s/^copy_variation2.tmp
181+
Destination file name => %s/^copy_variation2_mb.tmp
182182
Size of source file => int(1500)
183183
Size of destination file => int(1500)
184184

185185
-- Iteration 15 --
186186
Copy operation => bool(true)
187187
Existence of destination file => bool(true)
188-
Destination file name => %s/{copy_variation2.tmp
188+
Destination file name => %s/{copy_variation2_mb.tmp
189189
Size of source file => int(1500)
190190
Size of destination file => int(1500)
191191

@@ -198,14 +198,14 @@ Existence of destination file => bool(false)
198198
-- Iteration 17 --
199199
Copy operation => bool(true)
200200
Existence of destination file => bool(true)
201-
Destination file name => %s/~copy_variation2.tmp
201+
Destination file name => %s/~copy_variation2_mb.tmp
202202
Size of source file => int(1500)
203203
Size of destination file => int(1500)
204204

205205
-- Iteration 18 --
206206
Copy operation => bool(true)
207207
Existence of destination file => bool(true)
208-
Destination file name => %s/$copy_variation2.tmp
208+
Destination file name => %s/$copy_variation2_mb.tmp
209209
Size of source file => int(1500)
210210
Size of destination file => int(1500)
211211
*** Done ***

0 commit comments

Comments
 (0)