Skip to content

Commit 1bda445

Browse files
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Allow simple, relative paths in importmap.php [PropertyInfo] Make isWriteable() more consistent with isReadable() when checking snake_case properties [AssetMapper] Add support for CSS files in the importmap [Messenger] Add `--all` option to the `messenger:failed:remove` command Fix merge fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE [HttpClient] Fix Static Code Analyzer issue with JsonMockResponse [Messenger] Fix exiting `FailedMessagesRetryCommand` [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize() remove an unreachable code branch [Validator] Fix `File::$extensions`’ PHPDoc [Mime] Fix email (de)serialization issues [FrameworkBundle][WebProfilerBundle][Console][Form][HttpKernel][PropertyInfo][Validator] Remove optional before required param Replace usages of SkippedTestSuiteError with markTestSkipped() call Update InteractiveAuthenticatorInterface description wording to match documentation [Serializer] Fix parsing XML root node attributes fix parsing of payload timestamp to DateTimeImmutable Fix routing to multiple fallback transports Fix missing stamps in delayed message handling [DoctrineBridge] Ignore invalid stores in `LockStoreSchemaListener` raised by `StoreFactory`
2 parents 72731fd + fb7cb3f commit 1bda445

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Constraints/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class File extends Constraint
6565
protected int|string|null $maxSize = null;
6666

6767
/**
68-
* @param array<string, string|string[]>|string[]|string $extensions
68+
* @param array<string|string[]>|string $extensions
6969
*/
7070
public function __construct(
7171
array $options = null,

Context/ExecutionContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function __construct(ValidatorInterface $validator, mixed $root, Translat
121121
$this->cachedObjectsRefs = new \SplObjectStorage();
122122
}
123123

124-
public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void
124+
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath): void
125125
{
126126
$this->value = $value;
127127
$this->object = $object;
@@ -142,7 +142,7 @@ public function setConstraint(Constraint $constraint): void
142142
public function addViolation(string $message, array $parameters = []): void
143143
{
144144
$this->violations->add(new ConstraintViolation(
145-
false === $this->translationDomain ? strtr($message, $parameters) : $this->translator->trans($message, $parameters, $this->translationDomain),
145+
$this->translator->trans($message, $parameters, $this->translationDomain),
146146
$message,
147147
$parameters,
148148
$this->root,

Context/ExecutionContextInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function getObject(): ?object;
122122
* @param object|null $object The currently validated object
123123
* @param string $propertyPath The property path to the current value
124124
*/
125-
public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void;
125+
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath): void;
126126

127127
/**
128128
* Warning: Should not be called by user code, to be used by the validator engine only.

0 commit comments

Comments
 (0)