Skip to content

Commit dd1d119

Browse files
committed
Fix tests regarding negative fileinode()
The results of `fileinode()` may be negative due to wrap-around behavior (at least on Windows as of PHP 7.4.0).
1 parent 2053329 commit dd1d119

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

ext/standard/tests/file/fileinode_basic.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ unlink (__DIR__."/inode.tmp");
2828
?>
2929
--EXPECTF--
3030
*** Testing fileinode() with file, directory ***
31-
%d
32-
%d
33-
%d
34-
%d
31+
%i
32+
%i
33+
%i
34+
%i
3535

3636
*** Done ***

ext/standard/tests/file/fileinode_variation.phpt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,24 @@ echo "\n*** Done ***";
8989
--EXPECTF--
9090
*** Testing fileinode() with files, links and directories ***
9191
-- Testing with files --
92-
%d
93-
%d
92+
%i
93+
%i
9494
-- Testing with links: hard link --
95-
%d
96-
%d
95+
%i
96+
%i
9797
-- Testing with links: soft link --
98-
%d
99-
%d
98+
%i
99+
%i
100100
-- Testing after copying a file --
101-
%d
102-
%d
101+
%i
102+
%i
103103
-- Testing after renaming the file --
104-
%d
105-
%d
104+
%i
105+
%i
106106
-- Testing with directories --
107-
%d
108-
%d
107+
%i
108+
%i
109109
-- Testing with binary input --
110-
%d
111-
%d
110+
%i
111+
%i
112112
*** Done ***

ext/standard/tests/file/filestat.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ var_dump(filectime("/no/such/file/or/dir"));
3030
echo "Done\n";
3131
?>
3232
--EXPECTF--
33+
int(%i)
3334
int(%d)
3435
int(%d)
3536
int(%d)
3637
int(%d)
38+
int(%i)
3739
int(%d)
3840
int(%d)
3941
int(%d)
4042
int(%d)
41-
int(%d)
42-
int(%d)
43-
int(%d)
43+
int(%i)
4444
int(%d)
4545
int(%d)
4646
int(%d)

ext/standard/tests/file/tempnam_variation1.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,51 +66,51 @@ echo "*** Done ***\n";
6666
-- Iteration 1 --
6767
File name is => %s%etempnam_variation1.tmp%s
6868
File permissions are => 100600
69-
File inode is => %d
69+
File inode is => %i
7070
File created in => directory specified
7171
-- Iteration 2 --
7272
File name is => %s%etempnam_variation1.tmp%s
7373
File permissions are => 100600
74-
File inode is => %d
74+
File inode is => %i
7575
File created in => directory specified
7676
-- Iteration 3 --
7777
File name is => %s%etempnam_variation1.tmp%s
7878
File permissions are => 100600
79-
File inode is => %d
79+
File inode is => %i
8080
File created in => directory specified
8181
-- Iteration 4 --
8282
File name is => %s%etempnam_variation1.tmp%s
8383
File permissions are => 100600
84-
File inode is => %d
84+
File inode is => %i
8585
File created in => directory specified
8686
-- Iteration 5 --
8787
File name is => %s%etempnam_variation1.tmp%s
8888
File permissions are => 100600
89-
File inode is => %d
89+
File inode is => %i
9090
File created in => directory specified
9191
-- Iteration 6 --
9292
File name is => %s%etempnam_variation1.tmp%s
9393
File permissions are => 100600
94-
File inode is => %d
94+
File inode is => %i
9595
File created in => directory specified
9696
-- Iteration 7 --
9797
File name is => %s%etempnam_variation1.tmp%s
9898
File permissions are => 100600
99-
File inode is => %d
99+
File inode is => %i
100100
File created in => directory specified
101101
-- Iteration 8 --
102102
File name is => %s%etempnam_variation1.tmp%s
103103
File permissions are => 100600
104-
File inode is => %d
104+
File inode is => %i
105105
File created in => directory specified
106106
-- Iteration 9 --
107107
File name is => %s%etempnam_variation1.tmp%s
108108
File permissions are => 100600
109-
File inode is => %d
109+
File inode is => %i
110110
File created in => directory specified
111111
-- Iteration 10 --
112112
File name is => %s%etempnam_variation1.tmp%s
113113
File permissions are => 100600
114-
File inode is => %d
114+
File inode is => %i
115115
File created in => directory specified
116116
*** Done ***

0 commit comments

Comments
 (0)