Skip to content

Commit 4c1f684

Browse files
Merge branch '2.7' into 2.8
* 2.7: [HttpKernel] Fix lowest dep [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpKernel/composer.json
2 parents f279142 + b7fb8d4 commit 4c1f684

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Loader/XmlFileLoader.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function load($resource, $type = null)
4949
$this->parseImports($xml, $path);
5050

5151
// parameters
52-
$this->parseParameters($xml, $path);
52+
$this->parseParameters($xml);
5353

5454
// extensions
5555
$this->loadFromExtensions($xml);
@@ -70,9 +70,8 @@ public function supports($resource, $type = null)
7070
* Parses parameters.
7171
*
7272
* @param \DOMDocument $xml
73-
* @param string $file
7473
*/
75-
private function parseParameters(\DOMDocument $xml, $file)
74+
private function parseParameters(\DOMDocument $xml)
7675
{
7776
if ($parameters = $this->getChildren($xml->documentElement, 'parameters')) {
7877
$this->container->getParameterBag()->add($this->getArgumentsAsPhp($parameters[0], 'parameter'));

0 commit comments

Comments
 (0)