Browse Source

Fix: 8.0 arg info

viest 4 years ago
parent
commit
f27344cd96
3 changed files with 8 additions and 7 deletions
  1. 1 1
      .travis.yml
  2. 6 5
      kernel/excel.c
  3. 1 1
      kernel/format.c

+ 1 - 1
.travis.yml

@@ -17,7 +17,7 @@ matrix:
       env: USE_VALGRIND=1
     - php: 7.3
     - php: 7.4
-    - php: 8.0
+    - php: nightly
 
 addons:
   apt:

+ 6 - 5
kernel/excel.c

@@ -110,7 +110,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(xls_get_handle_arginfo, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_insert_text_arginfo, 0, 0, 5)
+ZEND_BEGIN_ARG_INFO_EX(xls_insert_text_arginfo, 0, 0, 3)
                 ZEND_ARG_INFO(0, row)
                 ZEND_ARG_INFO(0, column)
                 ZEND_ARG_INFO(0, data)
@@ -118,7 +118,7 @@ ZEND_BEGIN_ARG_INFO_EX(xls_insert_text_arginfo, 0, 0, 5)
                 ZEND_ARG_INFO(0, format_handle)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_insert_date_arginfo, 0, 0, 5)
+ZEND_BEGIN_ARG_INFO_EX(xls_insert_date_arginfo, 0, 0, 3)
                 ZEND_ARG_INFO(0, row)
                 ZEND_ARG_INFO(0, column)
                 ZEND_ARG_INFO(0, timestamp)
@@ -126,7 +126,7 @@ ZEND_BEGIN_ARG_INFO_EX(xls_insert_date_arginfo, 0, 0, 5)
                 ZEND_ARG_INFO(0, format_handle)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_insert_url_arginfo, 0, 0, 6)
+ZEND_BEGIN_ARG_INFO_EX(xls_insert_url_arginfo, 0, 0, 3)
                 ZEND_ARG_INFO(0, row)
                 ZEND_ARG_INFO(0, column)
                 ZEND_ARG_INFO(0, url)
@@ -195,8 +195,9 @@ ZEND_BEGIN_ARG_INFO_EX(xls_open_file_arginfo, 0, 0, 1)
                 ZEND_ARG_INFO(0, zs_file_name)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_open_sheet_arginfo, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(xls_open_sheet_arginfo, 0, 0, 0)
                 ZEND_ARG_INFO(0, zs_sheet_name)
+                ZEND_ARG_INFO(0, zl_flag)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(xls_put_csv_arginfo, 0, 0, 1)
@@ -236,7 +237,7 @@ ZEND_BEGIN_ARG_INFO_EX(xls_set_skip_arginfo, 0, 0, 1)
                 ZEND_ARG_INFO(0, zv_skip_t)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(xls_next_cell_callback_arginfo, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(xls_next_cell_callback_arginfo, 0, 0, 1)
                 ZEND_ARG_INFO(0, fci)
                 ZEND_ARG_INFO(0, sheet_name)
 ZEND_END_ARG_INFO()

+ 1 - 1
kernel/format.c

@@ -73,7 +73,7 @@ ZEND_BEGIN_ARG_INFO_EX(format_underline_arginfo, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(format_align_arginfo, 0, 0, 1)
-                ZEND_ARG_INFO(0, style)
+                ZEND_ARG_VARIADIC_INFO(0, style)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(format_color_arginfo, 0, 0, 1)