Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.7] Add callable docblock to route registrar methods #26524

Merged
merged 1 commit into from
Nov 15, 2018
Merged

[5.7] Add callable docblock to route registrar methods #26524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Illuminate/Contracts/Routing/Registrar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface Registrar
* Register a new GET route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function get($uri, $action);
Expand All @@ -17,7 +17,7 @@ public function get($uri, $action);
* Register a new POST route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function post($uri, $action);
Expand All @@ -26,7 +26,7 @@ public function post($uri, $action);
* Register a new PUT route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function put($uri, $action);
Expand All @@ -35,7 +35,7 @@ public function put($uri, $action);
* Register a new DELETE route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function delete($uri, $action);
Expand All @@ -44,7 +44,7 @@ public function delete($uri, $action);
* Register a new PATCH route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function patch($uri, $action);
Expand All @@ -53,7 +53,7 @@ public function patch($uri, $action);
* Register a new OPTIONS route with the router.
*
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function options($uri, $action);
Expand All @@ -63,7 +63,7 @@ public function options($uri, $action);
*
* @param array|string $methods
* @param string $uri
* @param \Closure|array|string $action
* @param \Closure|array|string|callable $action
* @return \Illuminate\Routing\Route
*/
public function match($methods, $uri, $action);
Expand Down
20 changes: 10 additions & 10 deletions src/Illuminate/Routing/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function __construct(Dispatcher $events, Container $container = null)
* Register a new GET route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function get($uri, $action = null)
Expand All @@ -145,7 +145,7 @@ public function get($uri, $action = null)
* Register a new POST route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function post($uri, $action = null)
Expand All @@ -157,7 +157,7 @@ public function post($uri, $action = null)
* Register a new PUT route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function put($uri, $action = null)
Expand All @@ -169,7 +169,7 @@ public function put($uri, $action = null)
* Register a new PATCH route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function patch($uri, $action = null)
Expand All @@ -181,7 +181,7 @@ public function patch($uri, $action = null)
* Register a new DELETE route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function delete($uri, $action = null)
Expand All @@ -193,7 +193,7 @@ public function delete($uri, $action = null)
* Register a new OPTIONS route with the router.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function options($uri, $action = null)
Expand All @@ -205,7 +205,7 @@ public function options($uri, $action = null)
* Register a new route responding to all verbs.
*
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function any($uri, $action = null)
Expand All @@ -216,7 +216,7 @@ public function any($uri, $action = null)
/**
* Register a new Fallback route with the router.
*
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function fallback($action)
Expand Down Expand Up @@ -275,7 +275,7 @@ public function view($uri, $view, $data = [])
*
* @param array|string $methods
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function match($methods, $uri, $action = null)
Expand Down Expand Up @@ -436,7 +436,7 @@ public function getLastGroupPrefix()
*
* @param array|string $methods
* @param string $uri
* @param \Closure|array|string|null $action
* @param \Closure|array|string|callable|null $action
* @return \Illuminate\Routing\Route
*/
public function addRoute($methods, $uri, $action)
Expand Down
16 changes: 8 additions & 8 deletions src/Illuminate/Support/Facades/Route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
namespace Illuminate\Support\Facades;

/**
* @method static \Illuminate\Routing\Route get(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route post(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route put(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route delete(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route patch(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route options(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route any(string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route match(array|string $methods, string $uri, \Closure|array|string|null $action = null)
* @method static \Illuminate\Routing\Route get(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route post(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route put(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route delete(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route patch(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route options(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route any(string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\Route match(array|string $methods, string $uri, \Closure|array|string|callable|null $action = null)
* @method static \Illuminate\Routing\RouteRegistrar prefix(string $prefix)
* @method static \Illuminate\Routing\RouteRegistrar where(array $where)
* @method static \Illuminate\Routing\PendingResourceRegistration resource(string $name, string $controller, array $options = [])
Expand Down