Change: data type

viest · Jan 1, 2021 · d3ebbc3 · d3ebbc3
1 parent a8ac46d
commit d3ebbc3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/tests/open_xlsx_global_data_type.phpt b/tests/open_xlsx_global_data_type.phpt
@@ -19,8 +19,7 @@ $filePath = $excel->fileName('tutorial.xlsx')
 $excel->openFile('tutorial.xlsx')
     ->setGlobalType(\Vtiful\Kernel\Excel::TYPE_DOUBLE)
     ->nextCellCallback(function ($row, $cell, $data) {
-        echo 'cell:' . $cell . ', row:' . $row . PHP_EOL;
-        var_dump($data);
+        echo 'cell:' . $cell . ', row:' . $row .', data type:' . gettype($data) . PHP_EOL;
     });
 
 echo '----------------' . PHP_EOL;
@@ -48,26 +47,16 @@ var_dump($excel->nextRow());
 @unlink(__DIR__ . '/tutorial.xlsx');
 ?>
 --EXPECT--
-cell:0, row:0
-string(4) "Item"
-cell:1, row:0
-string(4) "Cost"
-cell:2, row:0
-string(3) "Int"
-cell:3, row:0
-string(6) "Double"
-cell:3, row:0
-string(12) "XLSX_ROW_END"
-cell:0, row:1
-string(6) "Item_1"
-cell:1, row:1
-string(6) "Cost_1"
-cell:2, row:1
-float(10)
-cell:3, row:1
-float(10.9999995)
-cell:3, row:1
-string(12) "XLSX_ROW_END"
+cell:0, row:0, data type:string
+cell:1, row:0, data type:string
+cell:2, row:0, data type:string
+cell:3, row:0, data type:string
+cell:3, row:0, data type:string
+cell:0, row:1, data type:string
+cell:1, row:1, data type:string
+cell:2, row:1, data type:double
+cell:3, row:1, data type:double
+cell:3, row:1, data type:string
 ----------------
 array(2) {
   [0]=>

diff --git a/tests/open_xlsx_next_cell_callback_with_data_type.phpt b/tests/open_xlsx_next_cell_callback_with_data_type.phpt
@@ -26,36 +26,23 @@ $excel->openFile('tutorial.xlsx')
         \Vtiful\Kernel\Excel::TYPE_TIMESTAMP,
     ])
     ->nextCellCallback(function ($row, $cell, $data) {
-        echo 'cell:' . $cell . ', row:' . $row . PHP_EOL;
-        var_dump($data);
+        echo 'cell:' . $cell . ', row:' . $row .', data type:' . gettype($data) . PHP_EOL;
     });
 ?>
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/tutorial.xlsx');
 ?>
 --EXPECT--
-cell:0, row:0
-string(4) "Item"
-cell:1, row:0
-string(4) "Cost"
-cell:2, row:0
-string(3) "Int"
-cell:3, row:0
-string(6) "Double"
-cell:4, row:0
-string(4) "Date"
-cell:4, row:0
-string(12) "XLSX_ROW_END"
-cell:0, row:1
-string(6) "Item_1"
-cell:1, row:1
-string(6) "Cost_1"
-cell:2, row:1
-int(10)
-cell:3, row:1
-float(10.9999995)
-cell:4, row:1
-int(1568904314)
-cell:4, row:1
-string(12) "XLSX_ROW_END"
+cell:0, row:0, data type:string
+cell:1, row:0, data type:string
+cell:2, row:0, data type:string
+cell:3, row:0, data type:string
+cell:4, row:0, data type:string
+cell:4, row:0, data type:string
+cell:0, row:1, data type:string
+cell:1, row:1, data type:string
+cell:2, row:1, data type:integer
+cell:3, row:1, data type:double
+cell:4, row:1, data type:integer
+cell:4, row:1, data type:string