From 391e00c1de97c8450d671259ad751492169a896c Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 15 Feb 2011 22:06:52 +0100
Subject: [PATCH] [DependencyInjection] fixed a bug when xpath() returns false

---
 .../Loader/XmlFileLoader.php                   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 7e40094d9e..6b6b3c3bfc 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -101,7 +101,10 @@ class XmlFileLoader extends FileLoader
      */
     protected function parseImports(SimpleXMLElement $xml, $file)
     {
-        $imports = $xml->xpath('//container:imports/container:import');
+        if (false === $imports = $xml->xpath('//container:imports/container:import')) {
+            return;
+        }
+
         foreach ($imports as $import) {
             $this->currentDir = dirname($file);
             $this->import((string) $import['resource'], (Boolean) $import->getAttributeAsPhp('ignore-errors'));
@@ -151,7 +154,10 @@ class XmlFileLoader extends FileLoader
      */
     protected function parseDefinitions(SimpleXMLElement $xml, $file)
     {
-        $services = $xml->xpath('//container:services/container:service');
+        if (false === $services = $xml->xpath('//container:services/container:service')) {
+            return;
+        }
+
         foreach ($services as $service) {
             $this->parseDefinition((string) $service['id'], $service, $file);
         }
@@ -264,7 +270,9 @@ class XmlFileLoader extends FileLoader
         $count = 0;
 
         // anonymous services as arguments
-        $nodes = $xml->xpath('//container:argument[@type="service"][not(@id)]');
+        if (false === $nodes = $xml->xpath('//container:argument[@type="service"][not(@id)]')) {
+            return;
+        }
         foreach ($nodes as $node) {
             // give it a unique name
             $node['id'] = sprintf('%s_%d', md5($file), ++$count);
@@ -274,7 +282,9 @@ class XmlFileLoader extends FileLoader
         }
 
         // anonymous services "in the wild"
-        $nodes = $xml->xpath('//container:services/container:service[not(@id)]');
+        if (false === $nodes = $xml->xpath('//container:services/container:service[not(@id)]')) {
+            return;
+        }
         foreach ($nodes as $node) {
             // give it a unique name
             $node['id'] = sprintf('%s_%d', md5($file), ++$count);