From 0ebfb390e0dcf9e24e4af9615b883df37d55ab48 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 06:38:46 +0100 Subject: update to 1.5.8 drop patch merged upstream open https://github.com/viest/php-ext-xlswriter/issues/537 BC break --- 531.patch | 66 ------------------------------------------------- PHPINFO | 2 +- REFLECTION | 44 ++++++++++++++++++++++++--------- php-pecl-xlswriter.spec | 12 +++++---- 4 files changed, 41 insertions(+), 83 deletions(-) delete mode 100644 531.patch diff --git a/531.patch b/531.patch deleted file mode 100644 index 9ef28fb..0000000 --- a/531.patch +++ /dev/null @@ -1,66 +0,0 @@ -From c8f5a888cb304e8f369ff139964cd923ef3c722b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 30 Sep 2024 08:14:43 +0200 -Subject: [PATCH] fetcsv default values are deprecated with 8.4 - ---- - tests/xlsx_to_csv_callback.phpt | 6 +++--- - tests/xlsx_to_csv_callback_custom_delimiter.phpt | 4 ++-- - tests/xlsx_to_csv_custom_delimiter.phpt | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/xlsx_to_csv_callback.phpt b/tests/xlsx_to_csv_callback.phpt -index 81d1bdb..eea603e 100644 ---- a/tests/xlsx_to_csv_callback.phpt -+++ b/tests/xlsx_to_csv_callback.phpt -@@ -30,8 +30,8 @@ var_dump($csvResult); - - $fp = fopen('./tests/file.csv', 'r'); - --var_dump(fgetcsv($fp)); --var_dump(fgetcsv($fp)); -+var_dump(fgetcsv($fp, 1000, ',', '"', '\\')); -+var_dump(fgetcsv($fp, 1000, ',', '"', '\\')); - ?> - --CLEAN-- - - string(10) "10.9999995" --} -\ No newline at end of file -+} -diff --git a/tests/xlsx_to_csv_callback_custom_delimiter.phpt b/tests/xlsx_to_csv_callback_custom_delimiter.phpt -index 2a46550..d02cf22 100644 ---- a/tests/xlsx_to_csv_callback_custom_delimiter.phpt -+++ b/tests/xlsx_to_csv_callback_custom_delimiter.phpt -@@ -30,7 +30,7 @@ if (($csvHandler = fopen('./tests/file.csv', 'r')) === FALSE) { - die('csv file open failure'); - } - --while (($data = fgetcsv($csvHandler, 1000, ';')) !== FALSE) { -+while (($data = fgetcsv($csvHandler, 1000, ';', '"', '\\')) !== FALSE) { - var_dump($data); - } - ?> -@@ -56,4 +56,4 @@ array(4) { - string(2) "10" - [3]=> - string(10) "10.9999995" --} -\ No newline at end of file -+} -diff --git a/tests/xlsx_to_csv_custom_delimiter.phpt b/tests/xlsx_to_csv_custom_delimiter.phpt -index 5fb749c..0e86053 100644 ---- a/tests/xlsx_to_csv_custom_delimiter.phpt -+++ b/tests/xlsx_to_csv_custom_delimiter.phpt -@@ -28,7 +28,7 @@ if (($csvHandler = fopen('./tests/file.csv', 'r')) === FALSE) { - die('csv file open failure'); - } - --while (($data = fgetcsv($csvHandler, 1000, ';')) !== FALSE) { -+while (($data = fgetcsv($csvHandler, 1000, ';', '"', '\\')) !== FALSE) { - var_dump($data); - } - ?> diff --git a/PHPINFO b/PHPINFO index e912be8..fa75d77 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,6 +2,6 @@ xlswriter xlswriter support => enabled -Version => 1.5.7 +Version => 1.5.8 bundled libxlsxwriter version => 1.1.3 bundled libxlsxio version => 0.2.27 diff --git a/REFLECTION b/REFLECTION index 77028e3..c3c7e7b 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #101 xlswriter version 1.5.7 ] { +Extension [ extension #108 xlswriter version 1.5.8 ] { - Functions { Function [ function xlswriter_get_version ] { @@ -196,7 +196,7 @@ Extension [ extension #101 xlswriter version 1.5.7 ] { Property [ private $read_row_type = NULL ] } - - Methods [51] { + - Methods [52] { Method [ public method __construct ] { - Parameters [1] { @@ -389,19 +389,25 @@ Extension [ extension #101 xlswriter version 1.5.7 ] { Method [ public method setColumn ] { - - Parameters [3] { - Parameter #0 [ $format_handle ] - Parameter #1 [ $range ] - Parameter #2 [ $width ] + - Parameters [6] { + Parameter #0 [ $range ] + Parameter #1 [ $width ] + Parameter #2 [ $format_handle = ] + Parameter #3 [ $level = ] + Parameter #4 [ $collapsed = ] + Parameter #5 [ $hidden = ] } } Method [ public method setRow ] { - - Parameters [3] { - Parameter #0 [ $format_handle ] - Parameter #1 [ $range ] - Parameter #2 [ $height ] + - Parameters [6] { + Parameter #0 [ $range ] + Parameter #1 [ $height ] + Parameter #2 [ $format_handle = ] + Parameter #3 [ $level = ] + Parameter #4 [ $collapsed = ] + Parameter #5 [ $hidden = ] } } @@ -425,6 +431,15 @@ Extension [ extension #101 xlswriter version 1.5.7 ] { } } + Method [ public method defaultRowOptions ] { + + - Parameters [3] { + Parameter #0 [ $level = ] + Parameter #1 [ $collapsed = ] + Parameter #2 [ $hidden = ] + } + } + Method [ public method freezePanes ] { - Parameters [2] { @@ -675,7 +690,7 @@ Extension [ extension #101 xlswriter version 1.5.7 ] { - Properties [0] { } - - Methods [18] { + - Methods [19] { Method [ public method __construct ] { - Parameters [1] { @@ -789,6 +804,13 @@ Extension [ extension #101 xlswriter version 1.5.7 ] { } } + Method [ public method rotation ] { + + - Parameters [1] { + Parameter #0 [ $angle ] + } + } + Method [ public method toResource ] { - Parameters [0] { diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index 5bcafd5..0267f7c 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -26,13 +26,12 @@ Summary: An efficient and fast xlsx file extension Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.5.7 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.5.8 +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: 531.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -100,8 +99,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd %{sources} -%patch -P0 -p1 - %if %{with syslib} # we use the system libraries rm -r library @@ -232,6 +229,11 @@ cd .. %changelog +* Tue Nov 12 2024 Remi Collet - 1.5.8-1 +- update to 1.5.8 +- drop patch merged upstream +- open https://github.com/viest/php-ext-xlswriter/issues/537 BC break + * Mon Sep 30 2024 Remi Collet - 1.5.7-3 - fix test suite using patch from https://github.com/viest/php-ext-xlswriter/pull/531 -- cgit