Merge branch 'PHP-8.2'

* PHP-8.2:
  zip version bump to 1.21.1
  remove LIBZIP_VERSION constant def from stub

Author: remicollet

ext/zip/php_zip.c

@@ -3110,6 +3110,12 @@ static PHP_MINIT_FUNCTION(zip)
 	php_zip_register_prop_handler(&zip_prop_handlers, "filename",  NULL, php_zipobj_get_filename, IS_STRING);
 	php_zip_register_prop_handler(&zip_prop_handlers, "comment",   NULL, php_zipobj_get_zip_comment, IS_STRING);
 
+#ifdef HAVE_LIBZIP_VERSION
+	zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
+#else
+	zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
+#endif
+
 	php_register_url_stream_wrapper("zip", &php_stream_zip_wrapper);
 
 	le_zip_dir   = zend_register_list_destructors_ex(php_zip_free_dir,   NULL, le_zip_dir_name,   module_number);

ext/zip/php_zip.h

@@ -31,13 +31,7 @@ extern zend_module_entry zip_module_entry;
 #define ZIP_OVERWRITE ZIP_TRUNCATE
 #endif
 
-#define PHP_ZIP_VERSION "1.21.0"
-
-#ifdef HAVE_LIBZIP_VERSION
-#define LIBZIP_VERSION_STR zip_libzip_version()
-#else
-#define LIBZIP_VERSION_STR LIBZIP_VERSION
-#endif
+#define PHP_ZIP_VERSION "1.21.1"
 
 #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
 

ext/zip/php_zip.stub.php

@@ -633,12 +633,6 @@ class ZipArchive implements Countable
      */
     public const EM_UNKNOWN = UNKNOWN;
 
-    /**
-     * @var string
-     * @cvalue LIBZIP_VERSION_STR
-     */
-    public const LIBZIP_VERSION = UNKNOWN;
-
     /** @readonly */
     public int $lastId;
     /** @readonly */