Fixed bug #79678 Build fails due to undeclared ZIP_RDONLY

Author: remicollet

package.xml

@@ -28,6 +28,7 @@
   <license>PHP 3.01</license>
   <notes>
 - encode parameter is optional (PHP 8)
+- Fixed bug #79678 Build fails due to undeclared ZIP_RDONLY
   </notes>
   <contents>
     <dir name="/">
@@ -52,6 +53,7 @@
         <file name="bug53603.phpt" role="test"/>
         <file name="bug53854.phpt" role="test"/>
         <file name="bug53885.phpt" role="test"/>
+        <file name="bug53885_php8.phpt" role="test"/>
         <file name="bug64342_0.phpt" role="test"/>
         <file name="bug64342_1.phpt" role="test"/>
         <file name="bug64342_1-mb.phpt" role="test"/>

php8/php_zip.c

@@ -1456,7 +1456,11 @@ PHP_METHOD(ZipArchive, open)
 	   "Do not accept empty files as valid zip archives any longer" */
 
 	/* open for write without option to empty the archive */
+#ifdef ZIP_RDONLY
 	if ((flags & (ZIP_TRUNCATE | ZIP_RDONLY)) == 0) {
+#else
+	if ((flags & ZIP_TRUNCATE) == 0) {
+#endif
 		zend_stat_t st;
 
 		/* exists and is empty */

tests/bug53885.phpt

@@ -3,14 +3,15 @@ Bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
 --SKIPIF--
 <?php
 if(!extension_loaded('zip')) die('skip');
+if (PHP_VERSION_ID >= 80000) die('skip only for PHP < 8');
 ?>
 --FILE--
 <?php
 $fname = dirname(__FILE__)."/test53885.zip";
 if(file_exists($fname)) unlink($fname);
 touch($fname);
 $nx=new ZipArchive();
-@$nx->open($fname);
+$nx->open($fname);
 $nx->locateName("a",ZIPARCHIVE::FL_UNCHANGED);
 $nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
 ?>

tests/bug53885_php8.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
+--SKIPIF--
+<?php
+if(!extension_loaded('zip')) die('skip');
+if (PHP_VERSION_ID < 80000) die('skip only for PHP 8');
+?>
+--FILE--
+<?php
+$fname = __DIR__."/test53885.zip";
+if(file_exists($fname)) unlink($fname);
+touch($fname);
+$nx=new ZipArchive();
+$nx->open($fname);
+$nx->locateName("a",ZIPARCHIVE::FL_UNCHANGED);
+$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
+?>
+==DONE==
+--CLEAN--
+<?php
+$fname = __DIR__."/test53885.zip";
+unlink($fname);
+?>
+--EXPECTF--
+Deprecated: ZipArchive::open(): Using empty file as ZipArchive is deprecated in %s
+==DONE==