Skip to content

Commit ae3a789

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: the string "0" is a valid service identifier remove unreachable code updated MimeType extensions
2 parents 779e7ad + 2068060 commit ae3a789

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Loader/XmlFileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
497497

498498
switch ($arg->getAttribute('type')) {
499499
case 'service':
500-
if (!$arg->getAttribute('id')) {
500+
if ('' === $arg->getAttribute('id')) {
501501
throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="service" has no or empty "id" attribute in "%s".', $name, $file));
502502
}
503503

@@ -561,7 +561,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
561561
* @param \DOMNode $node
562562
* @param mixed $name
563563
*
564-
* @return array
564+
* @return \DOMElement[]
565565
*/
566566
private function getChildren(\DOMNode $node, $name)
567567
{

Tests/Fixtures/xml/services6.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,9 @@
6161
</service>
6262
<service id="alias_for_foo" alias="foo" />
6363
<service id="another_alias_for_foo" alias="foo" public="false" />
64+
<service id="0" class="FooClass" />
65+
<service id="1" class="FooClass">
66+
<argument type="service" id="0" />
67+
</service>
6468
</services>
6569
</container>

0 commit comments

Comments
 (0)