#718 - XML options

Author: egulias

Routing/Loader/RestXmlCollectionLoader.php

@@ -103,17 +103,6 @@ protected function parseNode(RouteCollection $collection, \DOMElement $node, $pa
      */
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)
     {
-        foreach ($node->childNodes as $child) {
-            if ($child instanceof \DOMElement && $child->tagName === 'option') {
-                $option = $node->ownerDocument->createElementNs(
-                    self::NAMESPACE_URI,
-                    'option',
-                    $child->nodeValue
-                );
-                $option->setAttribute('key', $child->getAttribute('key'));
-                $node->appendChild($option);
-            }
-        }
 
         // the Symfony Routing component uses a path attribute since Symfony 2.2
         // instead of the deprecated pattern attribute0
@@ -162,9 +151,33 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
             $node->appendChild($defaultFormatNode);
         }
 
+        $options = $this->getOptions($node);
+
+        foreach ($options as $option) {
+            $node->appendChild($option);
+        }
+
         parent::parseRoute($collection, $node, $path);
     }
 
+    private function getOptions(\DOMElement $node)
+    {
+        $options = array();
+        foreach ($node->childNodes as $child) {
+            if ($child instanceof \DOMElement && $child->tagName === 'option') {
+                $option = $node->ownerDocument->createElementNs(
+                    self::NAMESPACE_URI,
+                    'option',
+                    $child->nodeValue
+                );
+                $option->setAttribute('key', $child->getAttribute('key'));
+                $options[] = $option;
+            }
+        }
+
+        return $options;
+    }
+
     /**
      * {@inheritDoc}
      */

Tests/Routing/Loader/RestXmlCollectionLoaderTest.php

@@ -122,7 +122,7 @@ public function testForwardOptions()
         );
 
         foreach ($collection as $route) {
-            $this->assertTrue($route->getOption('expose'));
+            $this->assertTrue('true' === $route->getOption('expose'));
         }
     }
     /**