made schemes and methods available in XmlFileLoader

Tobion · Tobion · commit e803f4663c0b · 2012-12-12T09:48:09.000+01:00
it uses an attribute list instead of multiple scheme/method elements that I also experimented with
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -116,9 +116,12 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
             throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "pattern" attribute.', $path));
         }
 
+        $schemes = array_filter(explode(' ', $node->getAttribute('schemes')));
+        $methods = array_filter(explode(' ', $node->getAttribute('methods')));
+
         list($defaults, $requirements, $options) = $this->parseConfigs($node, $path);
 
-        $route = new Route($node->getAttribute('pattern'), $defaults, $requirements, $options, $node->getAttribute('hostname-pattern'));
+        $route = new Route($node->getAttribute('pattern'), $defaults, $requirements, $options, $node->getAttribute('hostname-pattern'), $schemes, $methods);
         $collection->add($id, $route);
     }
 
@@ -141,6 +144,8 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
         $type = $node->getAttribute('type');
         $prefix = $node->getAttribute('prefix');
         $hostnamePattern = $node->hasAttribute('hostname-pattern') ? $node->getAttribute('hostname-pattern') : null;
+        $schemes = $node->hasAttribute('schemes') ? array_filter(explode(' ', $node->getAttribute('schemes'))) : null;
+        $methods = $node->hasAttribute('methods') ? array_filter(explode(' ', $node->getAttribute('methods'))) : null;
 
         list($defaults, $requirements, $options) = $this->parseConfigs($node, $path);
 
@@ -152,6 +157,12 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
         if (null !== $hostnamePattern) {
             $subCollection->setHostnamePattern($hostnamePattern);
         }
+        if (null !== $schemes) {
+            $subCollection->setSchemes($schemes);
+        }
+        if (null !== $methods) {
+            $subCollection->setMethods($methods);
+        }
         $subCollection->addDefaults($defaults);
         $subCollection->addRequirements($requirements);
         $subCollection->addOptions($options);
diff --git a/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd b/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
@@ -17,6 +17,16 @@
 
   <xsd:element name="routes" type="routes" />
 
+  <xsd:simpleType name="word">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="([a-zA-Z]){3,}"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="stringlist">
+    <xsd:list itemType="word"/>
+  </xsd:simpleType>
+
   <xsd:complexType name="routes">
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
       <xsd:element name="import" type="import" />
@@ -38,6 +48,8 @@
     <xsd:attribute name="id" type="xsd:string" use="required" />
     <xsd:attribute name="pattern" type="xsd:string" use="required" />
     <xsd:attribute name="hostname-pattern" type="xsd:string" />
+    <xsd:attribute name="schemes" type="stringlist" />
+    <xsd:attribute name="methods" type="stringlist" />
   </xsd:complexType>
 
   <xsd:complexType name="import">
@@ -47,6 +59,8 @@
     <xsd:attribute name="type" type="xsd:string" />
     <xsd:attribute name="prefix" type="xsd:string" />
     <xsd:attribute name="hostname-pattern" type="xsd:string" />
+    <xsd:attribute name="schemes" type="stringlist" />
+    <xsd:attribute name="methods" type="stringlist" />
   </xsd:complexType>
 
   <xsd:complexType name="element">
