Skip to content

Commit 44af0a3

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: [Filesystem] [Serializer] fixes English grammar typo [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description [Validator] Add Japanese translation Remove some unused methods parameters Avoid empty \"If-Modified-Since\" header in validation request [Validator] ConstraintValidatorTestCase: add missing return value to mocked validate method calls
2 parents 539d558 + 8b1a5f5 commit 44af0a3

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Loader/XmlFileLoader.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
304304
$definition->setDeprecated(true, $deprecated[0]->nodeValue ?: null);
305305
}
306306

307-
$definition->setArguments($this->getArgumentsAsPhp($service, 'argument', $file, false, $definition instanceof ChildDefinition));
307+
$definition->setArguments($this->getArgumentsAsPhp($service, 'argument', $file, $definition instanceof ChildDefinition));
308308
$definition->setProperties($this->getArgumentsAsPhp($service, 'property', $file));
309309

310310
if ($factories = $this->getChildren($service, 'factory')) {
@@ -468,11 +468,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
468468
*
469469
* @param string $name
470470
* @param string $file
471-
* @param bool $lowercase
472471
*
473472
* @return mixed
474473
*/
475-
private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase = true, $isChildDefinition = false)
474+
private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $isChildDefinition = false)
476475
{
477476
$arguments = [];
478477
foreach ($this->getChildren($node, $name) as $arg) {
@@ -519,10 +518,10 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
519518
$arguments[$key] = new Expression($arg->nodeValue);
520519
break;
521520
case 'collection':
522-
$arguments[$key] = $this->getArgumentsAsPhp($arg, $name, $file, false);
521+
$arguments[$key] = $this->getArgumentsAsPhp($arg, $name, $file);
523522
break;
524523
case 'iterator':
525-
$arg = $this->getArgumentsAsPhp($arg, $name, $file, false);
524+
$arg = $this->getArgumentsAsPhp($arg, $name, $file);
526525
try {
527526
$arguments[$key] = new IteratorArgument($arg);
528527
} catch (InvalidArgumentException $e) {

0 commit comments

Comments
 (0)