@@ -2,12 +2,12 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace CarbonFramework\Routing; |
| 4 | 4 | |
| 5 | -use Closure; |
|
| 6 | -use Exception; |
|
| 7 | 5 | use CarbonFramework\Request; |
| 8 | 6 | use CarbonFramework\Routing\Conditions\ConditionInterface; |
| 9 | 7 | use CarbonFramework\Routing\Conditions\Url as UrlCondition; |
| 10 | 8 | use CarbonFramework\Routing\Middleware\HasMiddlewareTrait; |
| 9 | +use Closure; |
|
| 10 | +use Exception; |
|
| 11 | 11 | |
| 12 | 12 | class RouteGroup implements RouteInterface { |
| 13 | 13 | use HasRoutesTrait { |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * Constructor |
| 29 | 29 | * |
| 30 | - * @param string|ConditionInterface $target |
|
| 30 | + * @param string $target |
|
| 31 | 31 | * @param Closure $callable |
| 32 | 32 | */ |
| 33 | 33 | public function __construct( $target, Closure $callable ) { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * Add middleware |
| 49 | 49 | * |
| 50 | 50 | * @param string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware |
| 51 | - * @return object $this |
|
| 51 | + * @return HasMiddlewareTrait $this |
|
| 52 | 52 | */ |
| 53 | 53 | public function addMiddleware( $middleware ) { |
| 54 | 54 | $middleware = is_array( $middleware ) ? $middleware : [$middleware]; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * Alias for addMiddleware |
| 68 | 68 | * |
| 69 | 69 | * @param string|callable|\CarbonFramework\Routing\Middleware\middlewareInterface|array $middleware |
| 70 | - * @return object $this |
|
| 70 | + * @return HasMiddlewareTrait $this |
|
| 71 | 71 | */ |
| 72 | 72 | public function add( $middleware ) { |
| 73 | 73 | return $this->addMiddleware( $middleware ); |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace CarbonFramework\Routing; |
| 4 | 4 | |
| 5 | -use Exception; |
|
| 6 | 5 | use CarbonFramework\Request; |
| 7 | -use CarbonFramework\Routing\Middleware\HasMiddlewareTrait; |
|
| 8 | 6 | use CarbonFramework\Routing\Conditions\ConditionInterface; |
| 9 | 7 | use CarbonFramework\Routing\Conditions\Factory; |
| 10 | -use CarbonFramework\Routing\Conditions\Url as UrlCondition; |
|
| 11 | 8 | use CarbonFramework\Routing\Conditions\InvalidRouteConditionException; |
| 9 | +use CarbonFramework\Routing\Conditions\Url as UrlCondition; |
|
| 10 | +use CarbonFramework\Routing\Middleware\HasMiddlewareTrait; |
|
| 11 | +use Exception; |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * Represent a route |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace CarbonFramework\Routing\Conditions; |
| 4 | 4 | |
| 5 | -use Closure; |
|
| 6 | -use ReflectionClass; |
|
| 7 | -use Exception; |
|
| 8 | 5 | use CarbonFramework\Framework; |
| 9 | -use CarbonFramework\Routing\Conditions\Url as UrlCondition; |
|
| 10 | 6 | use CarbonFramework\Routing\Conditions\Custom as CustomCondition; |
| 11 | 7 | use CarbonFramework\Routing\Conditions\Multiple as MultipleCondition; |
| 8 | +use CarbonFramework\Routing\Conditions\Url as UrlCondition; |
|
| 9 | +use Closure; |
|
| 10 | +use Exception; |
|
| 11 | +use ReflectionClass; |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * Check against the current url |