Skip to content

Commit 5bef45f

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Support nexus -> nexuses pluralization [Lock] read (possible) error from Redis instance where evalSha() was called ignore the current locale before transliterating ASCII codes with iconv()
2 parents e0cbba9 + 69599a1 commit 5bef45f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Store/RedisStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private function evaluate(string $script, string $resource, array $args): mixed
265265
$client = $this->redis->_instance($this->redis->_target($resource));
266266
$client->clearLastError();
267267
$result = $client->evalSha($scriptSha, array_merge([$resource], $args), 1);
268-
if (null !== ($err = $this->redis->getLastError()) && str_starts_with($err, self::NO_SCRIPT_ERROR_MESSAGE_PREFIX)) {
268+
if (null !== ($err = $client->getLastError()) && str_starts_with($err, self::NO_SCRIPT_ERROR_MESSAGE_PREFIX)) {
269269
$client->clearLastError();
270270

271271
$client->script('LOAD', $script);

0 commit comments

Comments
 (0)