Merge pull request #48 from yajra/laravel10

feat: support laravel 10

Author: yajra

.github/workflows/continuous-integration.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 8.0, 8.1]
+        php: [8.1, 8.2]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -42,4 +42,4 @@ jobs:
           command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit

.github/workflows/static-analysis.yml

@@ -51,4 +51,4 @@ jobs:
           command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan --error-format=checkstyle"
+        run: "vendor/bin/phpstan --error-format=github"

.gitignore

@@ -2,3 +2,4 @@
 /coverage
 composer.phar
 composer.lock
+/.phpunit.cache

composer.json

@@ -17,16 +17,16 @@
     }
   ],
   "require": {
-    "php": ">=7.4|8.*",
-    "yajra/laravel-datatables-buttons": "4.*|9.*",
-    "livewire/livewire": "2.*|3.*",
-    "openspout/openspout": "^3",
-    "ext-json": "*"
+    "php": "^8.1",
+    "ext-json": "*",
+    "livewire/livewire": "^2.11.2",
+    "openspout/openspout": "^4.12.1",
+    "phpoffice/phpspreadsheet": "^1.27",
+    "yajra/laravel-datatables": "^10.0"
   },
   "require-dev": {
-    "maatwebsite/excel": "^3.1.40",
-    "nunomaduro/larastan": "^1.0|^2.2",
-    "orchestra/testbench": "6.*|^7.3"
+    "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": "10.0-dev"
     },
     "laravel": {
       "providers": [

phpunit.xml.dist

@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-            <exclude>./tests/views/</exclude>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

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) {
@@ -112,11 +113,13 @@ public function handle()
         }
 
         $columns = $this->getExportableColumns($oTable);
-        $writer->addRow(
-            WriterEntityFactory::createRowFromArray(
-                $columns->map(fn (Column $column) => strip_tags($column->title))->toArray()
-            )
-        );
+        $headers = [];
+
+        $columns->each(function (Column $column) use (&$headers) {
+            $headers[] = strip_tags($column->title);
+        });
+
+        $writer->addRow(Row::fromValues($headers));
 
         if ($this->usesLazyMethod()) {
             $chunkSize = intval(config('datatables-export.chunk', 1000));
@@ -144,7 +147,7 @@ public function handle()
                     $property = $property['_'] ?? $column->name;
                 }
 
-                /** @var array|bool|int|string|null $value */
+                /** @var array|bool|int|string|null|DateTimeInterface $value */
                 $value = $row[$property] ?? '';
 
                 if (is_array($value)) {
@@ -157,14 +160,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 +176,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 +202,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 +274,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'));
         });
     }