6.x

Author: DarkGhostHunter

.github/workflows/php.yml

@@ -50,18 +50,15 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 8.2
           - 8.3
           - 8.4
+          - 8.5
         laravel-constraint:
-          - 11.*
           - 12.*
+          - 13.*
         dependencies:
           - lowest
           - highest
-        exclude:
-          - laravel-constraint: 12.*
-            php-version: 8.2
     steps:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2

README.md

@@ -1,10 +1,10 @@
 # Cache Query 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/laragear/cache-query.svg)](https://packagist.org/packages/laragear/cache-query)
 [![Latest stable test run](https://github.com/Laragear/CacheQuery/workflows/Tests/badge.svg)](https://github.com/Laragear/CacheQuery/actions)
-[![Codecov coverage](https://codecov.io/gh/Laragear/CacheQuery/branch/5.x/graph/badge.svg?token=IOZS1TFJ5G)](https://codecov.io/gh/Laragear/CacheQuery)
+[![Codecov coverage](https://codecov.io/gh/Laragear/CacheQuery/graph/badge.svg?token=IOZS1TFJ5G)](https://codecov.io/gh/Laragear/CacheQuery)
 [![Maintainability](https://qlty.sh/badges/8738ff13-01ca-4d38-83a8-dd484723093d/maintainability.svg)](https://qlty.sh/gh/Laragear/projects/CacheQuery)
 [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=Laragear_CacheQuery&metric=alert_status)](https://sonarcloud.io/dashboard?id=Laragear_CacheQuery)
-[![Laravel Octane Compatibility](https://img.shields.io/badge/Laravel%20Octane-Compatible-success?style=flat&logo=laravel)](https://laravel.com/docs/11.x/octane#introduction)
+[![Laravel Octane Compatibility](https://img.shields.io/badge/Laravel%20Octane-Compatible-success?style=flat&logo=laravel)](https://laravel.com/docs/13.x/octane#introduction)
 
 Remember your query results using only one method. Yes, only one.
 
@@ -20,7 +20,8 @@ Your support allows me to keep this package free, up-to-date and maintainable. A
 
 ## Requirements
 
-* Laravel 11 or later
+* PHP 8.3 
+* Laravel 12 or later
 
 ## Installation
 
@@ -30,15 +31,15 @@ You can install the package via composer:
 composer require laragear/cache-query
 ```
 
-## How it works?
+## How does it work?
 
-This library wraps the connection into a proxy object. It proxies all method calls to it except `select()` and `selectOne()`.
+This library wraps the database connection into a proxy object. It proxies all method calls to it except `select()` and `selectOne()`.
 
 Once a `SELECT` statement is executed through the aforementioned methods, it will check if the results are in the cache before executing the query. On cache hit, it will return the cached results, otherwise it will continue execution, save the results using the cache configuration, and return them.
 
 ## Usage
 
-Just use the `cache()` method to remember the results of a query for a default of 60 seconds.
+Use the `cache()` method to remember the results of a query for a default of 60 seconds.
 
 ```php
 use Illuminate\Support\Facades\DB;
@@ -51,7 +52,7 @@ Article::latest('published_at')->take(10)->cache()->get();
 
 The next time you call the **same** query, the result will be retrieved from the cache instead of running the `SELECT` SQL statement in the database, even if the results are empty, `null` or `false`. You may also desire to [not cache empty results](#cache-except-empty-results).
 
-It's **eager load aware**. This means that it will cache an eager loaded relation automatically, but [you may also disable this](#eager-loaded-queries).
+It's **eager load aware**. This means that it will cache an eager loaded relation automatically (but [you may also disable this](#eager-loaded-queries)).
 
 ```php
 use App\Models\User;

composer.json

@@ -17,16 +17,16 @@
         "issues": "https://github.com/laragear/cache-query/issues"
     },
     "require": {
-        "php": "^8.2",
-        "illuminate/cache": "11.*|12.*",
-        "illuminate/config": "11.*|12.*",
-        "illuminate/database": "11.*|12.*",
-        "illuminate/support": "11.*|12.*",
-        "illuminate/container": "11.*|12.*",
-        "illuminate/contracts": "11.*|12.*"
+        "php": "^8.3",
+        "illuminate/cache": "12.*|13.*",
+        "illuminate/config": "12.*|13.*",
+        "illuminate/database": "12.*|13.*",
+        "illuminate/support": "12.*|13.*",
+        "illuminate/container": "12.*|13.*",
+        "illuminate/contracts": "12.*|13.*"
     },
     "require-dev": {
-        "orchestra/testbench": "9.*|10.*"
+        "orchestra/testbench": "10.*|11.*"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="Test Suite">
       <directory>tests</directory>

src/CacheQueryServiceProvider.php

@@ -24,8 +24,8 @@
  */
 class CacheQueryServiceProvider extends ServiceProvider
 {
-    public const CONFIG = __DIR__.'/../config/cache-query.php';
-    public const STUBS = __DIR__.'/../.stubs/stubs';
+    public const string CONFIG = __DIR__.'/../config/cache-query.php';
+    public const string STUBS = __DIR__.'/../.stubs/stubs';
 
     /**
      * Register the service provider.
@@ -95,7 +95,6 @@ protected function macro(): Closure
                 default => $cache = $ttl
             };
 
-            // Normalize the TTL argument to a Cache instance.
             $this->connection = Proxy::crateNewInstance($this->connection, $cache);
 
             return $this;

src/Proxy.php

@@ -11,6 +11,7 @@
 use Illuminate\Support\Str;
 
 use function app;
+use function array_filter;
 use function array_shift;
 use function is_array;
 use function max;
@@ -66,7 +67,7 @@ public function getCacheHelperInstance(): Cache
      *
      * @throws \Psr\SimpleCache\InvalidArgumentException
      */
-    public function select($query, $bindings = [], $useReadPdo = true): mixed
+    public function select($query, $bindings = [], $useReadPdo = true, array $fetchUsing = [])
     {
         // Create the unique hash for the query to avoid any duplicate query.
         $this->computedKey = (static::$queryHasher)($this->connection, $query, $bindings);
@@ -159,7 +160,11 @@ protected function retrieveResultsFromCache(string $key): array
             return [$key => null, $this->cache->key => null];
         }
 
-        return $this->repository->getMultiple([$key, $this->cache->key]);
+        $result = $this->repository->getMultiple(array_filter([$key, $this->cache->key]));
+
+        $result[$this->cache->key] ??= null;
+
+        return $result;
     }
 
     /**

tests/ProxyTest.php

@@ -370,7 +370,7 @@ public function test_uses_custom_time_to_live(): void
         $interval = $now->diffAsCarbonInterval(now());
 
         $repository = $this->mock(Repository::class);
-        $repository->expects('getMultiple')->with([$hash, ''])->times(4)->andReturn(['' => null, $hash => null]);
+        $repository->expects('getMultiple')->with([$hash])->times(4)->andReturn(['' => null, $hash => null]);
         $repository->allows('getStore')->never();
         $repository->expects('put')->with($hash, Mockery::type('array'), null);
         $repository->expects('put')->with($hash, Mockery::type('array'), $seconds);
@@ -560,7 +560,7 @@ public function test_uses_custom_store(): void
         $repository = $this->mock(Repository::class);
         $repository->expects('flexible')->never();
         $repository->expects('put')->with($hash, Mockery::type('array'), 60)->once();
-        $repository->expects('getMultiple')->with([$hash, ''])->times(1)->andReturn(['' => null, $hash => null]);
+        $repository->expects('getMultiple')->with([$hash])->times(1)->andReturn(['' => null, $hash => null]);
 
         $this->mock('cache')->expects('store')->with('test-store')->andReturn($repository);
 
@@ -630,7 +630,7 @@ public function test_doesnt_uses_flexible_caching_if_repository_is_not_flexible(
         $repository = $this->mock(Repository::class);
         $repository->expects('flexible')->never();
         $repository->expects('put')->with($hash, Mockery::type('array'), [5, 300])->once();
-        $repository->expects('getMultiple')->with([$hash, ''])->times(1)->andReturn(['' => null, $hash => null]);
+        $repository->expects('getMultiple')->with([$hash])->times(1)->andReturn(['' => null, $hash => null]);
 
         $this->mock('cache')->expects('store')->with(null)->andReturn($repository);
 
@@ -921,7 +921,7 @@ public function test_base_query_uses_cache_callback(): void
         $repository = $this->mock(Repository::class);
         $repository->expects('flexible')->never();
         $repository->expects('put')->with($hash, Mockery::type('array'), [5, 300])->once();
-        $repository->expects('getMultiple')->with([$hash, ''])->times(1)->andReturn(['' => null, $hash => null]);
+        $repository->expects('getMultiple')->with([$hash])->times(1)->andReturn(['' => null, $hash => null]);
 
         $this->mock('cache')->expects('store')->with(null)->andReturn($repository);