Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix tests for stat rdev
php · Jul 11, 2023 · 47b7570 · 47b7570
2 parents 097b08c + 6b87e08
commit 47b7570
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ext/standard/tests/file/lstat_stat_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt
@@ -88,7 +88,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -144,7 +144,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>

diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt
@@ -89,7 +89,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -143,7 +143,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -199,7 +199,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -253,7 +253,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>

diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt
@@ -98,7 +98,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -154,7 +154,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -208,7 +208,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>
@@ -262,7 +262,7 @@ array(26) {
   ["gid"]=>
   int(%d)
   ["rdev"]=>
-  int(%d)
+  int(%i)
   ["size"]=>
   int(%d)
   ["atime"]=>