Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix GH-8048: disk_*_space wrong for some filesystems on macOS

Author: cmb69

NEWS

@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-8115 (Can't catch arg type deprecation when instantiating Intl
     classes). (ilutov)
 
+- Standard:
+  . Fixed bug GH-8048 (Force macOS to use statfs). (risner)
+
 17 Mar 2022, PHP 8.1.4
 
 - Core:

ext/standard/filestat.c

@@ -42,6 +42,16 @@
 #  include <os2.h>
 #endif
 
+#if defined(__APPLE__)
+  /*
+   Apple statvfs has an interger overflow in libc copying to statvfs.
+   cvt_statfs_to_statvfs(struct statfs *from, struct statvfs *to) {
+   to->f_blocks = (fsblkcnt_t)from->f_blocks;
+   */
+#  undef HAVE_SYS_STATVFS_H
+#  undef HAVE_STATVFS
+#endif
+
 #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
 # include <sys/statvfs.h>
 #elif defined(HAVE_SYS_STATFS_H) && defined(HAVE_STATFS)