From 01cda536479c487c49974a1aebb9434feffddf65 Mon Sep 17 00:00:00 2001 From: Arjay Angeles Date: Mon, 2 Sep 2024 13:43:58 +0800 Subject: [PATCH 1/2] fix: CVE-2024-45046 --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index c79713e..43ab631 100644 --- a/composer.json +++ b/composer.json @@ -19,18 +19,18 @@ "require": { "php": "^8.2", "ext-json": "*", - "livewire/livewire": "^2.11.2|^3.4.12", - "openspout/openspout": "^4.24.1", - "phpoffice/phpspreadsheet": "^1.29", + "livewire/livewire": "^2.11.2|^3.5.6", + "openspout/openspout": "^4.24.5", + "phpoffice/phpspreadsheet": "2.2.1", "yajra/laravel-datatables-buttons": "^11.0" }, "require-dev": { - "larastan/larastan": "^2.9.6", - "orchestra/testbench": "^9.0.4", - "pestphp/pest": "^2.34.7", + "larastan/larastan": "^2.9.8", + "orchestra/testbench": "^9.4.0", + "pestphp/pest": "^2.35.1", "pestphp/pest-plugin-laravel": "^2.4", - "laravel/pint": "^1.15.3", - "rector/rector": "^1.1" + "laravel/pint": "^1.17.2", + "rector/rector": "^1.2.4" }, "autoload": { "psr-4": { From 0b76d534629a567a29a18dfa11df5c17277e2c31 Mon Sep 17 00:00:00 2001 From: Arjay Angeles Date: Mon, 2 Sep 2024 13:49:44 +0800 Subject: [PATCH 2/2] fix: date formats --- src/config/datatables-export.php | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/config/datatables-export.php b/src/config/datatables-export.php index 61014fe..87e77c7 100644 --- a/src/config/datatables-export.php +++ b/src/config/datatables-export.php @@ -78,27 +78,8 @@ */ 'date_formats' => [ 'mm/dd/yyyy', - NumberFormat::FORMAT_DATE_DATETIME, - NumberFormat::FORMAT_DATE_YYYYMMDD, - NumberFormat::FORMAT_DATE_XLSX22, - NumberFormat::FORMAT_DATE_DDMMYYYY, - NumberFormat::FORMAT_DATE_DMMINUS, - NumberFormat::FORMAT_DATE_DMYMINUS, - NumberFormat::FORMAT_DATE_DMYSLASH, - NumberFormat::FORMAT_DATE_MYMINUS, - NumberFormat::FORMAT_DATE_TIME1, - NumberFormat::FORMAT_DATE_TIME2, - NumberFormat::FORMAT_DATE_TIME3, - NumberFormat::FORMAT_DATE_TIME4, - NumberFormat::FORMAT_DATE_TIME5, - NumberFormat::FORMAT_DATE_TIME6, - NumberFormat::FORMAT_DATE_TIME7, - NumberFormat::FORMAT_DATE_XLSX14, - NumberFormat::FORMAT_DATE_XLSX15, - NumberFormat::FORMAT_DATE_XLSX16, - NumberFormat::FORMAT_DATE_XLSX17, - NumberFormat::FORMAT_DATE_YYYYMMDD2, - NumberFormat::FORMAT_DATE_YYYYMMDDSLASH, + ...NumberFormat::DATE_TIME_OR_DATETIME_ARRAY, + ...NumberFormat::TIME_OR_DATETIME_ARRAY, ], /* @@ -110,9 +91,8 @@ | */ 'text_formats' => [ - '@', - NumberFormat::FORMAT_GENERAL, NumberFormat::FORMAT_TEXT, + NumberFormat::FORMAT_GENERAL, ], /*