Apr 30, 2013 · May 7, 2013 · May 7, 2013 · May 31, 2013 · Jun 2, 2013 · Jun 2, 2013
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
        unset($requirements['_scheme'], $requirements['_method']);
        if (count($requirements)) {
            $routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
            foreach ($route->getOptions() as $attribute => $pattern) {
            foreach ($requirements as $attribute => $pattern) {
                $requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
                $requirementXML->setAttribute('attribute', $attribute);
                $requirementXML->appendChild(new \DOMText($pattern));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml
    <default attribute="name">Joseph</default>
  </defaults>
  <requirements>
    <requirement attribute="compiler_class">Symfony\Component\Routing\RouteCompiler</requirement>
    <requirement attribute="opt1">val1</requirement>
    <requirement attribute="opt2">val2</requirement>
    <requirement attribute="name">[a-z]+</requirement>
  </requirements>
  <options>
    <option name="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
    <option name="opt1">val1</option>
    <option name="opt2">val2</option>
  </options>
 </route>
 </route>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml
      <default attribute="name">Joseph</default>
    </defaults>
    <requirements>
      <requirement attribute="compiler_class">Symfony\Component\Routing\RouteCompiler</requirement>
      <requirement attribute="opt1">val1</requirement>
      <requirement attribute="opt2">val2</requirement>
      <requirement attribute="name">[a-z]+</requirement>
    </requirements>
    <options>
      <option name="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
      <option name="opt2">val2</option>
    </options>
  </route>
 </routes>
 </routes>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,7 +160,7 @@ private function getRouteDocument(Route $route, $name = null)
		unset($requirements['_scheme'], $requirements['_method']);
		if (count($requirements)) {
		$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
		foreach ($route->getOptions() as $attribute => $pattern) {
		foreach ($requirements as $attribute => $pattern) {
		$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
		$requirementXML->setAttribute('attribute', $attribute);
		$requirementXML->appendChild(new \DOMText($pattern));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,13 +9,11 @@
		<default attribute="name">Joseph</default>
Copy link Contributor TobionSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. instead of "attribute" I would name this "name". so`<default name="...">` Copy link ContributorAuthor jfsimonSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. `option` tag already uses a`name` attribute, I guess it would be more consistent.
		</defaults>
		<requirements>
		<requirement attribute="compiler_class">Symfony\Component\Routing\RouteCompiler</requirement>
		<requirement attribute="opt1">val1</requirement>
		<requirement attribute="opt2">val2</requirement>
		<requirement attribute="name">[a-z]+</requirement>
Copy link Contributor TobionSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. instead of "attribute" I would name this "placeholder" or "variable". so`<requirement placeholder="...">` Copy link ContributorAuthor jfsimonSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think the attribute should be named like the`default` one (ie.`name`), don't you think so? Copy link Member stofSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think the attribute should have the same name than the one used in XML routing files, for consistency Copy link ContributorAuthor jfsimonSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Good one, let's rename attributes to`key`. Copy link Contributor TobionSep 27, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. true, but then i would also need to be host, methods and schemes attributes instead of elements. seehttps://github.com/symfony/symfony/blob/master/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
		</requirements>
		<options>
		<option name="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
		<option name="opt1">val1</option>
		<option name="opt2">val2</option>
		</options>
		</route>
		</route>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,9 +10,7 @@
		<default attribute="name">Joseph</default>
		</defaults>
		<requirements>
		<requirement attribute="compiler_class">Symfony\Component\Routing\RouteCompiler</requirement>
		<requirement attribute="opt1">val1</requirement>
		<requirement attribute="opt2">val2</requirement>
		<requirement attribute="name">[a-z]+</requirement>
		</requirements>
		<options>
		<option name="compiler_class">Symfony\Component\Routing\RouteCompiler</option>
Expand All		@@ -32,4 +30,4 @@
		<option name="opt2">val2</option>
		</options>
		</route>
		</routes>
		</routes>