Browse files

merged branch Adel-E/patch-1 (PR #425)

Commits
-------

2de6ff7 Fix typehint

Discussion
----------

Fix typehint
  • Loading branch information...
2 parents 11c3943 + 2de6ff7 commit 4679d476aee0a5981b13d4ac899a8ef72b8b060c @fabpot committed Jul 10, 2012
Showing with 10 additions and 10 deletions.
  1. +10 −10 src/Silex/Route.php
View
20 src/Silex/Route.php
@@ -31,7 +31,7 @@ public function __construct($pattern = '', array $defaults = array(), array $req
* @param string $variable The variable name
* @param string $regexp The regexp to apply
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current route instance
*/
public function assert($variable, $regexp)
{
@@ -46,7 +46,7 @@ public function assert($variable, $regexp)
* @param string $variable The variable name
* @param mixed $default The default value
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function value($variable, $default)
{
@@ -61,7 +61,7 @@ public function value($variable, $default)
* @param string $variable The variable name
* @param mixed $callback A PHP callback that converts the original value
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function convert($variable, $callback)
{
@@ -77,7 +77,7 @@ public function convert($variable, $callback)
*
* @param string $method The HTTP method name. Multiple methods can be supplied, delimited by a pipe character '|', eg. 'GET|POST'
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function method($method)
{
@@ -87,9 +87,9 @@ public function method($method)
}
/**
- * Sets the requirement of HTTP (no HTTPS) on this controller.
+ * Sets the requirement of HTTP (no HTTPS) on this Route.
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function requireHttp()
{
@@ -99,9 +99,9 @@ public function requireHttp()
}
/**
- * Sets the requirement of HTTPS on this controller.
+ * Sets the requirement of HTTPS on this Route.
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function requireHttps()
{
@@ -115,7 +115,7 @@ public function requireHttps()
*
* @param mixed $callback A PHP callback to be triggered when the Route is matched, just before the route callback
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function before($callback)
{
@@ -131,7 +131,7 @@ public function before($callback)
*
* @param mixed $callback A PHP callback to be triggered after the route callback
*
- * @return Controller $this The current Controller instance
+ * @return Route $this The current Route instance
*/
public function after($callback)
{

0 comments on commit 4679d47

Please sign in to comment.