Skip to content

Commit 6cd84a7

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Process] intersect with getenv() in case-insensitive manner to get default envs [Serializer] fix support for lazy/unset properties Fix redundant type casts [Notifier] Fix AllMySms bridge body content Revert "[DoctrineBridge] add support for the JSON type"
2 parents f046570 + 37b82f9 commit 6cd84a7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Loader/XmlFileLoader.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
214214
if ($alias = $service->getAttribute('alias')) {
215215
$this->validateAlias($service, $file);
216216

217-
$this->container->setAlias((string) $service->getAttribute('id'), $alias = new Alias($alias));
217+
$this->container->setAlias($service->getAttribute('id'), $alias = new Alias($alias));
218218
if ($publicAttr = $service->getAttribute('public')) {
219219
$alias->setPublic(XmlUtils::phpize($publicAttr));
220220
} elseif ($defaults->getChanges()['public'] ?? false) {
@@ -352,7 +352,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
352352
}
353353

354354
if ('' === $tagName && '' === $tagName = $tag->getAttribute('name')) {
355-
throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
355+
throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $service->getAttribute('id'), $file));
356356
}
357357

358358
$definition->addTag($tagName, $parameters);
@@ -382,7 +382,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
382382
} elseif ('null' === $decorationOnInvalid) {
383383
$invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
384384
} else {
385-
throw new InvalidArgumentException(sprintf('Invalid value "%s" for attribute "decoration-on-invalid" on service "%s". Did you mean "exception", "ignore" or "null" in "%s"?', $decorationOnInvalid, (string) $service->getAttribute('id'), $file));
385+
throw new InvalidArgumentException(sprintf('Invalid value "%s" for attribute "decoration-on-invalid" on service "%s". Did you mean "exception", "ignore" or "null" in "%s"?', $decorationOnInvalid, $service->getAttribute('id'), $file));
386386
}
387387

388388
$renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null;

0 commit comments

Comments
 (0)