From f52e7ae50ec05ed3eccf01dc197ea54d5d86166c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 14:48:53 +0000
Subject: [PATCH 01/74] Update slevomat/coding-standard requirement from ^6.4
 to ^7.0

Updates the requirements on [slevomat/coding-standard](https://github.com/slevomat/coding-standard) to permit the latest version.
- [Release notes](https://github.com/slevomat/coding-standard/releases)
- [Commits](https://github.com/slevomat/coding-standard/compare/6.4.0...7.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c35e30f..73e2ed5 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "php-coveralls/php-coveralls" : "^2.2",
         "phpmd/phpmd": "^2.7",
         "phpunit/phpunit": "^9.0",
-        "slevomat/coding-standard": "^6.4",
+        "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.4",
         "symfony/thanks": "^1.2",
         "laravel/legacy-factories": "^1.0"

From 20410c37d575572a3822345f87b76bd13bef867e Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 9 Feb 2022 13:24:59 -0700
Subject: [PATCH 02/74] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index abc66d0..86d8635 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,10 @@
 ## Supporting This Package
 This is an MIT-licensed open source project with its ongoing development made possible by the support of the community. If you'd like to support this, and our other packages, please consider [becoming a sponsor](https://github.com/sponsors/mikebronner).
 
+We thank the following sponsors for their generosity, please take a moment to check them out:
+
+- [LIX](https://lix-it.com)
+
 ## Impetus
 I created this package in response to a client project that had complex, nested
 forms with many `<select>`'s that resulted in over 700 database queries on one

From bf1856dc57f2ea24144487a485672be731ae9260 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 9 Feb 2022 20:41:59 +0000
Subject: [PATCH 03/74] Brought tests to green.

---
 .github/workflows/laravel.yml                 |  2 +-
 composer.json                                 | 42 +++++++++++--------
 tests/Feature/PaginationTest.php              |  6 +--
 .../CachedBuilder/PaginateTest.php            |  6 +--
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 43663e4..4db00ff 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [7.4, 8.0, 8.1]
 
     name: PHP ${{ matrix.php }}
 
diff --git a/composer.json b/composer.json
index c35e30f..e93821d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,29 +15,29 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "genealabs/laravel-pivot-events": "^8.0",
-        "illuminate/cache": "^8.0",
-        "illuminate/config": "^8.0",
-        "illuminate/console": "^8.0",
-        "illuminate/container": "^8.0",
-        "illuminate/database": "^8.0",
-        "illuminate/http": "^8.0",
-        "illuminate/support": "^8.0"
+        "php": "^7.4|^8.0",
+        "genealabs/laravel-pivot-events": "^9.0",
+        "illuminate/cache": "^9.0",
+        "illuminate/config": "^9.0",
+        "illuminate/console": "^9.0",
+        "illuminate/container": "^9.0",
+        "illuminate/database": "^9.0",
+        "illuminate/http": "^9.0",
+        "illuminate/support": "^9.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.10",
+        "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^3.9",
-        "orchestra/testbench-browser-kit": "^6.0",
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench-browser-kit": "^7.0",
+        "orchestra/testbench": "^7.0",
         "php-coveralls/php-coveralls" : "^2.2",
-        "phpmd/phpmd": "^2.7",
-        "phpunit/phpunit": "^9.0",
-        "slevomat/coding-standard": "^6.4",
-        "squizlabs/php_codesniffer": "^3.4",
+        "phpmd/phpmd": "^2.11",
+        "phpunit/phpunit": "^9.5",
+        "slevomat/coding-standard": "^7.0",
+        "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",
-        "laravel/legacy-factories": "^1.0"
+        "laravel/legacy-factories": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -61,5 +61,11 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "symfony/thanks": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }
diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php
index ca0215e..b122b23 100644
--- a/tests/Feature/PaginationTest.php
+++ b/tests/Feature/PaginationTest.php
@@ -8,7 +8,7 @@ class PaginationTest extends FeatureTestCase
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -40,7 +40,7 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
     public function testAdvancedPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -63,7 +63,7 @@ public function testAdvancedPagination()
     public function testCustomPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php
index 3c2fe26..8f24ebb 100644
--- a/tests/Integration/CachedBuilder/PaginateTest.php
+++ b/tests/Integration/CachedBuilder/PaginateTest.php
@@ -36,7 +36,7 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -71,7 +71,7 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -106,7 +106,7 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^(8\.)/", app()->version())) {
+        if (preg_match("/^([8|9]\.)/", app()->version())) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';

From b25f7573a6b1456ca8c6dde004f302446cc59c29 Mon Sep 17 00:00:00 2001
From: Abraham Arango <skat_et_dieu@yahoo.com>
Date: Thu, 17 Feb 2022 19:18:46 -0500
Subject: [PATCH 04/74] Support for full text search

Recently Laravel added support for full-text search where clauses in the query builder.
https://laravel.com/docs/9.x/queries#full-text-where-clauses

Looks like using that functionality with this package throws an error in line 240 of CacheKey.php because it didn't properly handle that where clause.

This pull request makes a few changes to support full-text where clauses.
---
 src/CacheKey.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 441d002..ef9aaf2 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -177,7 +177,11 @@ protected function getOtherClauses(array $where) : string
         $value = $this->getTypeClause($where);
         $value .= $this->getValuesClause($where);
 
-        return "-{$where["column"]}_{$value}";
+        $column = "";
+        $column .= isset($where["column"]) ? $where["column"] : "";
+        $column .= isset($where["columns"]) ? implode("-", $where["columns"]) : "";
+
+        return "-{$column}_{$value}";
     }
 
     protected function getQueryColumns(array $columns) : string
@@ -231,7 +235,7 @@ protected function getTableSlug() : string
 
     protected function getTypeClause($where) : string
     {
-        $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains"])
+        $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains", "Fulltext"])
             ? strtolower($where["type"])
             : strtolower($where["operator"]);
 

From d36fef9befeb97f237c352079e55a645a0f4b938 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Fri, 18 Feb 2022 08:03:07 -0700
Subject: [PATCH 05/74] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e93821d..d60aea8 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "genealabs/laravel-pivot-events": "^9.0",
         "illuminate/cache": "^9.0",
         "illuminate/config": "^9.0",

From 01be31956ef9eb75fb13f83c31640fc5a2237bf8 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Fri, 18 Feb 2022 08:03:34 -0700
Subject: [PATCH 06/74] Update laravel.yml

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 4db00ff..3b751da 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 8.0, 8.1]
+        php: [8.0, 8.1]
 
     name: PHP ${{ matrix.php }}
 

From 9d78ca345aa9972cd36842995b8903767ab7559c Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Fri, 25 Feb 2022 14:14:44 -0600
Subject: [PATCH 07/74] Override withoutGlobalScopes

---
 src/CacheKey.php              | 12 +++++++++++-
 src/Traits/BuilderCaching.php | 12 ++++++++++++
 src/Traits/Caching.php        |  4 +++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index ef9aaf2..5aaeeaa 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -16,17 +16,23 @@ class CacheKey
     protected $macroKey;
     protected $model;
     protected $query;
+    protected $withoutScopes = [];
+    protected $withoutAllScopes = false;
 
     public function __construct(
         array $eagerLoad,
         $model,
         $query,
-        $macroKey
+        $macroKey,
+        $withoutScopes,
+        $withoutAllScopes
     ) {
         $this->eagerLoad = $eagerLoad;
         $this->macroKey = $macroKey;
         $this->model = $model;
         $this->query = $query;
+        $this->withoutScopes = $withoutScopes;
+        $this->withoutAllScopes = $withoutAllScopes;
     }
 
     public function make(
@@ -57,6 +63,10 @@ protected function getBindingsSlug() : string
             return '';
         }
 
+        if ($this->withoutAllScopes || ($this->withoutScopes != null && count($this->withoutScopes) == 0)) {
+            return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutScopes)->getBindings());
+        }
+
         return Arr::query($this->model->query()->getBindings());
     }
 
diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index 7ef35c1..d5b595c 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -21,4 +21,16 @@ public function truncate()
 
         return parent::truncate();
     }
+
+    public function withoutGlobalScopes(array $scopes = null)
+    {
+        $this->scopesAreApplied = true;
+        $this->withoutScopes = $scopes;
+
+        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+            $this->withoutAllScopes = true;
+        }
+
+        return parent::withoutGlobalScopes($scopes);
+    }
 }
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index e061b83..41ff2b6 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -16,6 +16,8 @@ trait Caching
     protected $isCachable = true;
     protected $scopesAreApplied = false;
     protected $macroKey = "";
+    protected $withoutScopes = null;
+    protected $withoutAllScopes = false;
 
     public function __call($method, $parameters)
     {
@@ -166,7 +168,7 @@ protected function makeCacheKey(
             $query = $this->query->getQuery();
         }
 
-        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey))
+        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutScopes, $this->withoutAllScopes))
             ->make($columns, $idColumn, $keyDifferentiator);
     }
 

From a28c0bf2e7fc65cb2fb3b0827e1ff5b9843e7b5b Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Mon, 28 Feb 2022 11:30:41 -0600
Subject: [PATCH 08/74] Move withoutGlobalScopes

---
 src/Traits/BuilderCaching.php | 12 ------------
 src/Traits/Caching.php        | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index d5b595c..7ef35c1 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -21,16 +21,4 @@ public function truncate()
 
         return parent::truncate();
     }
-
-    public function withoutGlobalScopes(array $scopes = null)
-    {
-        $this->scopesAreApplied = true;
-        $this->withoutScopes = $scopes;
-
-        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
-            $this->withoutAllScopes = true;
-        }
-
-        return parent::withoutGlobalScopes($scopes);
-    }
 }
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index 41ff2b6..5e7800a 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -43,6 +43,31 @@ public function applyScopes()
         return parent::applyScopes();
     }
 
+    public function withoutGlobalScope($scope)
+    {
+        $this->scopesAreApplied = true;
+        if ($this->withoutScopes == null) {
+            $this->withoutScopes = [];
+        }
+
+        array_push($this->withoutScopes[], $scope);
+        $this->withoutAllScopes = false;
+
+        return parent::withoutGlobalScope($scope);
+    }
+
+    public function withoutGlobalScopes(array $scopes = null)
+    {
+        $this->scopesAreApplied = true;
+        $this->withoutScopes = $scopes;
+
+        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+            $this->withoutAllScopes = true;
+        }
+
+        return parent::withoutGlobalScopes($scopes);
+    }
+
     protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")

From c6e87852218360d204fa8b26241d5e863ddcc9f3 Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Tue, 1 Mar 2022 13:26:57 -0600
Subject: [PATCH 09/74] Move withoutGlobalScopes to BuilderCaching

---
 src/Traits/BuilderCaching.php | 23 +++++++++++++++++++++++
 src/Traits/Caching.php        | 28 ++--------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index 7ef35c1..f78d147 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -21,4 +21,27 @@ public function truncate()
 
         return parent::truncate();
     }
+
+    public function withoutGlobalScope($scope)
+    {
+        if ($this->withoutScopes == null) {
+            $this->withoutScopes = [];
+        }
+
+        array_push($this->withoutScopes, $scope);
+
+        return parent::withoutGlobalScope($scope);
+    }
+
+    public function withoutGlobalScopes(array $scopes = null)
+    {
+        $this->withoutScopes = $scopes;
+
+        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+            $this->withoutAllScopes = true;
+        }
+
+        return parent::withoutGlobalScopes($scopes);
+    }
+
 }
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index 5e7800a..dad66e5 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -43,41 +43,17 @@ public function applyScopes()
         return parent::applyScopes();
     }
 
-    public function withoutGlobalScope($scope)
-    {
-        $this->scopesAreApplied = true;
-        if ($this->withoutScopes == null) {
-            $this->withoutScopes = [];
-        }
-
-        array_push($this->withoutScopes[], $scope);
-        $this->withoutAllScopes = false;
-
-        return parent::withoutGlobalScope($scope);
-    }
-
-    public function withoutGlobalScopes(array $scopes = null)
-    {
-        $this->scopesAreApplied = true;
-        $this->withoutScopes = $scopes;
-
-        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
-            $this->withoutAllScopes = true;
-        }
-
-        return parent::withoutGlobalScopes($scopes);
-    }
-
     protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")
             || $this->scopesAreApplied
+            || $this->withoutAllScopes
         ) {
             return;
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier])) {
+            if (! isset($this->scopes[$identifier]) || isset($this->withoutScopes[$identifier])) {
                 continue;
             }
 

From 832a3daa6b8419172d14fa77cf2673dc9b11f32a Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Thu, 3 Mar 2022 08:48:12 -0600
Subject: [PATCH 10/74] testWithoutGlobalScopes

---
 src/CacheKey.php                              |  2 +-
 src/Traits/Caching.php                        |  2 +-
 tests/Integration/CachedBuilder/ScopeTest.php | 26 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 5aaeeaa..cb3d2d4 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -24,7 +24,7 @@ public function __construct(
         $model,
         $query,
         $macroKey,
-        $withoutScopes,
+        array $withoutScopes,
         $withoutAllScopes
     ) {
         $this->eagerLoad = $eagerLoad;
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index dad66e5..a5a9403 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -16,7 +16,7 @@ trait Caching
     protected $isCachable = true;
     protected $scopesAreApplied = false;
     protected $macroKey = "";
-    protected $withoutScopes = null;
+    protected $withoutScopes = [];
     protected $withoutAllScopes = false;
 
     public function __call($method, $parameters)
diff --git a/tests/Integration/CachedBuilder/ScopeTest.php b/tests/Integration/CachedBuilder/ScopeTest.php
index 30096f3..9796b72 100644
--- a/tests/Integration/CachedBuilder/ScopeTest.php
+++ b/tests/Integration/CachedBuilder/ScopeTest.php
@@ -156,6 +156,32 @@ public function testGlobalScopesWhenSwitchingContextUsingGetMethod()
         $this->assertEquals("B", $authorsB->first());
     }
 
+    public function testWithoutGlobalScopes()
+    {
+        factory(Author::class, 200)->create();
+        $user = factory(User::class)->create(["name" => "Andrew Junior"]);
+        $this->actingAs($user);
+        $authorsA = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScopes()
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+        $user = factory(User::class)->create(["name" => "Barry Barry Barry"]);
+        $this->actingAs($user);
+        $authorsB = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScopes()
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+
+        $this->assertGreaterThan(1, count($authorsA));
+        $this->assertGreaterThan(1, count($authorsB));
+    }
+
     public function testLocalScopesInRelationship()
     {
         $first = "A";

From 1f524a6d02cb59eb02f39e5002e713f1128b1412 Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Thu, 3 Mar 2022 09:50:55 -0600
Subject: [PATCH 11/74] Add unit test for testWithoutGlobalScope

---
 src/CacheKey.php                              |  6 +++-
 src/Traits/BuilderCaching.php                 |  8 ++----
 tests/Integration/CachedBuilder/ScopeTest.php | 28 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index cb3d2d4..a6b7e86 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -63,7 +63,11 @@ protected function getBindingsSlug() : string
             return '';
         }
 
-        if ($this->withoutAllScopes || ($this->withoutScopes != null && count($this->withoutScopes) == 0)) {
+        if ($this->withoutAllScopes) {
+            return Arr::query($this->model->query()->withoutGlobalScopes()->getBindings());
+        }
+
+        if (count($this->withoutScopes) > 0) {
             return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutScopes)->getBindings());
         }
 
diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index f78d147..4e1459b 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -24,10 +24,6 @@ public function truncate()
 
     public function withoutGlobalScope($scope)
     {
-        if ($this->withoutScopes == null) {
-            $this->withoutScopes = [];
-        }
-
         array_push($this->withoutScopes, $scope);
 
         return parent::withoutGlobalScope($scope);
@@ -35,7 +31,9 @@ public function withoutGlobalScope($scope)
 
     public function withoutGlobalScopes(array $scopes = null)
     {
-        $this->withoutScopes = $scopes;
+        if ($scopes != null) {
+            $this->withoutScopes = $scopes;
+        }
 
         if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
             $this->withoutAllScopes = true;
diff --git a/tests/Integration/CachedBuilder/ScopeTest.php b/tests/Integration/CachedBuilder/ScopeTest.php
index 9796b72..9f71d7f 100644
--- a/tests/Integration/CachedBuilder/ScopeTest.php
+++ b/tests/Integration/CachedBuilder/ScopeTest.php
@@ -171,7 +171,33 @@ public function testWithoutGlobalScopes()
         $user = factory(User::class)->create(["name" => "Barry Barry Barry"]);
         $this->actingAs($user);
         $authorsB = (new AuthorBeginsWithScoped)
-            ->withoutGlobalScopes()
+            ->withoutGlobalScopes(['GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith'])
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+
+        $this->assertGreaterThan(1, count($authorsA));
+        $this->assertGreaterThan(1, count($authorsB));
+    }
+
+    public function testWithoutGlobalScope()
+    {
+        factory(Author::class, 200)->create();
+        $user = factory(User::class)->create(["name" => "Andrew Junior"]);
+        $this->actingAs($user);
+        $authorsA = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+        $user = factory(User::class)->create(["name" => "Barry Barry Barry"]);
+        $this->actingAs($user);
+        $authorsB = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
             ->get()
             ->map(function ($author) {
                 return (new Str)->substr($author->name, 0, 1);

From 6089d003e4d013ad34084c132caee6e068dd3f62 Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Thu, 3 Mar 2022 10:21:52 -0600
Subject: [PATCH 12/74] Rename withoutScopes and withoutAllScopes

---
 src/CacheKey.php              | 18 +++++++++---------
 src/Traits/BuilderCaching.php |  6 +++---
 src/Traits/Caching.php        | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index a6b7e86..13ddfa1 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -16,23 +16,23 @@ class CacheKey
     protected $macroKey;
     protected $model;
     protected $query;
-    protected $withoutScopes = [];
-    protected $withoutAllScopes = false;
+    protected $withoutGlobalScopes = [];
+    protected $withoutAllGlobalScopes = false;
 
     public function __construct(
         array $eagerLoad,
         $model,
         $query,
         $macroKey,
-        array $withoutScopes,
-        $withoutAllScopes
+        array $withoutGlobalScopes,
+        $withoutAllGlobalScopes
     ) {
         $this->eagerLoad = $eagerLoad;
         $this->macroKey = $macroKey;
         $this->model = $model;
         $this->query = $query;
-        $this->withoutScopes = $withoutScopes;
-        $this->withoutAllScopes = $withoutAllScopes;
+        $this->withoutGlobalScopes = $withoutGlobalScopes;
+        $this->withoutAllGlobalScopes = $withoutAllGlobalScopes;
     }
 
     public function make(
@@ -63,12 +63,12 @@ protected function getBindingsSlug() : string
             return '';
         }
 
-        if ($this->withoutAllScopes) {
+        if ($this->withoutAllGlobalScopes) {
             return Arr::query($this->model->query()->withoutGlobalScopes()->getBindings());
         }
 
-        if (count($this->withoutScopes) > 0) {
-            return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutScopes)->getBindings());
+        if (count($this->withoutGlobalScopes) > 0) {
+            return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutGlobalScopes)->getBindings());
         }
 
         return Arr::query($this->model->query()->getBindings());
diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index 4e1459b..44dd106 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -24,7 +24,7 @@ public function truncate()
 
     public function withoutGlobalScope($scope)
     {
-        array_push($this->withoutScopes, $scope);
+        array_push($this->withoutGlobalScopes, $scope);
 
         return parent::withoutGlobalScope($scope);
     }
@@ -32,11 +32,11 @@ public function withoutGlobalScope($scope)
     public function withoutGlobalScopes(array $scopes = null)
     {
         if ($scopes != null) {
-            $this->withoutScopes = $scopes;
+            $this->withoutGlobalScopes = $scopes;
         }
 
         if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
-            $this->withoutAllScopes = true;
+            $this->withoutAllGlobalScopes = true;
         }
 
         return parent::withoutGlobalScopes($scopes);
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index a5a9403..a615cd6 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -16,8 +16,8 @@ trait Caching
     protected $isCachable = true;
     protected $scopesAreApplied = false;
     protected $macroKey = "";
-    protected $withoutScopes = [];
-    protected $withoutAllScopes = false;
+    protected $withoutGlobalScopes = [];
+    protected $withoutAllGlobalScopes = false;
 
     public function __call($method, $parameters)
     {
@@ -47,13 +47,13 @@ protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")
             || $this->scopesAreApplied
-            || $this->withoutAllScopes
+            || $this->withoutAllGlobalScopes
         ) {
             return;
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier]) || isset($this->withoutScopes[$identifier])) {
+            if (! isset($this->scopes[$identifier]) || isset($this->withoutGlobalScopes[$identifier])) {
                 continue;
             }
 
@@ -169,7 +169,7 @@ protected function makeCacheKey(
             $query = $this->query->getQuery();
         }
 
-        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutScopes, $this->withoutAllScopes))
+        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutGlobalScopes, $this->withoutAllGlobalScopes))
             ->make($columns, $idColumn, $keyDifferentiator);
     }
 

From c14f5e9c0442f3fc1f280e1be6b6b101b26b1e20 Mon Sep 17 00:00:00 2001
From: Bill Harding <bill@breezechms.com>
Date: Thu, 3 Mar 2022 10:41:06 -0600
Subject: [PATCH 13/74] Add unit test
 testGlobalScopesAreNotCachedWhenUsingWithoutGlobalScopes

---
 tests/Integration/CachedBuilder/ScopeTest.php | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/Integration/CachedBuilder/ScopeTest.php b/tests/Integration/CachedBuilder/ScopeTest.php
index 9f71d7f..fb4ba9d 100644
--- a/tests/Integration/CachedBuilder/ScopeTest.php
+++ b/tests/Integration/CachedBuilder/ScopeTest.php
@@ -156,6 +156,31 @@ public function testGlobalScopesWhenSwitchingContextUsingGetMethod()
         $this->assertEquals("B", $authorsB->first());
     }
 
+    public function testGlobalScopesAreNotCachedWhenUsingWithoutGlobalScopes()
+    {
+        $user = factory(User::class)->create(["name" => "Abernathy Kings"]);
+        $this->actingAs($user);
+        $author = factory(UncachedAuthor::class, 1)
+            ->create(['name' => 'Alois'])
+            ->first();
+        $authors = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScopes()
+            ->get();
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthorbeginswithscoped");
+        $tags = ["genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthorbeginswithscoped"];
+
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedAuthor)
+            ->nameStartsWith("A")
+            ->get();
+
+        $this->assertTrue($authors->contains($author));
+        $this->assertTrue($cachedResults->contains($author));
+        $this->assertTrue($liveResults->contains($author));
+    }
+
     public function testWithoutGlobalScopes()
     {
         factory(Author::class, 200)->create();

From 3b03241cc9ce2770b94003dae2fdea65c70b877e Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Tue, 8 Mar 2022 09:29:59 +0000
Subject: [PATCH 14/74] Brought tests back to green.

---
 src/Traits/BuilderCaching.php                 | 15 ++++++---
 src/Traits/Caching.php                        | 33 +++++++++++++------
 .../CachedBuilder/UpdateRelationTest.php      |  4 ++-
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index 44dd106..e3cc90f 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Traits;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Traits;
 
 use Illuminate\Database\Eloquent\Collection;
 
@@ -31,15 +33,20 @@ public function withoutGlobalScope($scope)
 
     public function withoutGlobalScopes(array $scopes = null)
     {
-        if ($scopes != null) {
+        if ($scopes !== null) {
             $this->withoutGlobalScopes = $scopes;
         }
 
-        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+        if (
+            $scopes == null
+            || (
+                $scopes !== null
+                && count($scopes) === 0
+            )
+        ) {
             $this->withoutAllGlobalScopes = true;
         }
 
         return parent::withoutGlobalScopes($scopes);
     }
-
 }
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index a615cd6..5d5fccb 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Traits;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Traits;
 
 use Closure;
 use GeneaLabs\LaravelModelCaching\CachedBuilder;
@@ -45,7 +47,8 @@ public function applyScopes()
 
     protected function applyScopesToInstance()
     {
-        if (! property_exists($this, "scopes")
+        if (
+            ! property_exists($this, "scopes")
             || $this->scopesAreApplied
             || $this->withoutAllGlobalScopes
         ) {
@@ -53,7 +56,10 @@ protected function applyScopesToInstance()
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier]) || isset($this->withoutGlobalScopes[$identifier])) {
+            if (
+                ! isset($this->scopes[$identifier])
+                || isset($this->withoutGlobalScopes[$identifier])
+            ) {
                 continue;
             }
 
@@ -62,7 +68,8 @@ protected function applyScopesToInstance()
                     $scope($this);
                 }
 
-                if ($scope instanceof Scope
+                if (
+                    $scope instanceof Scope
                     && $this instanceof CachedBuilder
                 ) {
                     $scope->apply($this, $this->getModel());
@@ -127,7 +134,8 @@ protected function getCachePrefix() : string
             ->make("config")
             ->get("laravel-model-caching.cache-prefix", "");
 
-        if ($this->model
+        if (
+            $this->model
             && property_exists($this->model, "cachePrefix")
         ) {
             $cachePrefix = $this->model->cachePrefix;
@@ -163,7 +171,8 @@ protected function makeCacheKey(
                 ->make("db")
                 ->query();
         
-        if ($this->query
+        if (
+            $this->query
             && method_exists($this->query, "getQuery")
         ) {
             $query = $this->query->getQuery();
@@ -230,7 +239,8 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown
+        if (
+            ! $cacheCooldown
             || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown
         ) {
             return;
@@ -287,14 +297,16 @@ public function isCachable() : bool
             ->get("laravel-model-caching.enabled");
         $allRelationshipsAreCachable = true;
 
-        if (property_exists($this, "eagerLoad")
+        if (
+            property_exists($this, "eagerLoad")
             && $this->eagerLoad
         ) {
             $allRelationshipsAreCachable = collect($this
                 ->eagerLoad)
                 ->keys()
                 ->reduce(function ($carry, $related) {
-                    if (! method_exists($this->model, $related)
+                    if (
+                        ! method_exists($this->model, $related)
                         || $carry === false
                     ) {
                         return $carry;
@@ -302,7 +314,8 @@ public function isCachable() : bool
         
                     $relatedModel = $this->model->$related()->getRelated();
 
-                    if (! method_exists($relatedModel, "isCachable")
+                    if (
+                        ! method_exists($relatedModel, "isCachable")
                         || ! $relatedModel->isCachable()
                     ) {
                         return false;
diff --git a/tests/Integration/CachedBuilder/UpdateRelationTest.php b/tests/Integration/CachedBuilder/UpdateRelationTest.php
index 00af304..239b37c 100644
--- a/tests/Integration/CachedBuilder/UpdateRelationTest.php
+++ b/tests/Integration/CachedBuilder/UpdateRelationTest.php
@@ -1,4 +1,6 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
+<?php
+
+namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;

From 1efc4b60e9dad0abfc95b24d1a8b214aa2e85d2f Mon Sep 17 00:00:00 2001
From: Alex Hampu <alex.hampu@deploy.com.ro>
Date: Tue, 26 Apr 2022 17:02:52 +0300
Subject: [PATCH 15/74] add enum check when fetching values from where
 statements

Fixes: #426
---
 src/CacheKey.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 13ddfa1..e689e1d 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -287,7 +287,15 @@ protected function getValuesFromWhere(array $where) : string
             return implode("_", collect($where["value"])->flatten()->toArray());
         }
 
-        return (new Arr)->get($where, "value", "");
+        $value = (new Arr)->get($where, "value", "");
+
+        if ($value instanceof \BackedEnum) {
+            return $value->value;
+        } elseif ($value instanceof \UnitEnum) {
+            return $value->name;
+        }
+
+        return $value;
     }
 
     protected function getValuesFromBindings(array $where, string $values) : string

From f78d81904c12bfb987530ca7170231c08020de67 Mon Sep 17 00:00:00 2001
From: Alex Hampu <alex.hampu@deploy.com.ro>
Date: Mon, 2 May 2022 14:35:46 +0300
Subject: [PATCH 16/74] add enum processing when fetching all types of values
 from where statements

Fixes: #426
---
 src/CacheKey.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index e689e1d..37ec4a4 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -280,22 +280,18 @@ protected function getValuesFromWhere(array $where) : string
         }
 
         if (is_array((new Arr)->get($where, "values"))) {
-            return implode("_", collect($where["values"])->flatten()->toArray());
+            $values = collect($where["values"])->flatten()->toArray();
+            return implode("_", $this->processEnums($values));
         }
 
         if (is_array((new Arr)->get($where, "value"))) {
-            return implode("_", collect($where["value"])->flatten()->toArray());
+            $values = collect($where["value"])->flatten()->toArray();
+            return implode("_", $this->processEnums($values));
         }
 
         $value = (new Arr)->get($where, "value", "");
 
-        if ($value instanceof \BackedEnum) {
-            return $value->value;
-        } elseif ($value instanceof \UnitEnum) {
-            return $value->name;
-        }
-
-        return $value;
+        return $this->processEnum($value);
     }
 
     protected function getValuesFromBindings(array $where, string $values) : string
@@ -396,4 +392,20 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
 
         return $result;
     }
+
+    private function processEnum(\BackedEnum|\UnitEnum|string $value): string
+    {
+        if ($value instanceof \BackedEnum) {
+            return $value->value;
+        } elseif ($value instanceof \UnitEnum) {
+            return $value->name;
+        }
+
+        return $value;
+    }
+
+    private function processEnums(array $values): array
+    {
+        return array_map(fn($value) => $this->processEnum($value), $values);
+    }
 }

From 56740402e11bc214011441fa53131b5497f450b8 Mon Sep 17 00:00:00 2001
From: Ruben Robles <d8vjork@outlook.com>
Date: Wed, 20 Jul 2022 16:40:03 +0200
Subject: [PATCH 17/74] Add pivotSynced event listener to flush cache

---
 src/Traits/ModelCaching.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Traits/ModelCaching.php b/src/Traits/ModelCaching.php
index 587f814..5b240b4 100644
--- a/src/Traits/ModelCaching.php
+++ b/src/Traits/ModelCaching.php
@@ -75,6 +75,10 @@ public static function bootCachable()
         //     $instance->checkCooldownAndFlushAfterPersisting($instance);
         // });
 
+        static::pivotSynced(function ($instance, $secondInstance, $relationship) {
+            $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
+        });
+
         static::pivotAttached(function ($instance, $secondInstance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });

From d036d4a86fae112eaa240537575b7d55e465e89b Mon Sep 17 00:00:00 2001
From: Ruben Robles <d8vjork@outlook.com>
Date: Wed, 20 Jul 2022 19:14:58 +0200
Subject: [PATCH 18/74] Add test for pivotSync

---
 .../CachedBuilder/BelongsToManyTest.php       | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/tests/Integration/CachedBuilder/BelongsToManyTest.php b/tests/Integration/CachedBuilder/BelongsToManyTest.php
index 744d756..1fb8d21 100644
--- a/tests/Integration/CachedBuilder/BelongsToManyTest.php
+++ b/tests/Integration/CachedBuilder/BelongsToManyTest.php
@@ -169,6 +169,49 @@ public function testUncachedRelatedModelDoesntCache()
         $this->assertNotNull($uncachedResult);
     }
 
+    public function testInvalidatingCacheWhenSyncing()
+    {
+        $bookId = (new Store)
+            ->disableModelCaching()
+            ->with("books")
+            ->first()
+            ->books
+            ->first()
+            ->id;
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:stores:genealabslaravelmodelcachingtestsfixturesstore-testing:{$this->testingSqlitePath}testing.sqlite:books-first");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesstore",
+        ];
+
+        $newStores = factory(Store::class, 2)
+            ->create();
+
+        $result = Book::find($bookId)
+            ->stores;
+
+        Book::find($bookId)
+            ->stores()
+            ->attach($newStores[0]->id);
+        
+        Book::find($bookId)
+            ->stores()
+            ->sync($newStores->pluck('id'));
+
+        $this->assertEmpty(array_diff(
+            Book::find($bookId)->stores()->pluck((new Store)->getTable() . '.id')->toArray(),
+            $newStores->pluck('id')->toArray()
+        ));
+
+        $cachedResult = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value']
+            ?? null;
+
+        $this->assertNotEmpty($result);
+        $this->assertNull($cachedResult);
+    }
+
     // /** @group test */
     // public function testUncachedDetachesFromCached()
     // {

From 3530b50db0849c74d6ab6ac1cf1f96b8ad08ba1a Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 30 Jul 2022 14:19:41 +0000
Subject: [PATCH 19/74] Updated changelog and tests.

---
 CHANGELOG.md                                  |  6 ++
 .../CachedBuilder/BelongsToManyTest.php       | 86 +------------------
 2 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1d4163..7a4092c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.12.5] - 2022-07-30
+### Added
+- pivotSynced event listener to flush cache when performing BelongsToMany::sync
+
+[...]
+
 ## [0.10.3] - 2021-03-16
 ### Changed
 - The from part of the query ($query->from) instead of the table name of the model ($model->table)
diff --git a/tests/Integration/CachedBuilder/BelongsToManyTest.php b/tests/Integration/CachedBuilder/BelongsToManyTest.php
index 1fb8d21..1d9a3b1 100644
--- a/tests/Integration/CachedBuilder/BelongsToManyTest.php
+++ b/tests/Integration/CachedBuilder/BelongsToManyTest.php
@@ -182,106 +182,28 @@ public function testInvalidatingCacheWhenSyncing()
         $tags = [
             "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesstore",
         ];
-
         $newStores = factory(Store::class, 2)
             ->create();
-
         $result = Book::find($bookId)
             ->stores;
 
         Book::find($bookId)
             ->stores()
             ->attach($newStores[0]->id);
-        
         Book::find($bookId)
             ->stores()
             ->sync($newStores->pluck('id'));
-
-        $this->assertEmpty(array_diff(
-            Book::find($bookId)->stores()->pluck((new Store)->getTable() . '.id')->toArray(),
-            $newStores->pluck('id')->toArray()
-        ));
-
         $cachedResult = $this
             ->cache()
             ->tags($tags)
             ->get($key)['value']
             ?? null;
 
+        $this->assertEmpty(array_diff(
+            Book::find($bookId)->stores()->pluck((new Store)->getTable() . '.id')->toArray(),
+            $newStores->pluck('id')->toArray()
+        ));
         $this->assertNotEmpty($result);
         $this->assertNull($cachedResult);
     }
-
-    // /** @group test */
-    // public function testUncachedDetachesFromCached()
-    // {
-    //     // $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:book-store:genealabslaravelmodelcachingcachedbelongstomany-book_store.book_id_=_{$bookId}");
-    //     // $tags = [
-    //     //     "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesstore",
-    //     // ];
-
-    //     $store = (new StoreWithUncachedBooks)
-    //         ->with("books")
-    //         ->has("books")
-    //         ->first();
-    //     $store->books()
-    //         ->detach();
-    //     // $store->delete();
-    //     // dd($results);
-    //     // $cachedResult = $this
-    //     //     ->cache()
-    //     //     ->tags($tags)
-    //     //     ->get($key)['value'];
-
-    //     // $this->assertNotEmpty($result);
-    //     // $this->assertNull($cachedResult);
-    // }
-
-    // /** @group test */
-    // public function testCachedDetachesFromUncached()
-    // {
-    //     // $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:book-store:genealabslaravelmodelcachingcachedbelongstomany-book_store.book_id_=_{$bookId}");
-    //     // $tags = [
-    //     //     "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesstore",
-    //     // ];
-    //     $book = (new UncachedBookWithStores)
-    //         ->with("stores")
-    //         ->has("stores")
-    //         ->first();
-    //     $book->stores()
-    //         ->detach();
-    //     // $book->delete();
-    //     // dd($results);
-    //     // $cachedResult = $this
-    //     //     ->cache()
-    //     //     ->tags($tags)
-    //     //     ->get($key)['value'];
-
-    //     // $this->assertNotEmpty($result);
-    //     // $this->assertNull($cachedResult);
-    // }
-
-    // public function testDetachingFiresEvent()
-    // {
-    //     // $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:book-store:genealabslaravelmodelcachingcachedbelongstomany-book_store.book_id_=_{$bookId}");
-    //     // $tags = [
-    //     //     "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesstore",
-    //     // ];
-
-    //     $store = (new Store)
-    //         ->with("books")
-    //         ->has("books")
-    //         ->first();
-    //     $store->books()
-    //         ->detach();
-    //     $store->delete();
-    //     // dd($results);
-    //     // $cachedResult = $this
-    //     //     ->cache()
-    //     //     ->tags($tags)
-    //     //     ->get($key)['value'];
-
-    //     // $this->assertNotEmpty($result);
-    //     // $this->assertNull($cachedResult);
-    // }
 }

From 46a8503a73692c8d29ed776219b6f8598c7aa905 Mon Sep 17 00:00:00 2001
From: Fatih Aytekin <fatih@aytekin.me>
Date: Fri, 17 Feb 2023 22:15:04 +0300
Subject: [PATCH 20/74] Add Laravel 10 compatibility

---
 .gitignore                                    |  1 +
 composer.json                                 | 23 +++++++++----------
 tests/CreatesApplication.php                  | 15 ++++++++++++
 tests/Feature/PaginationTest.php              | 20 ++++++++--------
 tests/Fixtures/Book.php                       |  5 ++--
 tests/Fixtures/BookWithUncachedStore.php      |  5 ++--
 tests/Fixtures/UncachedBook.php               |  6 ++---
 tests/Fixtures/UncachedBookWithStores.php     |  6 ++---
 .../CachedBuilder/PaginateTest.php            | 18 +++++++--------
 9 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48b6166..c2d4570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 composer.lock
 .phpunit.result.cache
 phpunit.xml
+.idea
diff --git a/composer.json b/composer.json
index d60aea8..cac3762 100644
--- a/composer.json
+++ b/composer.json
@@ -15,22 +15,21 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "genealabs/laravel-pivot-events": "^9.0",
-        "illuminate/cache": "^9.0",
-        "illuminate/config": "^9.0",
-        "illuminate/console": "^9.0",
-        "illuminate/container": "^9.0",
-        "illuminate/database": "^9.0",
-        "illuminate/http": "^9.0",
-        "illuminate/support": "^9.0"
+        "php": "^8.1",
+        "genealabs/laravel-pivot-events": "^10.0",
+        "illuminate/cache": "^10.0",
+        "illuminate/config": "^10.0",
+        "illuminate/console": "^10.0",
+        "illuminate/container": "^10.0",
+        "illuminate/database": "^10.0",
+        "illuminate/http": "^10.0",
+        "illuminate/support": "^10.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
-        "laravel/nova": "^3.9",
-        "orchestra/testbench-browser-kit": "^7.0",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench-browser-kit": "^8.0",
+        "orchestra/testbench": "^8.0",
         "php-coveralls/php-coveralls" : "^2.2",
         "phpmd/phpmd": "^2.11",
         "phpunit/phpunit": "^9.5",
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 43e674e..b402ab3 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -138,4 +138,19 @@ protected function getEnvironmentSetUp($app)
             'pagination' => 'simple',
         ]);
     }
+
+    public function appVersionEightAndUp(): bool
+    {
+        return version_compare(app()->version(), '8.0.0', '>=');
+    }
+
+    public function appVersionFiveBetweenSeven(): bool
+    {
+        return version_compare(app()->version(), '5.6.0', '>=') && version_compare(app()->version(), '8.0.0', '<');
+    }
+
+    public function appVersionOld(): bool
+    {
+        return version_compare(app()->version(), '5.4.0', '>=') && version_compare(app()->version(), '5.6.0', '<');
+    }
 }
diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php
index b122b23..465ec82 100644
--- a/tests/Feature/PaginationTest.php
+++ b/tests/Feature/PaginationTest.php
@@ -8,19 +8,19 @@ class PaginationTest extends FeatureTestCase
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
 
-        // Checking the version start with 5.6, 5.7, 5.8 or 6.
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        // Checking the version start with 5.6, 5.7, 5.8, 6 or 7.
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
         }
 
         // Checking the version 5.4 and 5.5
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
         }
@@ -40,17 +40,17 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
     public function testAdvancedPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
 
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
         }
 
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
         }
@@ -63,17 +63,17 @@ public function testAdvancedPagination()
     public function testCustomPagination()
     {
         // Checking the version start with 8.0.
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
 
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
         }
 
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
         }
diff --git a/tests/Fixtures/Book.php b/tests/Fixtures/Book.php
index 8609380..59abb6e 100644
--- a/tests/Fixtures/Book.php
+++ b/tests/Fixtures/Book.php
@@ -14,10 +14,9 @@ class Book extends Model
 
     protected $casts = [
         'price' => 'float',
+        'published_at' => 'datetime',
     ];
-    protected $dates = [
-        'published_at',
-    ];
+
     protected $fillable = [
         "author_id",
         'description',
diff --git a/tests/Fixtures/BookWithUncachedStore.php b/tests/Fixtures/BookWithUncachedStore.php
index a9bd30f..83a4a2a 100644
--- a/tests/Fixtures/BookWithUncachedStore.php
+++ b/tests/Fixtures/BookWithUncachedStore.php
@@ -14,10 +14,9 @@ class BookWithUncachedStore extends Model
 
     protected $casts = [
         'price' => 'float',
+        'published_at' => 'datetime',
     ];
-    protected $dates = [
-        'published_at',
-    ];
+    
     protected $fillable = [
         "author_id",
         'description',
diff --git a/tests/Fixtures/UncachedBook.php b/tests/Fixtures/UncachedBook.php
index c73583a..bbdb359 100644
--- a/tests/Fixtures/UncachedBook.php
+++ b/tests/Fixtures/UncachedBook.php
@@ -10,15 +10,15 @@ class UncachedBook extends Model
 {
     protected $casts = [
         'price' => 'float',
+        'published_at' => 'datetime',
     ];
-    protected $dates = [
-        'published_at',
-    ];
+
     protected $fillable = [
         'description',
         'published_at',
         'title',
     ];
+
     protected $table = 'books';
 
     public function author() : BelongsTo
diff --git a/tests/Fixtures/UncachedBookWithStores.php b/tests/Fixtures/UncachedBookWithStores.php
index 173c939..f1972a0 100644
--- a/tests/Fixtures/UncachedBookWithStores.php
+++ b/tests/Fixtures/UncachedBookWithStores.php
@@ -10,15 +10,15 @@ class UncachedBookWithStores extends Model
 {
     protected $casts = [
         'price' => 'float',
+        'published_at' => 'datetime',
     ];
-    protected $dates = [
-        'published_at',
-    ];
+    
     protected $fillable = [
         'description',
         'published_at',
         'title',
     ];
+
     protected $table = 'books';
 
     public function author() : BelongsTo
diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php
index 8f24ebb..0ac4ead 100644
--- a/tests/Integration/CachedBuilder/PaginateTest.php
+++ b/tests/Integration/CachedBuilder/PaginateTest.php
@@ -36,19 +36,19 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
         }
 
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
         }
 
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
             $page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -71,19 +71,19 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
         }
 
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
         }
 
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
             $page24ActiveLink = '<li class="active"><span>24</span></li>';
@@ -106,19 +106,19 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^([8|9]\.)/", app()->version())) {
+        if ($this->appVersionEightAndUp()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
         }
 
-        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
+        if ($this->appVersionFiveBetweenSeven()) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
         }
 
-        if (preg_match("/^5\.[4-5]/", app()->version())) {
+        if ($this->appVersionOld()) {
             $page1ActiveLink = '<li class="active"><span>1</span></li>';
             $page2ActiveLink = '<li class="active"><span>2</span></li>';
             $page24ActiveLink = '<li class="active"><span>24</span></li>';

From 9b6d24affe056e0a26f9e6370226b4212db20f34 Mon Sep 17 00:00:00 2001
From: Fatih Aytekin <fatih@aytekin.me>
Date: Fri, 17 Feb 2023 22:56:37 +0300
Subject: [PATCH 21/74] Fix database expressions to strings for tests

---
 src/CacheKey.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 37ec4a4..0868550 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -2,6 +2,7 @@
 
 use Exception;
 use GeneaLabs\LaravelModelCaching\Traits\CachePrefixing;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -170,14 +171,19 @@ protected function getOrderByClauses() : string
         }
 
         $orders = collect($this->query->orders);
-
+        
         return $orders
             ->reduce(function ($carry, $order) {
                 if (($order["type"] ?? "") === "Raw") {
                     return $carry . "_orderByRaw_" . (new Str)->slug($order["sql"]);
                 }
 
-                return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
+                return sprintf(
+                    '%s_orderBy_%s_%s',
+                    $carry,
+                    $this->expressionToString($order["column"]),
+                    $order["direction"]
+                );
             })
             ?: "";
     }
@@ -211,7 +217,11 @@ protected function getQueryColumns(array $columns) : string
         if (property_exists($this->query, "columns")
             && $this->query->columns
         ) {
-            return "_" . implode("_", $this->query->columns);
+            $columns = array_map(function ($column) {                
+                return $this->expressionToString($column);
+            }, $this->query->columns);
+
+            return "_" . implode("_", $columns);
         }
 
         return "_" . implode("_", $columns);
@@ -393,12 +403,14 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
         return $result;
     }
 
-    private function processEnum(\BackedEnum|\UnitEnum|string $value): string
+    private function processEnum(\BackedEnum|\UnitEnum|Expression|string $value): string
     {
         if ($value instanceof \BackedEnum) {
             return $value->value;
         } elseif ($value instanceof \UnitEnum) {
             return $value->name;
+        } elseif ($value instanceof Expression) {
+            return $this->expressionToString($value);
         }
 
         return $value;
@@ -408,4 +420,13 @@ private function processEnums(array $values): array
     {
         return array_map(fn($value) => $this->processEnum($value), $values);
     }
+
+    private function expressionToString(Expression|string $value): string
+    {
+        if (is_string($value)) {
+            return $value;
+        }
+
+        return $value->getValue($this->query->getConnection()->getQueryGrammar());
+    }
 }

From d805f43e3aefc23b5ce7c96422e0b3176827cc31 Mon Sep 17 00:00:00 2001
From: Fatih Aytekin <fatih@aytekin.me>
Date: Fri, 17 Feb 2023 22:57:10 +0300
Subject: [PATCH 22/74] Put back nova

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index cac3762..0460718 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
+        "laravel/nova": "^3.9",
         "orchestra/testbench-browser-kit": "^8.0",
         "orchestra/testbench": "^8.0",
         "php-coveralls/php-coveralls" : "^2.2",

From d84e1d7abd3a7aab366d84e7c1ad35736a04f2e2 Mon Sep 17 00:00:00 2001
From: Fatih Aytekin <fatih@aytekin.me>
Date: Fri, 17 Feb 2023 23:23:18 +0300
Subject: [PATCH 23/74] Update laravel.yml

---
 .github/workflows/laravel.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 3b751da..a169f2b 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,12 +14,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1]
+        php: [8.2, 8.1]
 
     name: PHP ${{ matrix.php }}
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout code
+      uses: actions/checkout@v3
 
     - name: Cache dependencies
       uses: actions/cache@v1

From db0675ba0c16abd66b0d601da2c01b96b638fe45 Mon Sep 17 00:00:00 2001
From: Muhammad Rheza Alfin <aRhez0903@gmail.com>
Date: Tue, 28 Feb 2023 14:27:41 +0700
Subject: [PATCH 24/74] add expressionToString to getColumnClauses

---
 src/CacheKey.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 0868550..faace06 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -80,7 +80,10 @@ protected function getColumnClauses(array $where) : string
         if ($where["type"] !== "Column") {
             return "";
         }
-
+        if ($where["first"] instanceof Expression) {
+            $where["first"] = $this->expressionToString($where["first"]);
+        }
+        
         return "-{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
     }
 

From 94956a1200acfcbbf406f728464f595143a24c2d Mon Sep 17 00:00:00 2001
From: Muhammad Rheza Alfin <aRhez0903@gmail.com>
Date: Wed, 1 Mar 2023 15:10:44 +0700
Subject: [PATCH 25/74] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0460718..35db72b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "genealabs/laravel-model-caching",
+    "name": "vheins/laravel-model-caching",
     "description": "Automatic caching for Eloquent models.",
     "license": "MIT",
     "authors": [

From a0d18a4cf87ea3f9d19e5a993504500e5eac9524 Mon Sep 17 00:00:00 2001
From: Muhammad Rheza Alfin <aRhez0903@gmail.com>
Date: Sat, 4 Mar 2023 10:58:02 +0700
Subject: [PATCH 26/74] put back composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 35db72b..0460718 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "vheins/laravel-model-caching",
+    "name": "genealabs/laravel-model-caching",
     "description": "Automatic caching for Eloquent models.",
     "license": "MIT",
     "authors": [

From b54f6f0fd3bceb6d3155dce95aa36c268ea8f451 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Mon, 6 Mar 2023 07:42:50 -0700
Subject: [PATCH 27/74] Fixed code formatting.

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

diff --git a/src/CacheKey.php b/src/CacheKey.php
index faace06..b964425 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -80,6 +80,7 @@ protected function getColumnClauses(array $where) : string
         if ($where["type"] !== "Column") {
             return "";
         }
+        
         if ($where["first"] instanceof Expression) {
             $where["first"] = $this->expressionToString($where["first"]);
         }

From 99a05e41b13a10107516902c5104828541f42b04 Mon Sep 17 00:00:00 2001
From: Joshua Dwire <jdwire@boldcompass.com>
Date: Wed, 8 Mar 2023 10:42:37 -0500
Subject: [PATCH 28/74] Make Buildable@paginate compatible with Laravel 10.3.0

---
 src/Traits/Buildable.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Traits/Buildable.php b/src/Traits/Buildable.php
index f191e63..d50a633 100644
--- a/src/Traits/Buildable.php
+++ b/src/Traits/Buildable.php
@@ -158,7 +158,8 @@ public function paginate(
         $perPage = null,
         $columns = ["*"],
         $pageName = "page",
-        $page = null
+        $page = null,
+        $total = null
     ) {
         if (! $this->isCachable()) {
             return parent::paginate($perPage, $columns, $pageName, $page);
@@ -170,7 +171,17 @@ public function paginate(
             $page = $this->recursiveImplodeWithKey($page);
         }
         $columns = collect($columns)->toArray();
-        $cacheKey = $this->makeCacheKey($columns, null, "-paginate_by_{$perPage}_{$pageName}_{$page}");
+
+        $keyDifferentiator = "-paginate_by_{$perPage}_{$pageName}_{$page}";
+
+        if ($total !== null) {
+            $total = value($total);
+            if ($total !== null) {
+                $keyDifferentiator .= "_{$total}";
+            }
+        }
+
+        $cacheKey = $this->makeCacheKey($columns, null, $keyDifferentiator);
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }

From 43de5402f9e0b3446f4cdb47e5d573c233184716 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Thu, 9 Mar 2023 07:35:17 -0700
Subject: [PATCH 29/74] Cleaned up code.

---
 src/Traits/Buildable.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Traits/Buildable.php b/src/Traits/Buildable.php
index d50a633..d016dca 100644
--- a/src/Traits/Buildable.php
+++ b/src/Traits/Buildable.php
@@ -170,15 +170,15 @@ public function paginate(
         if (is_array($page)) {
             $page = $this->recursiveImplodeWithKey($page);
         }
+        
         $columns = collect($columns)->toArray();
-
         $keyDifferentiator = "-paginate_by_{$perPage}_{$pageName}_{$page}";
 
         if ($total !== null) {
             $total = value($total);
-            if ($total !== null) {
-                $keyDifferentiator .= "_{$total}";
-            }
+            $keyDifferentiator .= $total !== null
+                ? "_{$total}"
+                : "";
         }
 
         $cacheKey = $this->makeCacheKey($columns, null, $keyDifferentiator);

From 9da707a014b4c46339414fa94a7fe3b38ad73771 Mon Sep 17 00:00:00 2001
From: Muhammad Rheza Alfin <aRhez0903@gmail.com>
Date: Mon, 20 Mar 2023 15:12:15 +0700
Subject: [PATCH 30/74] parsing of second if it is an Expression object

---
 src/CacheKey.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index b964425..51594ec 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -85,6 +85,10 @@ protected function getColumnClauses(array $where) : string
             $where["first"] = $this->expressionToString($where["first"]);
         }
         
+		if ($where["second"] instanceof Expression) {
+			$where["second"] = $this->expressionToString($where["second"]);
+		}
+        
         return "-{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
     }
 

From 5dd9c100f7dbad5134771140f4dfeee808c54783 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Mon, 20 Mar 2023 07:38:15 -0700
Subject: [PATCH 31/74] Update CacheKey.php

---
 src/CacheKey.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 51594ec..fe3913b 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -84,11 +84,11 @@ protected function getColumnClauses(array $where) : string
         if ($where["first"] instanceof Expression) {
             $where["first"] = $this->expressionToString($where["first"]);
         }
-        
-		if ($where["second"] instanceof Expression) {
-			$where["second"] = $this->expressionToString($where["second"]);
-		}
-        
+
+        if ($where["second"] instanceof Expression) {
+	    $where["second"] = $this->expressionToString($where["second"]);
+        }
+
         return "-{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
     }
 

From 72716e371ee78ee9f0771a5c74c6b89ef4c2d006 Mon Sep 17 00:00:00 2001
From: Jason Klein <jason.klein@logicforte.com>
Date: Sun, 26 Mar 2023 20:35:22 -0500
Subject: [PATCH 32/74] fix: GeneaLabs/laravel-model-caching issue #448

checkCooldownAndFlushAfterPersisting(): Argument #2 ($relationship) must be of type string, array given, called in /var/www/html/vendor/genealabs/laravel-model-caching/src/Traits/ModelCaching.php on line 83
---
 src/Traits/ModelCaching.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Traits/ModelCaching.php b/src/Traits/ModelCaching.php
index 5b240b4..1f428c3 100644
--- a/src/Traits/ModelCaching.php
+++ b/src/Traits/ModelCaching.php
@@ -75,19 +75,19 @@ public static function bootCachable()
         //     $instance->checkCooldownAndFlushAfterPersisting($instance);
         // });
 
-        static::pivotSynced(function ($instance, $secondInstance, $relationship) {
+        static::pivotSynced(function ($instance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
 
-        static::pivotAttached(function ($instance, $secondInstance, $relationship) {
+        static::pivotAttached(function ($instance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
 
-        static::pivotDetached(function ($instance, $secondInstance, $relationship) {
+        static::pivotDetached(function ($instance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
 
-        static::pivotUpdated(function ($instance, $secondInstance, $relationship) {
+        static::pivotUpdated(function ($instance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
     }

From a1758639ec7b1339679da63ca1a84e727c296e10 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Mon, 9 Oct 2023 23:05:28 +0000
Subject: [PATCH 33/74] Updated dependencies.

---
 .devcontainer/devcontainer.json |  94 ++++++++++
 .vscode/extensions.json         |  70 +++++++
 .vscode/settings.json           | 320 ++++++++++++++++++++++++++++++++
 composer.json                   |   4 +-
 docker-compose.yml              |  59 ++++++
 phpunit.xml                     |   2 +-
 phpunit.xml.dist                |   2 +-
 7 files changed, 547 insertions(+), 4 deletions(-)
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/settings.json
 create mode 100644 docker-compose.yml

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..016cf01
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,94 @@
+// https://aka.ms/devcontainer.json
+{
+    "name": "Existing Docker Compose (Extend)",
+    "dockerComposeFile": [
+        "../docker-compose.yml"
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/sshd:1": {
+            "version": "latest"
+        }
+    },
+    "service": "laravel.test",
+    "workspaceFolder": "/var/www/html",
+    "customizations": {
+        "vscode": {
+            "settings": {},
+            "extensions": [
+                "aaron-bond.better-comments",
+                "adrianwilczynski.alpine-js-intellisense",
+                "amiralizadeh9480.laravel-extra-intellisense",
+                "austenc.laravel-blade-spacer",
+                "beyondcode.tinkerwell",
+                "bmewburn.vscode-intelephense-client",
+                "bradlc.vscode-tailwindcss",
+                "christian-kohler.npm-intellisense",
+                "christian-kohler.path-intellisense",
+                "cierra.livewire-vscode",
+                "codingyu.laravel-goto-view",
+                "davidanson.vscode-markdownlint",
+                "davidbwaters.macos-modern-theme",
+                "eamodio.gitlens",
+                "ecodes.vscode-phpmd@1.2.0",
+                "editorconfig.editorconfig",
+                "ericcheng.codesongclear",
+                "faelv.composer-companion",
+                "file-icons.file-icons",
+                "foxundermoon.shell-format",
+                "georgykurian.laravel-ide-helper",
+                "github.codespaces",
+                "GitHub.copilot-chat",
+                "GitHub.copilot-nightly",
+                "github.vscode-github-actions",
+                "github.vscode-pull-request-github",
+                "Gruntfuggly.activitusbar",
+                "heissenbergerlab.php-array-from-json",
+                "heybourn.headwind",
+                "huibizhang.codesnap-plus",
+                "irongeek.vscode-env",
+                "kencocaceo.customvscodeuicss",
+                "m4ns0ur.base64",
+                "maciejdems.add-to-gitignore",
+                "mahmoudshahin.laravel-routes",
+                "markis.code-coverage",
+                "martybegood.single-editor-tabs",
+                "mechatroner.rainbow-csv",
+                "mehedidracula.php-namespace-resolver",
+                "mhutchie.git-graph",
+                "mikestead.dotenv",
+                "mohamedbenhida.laravel-intellisense",
+                "mrmlnc.vscode-duplicate",
+                "naoray.laravel-goto-components",
+                "oderwat.indent-rainbow",
+                "pcbowers.alpine-intellisense",
+                "recca0120.vscode-phpunit",
+                "redhat.vscode-yaml",
+                "rifi2k.format-html-in-php",
+                "shevaua.phpcs",
+                "shufo.vscode-blade-formatter",
+                "sperovita.alpinejs-syntax-highlight",
+                "streetsidesoftware.code-spell-checker",
+                "syler.ignore",
+                "teabyii.ayu",
+                "usernamehw.errorlens",
+                "vincaslt.highlight-matching-tag",
+                "WakaTime.vscode-wakatime",
+                "withfig.fig",
+                "wongjn.php-sniffer",
+                "xdebug.php-debug",
+                "codecov.codecov"
+            ]
+        }
+    },
+    "remoteUser": "sail",
+    "postCreateCommand": "sudo chown -R 1000:1000 /var/www/html",
+    // "forwardPorts": [
+    // ],
+    // "portsAttributes": {
+    // },
+    "mounts": [
+        "source=${localEnv:HOME}/.wakatime.cfg,target=/home/sail/.wakatime.cfg,type=bind,consistency=delegated"
+    ]
+    // "runServices": [],
+    // "shutdownAction": "none",
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..db7c078
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,70 @@
+{
+    "recommendations": [
+        "aaron-bond.better-comments",
+        "adrianwilczynski.alpine-js-intellisense",
+        "amiralizadeh9480.laravel-extra-intellisense",
+        "austenc.laravel-blade-spacer",
+        "beyondcode.tinkerwell",
+        "bmewburn.vscode-intelephense-client",
+        "bradlc.vscode-tailwindcss",
+        "christian-kohler.npm-intellisense",
+        "christian-kohler.path-intellisense",
+        "cierra.livewire-vscode",
+        "codingyu.laravel-goto-view",
+        "davidanson.vscode-markdownlint",
+        "davidbwaters.macos-modern-theme",
+        "eamodio.gitlens",
+        "ecodes.vscode-phpmd@1.2.0",
+        "editorconfig.editorconfig",
+        "ericcheng.codesongclear",
+        "faelv.composer-companion",
+        "file-icons.file-icons",
+        "foxundermoon.shell-format",
+        "georgykurian.laravel-ide-helper",
+        "github.codespaces",
+        "GitHub.copilot-chat",
+        "GitHub.copilot-nightly",
+        "github.vscode-github-actions",
+        "github.vscode-pull-request-github",
+        "Gruntfuggly.activitusbar",
+        "heissenbergerlab.php-array-from-json",
+        "heybourn.headwind",
+        "huibizhang.codesnap-plus",
+        "irongeek.vscode-env",
+        "kencocaceo.customvscodeuicss",
+        "m4ns0ur.base64",
+        "maciejdems.add-to-gitignore",
+        "mahmoudshahin.laravel-routes",
+        "markis.code-coverage",
+        "martybegood.single-editor-tabs",
+        "mechatroner.rainbow-csv",
+        "mehedidracula.php-namespace-resolver",
+        "mhutchie.git-graph",
+        "mikestead.dotenv",
+        "mohamedbenhida.laravel-intellisense",
+        "mrmlnc.vscode-duplicate",
+        "naoray.laravel-goto-components",
+        "oderwat.indent-rainbow",
+        "pcbowers.alpine-intellisense",
+        "recca0120.vscode-phpunit",
+        "redhat.vscode-yaml",
+        "rifi2k.format-html-in-php",
+        "shevaua.phpcs",
+        "shufo.vscode-blade-formatter",
+        "sperovita.alpinejs-syntax-highlight",
+        "streetsidesoftware.code-spell-checker",
+        "syler.ignore",
+        "teabyii.ayu",
+        "usernamehw.errorlens",
+        "vincaslt.highlight-matching-tag",
+        "WakaTime.vscode-wakatime",
+        "withfig.fig",
+        "wongjn.php-sniffer",
+        "xdebug.php-debug",
+        "codecov.codecov"
+    ],
+    "unwantedRecommendations": [
+        "ikappas.phpcs",
+        "linyang95.phpmd"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..184d6e2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,320 @@
+{
+    "activitusbar.combineWorkspaceSettings": true,
+    "activitusbar.searchViewInPanel": false,
+    "activitusbar.showSourceControlCounter": true,
+    "activitusbar.views": [
+        {
+            "name": "command.workbench.panel.chatSidebar.copilot",
+            "codicon": "octoface"
+        },
+        {
+            "name": "explorer",
+            "codicon": "explorer-view-icon"
+        },
+        {
+            "name": "search",
+            "codicon": "search-view-icon"
+        },
+        {
+            "name": "pr:github",
+            "codicon": "github"
+        },
+        {
+            "name": "scm",
+            "codicon": "source-control-view-icon"
+        },
+        {
+            "name": "command.workbench.panel.chatSidebar.copilot",
+            "codicon": "octoface"
+        },
+        {
+            "name": "debug",
+            "codicon": "run-view-icon"
+        },
+        {
+            "name": "github.codespaces.explorer",
+            "codicon": "remote-explorer"
+        },
+        {
+            "name": "extensions",
+            "codicon": "extensions-view-icon"
+        },
+        {
+            "codicon": "kebab-vertical"
+        }
+    ],
+    "alpine-intellisense.settings.languageScopes": "html,blade,php",
+    "better-comments.tags": [
+        {
+            "tag": "!",
+            "color": "#FF2D00",
+            "strikethrough": false,
+            "underline": false,
+            "backgroundColor": "transparent",
+            "bold": false,
+            "italic": false
+        },
+        {
+            "tag": "?",
+            "color": "#3498DB",
+            "strikethrough": false,
+            "underline": false,
+            "backgroundColor": "transparent",
+            "bold": false,
+            "italic": false
+        },
+        {
+            "tag": "//",
+            "color": "#474747",
+            "strikethrough": true,
+            "underline": false,
+            "backgroundColor": "transparent",
+            "bold": false,
+            "italic": false
+        },
+        {
+            "tag": "todo",
+            "color": "#FF8C00",
+            "strikethrough": false,
+            "underline": false,
+            "backgroundColor": "transparent",
+            "bold": false,
+            "italic": false
+        },
+        {
+            "tag": "*",
+            "color": "#98C379",
+            "strikethrough": false,
+            "underline": false,
+            "backgroundColor": "transparent",
+            "bold": false,
+            "italic": false
+        }
+    ],
+    "blade.format.enable": true,
+    "blade.newLine": true,
+    "bladeFormatter.format.enabled": true,
+    "bladeFormatter.format.noMultipleEmptyLines": true,
+    "bladeFormatter.format.sortHtmlAttributes": "alphabetical",
+    "bladeFormatter.format.sortTailwindcssClasses": true,
+    "bladeFormatter.format.wrapAttributes": "force-expand-multiline",
+    "bladeFormatter.format.wrapLineLength": 100,
+    "breadcrumbs.enabled": true,
+    "composerCompanion.executablePath": "composer",
+    "cSpell.spellCheckOnlyWorkspaceFiles": true,
+    "cSpell.autoFormatConfigFile": true,
+    "css.validate": false,
+    "debug.allowBreakpointsEverywhere": true,
+    "debug.showBreakpointsInOverviewRuler": true,
+    "diffEditor.ignoreTrimWhitespace": false,
+    "diffEditor.wordWrap": "off",
+    "editor.acceptSuggestionOnEnter": "off",
+    "editor.accessibilitySupport": "off",
+    "editor.autoClosingBrackets": "always",
+    "editor.codeLensFontFamily": "JetBrains Mono",
+    "editor.cursorBlinking": "expand",
+    "editor.cursorSmoothCaretAnimation": "on",
+    "editor.detectIndentation": true,
+    "editor.emptySelectionClipboard": false,
+    "editor.fontFamily": "JetBrains Mono",
+    "editor.fontLigatures": true,
+    "editor.formatOnPaste": false,
+    "editor.formatOnType": true,
+    "editor.gotoLocation.multipleDeclarations": "goto",
+    "editor.gotoLocation.multipleDefinitions": "goto",
+    "editor.gotoLocation.multipleImplementations": "goto",
+    "editor.gotoLocation.multipleReferences": "goto",
+    "editor.gotoLocation.multipleTypeDefinitions": "goto",
+    "editor.inlayHints.fontFamily": "JetBrains Mono",
+    "editor.inlineSuggest.enabled": true,
+    "editor.insertSpaces": true,
+    "editor.lightbulb.enabled": false,
+    "editor.linkedEditing": true,
+    "editor.minimap.maxColumn": 100,
+    "editor.parameterHints.enabled": false,
+    "editor.quickSuggestions": {
+        "strings": true
+    },
+    "editor.renderFinalNewline": "on",
+    "editor.renderWhitespace": "none",
+    "editor.roundedSelection": true,
+    "editor.rulers": [
+        100,
+    ],
+    "editor.stickyScroll.enabled": true,
+    "editor.suggest.localityBonus": true,
+    "editor.suggest.showValues": false,
+    "editor.trimAutoWhitespace": true,
+    "editor.wordBasedSuggestions": false,
+    "editor.wordSeparators": "`~!@#%^&*()-=+[{]}\\|;:'\",.<>/?",
+    "editor.wordWrapColumn": 100,
+    "editor.wrappingIndent": "none",
+    "errorLens.enableOnDiffView": true,
+    "errorLens.fontFamily": "JetBrains Mono",
+    "errorLens.messageTemplate": "$message $source $code",
+    "explorer.confirmDelete": false,
+    "explorer.confirmDragAndDrop": false,
+    "extensions.ignoreRecommendations": false,
+    "files.autoGuessEncoding": true,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "files.trimTrailingWhitespace": true,
+    "git.allowForcePush": true,
+    "git.autofetch": true,
+    "git.confirmSync": false,
+    "git.enableCommitSigning": true,
+    "git.enableSmartCommit": true,
+    "git.fetchOnPull": true,
+    "git.ignoreRebaseWarning": true,
+    "git.mergeEditor": false,
+    "git.showPushSuccessNotification": true,
+    "github.copilot.enable": {
+        "*": true,
+        "yaml": false,
+        "plaintext": false,
+        "markdown": false
+    },
+    "github.copilot.inlineSuggest.enable": true,
+    "githubIssues.issueBranchTitle": "${user}/${sanitizedIssueTitle}",
+    "githubIssues.queries": [
+        {
+            "label": "My Issues",
+            "query": "default"
+        },
+        {
+            "label": "Created Issues",
+            "query": "author:${user} state:open repo:${owner}\/${repository} sort:created-desc"
+        },
+        {
+            "label": "Recent Issues",
+            "query": "state:open repo:${owner}\/${repository} sort:updated-desc"
+        }
+    ],
+    "githubIssues.workingIssueFormatScm": "",
+    "githubPullRequests.assignCreated": "${user}",
+    "githubPullRequests.createDraft": true,
+    "githubPullRequests.defaultMergeMethod": "squash",
+    "githubPullRequests.fileListLayout": "tree",
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "develop",
+        "master"
+    ],
+    "githubPullRequests.pullBranch": "never",
+    "githubPullRequests.showPullRequestNumberInTree": true,
+    "githubPullRequests.terminalLinksHandler": "vscode",
+    "gitlens.showWelcomeOnInstall": false,
+    "gitlens.showWhatsNewAfterUpgrades": false,
+    "gitlens.outputLevel": "silent",
+    "gitlens.plusFeatures.enabled": false,
+    "gitlens.virtualRepositories.enabled": false,
+    "gitlens.codeLens.enabled": false,
+    "gitlens.codeLens.recentChange.enabled": false,
+    "gitlens.codeLens.authors.enabled": false,
+    "gitlens.statusBar.enabled": false,
+    "gitlens.statusBar.pullRequests.enabled": false,
+    "gitlens.hovers.enabled": false,
+    "gitlens.hovers.avatars": false,
+    "gitlens.hovers.pullRequests.enabled": false,
+    "gitlens.hovers.autolinks.enabled": false,
+    "gitlens.hovers.currentLine.enabled": false,
+    "gitlens.hovers.autolinks.enhanced": false,
+    "gitlens.hovers.currentLine.details": false,
+    "gitlens.hovers.currentLine.changes": false,
+    "gitlens.hovers.annotations.enabled": false,
+    "gitlens.hovers.annotations.changes": false,
+    "gitlens.hovers.annotations.details": false,
+    "headwind.runOnSave": true,
+    "html.format.indentHandlebars": true,
+    "html.format.indentInnerHtml": true,
+    "html.format.preserveNewLines": true,
+    "html.format.wrapAttributes": "force",
+    "html.format.wrapLineLength": 100,
+    "indentRainbow.colorOnWhiteSpaceOnly": true,
+    "intelephense.environment.documentRoot": "public/index.php",
+    "intelephense.files.exclude": [
+        "**/.git/**",
+        "**/.svn/**",
+        "**/.hg/**",
+        "**/CVS/**",
+        "**/.DS_Store/**",
+        "**/node_modules/**",
+        "**/bower_components/**",
+        "**/vendor/**/{Tests,tests}/**",
+        "**/.history/**"
+    ],
+    "intelephense.phpdoc.returnVoid": false,
+    "javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
+    "LaravelExtraIntellisense.modelAccessorCase": "camel",
+    "LaravelExtraIntellisense.modelAttributeCase": "camel",
+    "LaravelExtraIntellisense.modelsPaths": [
+        "app",
+        "app/Models"
+    ],
+    "LaravelExtraIntellisense.modelVariables": {
+        "user": "App\\Models\\User"
+    },
+    "LaravelIntellisense.model": "App\\Models",
+    "markdown.preview.fontFamily": "JetBrains Mono",
+    "markdownlint.config": {
+        "default": true,
+        "MD024": false,
+        "MD022": false,
+        "MD032": false,
+    },
+    "namespaceResolver.leadingSeparator": false,
+    "namespaceResolver.showMessageOnStatusBar": true,
+    "namespaceResolver.sortAlphabetically": true,
+    "namespaceResolver.sortOnSave": true,
+    "php.suggest.basic": false,
+    "php.validate.enable": false,
+    "php.validate.run": "onType",
+    "phpcs.executablePath": "vendor/bin/phpcs",
+    "phpcs.showSources": true,
+    "phpmd.rules": "phpmd.xml",
+    "phpmd.command": "vendor/bin/phpmd",
+    "phpmd.verbose": true,
+    "phpunit.args": [
+        "--coverage-clover=coverage.xml",
+    ],
+    "redhat.telemetry.enabled": false,
+    "search.exclude": {
+        // Hide everything in /vendor, except "laravel" and "livewire" folders.
+        "**/vendor/{[^l],?[^ai]}*": true,
+        // Hide everything in /public, except "index.php"
+        "**/public/{[^i],?[^n]}*": true,
+        "**/node_modules": true,
+        "**/dist": true,
+        "**/_ide_helper.php": true,
+        "**/composer.lock": true,
+        "**/package-lock.json": true,
+        "storage": true,
+        ".phpunit.result.cache": true
+    },
+    "tailwindCSS.validate": true,
+    "terminal.explorerKind": "external",
+    "terminal.integrated.drawBoldTextInBrightColors": false,
+    "terminal.integrated.enableMultiLinePasteWarning": false,
+    "terminal.integrated.fontFamily": "MesloLGS NF",
+    "terminal.integrated.gpuAcceleration": "off",
+    "terminal.integrated.scrollback": 5000,
+    "typescript.suggest.enabled": false,
+    "window.commandCenter": true,
+    "workbench.editor.enablePreview": false,
+    "workbench.editor.showIcons": false,
+    "workbench.editor.showTabs": false,
+    "workbench.editor.tabCloseButton": "left",
+    "workbench.fontAliasing": "auto",
+    "workbench.iconTheme": "file-icons",
+    "workbench.productIconTheme": "macos-modern",
+    "workbench.startupEditor": "none",
+    "zenMode.fullScreen": false,
+    "zenMode.hideLineNumbers": false,
+    // formaters
+    "[blade]": {
+        "editor.defaultFormatter": "shufo.vscode-blade-formatter"
+    },
+    "[php]": {
+        "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
+    },
+    "window.title": "totality"
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 0460718..8bba5cb 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": ">=8.1",
         "genealabs/laravel-pivot-events": "^10.0",
         "illuminate/cache": "^10.0",
         "illuminate/config": "^10.0",
@@ -28,7 +28,7 @@
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
-        "laravel/nova": "^3.9",
+        "laravel/nova": "^4.0",
         "orchestra/testbench-browser-kit": "^8.0",
         "orchestra/testbench": "^8.0",
         "php-coveralls/php-coveralls" : "^2.2",
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..91897e8
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,59 @@
+# For more information: https://laravel.com/docs/sail
+version: '3'
+services:
+    laravel.test:
+        image: ghcr.io/mikebronner/sail/php-8.2:latest
+        extra_hosts:
+            - 'host.docker.internal:host-gateway'
+        ports:
+            - '${APP_PORT:-80}:80'
+            - '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
+        environment:
+            WWWUSER: '${WWWUSER}'
+            LARAVEL_SAIL: 1
+            XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
+            XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
+        volumes:
+            - '.:/var/www/html'
+        networks:
+            - sail
+        depends_on:
+            - redis
+    pgsql:
+        image: 'postgres:15'
+        ports:
+            - '${FORWARD_DB_PORT:-5432}:5432'
+        environment:
+            PGPASSWORD: '${DB_PASSWORD:-secret}'
+            POSTGRES_DB: '${DB_DATABASE:-testing}'
+            POSTGRES_USER: '${DB_USERNAME:-forge}'
+            POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
+        volumes:
+            - 'sail-pgsql:/var/lib/postgresql/data'
+            - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql'
+        networks:
+            - sail
+        healthcheck:
+            test: ["CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}"]
+            retries: 3
+            timeout: 5s
+    redis:
+        image: 'redis:alpine'
+        ports:
+            - '${FORWARD_REDIS_PORT:-6379}:6379'
+        volumes:
+            - 'sail-redis:/data'
+        networks:
+            - sail
+        healthcheck:
+            test: ["CMD", "redis-cli", "ping"]
+            retries: 3
+            timeout: 5s
+networks:
+    sail:
+        driver: bridge
+volumes:
+    sail-pgsql:
+        driver: local
+    sail-redis:
+        driver: local
diff --git a/phpunit.xml b/phpunit.xml
index 638c186..9728786 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -25,7 +25,7 @@
     <env name="QUEUE_DRIVER" value="sync"/>
     <env name="DB_CONNECTION" value="sqlite"/>
     <env name="DB_DATABASE" value=":memory:"/>
-    <env name="REDIS_HOST" value="127.0.0.1"/>
+    <env name="REDIS_HOST" value="redis"/>
     <env name="PGSQL_HOST" value="127.0.0.1"/>
     <env name="PGSQL_USERNAME" value="forge"/>
     <env name="PGSQL_PASSWORD" value="EgHVxwTqHq9zikfzAoe6"/>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3c8ff2d..5e696c7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -35,7 +35,7 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
-        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="REDIS_HOST" value="redis"/>
         <env name="PGSQL_HOST" value="127.0.0.1"/>
     </php>
 </phpunit>

From 6045f3da035877369e44f31a4898459d536b7be9 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Tue, 10 Oct 2023 01:06:30 +0000
Subject: [PATCH 34/74] Brought tests back to green.

---
 phpunit.xml                                   |  6 +--
 phpunit.xml.dist                              | 41 -------------------
 .../CachedBuilder/WhereJsonContainsTest.php   |  4 +-
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 phpunit.xml.dist

diff --git a/phpunit.xml b/phpunit.xml
index 9728786..aad85dd 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -19,16 +19,16 @@
   <php>
     <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
     <env name="APP_ENV" value="testing"/>
-    <env name="APP_URL" value="http://localhost"/>
+    <env name="APP_URL" value="http://127.0.0.1"/>
     <env name="CACHE_DRIVER" value="redis"/>
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
     <env name="DB_CONNECTION" value="sqlite"/>
     <env name="DB_DATABASE" value=":memory:"/>
     <env name="REDIS_HOST" value="redis"/>
-    <env name="PGSQL_HOST" value="127.0.0.1"/>
+    <env name="PGSQL_HOST" value="pgsql"/>
     <env name="PGSQL_USERNAME" value="forge"/>
-    <env name="PGSQL_PASSWORD" value="EgHVxwTqHq9zikfzAoe6"/>
+    <env name="PGSQL_PASSWORD" value="secret"/>
     <env name="PGSQL_DATABASE" value="testing"/>
   </php>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 5e696c7..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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="true"
->
-    <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-        <testsuite name="Integration">
-            <directory suffix="Test.php">./tests/Integration</directory>
-        </testsuite>
-        <testsuite name="Nova">
-            <directory suffix="Test.php">./tests/Nova</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="false">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_URL" value="http://localhost"/>
-        <env name="CACHE_DRIVER" value="redis"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
-        <env name="REDIS_HOST" value="redis"/>
-        <env name="PGSQL_HOST" value="127.0.0.1"/>
-    </php>
-</phpunit>
diff --git a/tests/Integration/CachedBuilder/WhereJsonContainsTest.php b/tests/Integration/CachedBuilder/WhereJsonContainsTest.php
index 0d4edc5..41d164c 100644
--- a/tests/Integration/CachedBuilder/WhereJsonContainsTest.php
+++ b/tests/Integration/CachedBuilder/WhereJsonContainsTest.php
@@ -14,9 +14,9 @@ protected function getEnvironmentSetUp($app)
         parent::getEnvironmentSetUp($app);
 
         $app['config']->set('database.default', 'pgsql');
-        $app['config']->set('database.connections.pgsql.host', env("PGSQL_HOST", "127.0.0.1"));
+        $app['config']->set('database.connections.pgsql.host', env("PGSQL_HOST", "pgsql"));
         $app['config']->set('database.connections.pgsql.database', env("PGSQL_DATABASE", "testing"));
-        $app['config']->set('database.connections.pgsql.username', env("PGSQL_USERNAME", "homestead"));
+        $app['config']->set('database.connections.pgsql.username', env("PGSQL_USERNAME", "forge"));
         $app['config']->set('database.connections.pgsql.password', env("PGSQL_PASSWORD", "secret"));
     }
 

From cb83f9553ece0d2563d328ac796df89e0b3fac0b Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 23 Dec 2023 18:03:26 +0000
Subject: [PATCH 35/74] Updated codespace configuration.

---
 .devcontainer/devcontainer.json | 17 +++++---
 .editorconfig                   | 19 +++++++++
 .github/workflows/laravel.yml   |  2 +-
 .gitignore                      |  6 +--
 .vscode/extensions.json         |  3 +-
 .vscode/settings.json           | 12 +++---
 composer.json                   |  3 +-
 phpmd.xml                       | 47 ---------------------
 phpunit.xml                     | 75 +++++++++++++++++++--------------
 tools/phpcs                     |  1 -
 tools/phpmd                     |  1 -
 tools/phpunit                   |  1 -
 12 files changed, 85 insertions(+), 102 deletions(-)
 create mode 100644 .editorconfig
 delete mode 100644 phpmd.xml
 delete mode 120000 tools/phpcs
 delete mode 120000 tools/phpmd
 delete mode 120000 tools/phpunit

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 016cf01..eaac2e1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,7 +29,6 @@
                 "davidanson.vscode-markdownlint",
                 "davidbwaters.macos-modern-theme",
                 "eamodio.gitlens",
-                "ecodes.vscode-phpmd@1.2.0",
                 "editorconfig.editorconfig",
                 "ericcheng.codesongclear",
                 "faelv.composer-companion",
@@ -82,10 +81,18 @@
     },
     "remoteUser": "sail",
     "postCreateCommand": "sudo chown -R 1000:1000 /var/www/html",
-    // "forwardPorts": [
-    // ],
-    // "portsAttributes": {
-    // },
+    "forwardPorts": [
+        5432,
+        6379
+    ],
+    "portsAttributes": {
+        "5432": {
+            "label": "Postgres"
+        },
+        "6379": {
+            "label": "Redis"
+        }
+    },
     "mounts": [
         "source=${localEnv:HOME}/.wakatime.cfg,target=/home/sail/.wakatime.cfg,type=bind,consistency=delegated"
     ]
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..bc1105d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[.blackfire.yaml]
+indent_size = 4
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index a169f2b..3589913 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -42,7 +42,7 @@ jobs:
 
     - uses: harmon758/postgresql-action@v1
       with:
-        postgresql version: '11'
+        postgresql version: '15'
         postgresql db: 'testing'
         postgresql user: 'homestead'
         postgresql password: 'secret'
diff --git a/.gitignore b/.gitignore
index c2d4570..8fbb483 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
+.idea
+.phpunit.result.cache
+/.phpunit*
 /build
 /vendor
 composer.lock
-.phpunit.result.cache
-phpunit.xml
-.idea
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index db7c078..757b5a7 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -14,7 +14,6 @@
         "davidanson.vscode-markdownlint",
         "davidbwaters.macos-modern-theme",
         "eamodio.gitlens",
-        "ecodes.vscode-phpmd@1.2.0",
         "editorconfig.editorconfig",
         "ericcheng.codesongclear",
         "faelv.composer-companion",
@@ -67,4 +66,4 @@
         "ikappas.phpcs",
         "linyang95.phpmd"
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 184d6e2..315d633 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -145,7 +145,7 @@
     "editor.suggest.localityBonus": true,
     "editor.suggest.showValues": false,
     "editor.trimAutoWhitespace": true,
-    "editor.wordBasedSuggestions": false,
+    "editor.wordBasedSuggestions": "off",
     "editor.wordSeparators": "`~!@#%^&*()-=+[{]}\\|;:'\",.<>/?",
     "editor.wordWrapColumn": 100,
     "editor.wrappingIndent": "none",
@@ -270,9 +270,6 @@
     "php.validate.run": "onType",
     "phpcs.executablePath": "vendor/bin/phpcs",
     "phpcs.showSources": true,
-    "phpmd.rules": "phpmd.xml",
-    "phpmd.command": "vendor/bin/phpmd",
-    "phpmd.verbose": true,
     "phpunit.args": [
         "--coverage-clover=coverage.xml",
     ],
@@ -301,7 +298,7 @@
     "window.commandCenter": true,
     "workbench.editor.enablePreview": false,
     "workbench.editor.showIcons": false,
-    "workbench.editor.showTabs": false,
+    "workbench.editor.showTabs": "single",
     "workbench.editor.tabCloseButton": "left",
     "workbench.fontAliasing": "auto",
     "workbench.iconTheme": "file-icons",
@@ -316,5 +313,6 @@
     "[php]": {
         "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
     },
-    "window.title": "totality"
-}
\ No newline at end of file
+    "window.title": "totality",
+    "workbench.editor.tabActionLocation": "left"
+}
diff --git a/composer.json b/composer.json
index 8bba5cb..68e8133 100644
--- a/composer.json
+++ b/composer.json
@@ -32,8 +32,7 @@
         "orchestra/testbench-browser-kit": "^8.0",
         "orchestra/testbench": "^8.0",
         "php-coveralls/php-coveralls" : "^2.2",
-        "phpmd/phpmd": "^2.11",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.0",
         "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",
diff --git a/phpmd.xml b/phpmd.xml
deleted file mode 100644
index 4544916..0000000
--- a/phpmd.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<ruleset
-    name="laravel"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
->
-    <description>
-        Custom ruleset for Laravel.
-    </description>
-
-    <rule ref="rulesets/cleancode.xml">
-        <exclude name="StaticAccess" />
-    </rule>
-
-    <rule ref="rulesets/codesize.xml" />
-
-    <rule ref="rulesets/controversial.xml" />
-
-    <rule ref="rulesets/design.xml" />
-
-    <rule ref="rulesets/naming.xml" />
-    <rule ref="rulesets/naming.xml/LongVariable">
-        <properties>
-            <property name="maximum">
-                <value>36</value>
-            </property>
-        </properties>
-    </rule>
-    <rule ref="rulesets/naming.xml/ShortMethodName">
-        <properties>
-            <property name="minimum">
-                <value>2</value>
-            </property>
-        </properties>
-    </rule>
-    <rule ref="rulesets/naming.xml/ShortVariable">
-        <properties>
-            <property name="minimum">
-                <value>2</value>
-            </property>
-        </properties>
-    </rule>
-
-    <rule ref="rulesets/unusedcode.xml" />
-</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
index aad85dd..eeb3898 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,34 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
-  <testsuites>
-    <testsuite name="Feature">
-      <directory suffix="Test.php">./tests/Feature</directory>
-    </testsuite>
-    <testsuite name="Integration">
-      <directory suffix="Test.php">./tests/Integration</directory>
-    </testsuite>
-    <testsuite name="Nova">
-      <directory suffix="Test.php">./tests/Nova</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
-    <env name="APP_ENV" value="testing"/>
-    <env name="APP_URL" value="http://127.0.0.1"/>
-    <env name="CACHE_DRIVER" value="redis"/>
-    <env name="SESSION_DRIVER" value="array"/>
-    <env name="QUEUE_DRIVER" value="sync"/>
-    <env name="DB_CONNECTION" value="sqlite"/>
-    <env name="DB_DATABASE" value=":memory:"/>
-    <env name="REDIS_HOST" value="redis"/>
-    <env name="PGSQL_HOST" value="pgsql"/>
-    <env name="PGSQL_USERNAME" value="forge"/>
-    <env name="PGSQL_PASSWORD" value="secret"/>
-    <env name="PGSQL_DATABASE" value="testing"/>
-  </php>
+<phpunit
+    backupGlobals="false"
+    backupStaticProperties="false"
+    bootstrap="vendor/autoload.php"
+    cacheDirectory=".phpunit.cache"
+    colors="true"
+    processIsolation="false"
+    stopOnFailure="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+>
+    <coverage/>
+    <testsuites>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+        <testsuite name="Integration">
+            <directory suffix="Test.php">./tests/Integration</directory>
+        </testsuite>
+        <testsuite name="Nova">
+            <directory suffix="Test.php">./tests/Nova</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
+        <env name="APP_ENV" value="testing"/>
+        <env name="APP_URL" value="http://127.0.0.1"/>
+        <env name="CACHE_DRIVER" value="redis"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="REDIS_HOST" value="redis"/>
+        <env name="PGSQL_HOST" value="pgsql"/>
+        <env name="PGSQL_USERNAME" value="forge"/>
+        <env name="PGSQL_PASSWORD" value="secret"/>
+        <env name="PGSQL_DATABASE" value="testing"/>
+    </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tools/phpcs b/tools/phpcs
deleted file mode 120000
index 9a822eb..0000000
--- a/tools/phpcs
+++ /dev/null
@@ -1 +0,0 @@
-/home/forge/.phive/phars/phpcs-3.5.6.phar
\ No newline at end of file
diff --git a/tools/phpmd b/tools/phpmd
deleted file mode 120000
index 7649801..0000000
--- a/tools/phpmd
+++ /dev/null
@@ -1 +0,0 @@
-/home/forge/.phive/phars/phpmd-2.7.0.phar
\ No newline at end of file
diff --git a/tools/phpunit b/tools/phpunit
deleted file mode 120000
index c8a2e31..0000000
--- a/tools/phpunit
+++ /dev/null
@@ -1 +0,0 @@
-/home/forge/.phive/phars/phpunit-9.3.10.phar
\ No newline at end of file

From 93a013cb2785d0e4c11e6f43233e84d12a914d7e Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 23 Dec 2023 18:03:37 +0000
Subject: [PATCH 36/74] WIP

---
 .vscode/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 315d633..66f1adc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -162,7 +162,7 @@
     "git.allowForcePush": true,
     "git.autofetch": true,
     "git.confirmSync": false,
-    "git.enableCommitSigning": true,
+    "git.enableCommitSigning": false,
     "git.enableSmartCommit": true,
     "git.fetchOnPull": true,
     "git.ignoreRebaseWarning": true,

From 4e70c9722464b5b95add471a5dbb1dd58b9a0986 Mon Sep 17 00:00:00 2001
From: Peter Brennan <peterbrennan84@gmail.com>
Date: Sun, 24 Dec 2023 04:26:40 +1000
Subject: [PATCH 37/74] Update CacheKey.php (#456)

BUG FIX
---
 src/CacheKey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index fe3913b..d8ae7af 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -411,7 +411,7 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
         return $result;
     }
 
-    private function processEnum(\BackedEnum|\UnitEnum|Expression|string $value): string
+    private function processEnum(\BackedEnum|\UnitEnum|Expression|string|null $value): string|null
     {
         if ($value instanceof \BackedEnum) {
             return $value->value;

From b952d5e02ce8d0e723a6b076bab3af1587399e18 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 23 Dec 2023 18:40:52 +0000
Subject: [PATCH 38/74] Cleaned up code.

---
 src/CacheKey.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index fe3913b..60d9082 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -1,5 +1,8 @@
-<?php namespace GeneaLabs\LaravelModelCaching;
+<?php
 
+namespace GeneaLabs\LaravelModelCaching;
+
+use BackedEnum;
 use Exception;
 use GeneaLabs\LaravelModelCaching\Traits\CachePrefixing;
 use Illuminate\Database\Query\Expression;
@@ -7,6 +10,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Ramsey\Uuid\Uuid;
+use UnitEnum;
 
 class CacheKey
 {
@@ -80,7 +84,7 @@ protected function getColumnClauses(array $where) : string
         if ($where["type"] !== "Column") {
             return "";
         }
-        
+
         if ($where["first"] instanceof Expression) {
             $where["first"] = $this->expressionToString($where["first"]);
         }
@@ -179,7 +183,7 @@ protected function getOrderByClauses() : string
         }
 
         $orders = collect($this->query->orders);
-        
+
         return $orders
             ->reduce(function ($carry, $order) {
                 if (($order["type"] ?? "") === "Raw") {
@@ -225,7 +229,7 @@ protected function getQueryColumns(array $columns) : string
         if (property_exists($this->query, "columns")
             && $this->query->columns
         ) {
-            $columns = array_map(function ($column) {                
+            $columns = array_map(function ($column) {
                 return $this->expressionToString($column);
             }, $this->query->columns);
 
@@ -350,7 +354,7 @@ protected function getWhereClauses(array $wheres = []) : string
                 return $value;
             });
     }
-    
+
     protected function getWheres(array $wheres) : Collection
     {
         $wheres = collect($wheres);
@@ -384,7 +388,7 @@ protected function getWithModels() : string
             return "{$carry}-{$relatedConnection}:{$relatedDatabase}:{$related}";
         });
     }
-   
+
     protected function recursiveImplode(array $items, string $glue = ",") : string
     {
         $result = "";
@@ -411,11 +415,11 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
         return $result;
     }
 
-    private function processEnum(\BackedEnum|\UnitEnum|Expression|string $value): string
+    private function processEnum(BackedEnum|UnitEnum|Expression|string|null $value): ?string
     {
-        if ($value instanceof \BackedEnum) {
+        if ($value instanceof BackedEnum) {
             return $value->value;
-        } elseif ($value instanceof \UnitEnum) {
+        } elseif ($value instanceof UnitEnum) {
             return $value->name;
         } elseif ($value instanceof Expression) {
             return $this->expressionToString($value);

From 3228a1825d82c0fcd21d88613f121240c9c7141f Mon Sep 17 00:00:00 2001
From: jamesRUS52 <39707635+jamesRUS52@users.noreply.github.com>
Date: Sat, 23 Dec 2023 21:46:19 +0300
Subject: [PATCH 39/74] JsonContainsKey supported (#454)

---
 src/CacheKey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 60d9082..4706655 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -271,7 +271,7 @@ protected function getTableSlug() : string
 
     protected function getTypeClause($where) : string
     {
-        $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains", "Fulltext"])
+        $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains", "Fulltext", "JsonContainsKey"])
             ? strtolower($where["type"])
             : strtolower($where["operator"]);
 

From 650e20d74b2c97448a132ea3dea25f1c9e07e5e3 Mon Sep 17 00:00:00 2001
From: Axel <padredes@gmail.com>
Date: Sat, 23 Dec 2023 19:49:59 +0100
Subject: [PATCH 40/74] Add expressionToString to getOtherClauses (#451)

---
 src/CacheKey.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 4706655..a7ff568 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -210,6 +210,11 @@ protected function getOtherClauses(array $where) : string
         $value .= $this->getValuesClause($where);
 
         $column = "";
+
+	if (data_get($where, "column") instanceof Expression) {
+            $where["column"] = $this->expressionToString(data_get($where, "column"));
+        }    
+
         $column .= isset($where["column"]) ? $where["column"] : "";
         $column .= isset($where["columns"]) ? implode("-", $where["columns"]) : "";
 

From 19bcdf2aa9b635e1c6ae034599c393366d5c8618 Mon Sep 17 00:00:00 2001
From: Charlie Waddell <charlie.waddell01@gmail.com>
Date: Sat, 23 Dec 2023 18:53:05 +0000
Subject: [PATCH 41/74] Having clauses missing from the generated CacheKey
 (#403)

---
 src/CacheKey.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index a7ff568..057582f 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -51,6 +51,7 @@ public function make(
         $key .= $this->getIdColumn($idColumn ?: "");
         $key .= $this->getQueryColumns($columns);
         $key .= $this->getWhereClauses();
+        $key .= $this->getHavingClauses();
         $key .= $this->getWithModels();
         $key .= $this->getOrderByClauses();
         $key .= $this->getOffsetClause();
@@ -58,7 +59,7 @@ public function make(
         $key .= $this->getBindingsSlug();
         $key .= $keyDifferentiator;
         $key .= $this->macroKey;
-// dump($key);
+
         return $key;
     }
 
@@ -101,6 +102,27 @@ protected function getCurrentBinding(string $type, $bindingFallback = null)
         return data_get($this->query->bindings, "{$type}.{$this->currentBinding}", $bindingFallback);
     }
 
+    protected function getHavingClauses()
+    {
+        return Collection::make($this->query->havings)->reduce(function ($carry, $having) {
+            $value = $carry;
+            $value .= $this->getHavingClause($having);
+
+            return $value;
+        });
+    }
+
+    protected function getHavingClause(array $having): string
+    {
+        $return = '-having';
+
+        foreach ($having as $key => $value) {
+            $return .= '_' . $key . '_' . str_replace(' ', '_', $value);
+        }
+
+        return $return;
+    }
+
     protected function getIdColumn(string $idColumn) : string
     {
         return $idColumn ? "_{$idColumn}" : "";

From 15bccaa066086b68e7430663d07c293ead274d8e Mon Sep 17 00:00:00 2001
From: Kieran Anderson <kieran@andersons.bz>
Date: Sun, 25 Feb 2024 05:04:28 +0000
Subject: [PATCH 42/74] Ensure isCacheable in
 checkCooldownAndFlushAfterPersisting

---
 src/Traits/Caching.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index 5d5fccb..7762a59 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -263,6 +263,10 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
 
     protected function checkCooldownAndFlushAfterPersisting(Model $instance, string $relationship = "")
     {
+        if (!$this->isCachable()) {
+            return;
+        }
+
         [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance);
 
         if (! $cacheCooldown) {
@@ -295,6 +299,10 @@ public function isCachable() : bool
         $isCacheDisabled = ! Container::getInstance()
             ->make("config")
             ->get("laravel-model-caching.enabled");
+        if ($isCacheDisabled) {
+            return false;
+        }
+
         $allRelationshipsAreCachable = true;
 
         if (
@@ -327,7 +335,6 @@ public function isCachable() : bool
         }
 
         return $this->isCachable
-            && ! $isCacheDisabled
             && $allRelationshipsAreCachable;
     }
 

From c90c9c56fbab05334c7b109a3ab56fd044c69d97 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Tue, 27 Feb 2024 01:21:31 +0000
Subject: [PATCH 43/74] Bump dependencies for Laravel 11

---
 composer.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 68e8133..dd32aaf 100644
--- a/composer.json
+++ b/composer.json
@@ -17,23 +17,23 @@
     "require": {
         "php": ">=8.1",
         "genealabs/laravel-pivot-events": "^10.0",
-        "illuminate/cache": "^10.0",
-        "illuminate/config": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/support": "^10.0"
+        "illuminate/cache": "^10.0|^11.0",
+        "illuminate/config": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/container": "^10.0|^11.0",
+        "illuminate/database": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^4.0",
         "orchestra/testbench-browser-kit": "^8.0",
-        "orchestra/testbench": "^8.0",
-        "php-coveralls/php-coveralls" : "^2.2",
+        "orchestra/testbench": "^8.0|^9.0",
+        "php-coveralls/php-coveralls": "^2.2",
         "phpunit/phpunit": "^10.0",
-        "slevomat/coding-standard": "^7.0",
+        "slevomat/coding-standard": "^7.0|^8.14",
         "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",
         "laravel/legacy-factories": "^1.3"

From 38adb0ab25091b8d1dc05fb78bdc6bbcb71ad9ad Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 21:44:51 +0000
Subject: [PATCH 44/74] Brought tests to green.

---
 .github/workflows/laravel.yml                 |  2 +-
 src/Traits/Caching.php                        |  9 ++++---
 tests/CreatesApplication.php                  | 16 ++++++++---
 tests/Feature/PaginationTest.php              | 24 ++++++++++++++---
 .../CachedBuilder/PaginateTest.php            | 27 ++++++++++++++++---
 5 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 3589913..1ed4c2c 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1]
+        php: [8.3, 8.2, 8.1]
 
     name: PHP ${{ matrix.php }}
 
diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index 7762a59..f85a54b 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -41,7 +41,7 @@ public function applyScopes()
         if ($this->scopesAreApplied) {
             return $this;
         }
-        
+
         return parent::applyScopes();
     }
 
@@ -170,7 +170,7 @@ protected function makeCacheKey(
             ?? Container::getInstance()
                 ->make("db")
                 ->query();
-        
+
         if (
             $this->query
             && method_exists($this->query, "getQuery")
@@ -263,7 +263,7 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
 
     protected function checkCooldownAndFlushAfterPersisting(Model $instance, string $relationship = "")
     {
-        if (!$this->isCachable()) {
+        if (! $this->isCachable()) {
             return;
         }
 
@@ -299,6 +299,7 @@ public function isCachable() : bool
         $isCacheDisabled = ! Container::getInstance()
             ->make("config")
             ->get("laravel-model-caching.enabled");
+
         if ($isCacheDisabled) {
             return false;
         }
@@ -319,7 +320,7 @@ public function isCachable() : bool
                     ) {
                         return $carry;
                     }
-        
+
                     $relatedModel = $this->model->$related()->getRelated();
 
                     if (
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index b402ab3..7b70d64 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -139,18 +139,26 @@ protected function getEnvironmentSetUp($app)
         ]);
     }
 
-    public function appVersionEightAndUp(): bool
+    public function appVersionEightAndNine(): bool
     {
-        return version_compare(app()->version(), '8.0.0', '>=');
+        return version_compare(app()->version(), '8.0.0', '>=')
+            && version_compare(app()->version(), '10.0.0', '<');
     }
 
     public function appVersionFiveBetweenSeven(): bool
     {
-        return version_compare(app()->version(), '5.6.0', '>=') && version_compare(app()->version(), '8.0.0', '<');
+        return version_compare(app()->version(), '5.6.0', '>=')
+            && version_compare(app()->version(), '8.0.0', '<');
     }
 
     public function appVersionOld(): bool
     {
-        return version_compare(app()->version(), '5.4.0', '>=') && version_compare(app()->version(), '5.6.0', '<');
+        return version_compare(app()->version(), '5.4.0', '>=')
+            && version_compare(app()->version(), '5.6.0', '<');
+    }
+
+    public function appVersionTen(): bool
+    {
+        return version_compare(app()->version(), '10.0.0', '>=');
     }
 }
diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php
index 465ec82..ab8e751 100644
--- a/tests/Feature/PaginationTest.php
+++ b/tests/Feature/PaginationTest.php
@@ -7,8 +7,14 @@ class PaginationTest extends FeatureTestCase
 {
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+        }
+
         // Checking the version start with 8.0.
-        if ($this->appVersionEightAndUp()) {
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -39,8 +45,14 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
 
     public function testAdvancedPagination()
     {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+        }
+
         // Checking the version start with 8.0.
-        if ($this->appVersionEightAndUp()) {
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
@@ -62,8 +74,14 @@ public function testAdvancedPagination()
 
     public function testCustomPagination()
     {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+        }
+
         // Checking the version start with 8.0.
-        if ($this->appVersionEightAndUp()) {
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
         }
diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php
index 0ac4ead..5d95b3d 100644
--- a/tests/Integration/CachedBuilder/PaginateTest.php
+++ b/tests/Integration/CachedBuilder/PaginateTest.php
@@ -36,7 +36,14 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if ($this->appVersionEightAndUp()) {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+            $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">24</span>';
+        }
+
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -71,7 +78,14 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if ($this->appVersionEightAndUp()) {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+            $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">24</span>';
+        }
+
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';
@@ -106,7 +120,14 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if ($this->appVersionEightAndUp()) {
+        // Checking the version start with 10.0.
+        if ($this->appVersionTen()) {
+            $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">1</span>';
+            $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">2</span>';
+            $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">24</span>';
+        }
+
+        if ($this->appVersionEightAndNine()) {
             $page1ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">1</span>';
             $page2ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">2</span>';
             $page24ActiveLink = '<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">24</span>';

From da53fcc9e71e8729de5cf8fcaaf093a3dc14935d Mon Sep 17 00:00:00 2001
From: Kieran <github@andersons.bz>
Date: Sat, 2 Mar 2024 21:46:09 +0000
Subject: [PATCH 45/74] Ensure isCacheable in
 checkCooldownAndFlushAfterPersisting (#458)

---
 src/Traits/Caching.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index 5d5fccb..7762a59 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -263,6 +263,10 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
 
     protected function checkCooldownAndFlushAfterPersisting(Model $instance, string $relationship = "")
     {
+        if (!$this->isCachable()) {
+            return;
+        }
+
         [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance);
 
         if (! $cacheCooldown) {
@@ -295,6 +299,10 @@ public function isCachable() : bool
         $isCacheDisabled = ! Container::getInstance()
             ->make("config")
             ->get("laravel-model-caching.enabled");
+        if ($isCacheDisabled) {
+            return false;
+        }
+
         $allRelationshipsAreCachable = true;
 
         if (
@@ -327,7 +335,6 @@ public function isCachable() : bool
         }
 
         return $this->isCachable
-            && ! $isCacheDisabled
             && $allRelationshipsAreCachable;
     }
 

From b3764ca06e1e6e8d5815785f69bce13b6da47a95 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 21:49:28 +0000
Subject: [PATCH 46/74] WIP

---
 src/Traits/Caching.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index b882948..f85a54b 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -299,7 +299,7 @@ public function isCachable() : bool
         $isCacheDisabled = ! Container::getInstance()
             ->make("config")
             ->get("laravel-model-caching.enabled");
-a
+
         if ($isCacheDisabled) {
             return false;
         }

From 50d76061ff91a0f87f5eb532cc3cab46fae653e1 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:09:00 +0000
Subject: [PATCH 47/74] WIP

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 1ed4c2c..1ce1d96 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -56,7 +56,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
+        composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_LICENSE_KEY }}"
         composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
 
     - name: Execute Integration and Feature tests via PHPUnit

From 49bcc5adb41ab6bea7b75690a805510b64e7a705 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:11:26 +0000
Subject: [PATCH 48/74] WIP

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 1ce1d96..dac061b 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.1]
+        php: [8.2, 8.1]
 
     name: PHP ${{ matrix.php }}
 

From 5933b33b62b97b78e772d7689678d9f324e90fa9 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:13:16 +0000
Subject: [PATCH 49/74] WIP

---
 .github/workflows/laravel.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index dac061b..50f69e0 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -60,8 +60,8 @@ jobs:
         composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
 
     - name: Execute Integration and Feature tests via PHPUnit
-      run: vendor/bin/phpunit --configuration phpunit.xml.dist --testsuite Integration,Feature
+      run: vendor/bin/phpunit --configuration phpunit.xml --testsuite Integration,Feature
 
     - name: Execute Nova tests via PHPUnit
       if: github.event_name != 'pull_request'
-      run: vendor/bin/phpunit --configuration phpunit.xml.dist --testsuite Nova
+      run: vendor/bin/phpunit --configuration phpunit.xml --testsuite Nova

From 8deb25022b1dd50b1eb05f7fb313804aee46060b Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:15:36 +0000
Subject: [PATCH 50/74] WIP

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 50f69e0..645d621 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1]
+        php: [8.2]
 
     name: PHP ${{ matrix.php }}
 

From 168c525d7d75a128f728b47c6ddf17bc66d9661b Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:19:28 +0000
Subject: [PATCH 51/74] WIP

---
 .github/workflows/laravel.yml |  6 ++---
 phpunit.xml.dist              | 41 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 phpunit.xml.dist

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 645d621..dac061b 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2]
+        php: [8.2, 8.1]
 
     name: PHP ${{ matrix.php }}
 
@@ -60,8 +60,8 @@ jobs:
         composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
 
     - name: Execute Integration and Feature tests via PHPUnit
-      run: vendor/bin/phpunit --configuration phpunit.xml --testsuite Integration,Feature
+      run: vendor/bin/phpunit --configuration phpunit.xml.dist --testsuite Integration,Feature
 
     - name: Execute Nova tests via PHPUnit
       if: github.event_name != 'pull_request'
-      run: vendor/bin/phpunit --configuration phpunit.xml --testsuite Nova
+      run: vendor/bin/phpunit --configuration phpunit.xml.dist --testsuite Nova
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..3c8ff2d
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,41 @@
+<?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="true"
+>
+    <testsuites>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+        <testsuite name="Integration">
+            <directory suffix="Test.php">./tests/Integration</directory>
+        </testsuite>
+        <testsuite name="Nova">
+            <directory suffix="Test.php">./tests/Nova</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
+        <env name="APP_ENV" value="testing"/>
+        <env name="APP_URL" value="http://localhost"/>
+        <env name="CACHE_DRIVER" value="redis"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="PGSQL_HOST" value="127.0.0.1"/>
+    </php>
+</phpunit>

From 546397c3c4431f956fc84736b01dd06f592b4ca2 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:28:40 +0000
Subject: [PATCH 52/74] WIP

---
 phpunit.xml.dist | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3c8ff2d..c74eae3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     backupGlobals="false"
-    backupStaticAttributes="false"
+    backupStaticProperties="false"
     bootstrap="vendor/autoload.php"
+    cacheDirectory=".phpunit.cache"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 >
     <testsuites>
         <testsuite name="Feature">
@@ -21,11 +21,6 @@
             <directory suffix="Test.php">./tests/Nova</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="false">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
     <php>
         <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
         <env name="APP_ENV" value="testing"/>
@@ -38,4 +33,9 @@
         <env name="REDIS_HOST" value="127.0.0.1"/>
         <env name="PGSQL_HOST" value="127.0.0.1"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>

From a6722e527e6b227e9c75932576385a4a1fe3a033 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:31:49 +0000
Subject: [PATCH 53/74] WIP

---
 phpunit.xml.dist | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c74eae3..6ccffab 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -22,16 +22,18 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
         <env name="APP_URL" value="http://localhost"/>
         <env name="CACHE_DRIVER" value="redis"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
-        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="DB_PASSWORD" value="secret"/>
+        <env name="DB_USERNAME" value="homestead"/>
         <env name="PGSQL_HOST" value="127.0.0.1"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="SESSION_DRIVER" value="array"/>
     </php>
     <source>
         <include>

From 4499d4e39a7b673ce081c3bf7a72d34ec095f296 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:33:53 +0000
Subject: [PATCH 54/74] WIP

---
 phpunit.xml.dist | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6ccffab..1a75ca5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -22,18 +22,18 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
-        <env name="APP_URL" value="http://localhost"/>
-        <env name="CACHE_DRIVER" value="redis"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
-        <env name="DB_PASSWORD" value="secret"/>
-        <env name="DB_USERNAME" value="homestead"/>
-        <env name="PGSQL_HOST" value="127.0.0.1"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="REDIS_HOST" value="127.0.0.1"/>
-        <env name="SESSION_DRIVER" value="array"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
+        <server name="APP_URL" value="http://localhost"/>
+        <server name="CACHE_DRIVER" value="redis"/>
+        <server name="DB_CONNECTION" value="sqlite"/>
+        <server name="DB_DATABASE" value=":memory:"/>
+        <server name="DB_PASSWORD" value="secret"/>
+        <server name="DB_USERNAME" value="homestead"/>
+        <server name="PGSQL_HOST" value="127.0.0.1"/>
+        <server name="QUEUE_DRIVER" value="sync"/>
+        <server name="REDIS_HOST" value="127.0.0.1"/>
+        <server name="SESSION_DRIVER" value="array"/>
     </php>
     <source>
         <include>

From eda274d2fcdc45da6a90363ab8b035bd1a2635e2 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:36:21 +0000
Subject: [PATCH 55/74] WIP

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index dac061b..b2d1c37 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -44,7 +44,7 @@ jobs:
       with:
         postgresql version: '15'
         postgresql db: 'testing'
-        postgresql user: 'homestead'
+        postgresql user: 'forge'
         postgresql password: 'secret'
 
     - name: Remove Nova on a pull request

From a0c1468412ba715447882f0d0e739329537a5c76 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Sat, 2 Mar 2024 22:45:21 +0000
Subject: [PATCH 56/74] WIP

---
 .github/workflows/laravel.yml | 2 +-
 phpunit.xml.dist              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index b2d1c37..c32d3fc 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1]
+        php: [8.3, 8.2]
 
     name: PHP ${{ matrix.php }}
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1a75ca5..45a3ad2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -28,8 +28,6 @@
         <server name="CACHE_DRIVER" value="redis"/>
         <server name="DB_CONNECTION" value="sqlite"/>
         <server name="DB_DATABASE" value=":memory:"/>
-        <server name="DB_PASSWORD" value="secret"/>
-        <server name="DB_USERNAME" value="homestead"/>
         <server name="PGSQL_HOST" value="127.0.0.1"/>
         <server name="QUEUE_DRIVER" value="sync"/>
         <server name="REDIS_HOST" value="127.0.0.1"/>

From 487a84eb9759bf9e5fabc3d64c200dc2ee952699 Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Sat, 2 Mar 2024 17:46:23 -0500
Subject: [PATCH 57/74] Bump dependencies for Laravel 11 (#459)

---
 composer.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 68e8133..dd32aaf 100644
--- a/composer.json
+++ b/composer.json
@@ -17,23 +17,23 @@
     "require": {
         "php": ">=8.1",
         "genealabs/laravel-pivot-events": "^10.0",
-        "illuminate/cache": "^10.0",
-        "illuminate/config": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/support": "^10.0"
+        "illuminate/cache": "^10.0|^11.0",
+        "illuminate/config": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/container": "^10.0|^11.0",
+        "illuminate/database": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^4.0",
         "orchestra/testbench-browser-kit": "^8.0",
-        "orchestra/testbench": "^8.0",
-        "php-coveralls/php-coveralls" : "^2.2",
+        "orchestra/testbench": "^8.0|^9.0",
+        "php-coveralls/php-coveralls": "^2.2",
         "phpunit/phpunit": "^10.0",
-        "slevomat/coding-standard": "^7.0",
+        "slevomat/coding-standard": "^7.0|^8.14",
         "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",
         "laravel/legacy-factories": "^1.3"

From 2a38f0f1ed3554cf2da272d66c4d08a7885f196b Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Thu, 14 Mar 2024 16:34:57 -0700
Subject: [PATCH 58/74] Update composer.json

Signed-off-by: Mike Bronner <mike@genealabs.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dd32aaf..a3570e3 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "genealabs/laravel-pivot-events": "^10.0",
+        "genealabs/laravel-pivot-events": "^10.0|^11.0",
         "illuminate/cache": "^10.0|^11.0",
         "illuminate/config": "^10.0|^11.0",
         "illuminate/console": "^10.0|^11.0",

From a38c905790c73c43dac09790eec7f0972cd651cc Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Fri, 15 Mar 2024 12:40:22 +0000
Subject: [PATCH 59/74] WIP

---
 .vscode/settings.json | 4 ++--
 composer.json         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 66f1adc..e614d03 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -128,7 +128,7 @@
     "editor.inlayHints.fontFamily": "JetBrains Mono",
     "editor.inlineSuggest.enabled": true,
     "editor.insertSpaces": true,
-    "editor.lightbulb.enabled": false,
+    "editor.lightbulb.enabled": "off",
     "editor.linkedEditing": true,
     "editor.minimap.maxColumn": 100,
     "editor.parameterHints.enabled": false,
@@ -313,6 +313,6 @@
     "[php]": {
         "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
     },
-    "window.title": "totality",
+    "window.title": "laravel-model-caching",
     "workbench.editor.tabActionLocation": "left"
 }
diff --git a/composer.json b/composer.json
index a3570e3..3d7c3d8 100644
--- a/composer.json
+++ b/composer.json
@@ -29,10 +29,10 @@
         "doctrine/dbal": "^3.3",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^4.0",
-        "orchestra/testbench-browser-kit": "^8.0",
-        "orchestra/testbench": "^8.0|^9.0",
+        "orchestra/testbench-browser-kit": "^9.0",
+        "orchestra/testbench": "^9.0",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^10.5",
         "slevomat/coding-standard": "^7.0|^8.14",
         "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",

From f209bc3cfc8f0b3722de3f5ebe59bdaad04575f2 Mon Sep 17 00:00:00 2001
From: domhaas <mail@dominik-haas.net>
Date: Wed, 26 Feb 2025 23:59:48 +0100
Subject: [PATCH 60/74] Update README.md (#474)

added "laravel-adjacency-list" to conflicting-list

Signed-off-by: domhaas <mail@dominik-haas.net>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 86d8635..2973936 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ The following are packages we have identified as conflicting:
 - [spatie/laravel-query-builder](https://github.com/spatie/laravel-query-builder)
 - [dwightwatson/rememberable](https://github.com/dwightwatson/rememberable)
 - [kalnoy/nestedset](https://github.com/lazychaser/laravel-nestedset)
+- [laravel-adjacency-list](https://github.com/staudenmeir/laravel-adjacency-list)
 
 ### Things That Don't Work Currently
 The following items currently do no work with this package:

From 44b077236968a9acbc3e16683516ec8db7a8f504 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Thu, 27 Feb 2025 00:00:35 +0100
Subject: [PATCH 61/74] Fix cachekey issue (#471)

This should fix #470 by making sure all columns are strings before imploding them.

Signed-off-by: James Cole <james@firefly-iii.org>
---
 src/CacheKey.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CacheKey.php b/src/CacheKey.php
index 057582f..eea4e29 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -263,6 +263,10 @@ protected function getQueryColumns(array $columns) : string
             return "_" . implode("_", $columns);
         }
 
+        $columns = array_map(function ($column) {
+            return $this->expressionToString($column);
+        }, $columns);
+        
         return "_" . implode("_", $columns);
     }
 

From b28e0308c7d8f8b895ba6195c910f1645b351396 Mon Sep 17 00:00:00 2001
From: Dan-Radu Pana <danradu.pana@gmail.com>
Date: Thu, 27 Feb 2025 01:01:04 +0200
Subject: [PATCH 62/74] [Fix] Carbon v3 new method default parameter
 compatibility (#469)

---
 src/Traits/Caching.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Traits/Caching.php b/src/Traits/Caching.php
index f85a54b..9748082 100644
--- a/src/Traits/Caching.php
+++ b/src/Traits/Caching.php
@@ -241,7 +241,7 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
 
         if (
             ! $cacheCooldown
-            || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown
+            || (new Carbon)->now()->diffInSeconds($invalidatedAt, true) < $cacheCooldown
         ) {
             return;
         }
@@ -285,7 +285,7 @@ protected function checkCooldownAndFlushAfterPersisting(Model $instance, string
 
         $this->setCacheCooldownSavedAtTimestamp($instance);
 
-        if ((new Carbon)->now()->diffInSeconds($invalidatedAt) >= $cacheCooldown) {
+        if ((new Carbon)->now()->diffInSeconds($invalidatedAt, true) >= $cacheCooldown) {
             $instance->flushCache();
 
             if ($relationship) {

From 4490d5aaee8c9a09106808c53471d923fd0f88ef Mon Sep 17 00:00:00 2001
From: Ruben Robles <d8vjork@users.noreply.github.com>
Date: Thu, 27 Feb 2025 00:01:28 +0100
Subject: [PATCH 63/74] fix deprecations with nullable func args in php 8.4
 (#477)

---
 src/Traits/BuilderCaching.php | 2 +-
 src/Traits/ModelCaching.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Traits/BuilderCaching.php b/src/Traits/BuilderCaching.php
index e3cc90f..f51d247 100644
--- a/src/Traits/BuilderCaching.php
+++ b/src/Traits/BuilderCaching.php
@@ -31,7 +31,7 @@ public function withoutGlobalScope($scope)
         return parent::withoutGlobalScope($scope);
     }
 
-    public function withoutGlobalScopes(array $scopes = null)
+    public function withoutGlobalScopes(?array $scopes = null)
     {
         if ($scopes !== null) {
             $this->withoutGlobalScopes = $scopes;
diff --git a/src/Traits/ModelCaching.php b/src/Traits/ModelCaching.php
index 1f428c3..539b9b3 100644
--- a/src/Traits/ModelCaching.php
+++ b/src/Traits/ModelCaching.php
@@ -160,7 +160,7 @@ public function scopeDisableCache(EloquentBuilder $query) : EloquentBuilder
 
     public function scopeWithCacheCooldownSeconds(
         EloquentBuilder $query,
-        int $seconds = null
+        ?int $seconds = null
     ) : EloquentBuilder {
         if (! $seconds) {
             $seconds = $this->cacheCooldownSeconds;

From 5c67470cef4b9ecab7bdbb40fefffbf981f1c438 Mon Sep 17 00:00:00 2001
From: Laravel Shift <shift@laravelshift.com>
Date: Wed, 26 Feb 2025 18:01:56 -0500
Subject: [PATCH 64/74] Bump dependencies for Laravel 12 (#478)

---
 composer.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 3d7c3d8..67c9334 100644
--- a/composer.json
+++ b/composer.json
@@ -17,22 +17,22 @@
     "require": {
         "php": ">=8.1",
         "genealabs/laravel-pivot-events": "^10.0|^11.0",
-        "illuminate/cache": "^10.0|^11.0",
-        "illuminate/config": "^10.0|^11.0",
-        "illuminate/console": "^10.0|^11.0",
-        "illuminate/container": "^10.0|^11.0",
-        "illuminate/database": "^10.0|^11.0",
-        "illuminate/http": "^10.0|^11.0",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/cache": "^10.0|^11.0|^12.0",
+        "illuminate/config": "^10.0|^11.0|^12.0",
+        "illuminate/console": "^10.0|^11.0|^12.0",
+        "illuminate/container": "^10.0|^11.0|^12.0",
+        "illuminate/database": "^10.0|^11.0|^12.0",
+        "illuminate/http": "^10.0|^11.0|^12.0",
+        "illuminate/support": "^10.0|^11.0|^12.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^3.3",
+        "doctrine/dbal": "^3.3|^4.2",
         "fakerphp/faker": "^1.11",
         "laravel/nova": "^4.0",
-        "orchestra/testbench-browser-kit": "^9.0",
-        "orchestra/testbench": "^9.0",
+        "orchestra/testbench-browser-kit": "^9.0|^10.0",
+        "orchestra/testbench": "^9.0|^10.0",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^10.5|^11.5.3",
         "slevomat/coding-standard": "^7.0|^8.14",
         "squizlabs/php_codesniffer": "^3.6",
         "symfony/thanks": "^1.2",

From 83b26190ad2836bf61dcb570978e24e6f1e43f7f Mon Sep 17 00:00:00 2001
From: Dan-Radu Pana <danradu.pana@gmail.com>
Date: Thu, 27 Feb 2025 01:03:44 +0200
Subject: [PATCH 65/74] Fixes `query` attribute not existing under strict mode
 (#465)

* Fixes `query` attribute not existing under strict mode

* Update ModelCaching.php

Signed-off-by: Mike Bronner <mike@genealabs.com>

---------

Signed-off-by: Mike Bronner <mike@genealabs.com>
Co-authored-by: Mike Bronner <mike@genealabs.com>
---
 src/Traits/ModelCaching.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Traits/ModelCaching.php b/src/Traits/ModelCaching.php
index 539b9b3..b18927d 100644
--- a/src/Traits/ModelCaching.php
+++ b/src/Traits/ModelCaching.php
@@ -22,6 +22,11 @@ public function __get($key)
                 ?? 0;
         }
 
+        if ($key === "query") {
+            return $this->query
+                ?? $this->newModelQuery();
+        }
+
         return parent::__get($key);
     }
 

From 1f3cf3fbd4e740cd839652617bef1b4b893a518a Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 16:04:11 -0700
Subject: [PATCH 66/74] WIP

---
 phpunit.xml                           | 8 ++++----
 tests/Integration/CachedModelTest.php | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index eeb3898..c26ddd5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -31,10 +31,10 @@
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
-        <env name="REDIS_HOST" value="redis"/>
-        <env name="PGSQL_HOST" value="pgsql"/>
-        <env name="PGSQL_USERNAME" value="forge"/>
-        <env name="PGSQL_PASSWORD" value="secret"/>
+        <env name="REDIS_HOST" value="127.0.0.1"/>
+        <env name="PGSQL_HOST" value="127.0.0.1"/>
+        <env name="PGSQL_USERNAME" value="root"/>
+        <env name="PGSQL_PASSWORD" value=""/>
         <env name="PGSQL_DATABASE" value="testing"/>
     </php>
     <source>
diff --git a/tests/Integration/CachedModelTest.php b/tests/Integration/CachedModelTest.php
index af6e252..dc93264 100644
--- a/tests/Integration/CachedModelTest.php
+++ b/tests/Integration/CachedModelTest.php
@@ -1,11 +1,11 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\AuthorWithCooldown;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
-use GeneaLabs\LaravelModelCaching\Tests\Fixtures\AuthorWithCooldown;
 use ReflectionClass;
 
 class CachedModelTest extends IntegrationTestCase
@@ -169,7 +169,7 @@ public function testCooldownIsQueriedForCooldownModels()
         $author = (new AuthorWithCooldown)
             ->withCacheCooldownSeconds(1)
             ->first();
-        
+
         [$usesCacheCooldown, $expiresAt, $savedAt] = $method->invokeArgs($author, [$author]);
 
         $this->assertEquals($usesCacheCooldown, 1);
@@ -188,7 +188,7 @@ public function testModelCacheDoesntInvalidateDuringCooldownPeriod()
             ->get();
         $uncachedAuthors = (new UncachedAuthor)
             ->get();
-        sleep(2);
+        sleep(3);
         $authorsAfterCooldown = (new AuthorWithCooldown)
             ->get();
 

From 6bb6a5676fb2bc6d277fe7abf5f82839bb457c3f Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 16:05:53 -0700
Subject: [PATCH 67/74] Added php 8.4 tests.

---
 .github/workflows/laravel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index c32d3fc..f5bcd95 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2]
+        php: [8.4, 8.3, 8.2]
 
     name: PHP ${{ matrix.php }}
 

From b134e526a5a84aa78318a8d61d957de5992976e5 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 16:07:02 -0700
Subject: [PATCH 68/74] Updated namespace.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 67c9334..8523203 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "genealabs/laravel-model-caching",
+    "name": "mikebronner/laravel-model-caching",
     "description": "Automatic caching for Eloquent models.",
     "license": "MIT",
     "authors": [

From 13a21d754938e5ba9e39b618448b0dcf5ab6c2bf Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 16:16:16 -0700
Subject: [PATCH 69/74] Update README.md

Signed-off-by: Mike Bronner <mike@genealabs.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2973936..f8c04ce 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ The following items currently do no work with this package:
 ## Installation
 Be sure to not require a specific version of this package when requiring it:
 ```
-composer require genealabs/laravel-model-caching
+composer require mikebronner/laravel-model-caching
 ```
 
 ### Gotchas If Using With Lumen

From b4fbabd0eb66774b9fb7d0574804fb7d8e643372 Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 16:55:11 -0700
Subject: [PATCH 70/74] Fixed package dependency.

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8523203..de5669c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "genealabs/laravel-pivot-events": "^10.0|^11.0",
+        "mikebronner/laravel-pivot-events": "^10.0|^11.0|^12.0",
         "illuminate/cache": "^10.0|^11.0|^12.0",
         "illuminate/config": "^10.0|^11.0|^12.0",
         "illuminate/console": "^10.0|^11.0|^12.0",
@@ -28,7 +28,7 @@
     "require-dev": {
         "doctrine/dbal": "^3.3|^4.2",
         "fakerphp/faker": "^1.11",
-        "laravel/nova": "^4.0",
+        "laravel/nova": "^5.0",
         "orchestra/testbench-browser-kit": "^9.0|^10.0",
         "orchestra/testbench": "^9.0|^10.0",
         "php-coveralls/php-coveralls": "^2.2",

From 90901c7edd2934304d1d6c55bf8cce132c90fa5d Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 17:34:22 -0700
Subject: [PATCH 71/74] Fixed #480

---
 tests/NovaTestCase.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/NovaTestCase.php b/tests/NovaTestCase.php
index 9a25ec4..d1885ad 100644
--- a/tests/NovaTestCase.php
+++ b/tests/NovaTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneaLabs\LaravelModelCaching\Tests;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Nova\AuthorResource;
@@ -7,6 +9,8 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Nova\StoreResource;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Providers\NovaServiceProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Artisan;
+use Inertia\ServiceProvider;
 use Laravel\Nova\Nova;
 use Laravel\Nova\NovaCoreServiceProvider;
 
@@ -34,6 +38,9 @@ public function setUp(): void
         });
 
         $this->authenticate();
+        $this->withoutMiddleware();
+
+        Artisan::call("nova:publish");
     }
 
     protected function authenticate()
@@ -54,6 +61,7 @@ protected function getPackageProviders($app)
                 NovaCoreServiceProvider::class,
                 \Laravel\Nova\NovaServiceProvider::class,
                 NovaServiceProvider::class,
+                ServiceProvider::class,
             ]
         );
     }

From 4c8dfda24617462bdd9317d1ea5ce40790b6b77d Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 17:37:28 -0700
Subject: [PATCH 72/74] Create FUNDING.yml

Signed-off-by: Mike Bronner <mike@genealabs.com>
---
 .github/FUNDING.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..58c2ca3
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [mikebronner] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 03ac02635ffb75ad957ad17454272f48f1a4887f Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 26 Feb 2025 17:39:38 -0700
Subject: [PATCH 73/74] Delete .github/FUNDING.yml

Signed-off-by: Mike Bronner <mike@genealabs.com>
---
 .github/FUNDING.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 58c2ca3..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-github: [mikebronner] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 356399351a78437b8511105006660ca7f16c9b1a Mon Sep 17 00:00:00 2001
From: Mike Bronner <mike@genealabs.com>
Date: Wed, 23 Jul 2025 06:58:34 -0700
Subject: [PATCH 74/74] Update README.md

Signed-off-by: Mike Bronner <mike@genealabs.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f8c04ce..a156235 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ The following are packages we have identified as conflicting:
 - [dwightwatson/rememberable](https://github.com/dwightwatson/rememberable)
 - [kalnoy/nestedset](https://github.com/lazychaser/laravel-nestedset)
 - [laravel-adjacency-list](https://github.com/staudenmeir/laravel-adjacency-list)
+- [archtechx/virtualcolumn](https://github.com/archtechx/virtualcolumn)
 
 ### Things That Don't Work Currently
 The following items currently do no work with this package: