Merge branch 'PHP-8.1' into PHP-8.2

nielsdos · nielsdos · commit 00ab6bb07848 · 2023-08-04T21:08:57.000+02:00
* PHP-8.1:
  Mark buildFromIterator test as conflicting
diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt
@@ -2,6 +2,8 @@
 Phar::buildFromIterator() RegexIterator(RecursiveIteratorIterator), SplFileInfo as current
 --EXTENSIONS--
 phar
+--CONFLICTS--
+all
 --INI--
 phar.require_hash=0
 phar.readonly=0
