Skip to content

Fixes cache callback using its return instead of Cache instance. #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DarkGhostHunter merged 2 commits into from
Feb 14, 2025
Merged

Fixes cache callback using its return instead of Cache instance. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f93fb13
Fixes cache callback using its return instead of Cache instance.
DarkGhostHunter Feb 14, 2025
e180986
Fixes cache variable not being overwritten.
DarkGhostHunter Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/CacheQueryServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,16 @@ protected function macro(): Closure
$this->connection = $this->connection->connection;
}

$cache = new Cache();

match (true) {
$ttl instanceof Closure => $ttl($cache),
! $ttl instanceof Cache => $cache->ttl($ttl),
default => $cache = $ttl
};

// Normalize the TTL argument to a Cache instance.
$this->connection = Proxy::crateNewInstance($this->connection, match (true) {
$ttl instanceof Closure => $ttl(new Cache),
! $ttl instanceof Cache => (new Cache)->ttl($ttl),
default => $ttl
});
$this->connection = Proxy::crateNewInstance($this->connection, $cache);

return $this;
};
Expand Down
29 changes: 22 additions & 7 deletions tests/ProxyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ protected function defineDatabaseMigrations(): void
});
}

public function test_passes_through_method_calls(): void
{
$query = $this->app->make('db')->table('users')->cache()->where('id', 1);

static::assertSame([], $query->getConnection()->getQueryLog());
}

public function test_caches_base_query_into_default_store(): void
{
$get = $this->app->make('db')->table('users')->cache()->where('id', 1)->get();
Expand Down Expand Up @@ -874,6 +867,10 @@ public function test_pass_through_methods_to_wrapped_connection(): void
$connection->setDatabaseName('foo');

static::assertSame('foo', $connection->getDatabaseName());

$query = $this->app->make('db')->table('users')->cache()->where('id', 1);

static::assertSame([], $query->getConnection()->getQueryLog());
}

public function test_pass_through_properties_set_and_get(): void
Expand Down Expand Up @@ -916,6 +913,24 @@ public function test_sets_custom_query_hasher(): void

static::assertTrue($this->app->make('cache')->has('cache-query|test_hash'));
}

public function test_base_query_uses_cache_callback(): void
{
$hash = 'cache-query|fj8Xyz4K1Zh0tdAamPbG1A';

$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]);

$this->mock('cache')->expects('store')->with(null)->andReturn($repository);

$this->app->make('db')->table('users')->where('id', 1)->cache(function ($cache) {
static::assertInstanceOf(Cache::class, $cache);

$cache->ttl([5, 300]);
})->first();
}
}

class User extends Authenticatable
Expand Down
Loading