Merge branch 'master' of github.com:mikebronner/laravel-model-caching

Author: mikebronner

Diff for: 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:

Diff for: 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",

Diff for: 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);
     }
 

Diff for: 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 for: 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) {

Diff for: 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);
     }
 
@@ -160,7 +165,7 @@ public function scopeDisableCache(EloquentBuilder $query) : EloquentBuilder
 
     public function scopeWithCacheCooldownSeconds(
         EloquentBuilder $query,
-        int $seconds = null
+        ?int $seconds = null
     ) : EloquentBuilder {
         if (! $seconds) {
             $seconds = $this->cacheCooldownSeconds;