Skip to content

Commit cb8fcbb

Browse files
committed
Merge branch '5.3' into 5.4
2 parents c9b51ac + d532c72 commit cb8fcbb

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

Context/ExecutionContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function setNode($value, ?object $object, MetadataInterface $metadata = n
153153
$this->value = $value;
154154
$this->object = $object;
155155
$this->metadata = $metadata;
156-
$this->propertyPath = (string) $propertyPath;
156+
$this->propertyPath = $propertyPath;
157157
}
158158

159159
/**

Mapping/Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function parseConstraints(\SimpleXMLElement $nodes)
8585
} else {
8686
$options = [];
8787
}
88-
} elseif (\strlen((string) $node) > 0) {
88+
} elseif ('' !== (string) $node) {
8989
$options = XmlUtils::phpize(trim($node));
9090
} else {
9191
$options = null;

Resources/translations/validators.de.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,10 @@
386386
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387387
<target>Dieser Wert ist keine gültige Internationale Wertpapierkennnummer (ISIN).</target>
388388
</trans-unit>
389+
<trans-unit id="100">
390+
<source>This value should be a valid expression.</source>
391+
<target>Dieser Wert sollte eine gültige Expression sein.</target>
392+
</trans-unit>
389393
</body>
390394
</file>
391395
</xliff>

Violation/ConstraintViolationBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
4646
/**
4747
* @param string $message The error message as a string or a stringable object
4848
*/
49-
public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
49+
public function __construct(ConstraintViolationList $violations, ?Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
5050
{
5151
$this->violations = $violations;
5252
$this->message = $message;

0 commit comments

Comments
 (0)