diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure id, pattern and resource are specified

Browse Source 
the yaml loader also requires the pattern to be given, so the xml loader should do the same
This commit is contained in:
Tobias Schultze 2012-12-03 13:03:01 +01:00
parent 8361b5a58b
commit b20d6a7960
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View File

@ -112,11 +112,14 @@ class XmlFileLoader extends FileLoader
*/
protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)
{
if ('' === ($id = $node->getAttribute('id')) || !$node->hasAttribute('pattern')) {
throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "pattern" attribute.', $path));
}
list($defaults, $requirements, $options) = $this->parseConfigs($node, $path);
$route = new Route($node->getAttribute('pattern'), $defaults, $requirements, $options, $node->getAttribute('hostname-pattern'));
$collection->add($node->getAttribute('id'), $route);
$collection->add($id, $route);
}
/**
@ -131,7 +134,10 @@ class XmlFileLoader extends FileLoader
*/
protected function parseImport(RouteCollection $collection, \DOMElement $node, $path, $file)
{
$resource = $node->getAttribute('resource');
if ('' === $resource = $node->getAttribute('resource')) {
throw new \InvalidArgumentException(sprintf('The <import> element in file "%s" must have a "resource" attribute.', $path));
}
$type = $node->getAttribute('type');
$prefix = $node->getAttribute('prefix');
$hostnamePattern = $node->hasAttribute('hostname-pattern') ? $node->getAttribute('hostname-pattern') : null;

2
src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
View File

@ -36,7 +36,7 @@
<xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
<xsd:attribute name="id" type="xsd:string" use="required" />
<xsd:attribute name="pattern" type="xsd:string" default="/" />
<xsd:attribute name="pattern" type="xsd:string" use="required" />
<xsd:attribute name="hostname-pattern" type="xsd:string" />
</xsd:complexType>