Merge pull request #400 from viest/dev

Library: libxlswirter 1.1.3

Author: viest

.github/workflows/main.yml

@@ -8,7 +8,18 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['8.0']
+        include:
+          - operating-system: 'ubuntu-18.04'
+            php-versions: '7.0'
+          - operating-system: 'ubuntu-18.04'
+            php-versions: '7.1'
+          - operating-system: 'ubuntu-18.04'
+            php-versions: '7.2'
+          - operating-system: 'ubuntu-18.04'
+            php-versions: '7.3'
+          - operating-system: 'ubuntu-18.04'
+            php-versions: '7.4'
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
       - name: Checkout
@@ -21,6 +32,7 @@ jobs:
 
       - name: Setup Dependencies
         run: |
+          sudo apt-get --fix-broken install
           sudo apt-get update
           sudo apt-get install zlib1g-dev valgrind -y
 

config.m4

@@ -49,6 +49,7 @@ if test "$PHP_XLSWRITER" != "no"; then
     library/libxlsxwriter/src/drawing.c \
     library/libxlsxwriter/src/format.c \
     library/libxlsxwriter/src/hash_table.c \
+    library/libxlsxwriter/src/metadata.c \
     library/libxlsxwriter/src/packager.c \
     library/libxlsxwriter/src/relationships.c \
     library/libxlsxwriter/src/shared_strings.c \

config.w32

@@ -58,6 +58,7 @@ if (PHP_XLSWRITER != "no") {
                 drawing.c \
                 format.c \
                 hash_table.c \
+                metadata.c \
                 packager.c \
                 relationships.c \
                 shared_strings.c \

library/libxlsxwriter

@@ -6,14 +6,14 @@ Check for vtiful presence
 <?php
 $config = ['path' => './tests'];
 $excel = new \Vtiful\Kernel\Excel($config);
-$filePath = $excel->fileName('tutorial01.xlsx')
+$filePath = $excel->fileName('005.xlsx')
     ->header(['Item', 'Cost'])
     ->output();
 var_dump($filePath);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
+@unlink(__DIR__ . '/005.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
+string(16) "./tests/005.xlsx"

tests/005.phpt

@@ -6,14 +6,14 @@ Check for vtiful presence
 <?php
 $config = ['path' => './tests'];
 $excel_one  = new \Vtiful\Kernel\Excel($config);
-$fileOne = $excel_one->fileName('tutorial01.xlsx')
+$fileOne = $excel_one->fileName('010-1.xlsx')
     ->header(['test1'])
     ->data([
         ['data1'],
     ])
     ->output();
 $excel_two  = new \Vtiful\Kernel\Excel($config);
-$fileTwo = $excel_two->fileName('tutorial02.xlsx')
+$fileTwo = $excel_two->fileName('010-2.xlsx')
     ->header(['test2'])
     ->data([
         ['data2'],
@@ -23,9 +23,9 @@ var_dump($fileOne,$fileTwo);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
-@unlink(__DIR__ . '/tutorial02.xlsx');
+@unlink(__DIR__ . '/010-1.xlsx');
+@unlink(__DIR__ . '/010-2.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
-string(23) "./tests/tutorial02.xlsx"
+string(18) "./tests/010-1.xlsx"
+string(18) "./tests/010-2.xlsx"

tests/010.phpt

@@ -7,7 +7,7 @@ Check for vtiful presence
 $config = ['path' => './tests'];
 $excel  = new \Vtiful\Kernel\Excel($config);
 
-$fileObject = $excel->fileName('tutorial01.xlsx');
+$fileObject = $excel->fileName('11.xlsx');
 $fileHandle = $fileObject->getHandle();
 
 $format    = new \Vtiful\Kernel\Format($fileHandle);
@@ -22,7 +22,7 @@ var_dump($filePath);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
+@unlink(__DIR__ . '/11.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
+string(15) "./tests/11.xlsx"

tests/011.phpt

@@ -7,7 +7,7 @@ Check for vtiful presence
 $config = ['path' => './tests'];
 $excel  = new \Vtiful\Kernel\Excel($config);
 
-$fileObject = $excel->fileName('tutorial01.xlsx');
+$fileObject = $excel->fileName('12.xlsx');
 $fileHandle = $fileObject->getHandle();
 
 $format    = new \Vtiful\Kernel\Format($fileHandle);
@@ -26,7 +26,7 @@ var_dump($filePath);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
+@unlink(__DIR__ . '/12.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
+string(15) "./tests/12.xlsx"

tests/012.phpt

@@ -7,7 +7,7 @@ Check for vtiful presence
 $config = ['path' => './tests'];
 $excel = new \Vtiful\Kernel\Excel($config);
 
-$textFile = $excel->fileName("tutorial01.xlsx")
+$textFile = $excel->fileName("13.xlsx")
     ->header(['name', 'age']);
 
 for ($index = 0; $index < 10; $index++) {
@@ -21,7 +21,7 @@ var_dump($filePath);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
+@unlink(__DIR__ . '/13.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
+string(15) "./tests/13.xlsx"

tests/013.phpt

@@ -7,7 +7,7 @@ Check for vtiful presence
 $config = ['path' => './tests'];
 $excel = new \Vtiful\Kernel\Excel($config);
 
-$freeFile = $excel->fileName("tutorial01.xlsx")
+$freeFile = $excel->fileName("14.xlsx")
     ->header(['name', 'money']);
 
 for($index = 1; $index < 10; $index++) {
@@ -24,7 +24,7 @@ var_dump($filePath);
 ?>
 --CLEAN--
 <?php
-@unlink(__DIR__ . '/tutorial01.xlsx');
+@unlink(__DIR__ . '/14.xlsx');
 ?>
 --EXPECT--
-string(23) "./tests/tutorial01.xlsx"
+string(15) "./tests/14.xlsx"