[Routing] fixed previous merge

fabpot · fabpot · commit 9aa8083cb462 · 2011-05-26T18:28:42.000+02:00
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -48,7 +48,7 @@ public function load($file, $type = null)
                 continue;
             }
 
-            $this->parseNode($collection, $node, $path);
+            $this->parseNode($collection, $node, $path, $file);
         }
 
         return $collection;
@@ -58,10 +58,11 @@ public function load($file, $type = null)
      * Parses a node from a loaded XML file.
      *
      * @param RouteCollection $collection the collection to associate with the node
-     * @param DOMElement $node the node to parse
-     * @param string $path the path of the XML file being processed
+     * @param DOMElement      $node the node to parse
+     * @param string          $path the path of the XML file being processed
+     * @param string          $file
      */
-    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path)
+    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path, $file)
     {
         switch ($node->tagName) {
             case 'route':

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function load($file, $type = null)`
`48`	`48`	`continue;`
`49`	`49`	`}`
`50`	`50`
`51`		`- $this->parseNode($collection, $node, $path);`
	`51`	`+ $this->parseNode($collection, $node, $path, $file);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return $collection;`
`@@ -58,10 +58,11 @@ public function load($file, $type = null)`
`58`	`58`	`* Parses a node from a loaded XML file.`
`59`	`59`	`*`
`60`	`60`	`* @param RouteCollection $collection the collection to associate with the node`
`61`		`- * @param DOMElement $node the node to parse`
`62`		`- * @param string $path the path of the XML file being processed`
	`61`	`+ * @param DOMElement $node the node to parse`
	`62`	`+ * @param string $path the path of the XML file being processed`
	`63`	`+ * @param string $file`
`63`	`64`	`*/`
`64`		`- protected function parseNode(RouteCollection $collection, \DOMElement $node, $path)`
	`65`	`+ protected function parseNode(RouteCollection $collection, \DOMElement $node, $path, $file)`
`65`	`66`	`{`
`66`	`67`	`switch ($node->tagName) {`
`67`	`68`	`case 'route':`