diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DependencyInjection] made a small cleanup

Browse Source
This commit is contained in:
Fabien Potencier 2012-05-07 12:17:20 +02:00
parent fe6b26c5d0
commit 1244158ceb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
View File

@ -44,7 +44,7 @@ class XmlFileLoader extends FileLoader
$this->container->addResource(new FileResource($path));
// anonymous services
$xml = $this->processAnonymousServices($xml, $path);
$this->processAnonymousServices($xml, $path);
// imports
$this->parseImports($xml, $path);
@ -222,8 +222,6 @@ class XmlFileLoader extends FileLoader
*
* @param SimpleXMLElement $xml
* @param string $file
*
* @return array An array of anonymous services
*/
private function processAnonymousServices(SimpleXMLElement $xml, $file)
{
@ -232,7 +230,7 @@ class XmlFileLoader extends FileLoader
// anonymous services as arguments
if (false === $nodes = $xml->xpath('//container:argument[@type="service"][not(@id)]')) {
return $xml;
return;
}
foreach ($nodes as $node) {
// give it a unique name
@ -244,7 +242,7 @@ class XmlFileLoader extends FileLoader
// anonymous services "in the wild"
if (false === $nodes = $xml->xpath('//container:services/container:service[not(@id)]')) {
return $xml;
return;
}
foreach ($nodes as $node) {
// give it a unique name
@ -271,8 +269,6 @@ class XmlFileLoader extends FileLoader
$oNode->parentNode->removeChild($oNode);
}
}
return $xml;
}
/**