]>
Commit | Line | Data |
---|---|---|
ac66a27b ER |
1 | --- php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt~ 2008-11-25 13:33:41.000000000 +0200 |
2 | +++ php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt 2010-06-14 00:23:51.340272864 +0300 | |
3 | @@ -57,15 +57,15 @@ | |
4 | --EXPECTF-- | |
5 | *** Testing fileinode() with different notations of file names *** | |
6 | - Iteration 1 - | |
7 | -int(%d) | |
8 | +int(%i) | |
9 | - Iteration 2 - | |
10 | ||
11 | Warning: fileinode(): stat failed for %s//fileinode_variation3/fileinode_variation3.tmp/ in %s on line %d | |
12 | bool(false) | |
13 | - Iteration 3 - | |
14 | -int(%d) | |
15 | +int(%i) | |
16 | - Iteration 4 - | |
17 | -int(%d) | |
18 | +int(%i) | |
19 | - Iteration 5 - | |
20 | ||
21 | Warning: fileinode(): stat failed for %s//fileinode_variation3/*.tmp in %s on line %d | |
22 | @@ -75,8 +75,8 @@ | |
23 | Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d | |
24 | bool(false) | |
25 | - Iteration 7 - | |
26 | -int(%d) | |
27 | +int(%i) | |
28 | - Iteration 8 - | |
29 | -int(%d) | |
30 | +int(%i) | |
31 | ||
32 | *** Done *** | |
e350a501 ER |
33 | --- php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~ 2007-11-05 19:43:21.000000000 +0200 |
34 | +++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt 2010-07-26 19:31:43.613553760 +0300 | |
35 | @@ -28,9 +28,9 @@ | |
36 | ?> | |
37 | --EXPECTF-- | |
38 | *** Testing fileinode() with file, directory *** | |
39 | -%d | |
40 | -%d | |
41 | -%d | |
42 | -%d | |
43 | +%i | |
44 | +%i | |
45 | +%i | |
46 | +%i | |
47 | ||
48 | *** Done *** | |
49 | --- php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt~ 2007-11-05 19:43:21.000000000 +0200 | |
50 | +++ php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt 2010-07-26 19:34:01.610414378 +0300 | |
51 | @@ -89,24 +89,24 @@ | |
52 | --EXPECTF-- | |
53 | *** Testing fileinode() with files, links and directories *** | |
54 | -- Testing with files -- | |
55 | -%d | |
56 | -%d | |
57 | +%i | |
58 | +%i | |
59 | -- Testing with links: hard link -- | |
60 | -%d | |
61 | -%d | |
62 | +%i | |
63 | +%i | |
64 | -- Testing with links: soft link -- | |
65 | -%d | |
66 | -%d | |
67 | +%i | |
68 | +%i | |
69 | -- Testing after copying a file -- | |
70 | -%d | |
71 | -%d | |
72 | +%i | |
73 | +%i | |
74 | -- Testing after renaming the file -- | |
75 | -%d | |
76 | -%d | |
77 | +%i | |
78 | +%i | |
79 | -- Testing with directories -- | |
80 | -%d | |
81 | -%d | |
82 | +%i | |
83 | +%i | |
84 | -- Testing with binary input -- | |
85 | -%d | |
86 | -%d | |
87 | +%i | |
88 | +%i | |
89 | *** Done *** | |
90 | --- php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt~ 2008-11-26 12:10:19.000000000 +0200 | |
91 | +++ php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt 2010-07-26 19:35:31.216291870 +0300 | |
92 | @@ -42,7 +42,7 @@ | |
93 | ||
94 | --EXPECTF-- | |
95 | *** Testing fileinode() with links *** | |
96 | -int(%d) | |
97 | -int(%d) | |
98 | +int(%i) | |
99 | +int(%i) | |
100 | ||
101 | *** Done *** | |
102 | --- php-5.3.3/ext/standard/tests/file/filestat.phpt~ 2006-11-15 19:27:03.000000000 +0200 | |
103 | +++ php-5.3.3/ext/standard/tests/file/filestat.phpt 2010-07-26 19:37:10.367060798 +0300 | |
104 | @@ -30,17 +30,17 @@ | |
105 | echo "Done\n"; | |
106 | ?> | |
107 | --EXPECTF-- | |
108 | +int(%i) | |
109 | int(%d) | |
110 | int(%d) | |
111 | int(%d) | |
112 | int(%d) | |
113 | +int(%i) | |
114 | int(%d) | |
115 | int(%d) | |
116 | int(%d) | |
117 | int(%d) | |
118 | -int(%d) | |
119 | -int(%d) | |
120 | -int(%d) | |
121 | +int(%i) | |
122 | int(%d) | |
123 | int(%d) | |
124 | int(%d) | |
125 | --- php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt~ 2010-07-26 19:43:12.000000000 +0300 | |
126 | +++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt 2010-07-26 19:43:14.470984630 +0300 | |
127 | @@ -66,7 +66,7 @@ | |
128 | [0]=> | |
129 | int(%d) | |
130 | [1]=> | |
131 | - int(%d) | |
132 | + int(%i) | |
133 | [2]=> | |
134 | int(%d) | |
135 | [3]=> | |
136 | @@ -92,7 +92,7 @@ | |
137 | ["dev"]=> | |
138 | int(%d) | |
139 | ["ino"]=> | |
140 | - int(%d) | |
141 | + int(%i) | |
142 | ["mode"]=> | |
143 | int(%d) | |
144 | ["nlink"]=> | |
145 | @@ -122,7 +122,7 @@ | |
146 | [0]=> | |
147 | int(%d) | |
148 | [1]=> | |
149 | - int(%d) | |
150 | + int(%i) | |
151 | [2]=> | |
152 | int(%d) | |
153 | [3]=> | |
154 | @@ -148,7 +148,7 @@ | |
155 | ["dev"]=> | |
156 | int(%d) | |
157 | ["ino"]=> | |
158 | - int(%d) | |
159 | + int(%i) | |
160 | ["mode"]=> | |
161 | int(%d) | |
162 | ["nlink"]=> | |
163 | --- php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt~ 2007-11-05 19:43:21.000000000 +0200 | |
164 | +++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt 2010-07-26 19:44:58.320079730 +0300 | |
165 | @@ -67,7 +67,7 @@ | |
166 | [0]=> | |
167 | int(%d) | |
168 | [1]=> | |
169 | - int(%d) | |
170 | + int(%i) | |
171 | [2]=> | |
172 | int(%d) | |
173 | [3]=> | |
174 | @@ -93,7 +93,7 @@ | |
175 | ["dev"]=> | |
176 | int(%d) | |
177 | ["ino"]=> | |
178 | - int(%d) | |
179 | + int(%i) | |
180 | ["mode"]=> | |
181 | int(%d) | |
182 | ["nlink"]=> | |
183 | @@ -121,7 +121,7 @@ | |
184 | [0]=> | |
185 | int(%d) | |
186 | [1]=> | |
187 | - int(%d) | |
188 | + int(%i) | |
189 | [2]=> | |
190 | int(%d) | |
191 | [3]=> | |
192 | @@ -147,7 +147,7 @@ | |
193 | ["dev"]=> | |
194 | int(%d) | |
195 | ["ino"]=> | |
196 | - int(%d) | |
197 | + int(%i) | |
198 | ["mode"]=> | |
199 | int(%d) | |
200 | ["nlink"]=> | |
201 | @@ -177,7 +177,7 @@ | |
202 | [0]=> | |
203 | int(%d) | |
204 | [1]=> | |
205 | - int(%d) | |
206 | + int(%i) | |
207 | [2]=> | |
208 | int(%d) | |
209 | [3]=> | |
210 | @@ -203,7 +203,7 @@ | |
211 | ["dev"]=> | |
212 | int(%d) | |
213 | ["ino"]=> | |
214 | - int(%d) | |
215 | + int(%i) | |
216 | ["mode"]=> | |
217 | int(%d) | |
218 | ["nlink"]=> | |
219 | @@ -231,7 +231,7 @@ | |
220 | [0]=> | |
221 | int(%d) | |
222 | [1]=> | |
223 | - int(%d) | |
224 | + int(%i) | |
225 | [2]=> | |
226 | int(%d) | |
227 | [3]=> | |
228 | @@ -257,7 +257,7 @@ | |
229 | ["dev"]=> | |
230 | int(%d) | |
231 | ["ino"]=> | |
232 | - int(%d) | |
233 | + int(%i) | |
234 | ["mode"]=> | |
235 | int(%d) | |
236 | ["nlink"]=> | |
237 | --- php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt~ 2007-07-26 16:38:24.000000000 +0300 | |
238 | +++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt 2010-07-26 19:46:33.907004377 +0300 | |
239 | @@ -69,7 +69,7 @@ | |
240 | [0]=> | |
241 | int(%d) | |
242 | [1]=> | |
243 | - int(%d) | |
244 | + int(%i) | |
245 | [2]=> | |
246 | int(%d) | |
247 | [3]=> | |
248 | @@ -95,7 +95,7 @@ | |
249 | ["dev"]=> | |
250 | int(%d) | |
251 | ["ino"]=> | |
252 | - int(%d) | |
253 | + int(%i) | |
254 | ["mode"]=> | |
255 | int(%d) | |
256 | ["nlink"]=> | |
257 | @@ -125,7 +125,7 @@ | |
258 | [0]=> | |
259 | int(%d) | |
260 | [1]=> | |
261 | - int(%d) | |
262 | + int(%i) | |
263 | [2]=> | |
264 | int(%d) | |
265 | [3]=> | |
266 | @@ -151,7 +151,7 @@ | |
267 | ["dev"]=> | |
268 | int(%d) | |
269 | ["ino"]=> | |
270 | - int(%d) | |
271 | + int(%i) | |
272 | ["mode"]=> | |
273 | int(%d) | |
274 | ["nlink"]=> | |
275 | @@ -179,7 +179,7 @@ | |
276 | [0]=> | |
277 | int(%d) | |
278 | [1]=> | |
279 | - int(%d) | |
280 | + int(%i) | |
281 | [2]=> | |
282 | int(%d) | |
283 | [3]=> | |
284 | @@ -205,7 +205,7 @@ | |
285 | ["dev"]=> | |
286 | int(%d) | |
287 | ["ino"]=> | |
288 | - int(%d) | |
289 | + int(%i) | |
290 | ["mode"]=> | |
291 | int(%d) | |
292 | ["nlink"]=> | |
293 | @@ -233,7 +233,7 @@ | |
294 | [0]=> | |
295 | int(%d) | |
296 | [1]=> | |
297 | - int(%d) | |
298 | + int(%i) | |
299 | [2]=> | |
300 | int(%d) | |
301 | [3]=> | |
302 | @@ -259,7 +259,7 @@ | |
303 | ["dev"]=> | |
304 | int(%d) | |
305 | ["ino"]=> | |
306 | - int(%d) | |
307 | + int(%i) | |
308 | ["mode"]=> | |
309 | int(%d) | |
310 | ["nlink"]=> | |
311 | --- php-5.3.3/ext/standard/tests/file/tempnam_variation1.phpt~ 2008-11-26 12:10:19.000000000 +0200 | |
312 | +++ php-5.3.3/ext/standard/tests/file/tempnam_variation1.phpt 2010-07-26 20:24:46.505943227 +0300 | |
313 | @@ -66,51 +66,51 @@ | |
314 | -- Iteration 1 -- | |
315 | File name is => %s%etempnam_variation1.tmp%s | |
316 | File permissions are => 100600 | |
317 | -File inode is => %d | |
318 | +File inode is => %i | |
319 | File created in => directory specified | |
320 | -- Iteration 2 -- | |
321 | File name is => %s%etempnam_variation1.tmp%s | |
322 | File permissions are => 100600 | |
323 | -File inode is => %d | |
324 | +File inode is => %i | |
325 | File created in => directory specified | |
326 | -- Iteration 3 -- | |
327 | File name is => %s%etempnam_variation1.tmp%s | |
328 | File permissions are => 100600 | |
329 | -File inode is => %d | |
330 | +File inode is => %i | |
331 | File created in => directory specified | |
332 | -- Iteration 4 -- | |
333 | File name is => %s%etempnam_variation1.tmp%s | |
334 | File permissions are => 100600 | |
335 | -File inode is => %d | |
336 | +File inode is => %i | |
337 | File created in => directory specified | |
338 | -- Iteration 5 -- | |
339 | File name is => %s%etempnam_variation1.tmp%s | |
340 | File permissions are => 100600 | |
341 | -File inode is => %d | |
342 | +File inode is => %i | |
343 | File created in => directory specified | |
344 | -- Iteration 6 -- | |
345 | File name is => %s%etempnam_variation1.tmp%s | |
346 | File permissions are => 100600 | |
347 | -File inode is => %d | |
348 | +File inode is => %i | |
349 | File created in => directory specified | |
350 | -- Iteration 7 -- | |
351 | File name is => %s%etempnam_variation1.tmp%s | |
352 | File permissions are => 100600 | |
353 | -File inode is => %d | |
354 | +File inode is => %i | |
355 | File created in => directory specified | |
356 | -- Iteration 8 -- | |
357 | File name is => %s%etempnam_variation1.tmp%s | |
358 | File permissions are => 100600 | |
359 | -File inode is => %d | |
360 | +File inode is => %i | |
361 | File created in => directory specified | |
362 | -- Iteration 9 -- | |
363 | File name is => %s%etempnam_variation1.tmp%s | |
364 | File permissions are => 100600 | |
365 | -File inode is => %d | |
366 | +File inode is => %i | |
367 | File created in => directory specified | |
368 | -- Iteration 10 -- | |
369 | File name is => %s%etempnam_variation1.tmp%s | |
370 | File permissions are => 100600 | |
371 | -File inode is => %d | |
372 | +File inode is => %i | |
373 | File created in => directory specified | |
374 | *** Done *** | |
d3b63428 ER |
375 | --- php-5.3.3/tests/security/open_basedir_fileinode.phpt~ 2008-05-09 11:39:44.000000000 +0300 |
376 | +++ php-5.3.3/tests/security/open_basedir_fileinode.phpt 2010-07-27 22:51:29.603089549 +0300 | |
377 | @@ -46,10 +46,10 @@ | |
378 | ||
379 | Warning: fileinode(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d | |
380 | bool(false) | |
381 | -int(%d) | |
382 | -int(%d) | |
383 | -int(%d) | |
384 | -int(%d) | |
385 | -int(%d) | |
386 | +int(%i) | |
387 | +int(%i) | |
388 | +int(%i) | |
389 | +int(%i) | |
390 | +int(%i) | |
391 | *** Finished testing open_basedir configuration [fileinode] *** | |
392 | ||
c526087e ER |
393 | --- php-5.3.3/ext/spl/tests/SplFileInfo_getInode_basic.phpt~ 2010-08-04 16:25:21.000000000 +0300 |
394 | +++ php-5.3.3/ext/spl/tests/SplFileInfo_getInode_basic.phpt 2010-08-04 16:28:32.722932851 +0300 | |
395 | @@ -11,6 +11,7 @@ | |
396 | --SKIPIF-- | |
397 | <?php | |
398 | if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms"); | |
399 | +if (PHP_INT_SIZE == 4) die("skip this test is for >32bit platform only (inodes overflow there)"); | |
400 | ?> | |
401 | --FILE-- | |
402 | <?php |