feat: [bc] openspout v4

Author: yajra

composer.json

@@ -18,15 +18,15 @@
   ],
   "require": {
     "php": ">=7.4|8.*",
-    "yajra/laravel-datatables-buttons": "4.*|9.*|10.*",
-    "livewire/livewire": "2.*|3.*",
-    "openspout/openspout": "^3",
-    "ext-json": "*"
+    "ext-json": "*",
+    "livewire/livewire": "^2.11.2",
+    "openspout/openspout": "^4.12.1",
+    "phpoffice/phpspreadsheet": "^1.27",
+    "yajra/laravel-datatables-buttons": "10.*"
   },
   "require-dev": {
-    "maatwebsite/excel": "^3.1.47",
-    "nunomaduro/larastan": "^1.0|^2.4.1",
-    "orchestra/testbench": "6.*|^7.3|8.*"
+    "nunomaduro/larastan": "^2.4.1",
+    "orchestra/testbench": "^8.0.1"
   },
   "autoload": {
     "psr-4": {
@@ -45,7 +45,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev"
+      "dev-master": "2.0-dev"
     },
     "laravel": {
       "providers": [

src/Jobs/DataTableExportJob.php

@@ -3,6 +3,7 @@
 namespace Yajra\DataTables\Jobs;
 
 use Carbon\Carbon;
+use DateTimeInterface;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Bus\Batchable;
 use Illuminate\Bus\Queueable;
@@ -20,12 +21,12 @@
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use OpenSpout\Common\Helper\CellTypeHelper;
-use OpenSpout\Common\Type;
-use OpenSpout\Writer\Common\Creator\Style\StyleBuilder;
-use OpenSpout\Writer\Common\Creator\WriterEntityFactory;
+use OpenSpout\Common\Entity\Cell;
+use OpenSpout\Common\Entity\Row;
+use OpenSpout\Common\Entity\Style\Style;
+use OpenSpout\Writer\Common\Creator\WriterFactory;
+use OpenSpout\Writer\XLSX\Helper\DateHelper;
 use OpenSpout\Writer\XLSX\Writer as XLSXWriter;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use Yajra\DataTables\Html\Column;
 use Yajra\DataTables\Services\DataTable;
@@ -95,14 +96,14 @@ public function handle()
         $dataTable = app()->call([$oTable, 'dataTable'], compact('query'));
         $dataTable->skipPaging();
 
-        $exportType = strval(request('exportType'));
+        $exportType = strtolower(strval(request('exportType')));
 
-        $type = Str::startsWith($exportType, Type::CSV) ? Type::CSV : Type::XLSX;
+        $type = Str::startsWith($exportType, 'csv') ? 'csv' : 'xlsx';
         $filename = $this->batchId.'.'.$type;
 
         $path = Storage::disk($this->getDisk())->path($filename);
 
-        $writer = WriterEntityFactory::createWriter($type);
+        $writer = WriterFactory::createFromFile($filename);
         $writer->openToFile($path);
 
         if ($writer instanceof XLSXWriter) {
@@ -113,7 +114,7 @@ public function handle()
 
         $columns = $this->getExportableColumns($oTable);
         $writer->addRow(
-            WriterEntityFactory::createRowFromArray(
+            Row::fromValues(
                 $columns->map(fn (Column $column) => strip_tags($column->title))->toArray()
             )
         );
@@ -157,14 +158,14 @@ public function handle()
                         $format = $column->exportFormat ?? '@';
                         break;
                     case $this->wantsDateFormat($column):
-                        $cellValue = $value ? Date::dateTimeToExcel(Carbon::parse(strval($value))) : '';
+                        $cellValue = $value ? DateHelper::toExcel(Carbon::parse(strval($value))) : '';
                         $format = $column->exportFormat ?? $defaultDateFormat;
                         break;
                     case $this->wantsNumeric($column):
                         $cellValue = floatval($value);
                         $format = $column->exportFormat;
                         break;
-                    case CellTypeHelper::isDateTimeOrDateInterval($value):
+                    case $value instanceof DateTimeInterface:
                         $cellValue = $value;
                         $format = $column->exportFormat ?? $defaultDateFormat;
                         break;
@@ -173,10 +174,10 @@ public function handle()
                         $format = $column->exportFormat ?? NumberFormat::FORMAT_GENERAL;
                 }
 
-                $cells[] = WriterEntityFactory::createCell($cellValue, (new StyleBuilder)->setFormat($format)->build());
+                $cells[] = Cell::fromValue($cellValue, (new Style)->setFormat($format));
             });
 
-            $writer->addRow(WriterEntityFactory::createRow($cells));
+            $writer->addRow(new Row($cells));
         }
 
         $writer->close();
@@ -199,14 +200,6 @@ protected function getDisk(): string
         return strval(config('datatables-export.disk', 'local'));
     }
 
-    /**
-     * @return string
-     */
-    protected function getS3Disk(): string
-    {
-        return strval(config('datatables-export.s3_disk', ''));
-    }
-
     /**
      * @param  \Yajra\DataTables\Services\DataTable  $dataTable
      * @return \Illuminate\Support\Collection<array-key, Column>
@@ -279,15 +272,23 @@ protected function isNumeric($value): bool
     }
 
     /**
-     * @param array $data
+     * @return string
+     */
+    protected function getS3Disk(): string
+    {
+        return strval(config('datatables-export.s3_disk', ''));
+    }
+
+    /**
+     * @param  array  $data
      * @return void
      */
     public function sendResults(array $data): void
     {
         Mail::send('datatables-export::export-email', $data, function ($message) use ($data) {
             $message->attach($data['path']);
             $message->to($data['email'])
-                ->subject('Export Report');
+                    ->subject('Export Report');
             $message->from(config('datatables-export.mail_from'));
         });
     }