[DependencyInjection] added the extension files in the list of loaded…

… resources
symfony · Feb 12, 2010 · 5d85297 · 5d85297
1 parent 8e81bbb
commit 5d85297
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Components/DependencyInjection/Loader/XmlFileLoader.php
@@ -343,6 +343,9 @@ protected function loadFromExtensions(BuilderConfiguration $configuration, $xml)
       $values = static::convertDomElementToArray($node);
       $config = $this->getExtension($node->namespaceURI)->load($node->localName, is_array($values) ? $values : array($values));
 
+      $r = new \ReflectionObject($this->getExtension($node->namespaceURI));
+      $config->addResource(new FileResource($r->getFileName()));
+
       $configuration->merge($config);
     }
   }

diff --git a/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php
@@ -253,7 +253,7 @@ protected function resolveServices($value)
 
   protected function loadFromExtensions(BuilderConfiguration $configuration, $content)
   {
-    foreach ($content as $key => $config)
+    foreach ($content as $key => $values)
     {
       if (in_array($key, array('imports', 'parameters', 'services')))
       {
@@ -262,12 +262,17 @@ protected function loadFromExtensions(BuilderConfiguration $configuration, $cont
 
       list($namespace, $tag) = explode('.', $key);
 
-      if (!is_array($config))
+      if (!is_array($values))
       {
-        $config = array();
+        $values = array();
       }
 
-      $configuration->merge(static::getExtension($namespace)->load($tag, $config));
+      $config = static::getExtension($namespace)->load($tag, $values);
+
+      $r = new \ReflectionObject($this->getExtension($namespace));
+      $config->addResource(new FileResource($r->getFileName()));
+
+      $configuration->merge($config);
     }
   }
 }