Merge remote branch 'Chekote/xmlfileloader_overload_refactor'

fabpot · fabpot · commit 1c0dfad979d5 · 2011-05-26T18:25:53.000+02:00
* Chekote/xmlfileloader_overload_refactor:
  Refactored the processing of each individual node into it's own method, enabling easier overloading of behavior for Bundles such as FriendsOfSymfony/RestBundle
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -48,25 +48,37 @@ public function load($file, $type = null)
                 continue;
             }
 
-            switch ($node->tagName) {
-                case 'route':
-                    $this->parseRoute($collection, $node, $path);
-                    break;
-                case 'import':
-                    $resource = (string) $node->getAttribute('resource');
-                    $type = (string) $node->getAttribute('type');
-                    $prefix = (string) $node->getAttribute('prefix');
-                    $this->setCurrentDir(dirname($path));
-                    $collection->addCollection($this->import($resource, ('' !== $type ? $type : null), false, $file), $prefix);
-                    break;
-                default:
-                    throw new \InvalidArgumentException(sprintf('Unable to parse tag "%s"', $node->tagName));
-            }
+            $this->parseNode($collection, $node, $path);
         }
 
         return $collection;
     }
 
+    /**
+     * 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
+     */
+    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path)
+    {
+      switch ($node->tagName) {
+          case 'route':
+              $this->parseRoute($collection, $node, $path);
+              break;
+          case 'import':
+              $resource = (string) $node->getAttribute('resource');
+              $type = (string) $node->getAttribute('type');
+              $prefix = (string) $node->getAttribute('prefix');
+              $this->setCurrentDir(dirname($path));
+              $collection->addCollection($this->import($resource, ('' !== $type ? $type : null), false, $file), $prefix);
+              break;
+          default:
+              throw new \InvalidArgumentException(sprintf('Unable to parse tag "%s"', $node->tagName));
+      }
+    }
+
     /**
      * Returns true if this class supports the given resource.
      *
