@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @param string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware |
23 | 23 | * @return object |
24 | 24 | */ |
25 | - public function addMiddleware( $middleware ); |
|
25 | + public function addMiddleware($middleware); |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * Alias for addMiddleware |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @param string|callable|\CarbonFramework\Routing\Middleware\MiddlewareInterface|array $middleware |
31 | 31 | * @return object |
32 | 32 | */ |
33 | - public function add( $middleware ); |
|
33 | + public function add($middleware); |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * Execute an array of middleware recursively (last in, first out) |
@@ -40,5 +40,5 @@ discard block |
||
40 | 40 | * @param Closure $next |
41 | 41 | * @return ResponseInterface |
42 | 42 | */ |
43 | - public function executeMiddleware( $middleware, $request, Closure $next ); |
|
43 | + public function executeMiddleware($middleware, $request, Closure $next); |
|
44 | 44 | } |
@@ -14,14 +14,14 @@ |
||
14 | 14 | /** |
15 | 15 | * {@inheritDoc} |
16 | 16 | */ |
17 | - public function handle( $request, Closure $next ) { |
|
18 | - $response = $next( $request ); |
|
17 | + public function handle($request, Closure $next) { |
|
18 | + $response = $next($request); |
|
19 | 19 | |
20 | - if ( Flash::enabled() ) { |
|
21 | - Flash::clear( OldInputService::getFlashKey() ); |
|
20 | + if (Flash::enabled()) { |
|
21 | + Flash::clear(OldInputService::getFlashKey()); |
|
22 | 22 | |
23 | - if ( $request->getMethod() === 'POST' ) { |
|
24 | - Flash::add( OldInputService::getFlashKey(), $request->post() ); |
|
23 | + if ($request->getMethod() === 'POST') { |
|
24 | + Flash::add(OldInputService::getFlashKey(), $request->post()); |
|
25 | 25 | } |
26 | 26 | } |
27 | 27 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @param RouteInterface $route |
31 | 31 | * @return RouteInterface |
32 | 32 | */ |
33 | - public function addRoute( $route ) { |
|
33 | + public function addRoute($route) { |
|
34 | 34 | $this->routes[] = $route; |
35 | 35 | return $route; |
36 | 36 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param string|Closure $handler |
44 | 44 | * @return RouteInterface |
45 | 45 | */ |
46 | - public function route( $methods, $target, $handler ) { |
|
47 | - $route = new Route( $methods, $target, $handler ); |
|
48 | - return $this->addRoute( $route ); |
|
46 | + public function route($methods, $target, $handler) { |
|
47 | + $route = new Route($methods, $target, $handler); |
|
48 | + return $this->addRoute($route); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | * @param Closure $callable |
56 | 56 | * @return RouteInterface |
57 | 57 | */ |
58 | - public function group( $target, Closure $callable ) { |
|
59 | - $routeGroup = new RouteGroup( $target, $callable ); |
|
60 | - return $this->addRoute( $routeGroup ); |
|
58 | + public function group($target, Closure $callable) { |
|
59 | + $routeGroup = new RouteGroup($target, $callable); |
|
60 | + return $this->addRoute($routeGroup); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | * @param string|Closure $handler |
68 | 68 | * @return RouteInterface |
69 | 69 | */ |
70 | - public function get( $target, $handler ) { |
|
71 | - return $this->route( ['GET', 'HEAD'], $target, $handler ); |
|
70 | + public function get($target, $handler) { |
|
71 | + return $this->route(['GET', 'HEAD'], $target, $handler); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | * @param string|Closure $handler |
79 | 79 | * @return RouteInterface |
80 | 80 | */ |
81 | - public function post( $target, $handler ) { |
|
82 | - return $this->route( ['POST'], $target, $handler ); |
|
81 | + public function post($target, $handler) { |
|
82 | + return $this->route(['POST'], $target, $handler); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | * @param string|Closure $handler |
90 | 90 | * @return RouteInterface |
91 | 91 | */ |
92 | - public function put( $target, $handler ) { |
|
93 | - return $this->route( ['PUT'], $target, $handler ); |
|
92 | + public function put($target, $handler) { |
|
93 | + return $this->route(['PUT'], $target, $handler); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | * @param string|Closure $handler |
101 | 101 | * @return RouteInterface |
102 | 102 | */ |
103 | - public function patch( $target, $handler ) { |
|
104 | - return $this->route( ['PATCH'], $target, $handler ); |
|
103 | + public function patch($target, $handler) { |
|
104 | + return $this->route(['PATCH'], $target, $handler); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -111,8 +111,8 @@ discard block |
||
111 | 111 | * @param string|Closure $handler |
112 | 112 | * @return RouteInterface |
113 | 113 | */ |
114 | - public function delete( $target, $handler ) { |
|
115 | - return $this->route( ['DELETE'], $target, $handler ); |
|
114 | + public function delete($target, $handler) { |
|
115 | + return $this->route(['DELETE'], $target, $handler); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | * @param string|Closure $handler |
123 | 123 | * @return RouteInterface |
124 | 124 | */ |
125 | - public function options( $target, $handler ) { |
|
126 | - return $this->route( ['OPTIONS'], $target, $handler ); |
|
125 | + public function options($target, $handler) { |
|
126 | + return $this->route(['OPTIONS'], $target, $handler); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param string|Closure $handler |
134 | 134 | * @return RouteInterface |
135 | 135 | */ |
136 | - public function any( $target, $handler ) { |
|
137 | - return $this->route( ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $target, $handler ); |
|
136 | + public function any($target, $handler) { |
|
137 | + return $this->route(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $target, $handler); |
|
138 | 138 | } |
139 | 139 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param RouteInterface $route |
22 | 22 | * @return RouteInterface |
23 | 23 | */ |
24 | - public function addRoute( $route ); |
|
24 | + public function addRoute($route); |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Create and add a new route |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param string|Closure $handler |
32 | 32 | * @return RouteInterface |
33 | 33 | */ |
34 | - public function route( $methods, $target, $handler ); |
|
34 | + public function route($methods, $target, $handler); |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Create and add a route group |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param Closure $callable |
41 | 41 | * @return RouteInterface |
42 | 42 | */ |
43 | - public function group( $target, Closure $callable ); |
|
43 | + public function group($target, Closure $callable); |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Create and add a route for the GET and HEAD methods |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param string|Closure $handler |
50 | 50 | * @return RouteInterface |
51 | 51 | */ |
52 | - public function get( $target, $handler ); |
|
52 | + public function get($target, $handler); |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * Create and add a route for the POST method |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @param string|Closure $handler |
59 | 59 | * @return RouteInterface |
60 | 60 | */ |
61 | - public function post( $target, $handler ); |
|
61 | + public function post($target, $handler); |
|
62 | 62 | |
63 | 63 | /** |
64 | 64 | * Create and add a route for the PUT method |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | * @param string|Closure $handler |
68 | 68 | * @return RouteInterface |
69 | 69 | */ |
70 | - public function put( $target, $handler ); |
|
70 | + public function put($target, $handler); |
|
71 | 71 | |
72 | 72 | /** |
73 | 73 | * Create and add a route for the PATCH method |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param string|Closure $handler |
77 | 77 | * @return RouteInterface |
78 | 78 | */ |
79 | - public function patch( $target, $handler ); |
|
79 | + public function patch($target, $handler); |
|
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Create and add a route for the DELETE method |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @param string|Closure $handler |
86 | 86 | * @return RouteInterface |
87 | 87 | */ |
88 | - public function delete( $target, $handler ); |
|
88 | + public function delete($target, $handler); |
|
89 | 89 | |
90 | 90 | /** |
91 | 91 | * Create and add a route for the OPTIONS method |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param string|Closure $handler |
95 | 95 | * @return RouteInterface |
96 | 96 | */ |
97 | - public function options( $target, $handler ); |
|
97 | + public function options($target, $handler); |
|
98 | 98 | |
99 | 99 | /** |
100 | 100 | * Create and add a route for all supported methods |
@@ -103,5 +103,5 @@ discard block |
||
103 | 103 | * @param string|Closure $handler |
104 | 104 | * @return RouteInterface |
105 | 105 | */ |
106 | - public function any( $target, $handler ); |
|
106 | + public function any($target, $handler); |
|
107 | 107 | } |
@@ -12,22 +12,22 @@ |
||
12 | 12 | /** |
13 | 13 | * {@inheritDoc} |
14 | 14 | */ |
15 | - public function register( $container ) { |
|
16 | - $container['framework.global_middleware'] = array_merge( $container['framework.global_middleware'], [ |
|
15 | + public function register($container) { |
|
16 | + $container['framework.global_middleware'] = array_merge($container['framework.global_middleware'], [ |
|
17 | 17 | OldInputMiddleware::class, |
18 | - ] ); |
|
18 | + ]); |
|
19 | 19 | |
20 | 20 | $container['framework.old_input.old_input'] = function() { |
21 | 21 | return new \CarbonFramework\Input\OldInput(); |
22 | 22 | }; |
23 | 23 | |
24 | - Framework::facade( 'OldInput', \CarbonFramework\Facades\OldInput::class ); |
|
24 | + Framework::facade('OldInput', \CarbonFramework\Facades\OldInput::class); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
28 | 28 | * {@inheritDoc} |
29 | 29 | */ |
30 | - public function boot( $container ) { |
|
30 | + public function boot($container) { |
|
31 | 31 | // nothing to boot |
32 | 32 | } |
33 | 33 | } |
34 | 34 | \ No newline at end of file |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | /** |
12 | 12 | * {@inheritDoc} |
13 | 13 | */ |
14 | - public function register( $container ) { |
|
14 | + public function register($container) { |
|
15 | 15 | $container['framework.templating.engine'] = function() { |
16 | 16 | return new \CarbonFramework\Templating\Php(); |
17 | 17 | }; |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * {@inheritDoc} |
22 | 22 | */ |
23 | - public function boot( $container ) { |
|
23 | + public function boot($container) { |
|
24 | 24 | // nothing to boot |
25 | 25 | } |
26 | 26 | } |
27 | 27 | \ No newline at end of file |
@@ -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.global_middleware'] = $container['framework.config']['global_middleware']; |
20 | - $container['framework.global_middleware'] = apply_filters( 'carbon_framework_global_middleware', $container['framework.global_middleware'] ); |
|
20 | + $container['framework.global_middleware'] = apply_filters('carbon_framework_global_middleware', $container['framework.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 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @return Request |
57 | 57 | */ |
58 | 58 | public static function fromGlobals() { |
59 | - return new static( stripslashes_deep( $_GET ), stripslashes_deep( $_POST ), $_COOKIE, $_FILES, $_SERVER, getallheaders() ); |
|
59 | + return new static(stripslashes_deep($_GET), stripslashes_deep($_POST), $_COOKIE, $_FILES, $_SERVER, getallheaders()); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @param array $server |
70 | 70 | * @param array $headers |
71 | 71 | */ |
72 | - public function __construct( $get, $post, $cookie, $files, $server, $headers ) { |
|
72 | + public function __construct($get, $post, $cookie, $files, $server, $headers) { |
|
73 | 73 | $this->get = $get; |
74 | 74 | $this->post = $post; |
75 | 75 | $this->cookie = $cookie; |
@@ -84,14 +84,14 @@ discard block |
||
84 | 84 | * @return string |
85 | 85 | */ |
86 | 86 | public function getMethod() { |
87 | - $method = (string) Arr::get( $this->server, 'REQUEST_METHOD', 'GET' ); |
|
87 | + $method = (string) Arr::get($this->server, 'REQUEST_METHOD', 'GET'); |
|
88 | 88 | |
89 | - $override = (string) Arr::get( $this->headers, 'X-HTTP-METHOD-OVERRIDE' ); |
|
90 | - if ( $method === 'POST' && $override ) { |
|
89 | + $override = (string) Arr::get($this->headers, 'X-HTTP-METHOD-OVERRIDE'); |
|
90 | + if ($method === 'POST' && $override) { |
|
91 | 91 | $method = $override; |
92 | 92 | } |
93 | 93 | |
94 | - return strtoupper( $method ); |
|
94 | + return strtoupper($method); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | * @return string |
101 | 101 | */ |
102 | 102 | public function getUrl() { |
103 | - $https = Arr::get( $this->server, 'HTTPS' ); |
|
103 | + $https = Arr::get($this->server, 'HTTPS'); |
|
104 | 104 | |
105 | 105 | $protocol = $https ? 'https' : 'http'; |
106 | - $host = (string) Arr::get( $this->server, 'HTTP_HOST', '' ); |
|
107 | - $uri = (string) Arr::get( $this->server, 'REQUEST_URI', '' ); |
|
106 | + $host = (string) Arr::get($this->server, 'HTTP_HOST', ''); |
|
107 | + $uri = (string) Arr::get($this->server, 'REQUEST_URI', ''); |
|
108 | 108 | |
109 | 109 | return $protocol . '://' . $host . $uri; |
110 | 110 | } |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | $args = func_get_args(); |
119 | 119 | $source = $this->{$args[0]}; |
120 | 120 | |
121 | - if ( count( $args ) === 1 ) { |
|
121 | + if (count($args) === 1) { |
|
122 | 122 | return $source; |
123 | 123 | } |
124 | 124 | |
125 | 125 | $args[0] = $source; |
126 | - return call_user_func_array( [Arr::class, 'get'], $args ); |
|
126 | + return call_user_func_array([Arr::class, 'get'], $args); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @return mixed |
133 | 133 | */ |
134 | 134 | public function get() { |
135 | - return call_user_func_array( [$this, 'input'], array_merge( ['get'], func_get_args() ) ); |
|
135 | + return call_user_func_array([$this, 'input'], array_merge(['get'], func_get_args())); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @return mixed |
142 | 142 | */ |
143 | 143 | public function post() { |
144 | - return call_user_func_array( [$this, 'input'], array_merge( ['post'], func_get_args() ) ); |
|
144 | + return call_user_func_array([$this, 'input'], array_merge(['post'], func_get_args())); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @return mixed |
151 | 151 | */ |
152 | 152 | public function cookie() { |
153 | - return call_user_func_array( [$this, 'input'], array_merge( ['cookie'], func_get_args() ) ); |
|
153 | + return call_user_func_array([$this, 'input'], array_merge(['cookie'], func_get_args())); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @return mixed |
160 | 160 | */ |
161 | 161 | public function files() { |
162 | - return call_user_func_array( [$this, 'input'], array_merge( ['files'], func_get_args() ) ); |
|
162 | + return call_user_func_array([$this, 'input'], array_merge(['files'], func_get_args())); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @return mixed |
169 | 169 | */ |
170 | 170 | public function server() { |
171 | - return call_user_func_array( [$this, 'input'], array_merge( ['server'], func_get_args() ) ); |
|
171 | + return call_user_func_array([$this, 'input'], array_merge(['server'], func_get_args())); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -177,6 +177,6 @@ discard block |
||
177 | 177 | * @return mixed |
178 | 178 | */ |
179 | 179 | public function headers() { |
180 | - return call_user_func_array( [$this, 'input'], array_merge( ['headers'], func_get_args() ) ); |
|
180 | + return call_user_func_array([$this, 'input'], array_merge(['headers'], func_get_args())); |
|
181 | 181 | } |
182 | 182 | } |
@@ -19,35 +19,35 @@ |
||
19 | 19 | /** |
20 | 20 | * @see Response::output() |
21 | 21 | */ |
22 | - protected function output( $output ) { |
|
23 | - return Response::output( $this->response(), $output ); |
|
22 | + protected function output($output) { |
|
23 | + return Response::output($this->response(), $output); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
27 | 27 | * @see Response::template() |
28 | 28 | */ |
29 | - protected function template( $templates, $context = array() ) { |
|
30 | - return Response::template( $this->response(), $templates, $context ); |
|
29 | + protected function template($templates, $context = array()) { |
|
30 | + return Response::template($this->response(), $templates, $context); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | 34 | * @see Response::json() |
35 | 35 | */ |
36 | - protected function json( $data ) { |
|
37 | - return Response::json( $this->response(), $data ); |
|
36 | + protected function json($data) { |
|
37 | + return Response::json($this->response(), $data); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | 41 | * @see Response::redirect() |
42 | 42 | */ |
43 | - protected function redirect( $url, $status = 302 ) { |
|
44 | - return Response::redirect( $this->response(), $url, $status ); |
|
43 | + protected function redirect($url, $status = 302) { |
|
44 | + return Response::redirect($this->response(), $url, $status); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @see Response::error() |
49 | 49 | */ |
50 | - protected function error( $code ) { |
|
51 | - return Response::error( $this->response(), $code ); |
|
50 | + protected function error($code) { |
|
51 | + return Response::error($this->response(), $code); |
|
52 | 52 | } |
53 | 53 | } |