8000 [Routing] added some unit tests for the YAML loader · symfony/symfony@3dfca47 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3dfca47

Browse files
fabpotarnaud-lb
fabpot
authored and
arnaud-lb
committed
[Routing] added some unit tests for the YAML loader
1 parent 92f9c15 commit 3dfca47

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
abstract class AnnotationClassLoader implements LoaderInterface
5858
{
5959
protected $reader;
60-
protected $routeAnnotationClass = 'Symfony\\Component\\Routing\\Annotation\\Route';
60+
protected $routeAnnotationClass = 'Symfony\\Component\\Routing\\Annotation\\Route';
6161
protected $defaultRouteIndex;
6262

6363
/**
@@ -97,11 +97,11 @@ public function load($class, $type = null)
9797
}
9898

9999
$globals = array(
100-
'pattern' => '',
101-
'requirements' => array(),
102-
'options' => array(),
103-
'defaults' => array(),
104-
'hostname_pattern' => null,
100+
'pattern' => '',
101+
'requirements' => array(),
102+
'options' => array(),
103+
'defaults' => array(),
104+
'hostname_pattern' => null,
105105
);
106106

107107
$class = new \ReflectionClass($class);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
blog_show:
2-
pattern: /blog/{slug}
3-
defaults: { _controller: MyBlogBundle:Blog:show }
2+
pattern: /blog/{slug}
3+
defaults: { _controller: MyBlogBundle:Blog:show }
4+
hostname_pattern: "{locale}.example.com"
5+
requirements: { 'foo': '\d+' }
46
options:
57
compiler_class: RouteCompiler

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
blog_show:
2-
resource: validpattern.yml
3-
prefix: /{foo}
4-
defaults: { 'foo': 'foo' }
5-
requirements: { 'foo': '\d+' }
6-
options: { 'foo': 'bar' }
2+
resource: validpattern.yml
3+
prefix: /{foo}
4+
defaults: { 'foo': 'foo' }
5+
requirements: { 'foo': '\d+' }
6+
options: { 'foo': 'bar' }
7+
hostname_pattern: "{locale}.example.com"
Collapse file

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ public function testLoadWithPattern()
8888
$this->assertEquals(1, count($routes), 'One route is loaded');
8989
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
9090
$route = $routes['blog_show'];
91+
$this->assertEquals('/blog/{slug}', $route->getPattern());
92+
$this->assertEquals('MyBlogBundle:Blog:show', $route->getDefault('_controller'));
93+
$this->assertEquals('\d+', $route->getRequirement('foo'));
94+
$this->assertEquals('{locale}.example.com', $route->getHostnamePattern());
9195
$this->assertEquals('RouteCompiler', $route->getOption('compiler_class'));
9296
}
9397

@@ -99,9 +103,12 @@ public function testLoadWithResource()
99103

100104
$this->assertEquals(1, count($routes), 'One route is loaded');
101105
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
106+
$this->assertEquals('/{foo}/blog/{slug}', $routes['blog_show']->getPattern());
107+
$this->assertEquals('MyBlogBundle:Blog:show', $routes['blog_show']->getDefault('_controller'));
102108
$this->assertEquals('foo', $routes['blog_show']->getDefault('foo'));
103109
$this->assertEquals('\d+', $routes['blog_show']->getRequirement('foo'));
104110
$this->assertEquals('bar', $routes['blog_show']->getOption('foo'));
111+
$this->assertEquals('{locale}.example.com', $routes['blog_show']->getHostnamePattern());
105112
}
106113

107114
/**

0 commit comments

Comments
 (0)
0