Browse Source

VERSION 1.2.1

viest 7 years ago
parent
commit
ee4d8c5ae9
3 changed files with 39 additions and 15 deletions
  1. 16 8
      kernel/excel.c
  2. 22 6
      package.xml
  3. 1 1
      php_xls_writer.h

+ 16 - 8
kernel/excel.c

@@ -68,6 +68,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(xls_const_memory_arginfo, 0, 0, 1)
                 ZEND_ARG_INFO(0, file_name)
+                ZEND_ARG_INFO(0, sheet_name)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(xls_file_add_sheet, 0, 0, 1)
@@ -149,7 +150,7 @@ PHP_METHOD(vtiful_xls, __construct)
 }
 /* }}} */
 
-/** {{{ \Vtiful\Kernel\xls::filename(string $fileName)
+/** {{{ \Vtiful\Kernel\xls::filename(string $fileName [, string $sheetName])
  */
 PHP_METHOD(vtiful_xls, fileName)
 {
@@ -217,15 +218,18 @@ PHP_METHOD(vtiful_xls, addSheet)
 }
 /* }}} */
 
-/** {{{ \Vtiful\Kernel\xls::constMemory(string $fileName)
+/** {{{ \Vtiful\Kernel\xls::constMemory(string $fileName [, string $sheetName])
  */
 PHP_METHOD(vtiful_xls, constMemory)
 {
-    zval file_path, *dir_path;
-    zend_string *file_name;
+    zval file_path, *dir_path = NULL;
+    zend_string *zs_file_name = NULL, *zs_sheet_name = NULL;
+    char *sheet_name = NULL;
 
-    ZEND_PARSE_PARAMETERS_START(1, 1)
-            Z_PARAM_STR(file_name)
+    ZEND_PARSE_PARAMETERS_START(1, 2)
+            Z_PARAM_STR(zs_file_name)
+            Z_PARAM_OPTIONAL
+            Z_PARAM_STR(zs_sheet_name)
     ZEND_PARSE_PARAMETERS_END();
 
     ZVAL_COPY(return_value, getThis());
@@ -235,12 +239,16 @@ PHP_METHOD(vtiful_xls, constMemory)
     xls_object *obj = Z_XLS_P(getThis());
 
     if(obj->ptr.workbook == NULL) {
-        xls_file_path(file_name, dir_path, &file_path);
+        xls_file_path(zs_file_name, dir_path, &file_path);
 
         lxw_workbook_options options = {.constant_memory = LXW_TRUE, .tmpdir = NULL};
 
+        if(zs_sheet_name != NULL) {
+            sheet_name = ZSTR_VAL(zs_sheet_name);
+        }
+
         obj->ptr.workbook  = workbook_new_opt(Z_STRVAL(file_path), &options);
-        obj->ptr.worksheet = workbook_add_worksheet(obj->ptr.workbook, NULL);
+        obj->ptr.worksheet = workbook_add_worksheet(obj->ptr.workbook, sheet_name);
 
         add_property_zval(return_value, V_XLS_FIL, &file_path);
 

+ 22 - 6
package.xml

@@ -17,11 +17,11 @@
         <email>[email protected]</email>
         <active>yes</active>
     </lead>
-    <date>2018-05-31</date>
-    <time>22:30:00</time>
+    <date>2018-06-02</date>
+    <time>12:00:00</time>
     <version>
-        <release>1.2.0</release>
-        <api>1.2.0</api>
+        <release>1.2.1</release>
+        <api>1.2.1</api>
     </version>
     <stability>
         <release>stable</release>
@@ -29,8 +29,7 @@
     </stability>
     <license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
     <notes>
-        - FEAT #70. Data Bulk Insert automatic maintenance line number.
-        - FEAT #70. Customizing the default sheet name.
+        - FEAT #72. Compatible string key value
     </notes>
     <contents>
         <dir name="/">
@@ -91,6 +90,23 @@
     <providesextension>xlswriter</providesextension>
     <extsrcrelease />
     <changelog>
+        <release>
+            <date>2018-05-31</date>
+            <time>22:30:00</time>
+            <version>
+                <release>1.2.0</release>
+                <api>1.2.0</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
+            <notes>
+                - FEAT #70. Data Bulk Insert automatic maintenance line number.
+                - FEAT #70. Customizing the default sheet name.
+            </notes>
+        </release>
         <release>
             <date>2018-05-31</date>
             <time>10:00:00</time>

+ 1 - 1
php_xls_writer.h

@@ -18,7 +18,7 @@
 extern zend_module_entry xlswriter_module_entry;
 #define phpext_xlswriter_ptr &xlswriter_module_entry
 
-#define PHP_XLSWRITER_VERSION "1.2.0"
+#define PHP_XLSWRITER_VERSION "1.2.1"
 
 #ifdef PHP_WIN32
 #	define PHP_VTIFUL_API __declspec(dllexport)