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