[Routing] fixed Route annotation for hostname (should be hostname_pattern instead of hostnamePattern)

fabpot · arnaud-lb · commit d91e5a26a27c · 2012-11-12T11:14:24.000+01:00
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -44,7 +44,7 @@ public function __construct(array $data)
         }
 
         foreach ($data as $key => $value) {
-            $method = 'set'.$key;
+            $method = 'set'.str_replace('_', '', $key);
             if (!method_exists($this, $method)) {
                 throw new \BadMethodCallException(sprintf("Unknown property '%s' on annotation '%s'.", $key, get_class($this)));
             }
diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
@@ -39,7 +39,8 @@ public function getValidParameters()
            array('requirements', array('_method' => 'GET'), 'getRequirements'),
            array('options', array('compiler_class' => 'RouteCompiler'), 'getOptions'),
            array('name', 'blog_index', 'getName'),
-           array('defaults', array('_controller' => 'MyBlogBundle:Blog:index'), 'getDefaults')
+           array('defaults', array('_controller' => 'MyBlogBundle:Blog:index'), 'getDefaults'),
+           array('hostname_pattern', array('{locale}.example.com'), 'getHostnamePattern')
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(array $data)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`foreach ($data as $key => $value) {`
`47`		`- $method = 'set'.$key;`
	`47`	`+ $method = 'set'.str_replace('_', '', $key);`
`48`	`48`	`if (!method_exists($this, $method)) {`
`49`	`49`	`throw new \BadMethodCallException(sprintf("Unknown property '%s' on annotation '%s'.", $key, get_class($this)));`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ public function getValidParameters()`
`39`	`39`	`array('requirements', array('_method' => 'GET'), 'getRequirements'),`
`40`	`40`	`array('options', array('compiler_class' => 'RouteCompiler'), 'getOptions'),`
`41`	`41`	`array('name', 'blog_index', 'getName'),`
`42`		`- array('defaults', array('_controller' => 'MyBlogBundle:Blog:index'), 'getDefaults')`
	`42`	`+ array('defaults', array('_controller' => 'MyBlogBundle:Blog:index'), 'getDefaults'),`
	`43`	`+ array('hostname_pattern', array('{locale}.example.com'), 'getHostnamePattern')`
`43`	`44`	`);`
`44`	`45`	`}`
`45`	`46`	`}`