clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  zip version bump to 1.21.1
  remove LIBZIP_VERSION constant def from stub
This commit is contained in:
Remi Collet 2022-09-15 16:42:13 +02:00
commit 59894c7bf1
No known key found for this signature in database
GPG Key ID: DC9FF8D3EE5AF27F
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/zip/php_zip.c
View File

@ -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);

8
ext/zip/php_zip.h
View File

@ -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)

6
ext/zip/php_zip.stub.php
View File

@ -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 */

9
ext/zip/php_zip_arginfo.h generated
View File

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: d8c14dfe45c7eff2c18fd3c562488a827f658e12 */
* Stub hash: 52db51284a16b7664a3f66ea5d8a4a7b23aa5127 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@ -1154,13 +1154,6 @@ static zend_class_entry *register_class_ZipArchive(zend_class_entry *class_entry
zend_declare_class_constant_ex(class_entry, const_EM_UNKNOWN_name, &const_EM_UNKNOWN_value, ZEND_ACC_PUBLIC, NULL);
zend_string_release(const_EM_UNKNOWN_name);
zval const_LIBZIP_VERSION_value;
zend_string *const_LIBZIP_VERSION_value_str = zend_string_init(LIBZIP_VERSION_STR, sizeof(LIBZIP_VERSION_STR) - 1, 1);
ZVAL_STR(&const_LIBZIP_VERSION_value, const_LIBZIP_VERSION_value_str);
zend_string *const_LIBZIP_VERSION_name = zend_string_init_interned("LIBZIP_VERSION", sizeof("LIBZIP_VERSION") - 1, 1);
zend_declare_class_constant_ex(class_entry, const_LIBZIP_VERSION_name, &const_LIBZIP_VERSION_value, ZEND_ACC_PUBLIC, NULL);
zend_string_release(const_LIBZIP_VERSION_name);
zval property_lastId_default_value;
ZVAL_UNDEF(&property_lastId_default_value);
zend_string *property_lastId_name = zend_string_init("lastId", sizeof("lastId") - 1, 1);