Skip to content

Commit 371e29e

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix tests regarding negative fileinode()
2 parents f74e9a4 + dd1d119 commit 371e29e

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
@@ -23,9 +23,9 @@ unlink (__DIR__."/inode.tmp");
2323
?>
2424
--EXPECTF--
2525
*** Testing fileinode() with file, directory ***
26-
%d
27-
%d
28-
%d
29-
%d
26+
%i
27+
%i
28+
%i
29+
%i
3030

3131
*** Done ***

ext/standard/tests/file/fileinode_variation.phpt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,24 @@ echo "\n*** Done ***";
8484
--EXPECTF--
8585
*** Testing fileinode() with files, links and directories ***
8686
-- Testing with files --
87-
%d
88-
%d
87+
%i
88+
%i
8989
-- Testing with links: hard link --
90-
%d
91-
%d
90+
%i
91+
%i
9292
-- Testing with links: soft link --
93-
%d
94-
%d
93+
%i
94+
%i
9595
-- Testing after copying a file --
96-
%d
97-
%d
96+
%i
97+
%i
9898
-- Testing after renaming the file --
99-
%d
100-
%d
99+
%i
100+
%i
101101
-- Testing with directories --
102-
%d
103-
%d
102+
%i
103+
%i
104104
-- Testing with binary input --
105-
%d
106-
%d
105+
%i
106+
%i
107107
*** 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
@@ -62,51 +62,51 @@ echo "*** Done ***\n";
6262
-- Iteration 1 --
6363
File name is => %s%etempnam_variation1.tmp%s
6464
File permissions are => 100600
65-
File inode is => %d
65+
File inode is => %i
6666
File created in => directory specified
6767
-- Iteration 2 --
6868
File name is => %s%etempnam_variation1.tmp%s
6969
File permissions are => 100600
70-
File inode is => %d
70+
File inode is => %i
7171
File created in => directory specified
7272
-- Iteration 3 --
7373
File name is => %s%etempnam_variation1.tmp%s
7474
File permissions are => 100600
75-
File inode is => %d
75+
File inode is => %i
7676
File created in => directory specified
7777
-- Iteration 4 --
7878
File name is => %s%etempnam_variation1.tmp%s
7979
File permissions are => 100600
80-
File inode is => %d
80+
File inode is => %i
8181
File created in => directory specified
8282
-- Iteration 5 --
8383
File name is => %s%etempnam_variation1.tmp%s
8484
File permissions are => 100600
85-
File inode is => %d
85+
File inode is => %i
8686
File created in => directory specified
8787
-- Iteration 6 --
8888
File name is => %s%etempnam_variation1.tmp%s
8989
File permissions are => 100600
90-
File inode is => %d
90+
File inode is => %i
9191
File created in => directory specified
9292
-- Iteration 7 --
9393
File name is => %s%etempnam_variation1.tmp%s
9494
File permissions are => 100600
95-
File inode is => %d
95+
File inode is => %i
9696
File created in => directory specified
9797
-- Iteration 8 --
9898
File name is => %s%etempnam_variation1.tmp%s
9999
File permissions are => 100600
100-
File inode is => %d
100+
File inode is => %i
101101
File created in => directory specified
102102
-- Iteration 9 --
103103
File name is => %s%etempnam_variation1.tmp%s
104104
File permissions are => 100600
105-
File inode is => %d
105+
File inode is => %i
106106
File created in => directory specified
107107
-- Iteration 10 --
108108
File name is => %s%etempnam_variation1.tmp%s
109109
File permissions are => 100600
110-
File inode is => %d
110+
File inode is => %i
111111
File created in => directory specified
112112
*** Done ***

0 commit comments

Comments
 (0)