From 3d66c71e50baac41bfd6021fb45345b195224332 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Apr 2022 16:12:40 +0200
Subject: update to 1.5.2

---
 PHPINFO                 |   2 +-
 REFLECTION              | 118 +++++++++++++++++++++++++++++++-----------------
 php-pecl-xlswriter.spec |  13 ++----
 3 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 40b71b3..a7bc26a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,6 +2,6 @@
 xlswriter
 
 xlswriter support => enabled
-Version => 1.5.1
+Version => 1.5.2
 bundled libxlsxwriter version => 1.1.3
 bundled libxlsxio version => 0.2.27
diff --git a/REFLECTION b/REFLECTION
index dc308f5..79463f0 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
+Extension [ <persistent> extension #103 xlswriter version 1.5.2 ] {
 
   - Functions {
     Function [ <internal:xlswriter> function xlswriter_get_version ] {
@@ -14,7 +14,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
   }
 
   - Classes [6] {
-    Class [ <internal:xlswriter> class Vtiful\Kernel\Exception extends Exception implements Throwable ] {
+    Class [ <internal:xlswriter> class Vtiful\Kernel\Exception extends Exception implements Throwable, Stringable ] {
 
       - Constants [0] {
       }
@@ -26,47 +26,81 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
       }
 
       - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
+        Property [ protected $message = '' ]
+        Property [ protected $code = 0 ]
+        Property [ protected $file = NULL ]
+        Property [ protected $line = NULL ]
       }
 
       - Methods [10] {
         Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
+            Parameter #0 [ <optional> string $message = "" ]
+            Parameter #1 [ <optional> int $code = 0 ]
+            Parameter #2 [ <optional> ?Throwable $previous = null ]
           }
         }
 
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
+
+          - Parameters [0] {
+          }
+          - Return [ int ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
+
+          - Parameters [0] {
+          }
+          - Return [ ?Throwable ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Stringable> public method __toString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
       }
     }
@@ -156,9 +190,9 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
       }
 
       - Properties [3] {
-        Property [ <default> private $config ]
-        Property [ <default> private $fileName ]
-        Property [ <default> private $read_row_type ]
+        Property [ private $config = NULL ]
+        Property [ private $fileName = NULL ]
+        Property [ private $read_row_type = NULL ]
       }
 
       - Methods [50] {
@@ -179,7 +213,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $file_name ]
-            Parameter #1 [ <optional> $sheet_name ]
+            Parameter #1 [ <optional> $sheet_name = <default> ]
           }
         }
 
@@ -215,8 +249,8 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [3] {
             Parameter #0 [ <required> $file_name ]
-            Parameter #1 [ <optional> $sheet_name ]
-            Parameter #2 [ <optional> $use_zip64 ]
+            Parameter #1 [ <optional> $sheet_name = <default> ]
+            Parameter #2 [ <optional> $use_zip64 = <default> ]
           }
         }
 
@@ -224,7 +258,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $header ]
-            Parameter #1 [ <optional> $format_handle ]
+            Parameter #1 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -260,8 +294,8 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $data ]
-            Parameter #3 [ <optional> $format ]
-            Parameter #4 [ <optional> $format_handle ]
+            Parameter #3 [ <optional> $format = <default> ]
+            Parameter #4 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -271,7 +305,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $rich_strings ]
-            Parameter #3 [ <optional> $format_handle ]
+            Parameter #3 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -281,8 +315,8 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $timestamp ]
-            Parameter #3 [ <optional> $format ]
-            Parameter #4 [ <optional> $format_handle ]
+            Parameter #3 [ <optional> $format = <default> ]
+            Parameter #4 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -301,9 +335,9 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $url ]
-            Parameter #3 [ <optional> $text ]
-            Parameter #4 [ <optional> $tool_tip ]
-            Parameter #5 [ <optional> $format ]
+            Parameter #3 [ <optional> $text = <default> ]
+            Parameter #4 [ <optional> $tool_tip = <default> ]
+            Parameter #5 [ <optional> $format = <default> ]
           }
         }
 
@@ -313,8 +347,8 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $image ]
-            Parameter #3 [ <optional> $width ]
-            Parameter #4 [ <optional> $height ]
+            Parameter #3 [ <optional> $width = <default> ]
+            Parameter #4 [ <optional> $height = <default> ]
           }
         }
 
@@ -324,7 +358,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
             Parameter #0 [ <required> $row ]
             Parameter #1 [ <required> $column ]
             Parameter #2 [ <required> $formula ]
-            Parameter #3 [ <optional> $format_handle ]
+            Parameter #3 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -348,7 +382,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> $range ]
             Parameter #1 [ <required> $data ]
-            Parameter #2 [ <optional> $format_handle ]
+            Parameter #2 [ <optional> $format_handle = <default> ]
           }
         }
 
@@ -401,7 +435,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
         Method [ <internal:xlswriter> public method protection ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $password ]
+            Parameter #0 [ <optional> $password = <default> ]
           }
         }
 
@@ -478,8 +512,8 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
         Method [ <internal:xlswriter> public method openSheet ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $zs_sheet_name ]
-            Parameter #1 [ <optional> $zl_flag ]
+            Parameter #0 [ <optional> $zs_sheet_name = <default> ]
+            Parameter #1 [ <optional> $zl_flag = <default> ]
           }
         }
 
@@ -487,9 +521,9 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [4] {
             Parameter #0 [ <required> $fp ]
-            Parameter #1 [ <optional> $delimiter_str ]
-            Parameter #2 [ <optional> $enclosure_str ]
-            Parameter #3 [ <optional> $escape_str ]
+            Parameter #1 [ <optional> $delimiter_str = <default> ]
+            Parameter #2 [ <optional> $enclosure_str = <default> ]
+            Parameter #3 [ <optional> $escape_str = <default> ]
           }
         }
 
@@ -498,9 +532,9 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
           - Parameters [5] {
             Parameter #0 [ <required> $callback ]
             Parameter #1 [ <required> $fp ]
-            Parameter #2 [ <optional> $delimiter_str ]
-            Parameter #3 [ <optional> $enclosure_str ]
-            Parameter #4 [ <optional> $escape_str ]
+            Parameter #2 [ <optional> $delimiter_str = <default> ]
+            Parameter #3 [ <optional> $enclosure_str = <default> ]
+            Parameter #4 [ <optional> $escape_str = <default> ]
           }
         }
 
@@ -540,7 +574,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
         Method [ <internal:xlswriter> public method nextRow ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $zv_type_t ]
+            Parameter #0 [ <optional> $zv_type_t = <default> ]
           }
         }
 
@@ -548,7 +582,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $fci ]
-            Parameter #1 [ <optional> $sheet_name ]
+            Parameter #1 [ <optional> $sheet_name = <default> ]
           }
         }
       }
@@ -792,7 +826,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $value ]
-            Parameter #1 [ <optional> $categories ]
+            Parameter #1 [ <optional> $categories = <default> ]
           }
         }
 
@@ -1068,7 +1102,7 @@ Extension [ <persistent> extension #111 xlswriter version 1.5.1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $text ]
-            Parameter #1 [ <optional> $format_handle ]
+            Parameter #1 [ <optional> $format_handle = <default> ]
           }
         }
       }
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index 4c9cfad..a0cc04d 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-xlswriter
 #
-# Copyright (c) 2018-2021 Remi Collet
+# Copyright (c) 2018-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,7 +20,6 @@
 
 %global with_zts     0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name    xlswriter
-# After json
 %global ini_name     40-%{pecl_name}.ini
 
 %if %{with syslib}
@@ -31,7 +30,7 @@
 
 Summary:        An efficient and fast xlsx file extension
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.5.1
+Version:        1.5.2
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 URL:            https://pecl.php.net/package/%{pecl_name}
@@ -49,7 +48,6 @@ BuildRequires:  zlib-devel
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-Requires:       %{?scl_prefix}php-json%{?_isa}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 %if %{with syslib}
 Requires:       libxlsxwriter%{?_isa} >= %{libxlsxwriter_version}
@@ -231,12 +229,9 @@ rm ?TS/tests/open_xlsx_get_data_skip_empty.phpt
 rm ?TS/tests/open_xlsx_next_row_skip_empty.phpt
 %endif
 
-modules="-d extension=json.so"
-
 cd NTS
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
-    $modules \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
@@ -251,7 +246,6 @@ REPORT_EXIT_STATUS=1 \
 cd ../ZTS
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
-    $modules \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
@@ -280,6 +274,9 @@ cd ..
 
 
 %changelog
+* Thu Apr 28 2022 Remi Collet <remi@remirepo.net> - 1.5.2-1
+- update to 1.5.2
+
 * Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 1.5.1-1
 - update to 1.5.1
 
-- 
cgit