Skip to content

Commit c739674

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: synchronize RelayProxy [Validator] added missing Hungarian translation [Validator] add missing lv translation fix the exception being thrown
2 parents 014bfac + e79914a commit c739674

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

src/Symfony/Component/Cache/Traits/RelayProxy.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ public function info(...$sections): \Relay\Relay|array|false
236236
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->info(...\func_get_args());
237237
}
238238

239-
public function flushdb($async = false): \Relay\Relay|bool
239+
public function flushdb($sync = null): \Relay\Relay|bool
240240
{
241241
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushdb(...\func_get_args());
242242
}
243243

244-
public function flushall($async = false): \Relay\Relay|bool
244+
public function flushall($sync = null): \Relay\Relay|bool
245245
{
246246
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushall(...\func_get_args());
247247
}
@@ -326,6 +326,11 @@ public function lastsave(): \Relay\Relay|false|int
326326
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lastsave(...\func_get_args());
327327
}
328328

329+
public function lcs($key1, $key2, $options = null): mixed
330+
{
331+
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lcs(...\func_get_args());
332+
}
333+
329334
public function bgsave($schedule = false): \Relay\Relay|bool
330335
{
331336
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args());

src/Symfony/Component/Validator/Constraints/JsonValidator.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
17+
use Symfony\Component\Validator\Exception\UnexpectedValueException;
1718

1819
/**
1920
* @author Imad ZAIRIG <[email protected]>
@@ -34,7 +35,7 @@ public function validate(mixed $value, Constraint $constraint)
3435
}
3536

3637
if (!\is_scalar($value) && !$value instanceof \Stringable) {
37-
throw new UnexpectedTypeException($value, 'string');
38+
throw new UnexpectedValueException($value, 'string');
3839
}
3940

4041
$value = (string) $value;

src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@
434434
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435435
<target>Az érzékelt karakterkódolás érvénytelen ({{ detected }}). Engedélyezett karakterkódolások: {{ encodings }}.</target>
436436
</trans-unit>
437+
<trans-unit id="112">
438+
<source>This is not a valid MAC address.</source>
439+
<target>Ez egy érvénytelen MAC cím.</target>
440+
</trans-unit>
437441
</body>
438442
</file>
439443
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@
434434
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435435
<target>Noteiktais rakstzīmju kodējums nav derīgs ({{ detected }}). Atļautie kodējumi ir {{ encodings }}.</target>
436436
</trans-unit>
437+
<trans-unit id="112">
438+
<source>This is not a valid MAC address.</source>
439+
<target>Šī nav derīga MAC adrese.</target>
440+
</trans-unit>
437441
</body>
438442
</file>
439443
</xliff>

0 commit comments

Comments
 (0)