Skip to content

Commit c7237dc

Browse files
authored
refactor(kv-store): fix typo, correct type annotation, and fix TTL calculation (#1770)
1 parent fdd6b8b commit c7237dc

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

packages/kv-store/src/Redis/Config/RedisConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(
3838
/**
3939
* Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets.
4040
*/
41-
public ?int $unixSocketPath = null,
41+
public ?string $unixSocketPath = null,
4242

4343
/**
4444
* Specifies the protocol used to communicate with the Redis instance. This is specific to predis.

packages/kv-store/src/Redis/PhpRedisClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function command(Stringable|string $command, Stringable|string ...$argume
9999
public function set(Stringable|string $key, mixed $value, null|Duration|DateTimeInterface $expiration = null): void
100100
{
101101
if ($expiration instanceof DateTimeInterface) {
102-
$expiration = DateTime::now()->since($expiration);
102+
$expiration = $expiration->since(DateTime::now());
103103
}
104104

105105
if ($expiration?->isNegative()) {

packages/kv-store/src/Redis/PredisClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function command(Stringable|string $command, Stringable|string ...$argume
5656
public function set(Stringable|string $key, mixed $value, null|Duration|DateTimeInterface $expiration = null): void
5757
{
5858
if ($expiration instanceof DateTimeInterface) {
59-
$expiration = DateTime::now()->since($expiration);
59+
$expiration = $expiration->since(DateTime::now());
6060
}
6161

6262
if ($expiration?->isNegative()) {

packages/kv-store/src/Redis/ReddisExtensionWasMissing.php renamed to packages/kv-store/src/Redis/RedisExtensionWasMissing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Exception;
66
use Predis;
77

8-
final class ReddisExtensionWasMissing extends Exception implements RedisException
8+
final class RedisExtensionWasMissing extends Exception implements RedisException
99
{
1010
public function __construct(string $fqcn)
1111
{

packages/kv-store/src/Redis/RedisInitializer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ public function initialize(Container $container): Redis
1919

2020
try {
2121
return new PhpRedisClient($this->buildPhpRedisClient(), $config, $bus);
22-
} catch (ReddisExtensionWasMissing) {
22+
} catch (RedisExtensionWasMissing) {
2323
return new PredisClient($this->buildPredisClient($config), $bus);
2424
}
2525
}
2626

2727
private function buildPhpRedisClient(): \Redis
2828
{
2929
if (! extension_loaded('redis') || ! class_exists(\Redis::class)) {
30-
throw new ReddisExtensionWasMissing(\Redis::class);
30+
throw new RedisExtensionWasMissing(\Redis::class);
3131
}
3232

3333
return new \Redis();
@@ -36,7 +36,7 @@ private function buildPhpRedisClient(): \Redis
3636
private function buildPredisClient(RedisConfig $config): Predis\Client
3737
{
3838
if (! class_exists(Predis\Client::class)) {
39-
throw new ReddisExtensionWasMissing(Predis\Client::class);
39+
throw new RedisExtensionWasMissing(Predis\Client::class);
4040
}
4141

4242
return new Predis\Client(

0 commit comments

Comments
 (0)