Merge pull request #435 from viest/dev

Dev

Author: viest

kernel/excel.c

@@ -637,6 +637,10 @@ PHP_METHOD(vtiful_xls, data)
     WORKBOOK_NOT_INITIALIZED(obj);
 
     ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), data_r_value)
+        if (Z_TYPE_P(data_r_value) == IS_REFERENCE) {
+            data_r_value = Z_REFVAL_P(data_r_value);
+        }
+
         if(Z_TYPE_P(data_r_value) != IS_ARRAY) {
             continue;
         }

kernel/help.c

@@ -38,6 +38,7 @@ zend_long date_double_to_timestamp(double value) {
     }
     smart_str_append_long(&_modify_arg_string, days);
     smart_str_appendl(&_modify_arg_string, " days", 5);
+    ZSTR_VAL(_modify_arg_string.s)[ZSTR_LEN(_modify_arg_string.s)] = '\0';
     ZVAL_STR(&_modify_args[0], _modify_arg_string.s);
     call_object_method(&datetime, "modify", 1, _modify_args, &_modify_result);
     zval_ptr_dtor(&datetime);

tests/data_reference.phpt

@@ -0,0 +1,60 @@
+--TEST--
+Check for vtiful presence
+--SKIPIF--
+<?php
+require __DIR__ . '/include/skipif.inc';
+skip_disable_reader();
+?>
+--FILE--
+<?php
+$data = [
+    [23],
+    [21],
+    [21],
+    [21],
+];
+
+foreach($data as &$line) {
+    $line[0]++;
+}
+
+$excel = new \Vtiful\Kernel\Excel([
+    'path' => './tests',
+]);
+
+$fileObject = $excel->constMemory('data_reference.xlsx', NULL, false);
+$fileHandle = $fileObject->getHandle();
+
+$path = $fileObject->header(['age'])
+    ->data($data)
+    ->output();
+
+$excel->openFile('data_reference.xlsx')
+    ->openSheet();
+
+var_dump($excel->nextRow());
+var_dump($excel->nextRow());
+var_dump($excel->nextRow());
+var_dump($excel->nextRow());
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/data_reference.xlsx');
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  string(3) "age"
+}
+array(1) {
+  [0]=>
+  int(24)
+}
+array(1) {
+  [0]=>
+  int(22)
+}
+array(1) {
+  [0]=>
+  int(22)
+}