Commit 4679d476 authored by Fabien Potencier's avatar Fabien Potencier

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

Commits
-------

2de6ff72 Fix typehint

Discussion
----------

Fix typehint
parents 11c3943d 2de6ff72
...@@ -31,7 +31,7 @@ class Route extends BaseRoute ...@@ -31,7 +31,7 @@ class Route extends BaseRoute
* @param string $variable The variable name * @param string $variable The variable name
* @param string $regexp The regexp to apply * @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) public function assert($variable, $regexp)
{ {
...@@ -46,7 +46,7 @@ class Route extends BaseRoute ...@@ -46,7 +46,7 @@ class Route extends BaseRoute
* @param string $variable The variable name * @param string $variable The variable name
* @param mixed $default The default value * @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) public function value($variable, $default)
{ {
...@@ -61,7 +61,7 @@ class Route extends BaseRoute ...@@ -61,7 +61,7 @@ class Route extends BaseRoute
* @param string $variable The variable name * @param string $variable The variable name
* @param mixed $callback A PHP callback that converts the original value * @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) public function convert($variable, $callback)
{ {
...@@ -77,7 +77,7 @@ class Route extends BaseRoute ...@@ -77,7 +77,7 @@ class Route extends BaseRoute
* *
* @param string $method The HTTP method name. Multiple methods can be supplied, delimited by a pipe character '|', eg. 'GET|POST' * @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) public function method($method)
{ {
...@@ -87,9 +87,9 @@ class Route extends BaseRoute ...@@ -87,9 +87,9 @@ class Route extends BaseRoute
} }
/** /**
* 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() public function requireHttp()
{ {
...@@ -99,9 +99,9 @@ class Route extends BaseRoute ...@@ -99,9 +99,9 @@ class Route extends BaseRoute
} }
/** /**
* 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() public function requireHttps()
{ {
...@@ -115,7 +115,7 @@ class Route extends BaseRoute ...@@ -115,7 +115,7 @@ class Route extends BaseRoute
* *
* @param mixed $callback A PHP callback to be triggered when the Route is matched, just before the route callback * @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) public function before($callback)
{ {
...@@ -131,7 +131,7 @@ class Route extends BaseRoute ...@@ -131,7 +131,7 @@ class Route extends BaseRoute
* *
* @param mixed $callback A PHP callback to be triggered after the route 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) public function after($callback)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment