ext/zip: Sync remaining parts for libzip >= 1.0.0 (#20365)

Follow up of GH-20355

Author: petk

ext/zip/config.w32

@@ -17,7 +17,7 @@ if (PHP_ZIP != "no") {
 		}
 
 		AC_DEFINE('HAVE_ZIP', 1, "Define to 1 if the PHP extension 'zip' is available.");
-		ADD_FLAG("CFLAGS_ZIP", "/D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");
+		ADD_FLAG("CFLAGS_ZIP", "/D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");
 	} else {
 		WARNING("zip not enabled; libraries and headers not found");
 	}

ext/zip/php_zip.c

@@ -2424,7 +2424,6 @@ PHP_METHOD(ZipArchive, setCompressionIndex)
 }
 /* }}} */
 
-#ifdef HAVE_SET_MTIME
 /* {{{ Set the modification time of a file in zip, using its name */
 PHP_METHOD(ZipArchive, setMtimeName)
 {
@@ -2477,7 +2476,6 @@ PHP_METHOD(ZipArchive, setMtimeIndex)
 			(time_t)mtime, (zip_uint32_t)flags) == 0);
 }
 /* }}} */
-#endif
 
 /* {{{ Delete a file using its index */
 PHP_METHOD(ZipArchive, deleteIndex)

ext/zip/php_zip.stub.php

@@ -704,13 +704,11 @@ public function setCommentIndex(int $index, string $comment): bool {}
     /** @tentative-return-type */
     public function setCommentName(string $name, string $comment): bool {}
 
-#ifdef HAVE_SET_MTIME
     /** @tentative-return-type */
     public function setMtimeIndex(int $index, int $timestamp, int $flags = 0): bool {}
 
     /** @tentative-return-type */
     public function setMtimeName(string $name, int $timestamp, int $flags = 0): bool {}
-#endif
 
     /** @tentative-return-type */
     public function getCommentIndex(int $index, int $flags = 0): string|false {}

ext/zip/php_zip_arginfo.h

@@ -2,11 +2,6 @@
 setMtime
 --EXTENSIONS--
 zip
---SKIPIF--
-<?php
-/* $Id$ */
-if (!method_exists('ZipArchive', 'setMtimeName')) die('skip libzip too old');
-?>
 --INI--
 date.timezone=UTC
 --FILE--

ext/zip/tests/oo_setmtime.phpt

@@ -49,18 +49,11 @@ static ssize_t php_zip_ops_read(php_stream *stream, char *buf, size_t count)
 	if (self->zf) {
 		n = zip_fread(self->zf, buf, count);
 		if (n < 0) {
-#if LIBZIP_VERSION_MAJOR < 1
-			int ze, se;
-			zip_file_error_get(self->zf, &ze, &se);
-			stream->eof = 1;
-			php_error_docref(NULL, E_WARNING, "Zip stream error: %s", zip_file_strerror(self->zf));
-#else
 			zip_error_t *err;
 			err = zip_file_get_error(self->zf);
 			stream->eof = 1;
 			php_error_docref(NULL, E_WARNING, "Zip stream error: %s", zip_error_strerror(err));
 			zip_error_fini(err);
-#endif
 			return -1;
 		}
 		/* cast count to signed value to avoid possibly negative n