diff options
| -rw-r--r-- | 0001-Another-fix-for-PACKED-array-on-PHP-8.2.patch | 66 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-xlswriter.spec | 10 |
4 files changed, 7 insertions, 73 deletions
diff --git a/0001-Another-fix-for-PACKED-array-on-PHP-8.2.patch b/0001-Another-fix-for-PACKED-array-on-PHP-8.2.patch deleted file mode 100644 index 57df4ea..0000000 --- a/0001-Another-fix-for-PACKED-array-on-PHP-8.2.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 9ea164d4d8fb0af74bcb8fd41266582d7469fab1 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 1 Mar 2023 16:04:38 +0100 -Subject: [PATCH] Another fix for PACKED array on PHP 8.2 - ---- - kernel/validation.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/kernel/validation.c b/kernel/validation.c -index 8a07e76..a7c4178 100644 ---- a/kernel/validation.c -+++ b/kernel/validation.c -@@ -433,7 +433,7 @@ PHP_METHOD(vtiful_validation, valueList) - int index = 0; - char **list = NULL; - -- Bucket *bucket; -+ zval *data; - zval *zv_value_list = NULL; - validation_object *obj = NULL; - -@@ -465,25 +465,25 @@ PHP_METHOD(vtiful_validation, valueList) - - zend_array *za_value_list = Z_ARR_P(zv_value_list); - -- ZEND_HASH_FOREACH_BUCKET(za_value_list, bucket) -- if (Z_TYPE(bucket->val) != IS_STRING) { -+ ZEND_HASH_FOREACH_VAL(za_value_list, data) { -+ if (Z_TYPE_P(data) != IS_STRING) { - zend_throw_exception(vtiful_exception_ce, "Arrays can only consist of strings.", 300); - return; - } -- if (ZSTR_LEN(bucket->val.value.str) == 0 ) { -+ if (Z_STRLEN_P(data) == 0 ) { - zend_throw_exception(vtiful_exception_ce, "Array value is empty string.", 301); - return; - } -- ZEND_HASH_FOREACH_END(); -+ } ZEND_HASH_FOREACH_END(); - - index = 0; - list = ecalloc(za_value_list->nNumOfElements + 1, sizeof(char *)); - -- ZEND_HASH_FOREACH_BUCKET(za_value_list, bucket) -- list[index] = ecalloc(1, bucket->val.value.str->len + 1); -- strcpy(list[index],bucket->val.value.str->val); -+ ZEND_HASH_FOREACH_VAL(za_value_list, data) { -+ list[index] = ecalloc(1, Z_STRLEN_P(data) + 1); -+ strcpy(list[index], Z_STRVAL_P(data)); - index++; -- ZEND_HASH_FOREACH_END(); -+ } ZEND_HASH_FOREACH_END(); - - list[index] = NULL; - -@@ -823,4 +823,4 @@ VTIFUL_STARTUP_FUNCTION(validation) { - - return SUCCESS; - } --/* }}} */ -\ No newline at end of file -+/* }}} */ --- -2.39.2 - @@ -2,6 +2,6 @@ xlswriter xlswriter support => enabled -Version => 1.5.3 +Version => 1.5.4 bundled libxlsxwriter version => 1.1.3 bundled libxlsxio version => 0.2.27 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #103 xlswriter version 1.5.3 ] { +Extension [ <persistent> extension #103 xlswriter version 1.5.4 ] { - Functions { Function [ <internal:xlswriter> function xlswriter_get_version ] { diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index decd55b..b31e174 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -29,14 +29,12 @@ Summary: An efficient and fast xlsx file extension Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: 0001-Another-fix-for-PACKED-array-on-PHP-8.2.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -107,8 +105,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr470 - %if %{with syslib} # we use the system libraries rm -r library @@ -255,6 +251,10 @@ cd .. %changelog +* Thu Mar 2 2023 Remi Collet <remi@remirepo.net> - 1.5.4-1 +- update to 1.5.4 +- drop patch merged upstream + * Wed Mar 1 2023 Remi Collet <remi@remirepo.net> - 1.5.3-1 - update to 1.5.3 - drop patch merged upstream |