Merge remote-tracking branch 'upstream/master' into laravel-11-upstream-merge

Author: Josh Ralph

.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 }}
 

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:
@@ -81,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

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": [
@@ -16,23 +16,23 @@
     ],
     "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"
+        "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",
+        "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",
+        "laravel/nova": "^5.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",

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>

src/CacheKey.php

@@ -276,9 +276,11 @@ protected function getQueryColumns(array $columns) : string
             return "_" . implode("_", $columns);
         }
 
-        return "_" . implode("_", array_map(function ($column) {
+        $columns = array_map(function ($column) {
             return $this->expressionToString($column);
-        }, $columns));
+        }, $columns);
+
+        return "_" . implode("_", $columns);
     }
 
     protected function getRawClauses(array $where) : string

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;

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) {

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;

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();
 

tests/NovaTestCase.php

@@ -1,12 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneaLabs\LaravelModelCaching\Tests;
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Nova\AuthorResource;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Nova\BookResource;
 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,
             ]
         );
     }