Upgrade to PHPSpreadsheet & replace depricated function & prevent nul…

…l since HTMLHelper does not support it anymore (#330)
omines · Feb 24, 2024 · 3ef3fcf · 3ef3fcf
1 parent 2c41aae
commit 3ef3fcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "friendsofphp/php-cs-fixer": "^v3.40.0",
         "mongodb/mongodb": "^1.17",
         "ocramius/package-versions": "^2.8",
-        "phpoffice/phpspreadsheet": "^1.29.0",
+        "phpoffice/phpspreadsheet": "^2.0",
         "phpstan/extension-installer": "^1.3.1",
         "phpstan/phpstan": "^1.10.55",
         "phpstan/phpstan-doctrine": "^1.3.54",

diff --git a/src/Exporter/Excel/ExcelExporter.php b/src/Exporter/Excel/ExcelExporter.php
@@ -13,6 +13,7 @@
 namespace Omines\DataTablesBundle\Exporter\Excel;
 
 use Omines\DataTablesBundle\Exporter\DataTableExporterInterface;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Helper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -42,7 +43,7 @@ public function export(array $columnNames, \Iterator $data): \SplFileInfo
         foreach ($data as $row) {
             $colIndex = 1;
             foreach ($row as $value) {
-                $sheet->setCellValueByColumnAndRow($colIndex++, $rowIndex, $htmlHelper->toRichTextObject($value));
+                $sheet->getCell(CellAddress::fromColumnAndRow($colIndex++, $rowIndex))->setValue($htmlHelper->toRichTextObject($value ?? ''));
             }
             ++$rowIndex;
         }