diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php index 85c18e7edf..08e7d6e347 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php +++ b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php @@ -6,7 +6,7 @@ $collection = new RouteCollection(); $collection->add('blog_show', new Route( '/blog/{slug}', array('_controller' => 'MyBlogBundle:Blog:show'), - array('_method' => 'GET'), + array('_method' => 'GET', 'locale' => '\w+'), array('compiler_class' => 'RouteCompiler'), '{locale}.example.com' )); diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml index f75fb1a2a7..079116399c 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml +++ b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml @@ -7,6 +7,7 @@ MyBundle:Blog:show GET + \w+ diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml index b85bab3465..8fad8a0923 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml +++ b/src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml @@ -2,6 +2,6 @@ blog_show: pattern: /blog/{slug} defaults: { _controller: MyBlogBundle:Blog:show } hostname_pattern: "{locale}.example.com" - requirements: { 'locale': '\d+' } + requirements: { '_method': 'GET', 'locale': '\w+' } options: compiler_class: RouteCompiler diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml index 9e1100684b..b3747864fb 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml +++ b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd"> - foo + 123 \d+ diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.yml b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.yml index a5f867fa2b..35a45398ff 100644 --- a/src/Symfony/Component/Routing/Tests/Fixtures/validresource.yml +++ b/src/Symfony/Component/Routing/Tests/Fixtures/validresource.yml @@ -1,7 +1,7 @@ blog_show: resource: validpattern.yml prefix: /{foo} - defaults: { 'foo': 'foo' } + defaults: { 'foo': '123' } requirements: { 'foo': '\d+' } options: { 'foo': 'bar' } hostname_pattern: "{locale}.example.com" diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php index bf5116a859..235a9d13af 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php @@ -51,6 +51,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase $this->assertEquals('/blog/{slug}', $route->getPattern()); $this->assertEquals('MyBundle:Blog:show', $route->getDefault('_controller')); $this->assertEquals('GET', $route->getRequirement('_method')); + $this->assertEquals('\w+', $route->getRequirement('locale')); $this->assertEquals('{locale}.example.com', $route->getHostnamePattern()); $this->assertEquals('RouteCompiler', $route->getOption('compiler_class')); } @@ -65,7 +66,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); $this->assertEquals('/{foo}/blog/{slug}', $routes['blog_show']->getPattern()); $this->assertEquals('MyBundle:Blog:show', $routes['blog_show']->getDefault('_controller')); - $this->assertEquals('foo', $routes['blog_show']->getDefault('foo')); + $this->assertEquals('123', $routes['blog_show']->getDefault('foo')); $this->assertEquals('\d+', $routes['blog_show']->getRequirement('foo')); $this->assertEquals('bar', $routes['blog_show']->getOption('foo')); $this->assertEquals('{locale}.example.com', $routes['blog_show']->getHostnamePattern()); diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php index b2c2d6b969..2606062a94 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php @@ -90,7 +90,8 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase $route = $routes['blog_show']; $this->assertEquals('/blog/{slug}', $route->getPattern()); $this->assertEquals('MyBlogBundle:Blog:show', $route->getDefault('_controller')); - $this->assertEquals('\d+', $route->getRequirement('locale')); + $this->assertEquals('GET', $route->getRequirement('_method')); + $this->assertEquals('\w+', $route->getRequirement('locale')); $this->assertEquals('{locale}.example.com', $route->getHostnamePattern()); $this->assertEquals('RouteCompiler', $route->getOption('compiler_class')); } @@ -105,7 +106,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); $this->assertEquals('/{foo}/blog/{slug}', $routes['blog_show']->getPattern()); $this->assertEquals('MyBlogBundle:Blog:show', $routes['blog_show']->getDefault('_controller')); - $this->assertEquals('foo', $routes['blog_show']->getDefault('foo')); + $this->assertEquals('123', $routes['blog_show']->getDefault('foo')); $this->assertEquals('\d+', $routes['blog_show']->getRequirement('foo')); $this->assertEquals('bar', $routes['blog_show']->getOption('foo')); $this->assertEquals('{locale}.example.com', $routes['blog_show']->getHostnamePattern());