8000 [Routing] remove deprecations for 3.0 by Tobion · Pull Request #13396 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Routing] remove deprecations for 3.0 #13396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 31, 2015
Merged

[Routing] remove deprecations for 3.0 #13396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86278cd
[Routing] remove deprecated features from routing
Tobion Jan 13, 2015
4ca9ab3
[FrameworkBundle] remove deprecated routing features
Tobion Jan 13, 2015
82d54fa
[FramworkBundle] our tests now expect symfony 3.0 behavior for routing
Tobion Jan 16, 2015
f939fea
[Routing] make path required again in the xsd
Tobion Jan 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109CB
Prev Previous commit
[Routing] make path required again in the xsd 
pattern was previously also required, see 5082994#diff-4
  • Loading branch information
@Tobion
Tobion committed Jan 31, 2015
commit f939fea5438983bc296c0b8da705ffe3aabd2c0a
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
0