8000 synchronize the fixtures in different formats and fix default for num… · symfony/symfony@9ffe3de · GitHub
[go: up one dir, main page]
Skip to content

Commit 9ffe3de

Browse files
Tobionarnaud-lb
Tobion
authored and
arnaud-lb
committed
synchronize the fixtures in different formats and fix default for numeric requirement
1 parent 6cd3457 commit 9ffe3de

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

‎src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
$collection->add('blog_show', new Route(
77
'/blog/{slug}',
88
array('_controller' => 'MyBlogBundle:Blog:show'),
9-
array('_method' => 'GET'),
9+
array('_method' => 'GET', 'locale' => '\w+'),
1010
array('compiler_class' => 'RouteCompiler'),
1111
'{locale}.example.com'
1212
));

‎src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<route id="blog_show" pattern="/blog/{slug}" hostname-pattern="{locale}.example.com">
88
<default key="_controller">MyBundle:Blog:show</default>
99
<requirement key="_method">GET</requirement>
10+
<requirement key="locale">\w+</requirement>
1011
<option key="compiler_class">RouteCompiler</option>
1112
</route>
1213
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ blog_show:
22
pattern: /blog/{slug}
33
defaults: { _controller: MyBlogBundle:Blog:show }
44
hostname_pattern: "{locale}.example.com"
5-
requirements: { 'locale': '\d+' }
5+
requirements: { '_method': 'GET', 'locale': '\w+' }
66
options:
77
compiler_class: RouteCompiler

‎src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="validpattern.xml" prefix="/{foo}" hostname-pattern="{locale}.example.com">
8-
<default key="foo">foo 8000 </default>
8+
<default key="foo">123</default>
99
<requirement key="foo">\d+</requirement>
1010
<option key="foo">bar</option>
1111
</import>

‎src/Symfony/Component/Routing/Tests/Fixtures/validresource.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blog_show:
22
resource: validpattern.yml
33
prefix: /{foo}
4-
defaults: { 'foo': 'foo' }
4+
defaults: { 'foo': '123' }
55
requirements: { 'foo': '\d+' }
66
options: { 'foo': 'bar' }
77
hostname_pattern: "{locale}.example.com"

‎src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function testLoadWithRoute()
5151
$this->assertEquals('/blog/{slug}', $route->getPattern());
5252
$this->assertEquals('MyBundle:Blog:show', $route->getDefault('_controller'));
5353
$this->assertEquals('GET', $route->getRequirement('_method'));
54+
$this->assertEquals('\w+', $route->getRequirement('locale'));
5455
$this->assertEquals('{locale}.example.com', $route->getHostnamePattern());
5556
$this->assertEquals('RouteCompiler', $route->getOption('compiler_class'));
5657
}
@@ -65,7 +66,7 @@ public function testLoadWithImport()
6566
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
6667
$this->assertEquals('/{foo}/blog/{slug}', $routes['blog_show']->getPattern());
6768
$this->assertEquals('MyBundle:Blog:show', $routes['blog_show']->getDefault('_controller'));
68-
$this->assertEquals('foo', $routes['blog_show']->getDefault('foo'));
69+
$this->assertEquals('123', $routes['blog_show']->getDefault('foo'));
6970
$this->assertEquals('\d+', $routes['blog_show']->getRequirement('foo'));
7071
$this->assertEquals('bar', $routes['blog_show']->getOption('foo'));
7172
$this->assertEquals('{locale}.example.com', $routes['blog_show']->getHostnamePattern());

‎src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public function testLoadWithPattern()
9090
$route = $routes['blog_show'];
9191
$this->assertEquals('/blog/{slug}', $route->getPattern());
9292
$this->assertEquals('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
93-
$this->assertEquals('\d+', $route->getRequirement('locale'));
93+
$this->assertEquals('GET', $route->getRequirement('_method'));
94+
$this->assertEquals('\w+', $route->getRequirement('locale'));
9495
$this->assertEquals('{locale}.example.com', $route->getHostnamePattern());
9596
$this->assertEquals('RouteCompiler', $route->getOption('compiler_class'));
9697
}
@@ -105,7 +106,7 @@ public function testLoadWithResource()
105106
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
106107
$this->assertEquals('/{foo}/blog/{slug}', $routes['blog_show']->getPattern());
107108
$this->assertEquals('MyBlogBundle:Blog:show', $routes['blog_show']->getDefault('_controller'));
108-
$this->assertEquals('foo', $routes['blog_show']->getDefault('foo'));
109+
$this->assertEquals('123', $routes['blog_show']->getDefault('foo'));
109110
$this->assertEquals('\d+', $routes['blog_show']->getRequirement('foo'));
110111
$this->assertEquals('bar', $routes['blog_show']->getOption('foo'));
111112
$this->assertEquals('{locale}.example.com', $routes['blog_show']->getHostnamePattern());

0 commit comments

Comments
 (0)
0