@@ -167,6 +167,9 @@ |
||
167 | 167 | |
168 | 168 | } |
169 | 169 | |
170 | + /** |
|
171 | + * @param string $name |
|
172 | + */ |
|
170 | 173 | private function emitServiceSpecializedEvents($name) { |
171 | 174 | |
172 | 175 | return new ServiceEvent( |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $this->setTimestamp(); |
77 | 77 | |
78 | 78 | // parsing configuration |
79 | - $this->configuration = new Configuration( DefaultConfiguration::get() ); |
|
79 | + $this->configuration = new Configuration(DefaultConfiguration::get()); |
|
80 | 80 | |
81 | 81 | $this->configuration()->merge($configuration); |
82 | 82 | |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | |
156 | 156 | $this->logger()->debug("Emitting global dispatcher event."); |
157 | 157 | |
158 | - $this->events()->emit( new DispatcherEvent($this) ); |
|
158 | + $this->events()->emit(new DispatcherEvent($this)); |
|
159 | 159 | |
160 | - if ( $this->configuration()->get('enabled') === false ) { |
|
160 | + if ($this->configuration()->get('enabled') === false) { |
|
161 | 161 | |
162 | 162 | $this->logger()->debug("Dispatcher disabled, shutting down gracefully."); |
163 | 163 | |
@@ -173,13 +173,13 @@ discard block |
||
173 | 173 | |
174 | 174 | } |
175 | 175 | |
176 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request') ); |
|
176 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request')); |
|
177 | 177 | |
178 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get()) ); |
|
178 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get())); |
|
179 | 179 | |
180 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.#') ); |
|
180 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.#')); |
|
181 | 181 | |
182 | - if ( $this->readCache() ) { |
|
182 | + if ($this->readCache()) { |
|
183 | 183 | |
184 | 184 | return $this->shutdown(); |
185 | 185 | |
@@ -209,13 +209,13 @@ discard block |
||
209 | 209 | |
210 | 210 | $this->logger()->debug("Route acquired, type $route_type directed to $route_service."); |
211 | 211 | |
212 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route') ); |
|
212 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route')); |
|
213 | 213 | |
214 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type) ); |
|
214 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type)); |
|
215 | 215 | |
216 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service) ); |
|
216 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service)); |
|
217 | 217 | |
218 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') ); |
|
218 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.#')); |
|
219 | 219 | |
220 | 220 | // translate route to service |
221 | 221 | |
@@ -243,11 +243,11 @@ discard block |
||
243 | 243 | |
244 | 244 | private function readCache() { |
245 | 245 | |
246 | - $name = (string) $this->request()->uri(); |
|
246 | + $name = (string)$this->request()->uri(); |
|
247 | 247 | |
248 | 248 | $cache = $this->cache()->setNamespace('dispatcherservice')->get($name); |
249 | 249 | |
250 | - if ( is_null($cache) ) return false; |
|
250 | + if (is_null($cache)) return false; |
|
251 | 251 | |
252 | 252 | $this->response = $cache; |
253 | 253 | |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | |
260 | 260 | $cache = strtoupper($route->getParameter('cache')); |
261 | 261 | $ttl = $route->getParameter('ttl'); |
262 | - $name = (string) $this->request()->uri(); |
|
262 | + $name = (string)$this->request()->uri(); |
|
263 | 263 | $method = $this->request()->method()->get(); |
264 | 264 | $status = $this->response()->status()->get(); |
265 | 265 | |
@@ -267,10 +267,10 @@ discard block |
||
267 | 267 | // because of dispatcher internal structure: if post request is cached |
268 | 268 | // subsequent requests will never reach the service. |
269 | 269 | if ( |
270 | - ( $cache == 'SERVER' || $cache == 'BOTH' ) && |
|
270 | + ($cache == 'SERVER' || $cache == 'BOTH') && |
|
271 | 271 | in_array($request->method()->get(), array('GET', 'HEAD')) && |
272 | 272 | in_array($this->status()->get(), array(200, 203, 300, 301, 302, 404, 410)) |
273 | - ){ |
|
273 | + ) { |
|
274 | 274 | |
275 | 275 | $this->cache()->setNamespace('dispatcherservice')->set($name, $this->response(), $ttl); |
276 | 276 | |
@@ -282,9 +282,9 @@ discard block |
||
282 | 282 | |
283 | 283 | $params = $route->getParameter('headers'); |
284 | 284 | |
285 | - if ( !empty($params) && is_array($params) ) { |
|
285 | + if (!empty($params) && is_array($params)) { |
|
286 | 286 | |
287 | - foreach($params as $name=>$value) $this->response()->headers()->set($name, $value); |
|
287 | + foreach ($params as $name=>$value) $this->response()->headers()->set($name, $value); |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | } |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | |
325 | 325 | $this->response()->consolidate($this->request, $this->route); |
326 | 326 | |
327 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response') ); |
|
327 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response')); |
|
328 | 328 | |
329 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get()) ); |
|
329 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get())); |
|
330 | 330 | |
331 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.#') ); |
|
331 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.#')); |
|
332 | 332 | |
333 | 333 | $this->logger()->debug("Composing return value."); |
334 | 334 | |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | |
337 | 337 | $this->logger()->debug("Dispatcher run-cycle ends."); |
338 | 338 | |
339 | - if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request(); |
|
339 | + if (function_exists('fastcgi_finish_request')) fastcgi_finish_request(); |
|
340 | 340 | else ob_end_clean(); |
341 | 341 | |
342 | 342 | return $return; |
@@ -247,7 +247,9 @@ discard block |
||
247 | 247 | |
248 | 248 | $cache = $this->cache()->setNamespace('dispatcherservice')->get($name); |
249 | 249 | |
250 | - if ( is_null($cache) ) return false; |
|
250 | + if ( is_null($cache) ) { |
|
251 | + return false; |
|
252 | + } |
|
251 | 253 | |
252 | 254 | $this->response = $cache; |
253 | 255 | |
@@ -284,7 +286,9 @@ discard block |
||
284 | 286 | |
285 | 287 | if ( !empty($params) && is_array($params) ) { |
286 | 288 | |
287 | - foreach($params as $name=>$value) $this->response()->headers()->set($name, $value); |
|
289 | + foreach($params as $name=>$value) { |
|
290 | + $this->response()->headers()->set($name, $value); |
|
291 | + } |
|
288 | 292 | } |
289 | 293 | |
290 | 294 | } |
@@ -336,8 +340,11 @@ discard block |
||
336 | 340 | |
337 | 341 | $this->logger()->debug("Dispatcher run-cycle ends."); |
338 | 342 | |
339 | - if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request(); |
|
340 | - else ob_end_clean(); |
|
343 | + if ( function_exists('fastcgi_finish_request') ) { |
|
344 | + fastcgi_finish_request(); |
|
345 | + } else { |
|
346 | + ob_end_clean(); |
|
347 | + } |
|
341 | 348 | |
342 | 349 | return $return; |
343 | 350 |
@@ -28,16 +28,16 @@ |
||
28 | 28 | |
29 | 29 | final public function get($parameter=null) { |
30 | 30 | |
31 | - if ( is_null($parameter) ) return $this->parameters; |
|
32 | - |
|
33 | - else if ( array_key_exists($parameter, $this->parameters) ) { |
|
31 | + if ( is_null($parameter) ) { |
|
32 | + return $this->parameters; |
|
33 | + } else if ( array_key_exists($parameter, $this->parameters) ) { |
|
34 | 34 | |
35 | 35 | return $this->parameters[$parameter]; |
36 | 36 | |
37 | + } else { |
|
38 | + return null; |
|
37 | 39 | } |
38 | 40 | |
39 | - else return null; |
|
40 | - |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | final public function set($parameter, $value) { |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | |
28 | 28 | protected $parameters = array(); |
29 | 29 | |
30 | - final public function get($parameter=null, $index=null) { |
|
30 | + final public function get($parameter = null, $index = null) { |
|
31 | 31 | |
32 | - if ( is_null($parameter) ) return $this->parameters; |
|
32 | + if (is_null($parameter)) return $this->parameters; |
|
33 | 33 | |
34 | - else if ( array_key_exists($parameter, $this->parameters) ) { |
|
34 | + else if (array_key_exists($parameter, $this->parameters)) { |
|
35 | 35 | |
36 | 36 | $value = $this->parameters[$parameter]; |
37 | 37 | |
@@ -69,13 +69,13 @@ discard block |
||
69 | 69 | |
70 | 70 | final public function delete($parameter = null) { |
71 | 71 | |
72 | - if ( is_null($parameter) ) { |
|
72 | + if (is_null($parameter)) { |
|
73 | 73 | |
74 | 74 | $this->parameters = array(); |
75 | 75 | |
76 | 76 | return true; |
77 | 77 | |
78 | - } else if ( array_key_exists($parameter, $this->parameters) ) { |
|
78 | + } else if (array_key_exists($parameter, $this->parameters)) { |
|
79 | 79 | |
80 | 80 | unset($this->parameters[$parameter]); |
81 | 81 |
@@ -41,13 +41,13 @@ |
||
41 | 41 | */ |
42 | 42 | private static function getHeaders() { |
43 | 43 | |
44 | - if ( function_exists('getallheaders') ) return getallheaders(); |
|
44 | + if (function_exists('getallheaders')) return getallheaders(); |
|
45 | 45 | |
46 | 46 | $headers = array(); |
47 | 47 | |
48 | - foreach ( $_SERVER as $name => $value ) { |
|
48 | + foreach ($_SERVER as $name => $value) { |
|
49 | 49 | |
50 | - if ( substr($name, 0, 5) == 'HTTP_' ) { |
|
50 | + if (substr($name, 0, 5) == 'HTTP_') { |
|
51 | 51 | |
52 | 52 | $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; |
53 | 53 |
@@ -41,7 +41,9 @@ |
||
41 | 41 | */ |
42 | 42 | private static function getHeaders() { |
43 | 43 | |
44 | - if ( function_exists('getallheaders') ) return getallheaders(); |
|
44 | + if ( function_exists('getallheaders') ) { |
|
45 | + return getallheaders(); |
|
46 | + } |
|
45 | 47 | |
46 | 48 | $headers = array(); |
47 | 49 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | private static function getParameters() { |
48 | 48 | |
49 | - switch( $_SERVER['REQUEST_METHOD'] ) { |
|
49 | + switch ($_SERVER['REQUEST_METHOD']) { |
|
50 | 50 | |
51 | 51 | case 'POST': |
52 | 52 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | private static function getParameters() { |
48 | 48 | |
49 | - switch( $_SERVER['REQUEST_METHOD'] ) { |
|
49 | + switch ($_SERVER['REQUEST_METHOD']) { |
|
50 | 50 | |
51 | 51 | case 'POST': |
52 | 52 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | public function set($code) { |
87 | 87 | |
88 | - if ( !array_key_exists($code, $this->http_status_codes) ) { |
|
88 | + if (!array_key_exists($code, $this->http_status_codes)) { |
|
89 | 89 | |
90 | 90 | throw new Exception("Invalid HTTP Status Code"); |
91 | 91 | |
@@ -97,9 +97,9 @@ discard block |
||
97 | 97 | |
98 | 98 | } |
99 | 99 | |
100 | - public function description($code=null) { |
|
100 | + public function description($code = null) { |
|
101 | 101 | |
102 | - if ( is_null($code) || !array_key_exists($code, $this->http_status_codes) ) { |
|
102 | + if (is_null($code) || !array_key_exists($code, $this->http_status_codes)) { |
|
103 | 103 | |
104 | 104 | $message = $this->http_status_codes[$this->status_code]; |
105 | 105 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | protected $attributes = array(); |
29 | 29 | |
30 | - public function __construct( $configuration = array() ) { |
|
30 | + public function __construct($configuration = array()) { |
|
31 | 31 | |
32 | 32 | $this->attributes = array_merge($this->attributes, $configuration); |
33 | 33 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | final public function get($property = null) { |
37 | 37 | |
38 | - if ( is_null($property) ) { |
|
38 | + if (is_null($property)) { |
|
39 | 39 | |
40 | 40 | return $this->attributes; |
41 | 41 | |
@@ -91,13 +91,13 @@ discard block |
||
91 | 91 | |
92 | 92 | final public function delete($property = null) { |
93 | 93 | |
94 | - if ( is_null($property) ) { |
|
94 | + if (is_null($property)) { |
|
95 | 95 | |
96 | 96 | $this->attributes = array(); |
97 | 97 | |
98 | 98 | return true; |
99 | 99 | |
100 | - } else if ( $this->isDefined($property) ) { |
|
100 | + } else if ($this->isDefined($property)) { |
|
101 | 101 | |
102 | 102 | unset($this->attributes[$property]); |
103 | 103 |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | |
30 | 30 | public function get($header = null) { |
31 | 31 | |
32 | - if ( is_null($header) ) return $this->headers; |
|
32 | + if (is_null($header)) return $this->headers; |
|
33 | 33 | |
34 | - else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header]; |
|
34 | + else if (array_key_exists($header, $this->headers)) return $this->headers[$header]; |
|
35 | 35 | |
36 | 36 | else return null; |
37 | 37 | |
@@ -39,14 +39,14 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getAsString($header = null) { |
41 | 41 | |
42 | - if ( is_null($header) ) { |
|
42 | + if (is_null($header)) { |
|
43 | 43 | |
44 | - return array_map( function($header, $value) { |
|
44 | + return array_map(function($header, $value) { |
|
45 | 45 | return (string)($header.':'.$value); |
46 | 46 | }, |
47 | 47 | $this->headers); |
48 | 48 | |
49 | - } else if ( array_key_exists($header, $this->headers) ) { |
|
49 | + } else if (array_key_exists($header, $this->headers)) { |
|
50 | 50 | |
51 | 51 | return (string)($header.':'.$this->headers[$header]); |
52 | 52 | |
@@ -54,9 +54,9 @@ discard block |
||
54 | 54 | |
55 | 55 | } |
56 | 56 | |
57 | - public function set($header, $value=null) { |
|
57 | + public function set($header, $value = null) { |
|
58 | 58 | |
59 | - if ( is_null($value) ) { |
|
59 | + if (is_null($value)) { |
|
60 | 60 | |
61 | 61 | $header = explode(":", $header); |
62 | 62 | |
@@ -74,13 +74,13 @@ discard block |
||
74 | 74 | |
75 | 75 | public function delete($header = null) { |
76 | 76 | |
77 | - if ( is_null($header) ) { |
|
77 | + if (is_null($header)) { |
|
78 | 78 | |
79 | 79 | $this->headers = array(); |
80 | 80 | |
81 | 81 | return true; |
82 | 82 | |
83 | - } else if ( array_key_exists($header, $this->headers) ) { |
|
83 | + } else if (array_key_exists($header, $this->headers)) { |
|
84 | 84 | |
85 | 85 | unset($this->headers[$header]); |
86 | 86 |
@@ -29,11 +29,13 @@ discard block |
||
29 | 29 | |
30 | 30 | public function get($header = null) { |
31 | 31 | |
32 | - if ( is_null($header) ) return $this->headers; |
|
33 | - |
|
34 | - else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header]; |
|
35 | - |
|
36 | - else return null; |
|
32 | + if ( is_null($header) ) { |
|
33 | + return $this->headers; |
|
34 | + } else if ( array_key_exists($header, $this->headers) ) { |
|
35 | + return $this->headers[$header]; |
|
36 | + } else { |
|
37 | + return null; |
|
38 | + } |
|
37 | 39 | |
38 | 40 | } |
39 | 41 | |
@@ -50,7 +52,9 @@ discard block |
||
50 | 52 | |
51 | 53 | return (string)($header.':'.$this->headers[$header]); |
52 | 54 | |
53 | - } else return null; |
|
55 | + } else { |
|
56 | + return null; |
|
57 | + } |
|
54 | 58 | |
55 | 59 | } |
56 | 60 |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | final public function setTimestamp($time = null) { |
37 | 37 | |
38 | - if ( is_float($time) ) $this->timestamp = $time; |
|
38 | + if (is_float($time)) $this->timestamp = $time; |
|
39 | 39 | |
40 | 40 | else $this->timestamp = microtime(true); |
41 | 41 |
@@ -35,9 +35,11 @@ |
||
35 | 35 | |
36 | 36 | final public function setTimestamp($time = null) { |
37 | 37 | |
38 | - if ( is_float($time) ) $this->timestamp = $time; |
|
39 | - |
|
40 | - else $this->timestamp = microtime(true); |
|
38 | + if ( is_float($time) ) { |
|
39 | + $this->timestamp = $time; |
|
40 | + } else { |
|
41 | + $this->timestamp = microtime(true); |
|
42 | + } |
|
41 | 43 | |
42 | 44 | return $this; |
43 | 45 |