Skip to content

Commit 1806e43

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [Serializer] Added check of constuctor modifiers to AbstractNormalizer [Intl] Simplify the compile binary [Routing] Fix routes annotation loading with glob pattern Fix hardcoded hotPathTagName [Validator] Improve constraint default option check [Validator] Fix annotation default for @count and @Length Update composer.json Fix getSetMethodNormalizer to correctly ignore the attributes specified in "ignored_attributes" Add missing "vi" translations add missing German translations [Intl] Fix test added missing translation use behavior instead of behaviour [Validator] Translate JSON message to Hungarian [Validator] fix sr_Latn translations [FrameworkBundle][HttpFoundation] make session service resettable
2 parents 2123e78 + 85172cc commit 1806e43

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dumper/XmlDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
287287
} elseif ($value instanceof Reference) {
288288
$element->setAttribute('type', 'service');
289289
$element->setAttribute('id', (string) $value);
290-
$behaviour = $value->getInvalidBehavior();
291-
if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behaviour) {
290+
$behavior = $value->getInvalidBehavior();
291+
if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behavior) {
292292
$element->setAttribute('on-invalid', 'null');
293-
} elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behaviour) {
293+
} elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behavior) {
294294
$element->setAttribute('on-invalid', 'ignore');
295-
} elseif (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE == $behaviour) {
295+
} elseif (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE == $behavior) {
296296
$element->setAttribute('on-invalid', 'ignore_uninitialized');
297297
}
298298
} elseif ($value instanceof Definition) {

0 commit comments

Comments
 (0)