ソースを参照

Merge branch 'master' of github.com:viest/php-ext-excel-export into dev

viest 7 年 前
コミット
7a13d5ef5e
3 ファイル変更10 行追加3 行削除
  1. 1 0
      .gitignore
  2. 6 2
      kernel/excel.c
  3. 3 1
      package.xml

+ 1 - 0
.gitignore

@@ -40,3 +40,4 @@ tmp-php.ini
 cmake-build-debug
 CMakeLists.txt
 local_test.php
+xlswriter-*.tgz

+ 6 - 2
kernel/excel.c

@@ -61,11 +61,15 @@ ZEND_BEGIN_ARG_INFO_EX(xls_construct_arginfo, 0, 0, 1)
                 ZEND_ARG_INFO(0, config)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_file_name_arginfo, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(xls_file_name_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_const_memory_arginfo, 0, 0, 1)
+                ZEND_ARG_INFO(0, file_name)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(xls_file_add_sheet, 0, 0, 1)
                 ZEND_ARG_INFO(0, sheet_name)
 ZEND_END_ARG_INFO()
@@ -494,7 +498,7 @@ zend_function_entry xls_methods[] = {
         PHP_ME(vtiful_xls, __construct,   xls_construct_arginfo,      ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
         PHP_ME(vtiful_xls, fileName,      xls_file_name_arginfo,      ZEND_ACC_PUBLIC)
         PHP_ME(vtiful_xls, addSheet,      xls_file_add_sheet,         ZEND_ACC_PUBLIC)
-        PHP_ME(vtiful_xls, constMemory,   xls_file_name_arginfo,      ZEND_ACC_PUBLIC)
+        PHP_ME(vtiful_xls, constMemory,   xls_const_memory_arginfo,   ZEND_ACC_PUBLIC)
         PHP_ME(vtiful_xls, header,        xls_header_arginfo,         ZEND_ACC_PUBLIC)
         PHP_ME(vtiful_xls, data,          xls_data_arginfo,           ZEND_ACC_PUBLIC)
         PHP_ME(vtiful_xls, output,        NULL,                       ZEND_ACC_PUBLIC)

+ 3 - 1
package.xml

@@ -73,6 +73,8 @@
                 <file role="src" name="014.phpt" />
                 <file role="src" name="015.phpt" />
                 <file role="src" name="016.phpt" />
+                <file role="src" name="017.phpt" />
+                <file role="src" name="018.phpt" />
             </dir>
         </dir>
     </contents>
@@ -156,4 +158,4 @@
             </notes>
         </release>
     </changelog>
-</package>
+</package>