From 9f2c7e3dc3435988d391dc540c8133609d87082d Mon Sep 17 00:00:00 2001
From: Jack Webb-Heller <jack@jackwebbheller.com>
Date: Tue, 17 May 2022 20:44:18 +0100
Subject: [PATCH 1/4] Fix PHP 8.1 compatibility errors with JavascriptDate and
 Carbon constructors

---
 src/Support/JavascriptDate.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Support/JavascriptDate.php b/src/Support/JavascriptDate.php
index 2f7cce49..6bdb079a 100644
--- a/src/Support/JavascriptDate.php
+++ b/src/Support/JavascriptDate.php
@@ -9,9 +9,8 @@ class JavascriptDate extends Carbon
     /**
      * JavascriptDate constructor.
      */
-    public function __construct()
+    public function __construct($time = null, $tz = null)
     {
-        $tz   = null;
         $hour = null;
         $args = func_get_args();
 
@@ -41,7 +40,7 @@ public function __construct()
             $second = isset($args[5]) ? $args[5] : 0;
         }
 
-        return parent::__construct(sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
+        parent::__construct(sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
     }
 
 }

From ac7a5605c9c95a51bd07e0371b2b7418fc3dfbba Mon Sep 17 00:00:00 2001
From: Jack Webb-Heller <jack@jackwebbheller.com>
Date: Tue, 17 May 2022 20:46:11 +0100
Subject: [PATCH 2/4] Updated changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72b1cfad..f3cc1bad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- 3.1.10
+  - Fixed PHP 8.1 compatibility issues between `JavascriptDate` and `Carbon`, which may cause opcache compilation failures. 
+
 - 3.1.9
   - Fixing bug where using `setOptions` instead of the constructor skipped the processing of `png` and `material` attributes.
 
@@ -126,7 +129,7 @@
       - Called after all of the google jsapi is loaded and the charts are rendered.
 
 - 2.5.7
- - AJAX data loading bugfixes
+- AJAX data loading bugfixes
 
 - 2.5.6
   - Fixes for AJAX chart loading

From ae0523cb242c776fa23dfb585751f2c50eb9add3 Mon Sep 17 00:00:00 2001
From: Jack Webb-Heller <jack@jackwebbheller.com>
Date: Tue, 17 May 2022 20:47:50 +0100
Subject: [PATCH 3/4] Corrected version number

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3cc1bad..be18225b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-- 3.1.10
+- 3.1.15
   - Fixed PHP 8.1 compatibility issues between `JavascriptDate` and `Carbon`, which may cause opcache compilation failures. 
 
 - 3.1.9

From 510cdf1305e4a7faf62604ac767615e59046898e Mon Sep 17 00:00:00 2001
From: Jack Webb-Heller <JackWH@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:57:42 +0100
Subject: [PATCH 4/4] Fix deprecated creation of dynamic property

---
 src/Laravel/LavachartsServiceProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Laravel/LavachartsServiceProvider.php b/src/Laravel/LavachartsServiceProvider.php
index 8e511dd4..0fcfcc8c 100644
--- a/src/Laravel/LavachartsServiceProvider.php
+++ b/src/Laravel/LavachartsServiceProvider.php
@@ -25,6 +25,7 @@ class LavachartsServiceProvider extends ServiceProvider
 {
     protected $defer = true;
 
+    private string $configPath;
     private $configFile = 'lavacharts.php';
 
     /**