Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Add missing SKIPIF clause for recently introduced test case

Author: cmb69

ext/phar/tests/bug69279a.phpt

@@ -3,6 +3,7 @@ Bug #69279 (Compressed ZIP Phar extractTo() creates garbage files)
 --SKIPIF--
 <?php
 if (!extension_loaded('phar')) die('skip phar extension not available');
+if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --FILE--
 <?php