Skip to content

Commit 6f8cc9c

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Filesystem] Fix str_contains deprecation [Security] Correctly initialize the voter property [ErrorHandler] Skip failing tests when "xdebug.file_link_format" option is defined [FrameworkBundle] Fix typo Update `changed-translation-files` step with native git diff command [DependencyInjection] fix XmlDumper when a tag contains also a 'name' property [Lock] Check the correct SQLSTATE error code for MySQL [ErrorHandler] Fix `ErrorHandlerTest::tearDown()` visibility [Lock] compatiblity with redis cluster 7 fix: typo [Messenger] trigger retry logic when message is a redelivery [PropertyAccess] Fix checking for missing properties add missing invalid extension error entry
2 parents e184c65 + 5dd358c commit 6f8cc9c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Store/PdoStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ private function getCurrentTimestampStatement(): string
232232
private function isTableMissing(\PDOException $exception): bool
233233
{
234234
$driver = $this->getDriver();
235-
$code = $exception->getCode();
235+
$code = $exception->errorInfo ? $exception->errorInfo[1] : $exception->getCode();
236236

237237
return match ($driver) {
238238
'pgsql' => '42P01' === $code,

Store/RedisStore.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,9 @@ private function getNowCode(): string
282282
try {
283283
$this->supportTime = 1 === $this->evaluate($script, 'symfony_check_support_time', []);
284284
} catch (LockStorageException $e) {
285-
if (!str_contains($e->getMessage(), 'commands not allowed after non deterministic')) {
285+
if (!str_contains($e->getMessage(), 'commands not allowed after non deterministic')
286+
&& !str_contains($e->getMessage(), 'is not allowed from script script')
287+
) {
286288
throw $e;
287289
}
288290
$this->supportTime = false;

0 commit comments

Comments
 (0)