[Routing] make path required again in the xsd

Tobion · Tobion · commit f939fea54389 · 2015-01-31T21:19:47.000+01:00
pattern was previously also required, see 5082994#diff-4
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -113,7 +113,7 @@ public function supports($resource, $type = null)
      */
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)
     {
-        if ('' === ($id = $node->getAttribute('id')) || (!$node->hasAttribute('pattern') && !$node->hasAttribute('path'))) {
+        if ('' === ($id = $node->getAttribute('id')) || !$node->hasAttribute('path')) {
             throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "path" attribute.', $path));
         }
 
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
@@ -37,7 +37,7 @@
     <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
 
     <xsd:attribute name="id" type="xsd:string" use="required" />
-    <xsd:attribute name="path" type="xsd:string" />
+    <xsd:attribute name="path" type="xsd:string" use="required" />
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="schemes" type="xsd:string" />
     <xsd:attribute name="methods" type="xsd:string" />

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function supports($resource, $type = null)`
`113`	`113`	`*/`
`114`	`114`	`protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)`
`115`	`115`	`{`
`116`		`- if ('' === ($id = $node->getAttribute('id')) \|\| (!$node->hasAttribute('pattern') && !$node->hasAttribute('path'))) {`
	`116`	`+ if ('' === ($id = $node->getAttribute('id')) \|\| !$node->hasAttribute('path')) {`
`117`	`117`	`throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "path" attribute.', $path));`
`118`	`118`	`}`
`119`	`119`