@@ -28,22 +28,22 @@ |
||
| 28 | 28 | * @param callable $callable |
| 29 | 29 | * @param mixed ...$arguments |
| 30 | 30 | */ |
| 31 | - public function __construct( $callable ) { |
|
| 31 | + public function __construct($callable) { |
|
| 32 | 32 | $this->callable = $callable; |
| 33 | - $this->arguments = array_slice( func_get_args(), 1 ); |
|
| 33 | + $this->arguments = array_slice(func_get_args(), 1); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * {@inheritDoc} |
| 38 | 38 | */ |
| 39 | - public function satisfied( Request $request ) { |
|
| 40 | - return call_user_func_array( $this->callable, $this->arguments ); |
|
| 39 | + public function satisfied(Request $request) { |
|
| 40 | + return call_user_func_array($this->callable, $this->arguments); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * {@inheritDoc} |
| 45 | 45 | */ |
| 46 | - public function getArguments( Request $request ) { |
|
| 46 | + public function getArguments(Request $request) { |
|
| 47 | 47 | return $this->arguments; |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -20,21 +20,21 @@ |
||
| 20 | 20 | * |
| 21 | 21 | * @param string $post_id |
| 22 | 22 | */ |
| 23 | - public function __construct( $post_id ) { |
|
| 23 | + public function __construct($post_id) { |
|
| 24 | 24 | $this->post_id = $post_id; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * {@inheritDoc} |
| 29 | 29 | */ |
| 30 | - public function satisfied( Request $request ) { |
|
| 30 | + public function satisfied(Request $request) { |
|
| 31 | 31 | return $this->post_id === get_the_ID(); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * {@inheritDoc} |
| 36 | 36 | */ |
| 37 | - public function getArguments( Request $request ) { |
|
| 37 | + public function getArguments(Request $request) { |
|
| 38 | 38 | return [$this->post_id]; |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -20,21 +20,21 @@ |
||
| 20 | 20 | * |
| 21 | 21 | * @param string $post_type |
| 22 | 22 | */ |
| 23 | - public function __construct( $post_type ) { |
|
| 23 | + public function __construct($post_type) { |
|
| 24 | 24 | $this->post_type = $post_type; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * {@inheritDoc} |
| 29 | 29 | */ |
| 30 | - public function satisfied( Request $request ) { |
|
| 30 | + public function satisfied(Request $request) { |
|
| 31 | 31 | return $this->post_type === get_post_type(); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * {@inheritDoc} |
| 36 | 36 | */ |
| 37 | - public function getArguments( Request $request ) { |
|
| 37 | + public function getArguments(Request $request) { |
|
| 38 | 38 | return [$this->post_type]; |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | * @param Request $request |
| 15 | 15 | * @return boolean |
| 16 | 16 | */ |
| 17 | - public function satisfied( Request $request ); |
|
| 17 | + public function satisfied(Request $request); |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * Return an array of arguments for use in request |
@@ -22,5 +22,5 @@ discard block |
||
| 22 | 22 | * @param Request $request |
| 23 | 23 | * @return array |
| 24 | 24 | */ |
| 25 | - public function getArguments( Request $request ); |
|
| 25 | + public function getArguments(Request $request); |
|
| 26 | 26 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | * @param Request $request |
| 16 | 16 | * @return boolean |
| 17 | 17 | */ |
| 18 | - public function satisfied( Request $request ); |
|
| 18 | + public function satisfied(Request $request); |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * Return a response for the given request |
@@ -23,5 +23,5 @@ discard block |
||
| 23 | 23 | * @param Request $request |
| 24 | 24 | * @return \Psr\Http\Message\ResponseInterface |
| 25 | 25 | */ |
| 26 | - public function handle( Request $request ); |
|
| 26 | + public function handle(Request $request); |
|
| 27 | 27 | } |
@@ -31,18 +31,18 @@ discard block |
||
| 31 | 31 | * @param string|ConditionInterface $target |
| 32 | 32 | * @param Closure $callable |
| 33 | 33 | */ |
| 34 | - public function __construct( $target, Closure $callable ) { |
|
| 35 | - if ( is_string( $target ) ) { |
|
| 36 | - $target = new UrlCondition( $target ); |
|
| 34 | + public function __construct($target, Closure $callable) { |
|
| 35 | + if (is_string($target)) { |
|
| 36 | + $target = new UrlCondition($target); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - if ( ! is_a( $target, UrlCondition::class ) ) { |
|
| 40 | - throw new Exception( 'Route groups can only use route strings.' ); |
|
| 39 | + if ( ! is_a($target, UrlCondition::class)) { |
|
| 40 | + throw new Exception('Route groups can only use route strings.'); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | $this->target = $target; |
| 44 | 44 | |
| 45 | - $callable( $this ); |
|
| 45 | + $callable($this); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -50,10 +50,10 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @return RouteInterface|null |
| 52 | 52 | */ |
| 53 | - protected function getSatisfiedRoute( Request $request ) { |
|
| 53 | + protected function getSatisfiedRoute(Request $request) { |
|
| 54 | 54 | $routes = $this->getRoutes(); |
| 55 | - foreach ( $routes as $route ) { |
|
| 56 | - if ( $route->satisfied( $request ) ) { |
|
| 55 | + foreach ($routes as $route) { |
|
| 56 | + if ($route->satisfied($request)) { |
|
| 57 | 57 | return $route; |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -63,45 +63,45 @@ discard block |
||
| 63 | 63 | /** |
| 64 | 64 | * {@inheritDoc} |
| 65 | 65 | */ |
| 66 | - public function satisfied( Request $request ) { |
|
| 67 | - $route = $this->getSatisfiedRoute( $request ); |
|
| 66 | + public function satisfied(Request $request) { |
|
| 67 | + $route = $this->getSatisfiedRoute($request); |
|
| 68 | 68 | return $route !== null; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * {@inheritDoc} |
| 73 | 73 | */ |
| 74 | - public function handle( Request $request ) { |
|
| 75 | - $route = $this->getSatisfiedRoute( $request ); |
|
| 76 | - return $route ? $route->handle( $request ) : null; |
|
| 74 | + public function handle(Request $request) { |
|
| 75 | + $route = $this->getSatisfiedRoute($request); |
|
| 76 | + return $route ? $route->handle($request) : null; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * {@inheritDoc} |
| 81 | 81 | */ |
| 82 | - public function route( $methods, $target, $handler ) { |
|
| 83 | - if ( is_string( $target ) ) { |
|
| 84 | - $target = new UrlCondition( $target ); |
|
| 82 | + public function route($methods, $target, $handler) { |
|
| 83 | + if (is_string($target)) { |
|
| 84 | + $target = new UrlCondition($target); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if ( ! is_a( $target, UrlCondition::class ) ) { |
|
| 88 | - throw new Exception( 'Routes inside route groups can only use route strings.' ); |
|
| 87 | + if ( ! is_a($target, UrlCondition::class)) { |
|
| 88 | + throw new Exception('Routes inside route groups can only use route strings.'); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - $target = $this->target->concatenate( $target ); |
|
| 92 | - return $this->traitRoute( $methods, $target, $handler ); |
|
| 91 | + $target = $this->target->concatenate($target); |
|
| 92 | + return $this->traitRoute($methods, $target, $handler); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * {@inheritDoc} |
| 97 | 97 | */ |
| 98 | - public function addMiddleware( $middleware ) { |
|
| 98 | + public function addMiddleware($middleware) { |
|
| 99 | 99 | $routes = $this->getRoutes(); |
| 100 | 100 | |
| 101 | - foreach ( $routes as $route ) { |
|
| 102 | - $route->addMiddleware( $middleware ); |
|
| 101 | + foreach ($routes as $route) { |
|
| 102 | + $route->addMiddleware($middleware); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - return $this->traitAddMiddleware( $middleware ); |
|
| 105 | + return $this->traitAddMiddleware($middleware); |
|
| 106 | 106 | } |
| 107 | 107 | } |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | * |
| 14 | 14 | * @return string |
| 15 | 15 | */ |
| 16 | - public static function getCurrentPath( Request $request ) { |
|
| 16 | + public static function getCurrentPath(Request $request) { |
|
| 17 | 17 | $url = $request->getUrl(); |
| 18 | - $relative_url = substr( $url, strlen( home_url( '/' ) ) ); |
|
| 19 | - return static::addTrailingSlash( static::addLeadingSlash( $relative_url ) ); |
|
| 18 | + $relative_url = substr($url, strlen(home_url('/'))); |
|
| 19 | + return static::addTrailingSlash(static::addLeadingSlash($relative_url)); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | * @param string $url |
| 26 | 26 | * @return string |
| 27 | 27 | */ |
| 28 | - public static function addLeadingSlash( $url ) { |
|
| 29 | - return '/' . static::removeLeadingSlash( $url ); |
|
| 28 | + public static function addLeadingSlash($url) { |
|
| 29 | + return '/' . static::removeLeadingSlash($url); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | * @param string $url |
| 36 | 36 | * @return string |
| 37 | 37 | */ |
| 38 | - public static function removeLeadingSlash( $url ) { |
|
| 39 | - return preg_replace( '/^\/+/', '', $url ); |
|
| 38 | + public static function removeLeadingSlash($url) { |
|
| 39 | + return preg_replace('/^\/+/', '', $url); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | * @param string $url |
| 46 | 46 | * @return string |
| 47 | 47 | */ |
| 48 | - public static function addTrailingSlash( $url ) { |
|
| 49 | - return trailingslashit( $url ); |
|
| 48 | + public static function addTrailingSlash($url) { |
|
| 49 | + return trailingslashit($url); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @param string $url |
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | - public static function removeTrailingSlash( $url ) { |
|
| 59 | - return untrailingslashit( $url ); |
|
| 58 | + public static function removeTrailingSlash($url) { |
|
| 59 | + return untrailingslashit($url); |
|
| 60 | 60 | } |
| 61 | 61 | } |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | * Template used to override the loaded template file by WordPress when a route is handled |
| 4 | 4 | */ |
| 5 | 5 | use CarbonFramework\Framework; |
| 6 | -$response = apply_filters( 'carbon_framework_response', null ); |
|
| 7 | -if ( $response !== null ) { |
|
| 8 | - Framework::respond( $response ); |
|
| 6 | +$response = apply_filters('carbon_framework_response', null); |
|
| 7 | +if ($response !== null) { |
|
| 8 | + Framework::respond($response); |
|
| 9 | 9 | } |
@@ -11,13 +11,13 @@ discard block |
||
| 11 | 11 | /** |
| 12 | 12 | * {@inheritDoc} |
| 13 | 13 | */ |
| 14 | - public function register( $container ) { |
|
| 15 | - $container['framework.config'] = array_merge( [ |
|
| 14 | + public function register($container) { |
|
| 15 | + $container['framework.config'] = array_merge([ |
|
| 16 | 16 | 'global_middleware' => [], |
| 17 | - ], $container['framework.config'] ); |
|
| 17 | + ], $container['framework.config']); |
|
| 18 | 18 | |
| 19 | 19 | $container['framework.routing.global_middleware'] = $container['framework.config']['global_middleware']; |
| 20 | - $container['framework.routing.global_middleware'] = apply_filters( 'carbon_framework_global_middleware', $container['framework.routing.global_middleware'] ); |
|
| 20 | + $container['framework.routing.global_middleware'] = apply_filters('carbon_framework_global_middleware', $container['framework.routing.global_middleware']); |
|
| 21 | 21 | |
| 22 | 22 | $container['framework.routing.conditions.custom'] = \CarbonFramework\Routing\Conditions\Custom::class; |
| 23 | 23 | $container['framework.routing.conditions.url'] = \CarbonFramework\Routing\Conditions\Url::class; |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | return new \CarbonFramework\Routing\Router(); |
| 31 | 31 | }; |
| 32 | 32 | |
| 33 | - Framework::facade( 'Router', \CarbonFramework\Facades\Router::class ); |
|
| 33 | + Framework::facade('Router', \CarbonFramework\Facades\Router::class); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * {@inheritDoc} |
| 38 | 38 | */ |
| 39 | - public function boot( $container ) { |
|
| 39 | + public function boot($container) { |
|
| 40 | 40 | \Router::boot(); // facade |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | \ No newline at end of file |