Merge pull request #16 from luyadev/xlsx-test

add test
luyadev · Jan 25, 2023 · 19fb23f · 19fb23f
2 parents c709157 + 24f5bea
commit 19fb23f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -81,7 +81,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       ## checkout the repoistory 
@@ -104,7 +104,7 @@ jobs:
       ## run unit tests
       - name: PHP Unit tests for PHP 
         run: vendor/bin/phpunit --verbose --configuration actions.phpunit.xml
-        if: matrix.php == '7.2' || matrix.php == '7.3' || matrix.php == '8.1' || matrix.php == '8.0'
+        if: matrix.php == '7.2' || matrix.php == '7.3' || matrix.php == '8.0' || matrix.php == '8.1' || matrix.php == '8.2'
 
       ## unit test with coverage
       - name: PHP Unit tests for PHP 7.4 Coverage

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.4.2 (25. January 2022)
+
++ [#16](https://github.com/luyadev/yii-helpers/pull/16) Fix PHP 8.1 compatibility bug in `ExportHelper::xlsx()`.
+
 ## 1.4.1 (18. January 2022)
 
-+ [#15](https://github.com/luyadev/yii-helpers/pull/15) Fix PHP 8.1 compatibility bug in `ArrayHelper::searchColumns()`
++ [#15](https://github.com/luyadev/yii-helpers/pull/15) Fix PHP 8.1 compatibility bug in `ArrayHelper::searchColumns()`.
 
 ## 1.4.0 (20. October 2022)
 

diff --git a/src/helpers/XLSXWriter.php b/src/helpers/XLSXWriter.php
@@ -899,7 +899,7 @@ public static function xmlspecialchars($val)
         static $badchars = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f";
         static $goodchars = "                              ";
         return strtr(
-            htmlspecialchars($val, ENT_QUOTES | ENT_XML1),
+            htmlspecialchars((string) $val, ENT_QUOTES | ENT_XML1),
             $badchars,
             $goodchars
         );//strtr appears to be faster than str_replace

diff --git a/tests/helpers/ExportHelperTest.php b/tests/helpers/ExportHelperTest.php
@@ -142,4 +142,30 @@ public function testSpecialCharsEncoding()
 
         $this->assertSameTrimmed('"&","\'","a""b""c" "nix","nix","\'=1+2"";=1+2"', $content);
     }
+
+    public function testXlsPhp81()
+    {
+        $data = [
+            [
+                'Datum' => '20.01.2023, 10:52:52',
+                'Sprache' => 'de',
+                'name' => 'TEST',
+                'visit' => 'Sehr gut',
+                'happiness' => 'Ja',
+                'fragen' => '',
+                'datenschutz' => 'Ja',
+            ],
+            [
+                'Datum' => '13.11.2022, 13:36:56',
+                'Sprache' => 'de',
+                'name' => 'TEST',
+                'visit' => 'Sehr gut',
+                'happiness' => 'Ja',
+                'fragen' => '',
+                'datenschutz' => 'Ja',
+            ],
+        ];
+
+        $this->assertNotEmpty(ExportHelper::xlsx($data, [], true, ['sort' => false]));
+    }
 }