@@ -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( |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->setTimestamp(); |
76 | 76 | |
77 | 77 | // parsing configuration |
78 | - $this->configuration = new Configuration( DefaultConfiguration::get() ); |
|
78 | + $this->configuration = new Configuration(DefaultConfiguration::get()); |
|
79 | 79 | |
80 | 80 | $this->configuration()->merge($configuration); |
81 | 81 | |
@@ -154,9 +154,9 @@ discard block |
||
154 | 154 | |
155 | 155 | $this->logger()->debug("Emitting global dispatcher event."); |
156 | 156 | |
157 | - $this->events()->emit( new DispatcherEvent($this) ); |
|
157 | + $this->events()->emit(new DispatcherEvent($this)); |
|
158 | 158 | |
159 | - if ( $this->configuration()->get('enabled') === false ) { |
|
159 | + if ($this->configuration()->get('enabled') === false) { |
|
160 | 160 | |
161 | 161 | $this->logger()->debug("Dispatcher disabled, shutting down gracefully."); |
162 | 162 | |
@@ -172,11 +172,11 @@ discard block |
||
172 | 172 | |
173 | 173 | } |
174 | 174 | |
175 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request') ); |
|
175 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request')); |
|
176 | 176 | |
177 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get()) ); |
|
177 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get())); |
|
178 | 178 | |
179 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.#') ); |
|
179 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.#')); |
|
180 | 180 | |
181 | 181 | $this->logger()->debug("Starting router."); |
182 | 182 | |
@@ -200,13 +200,13 @@ discard block |
||
200 | 200 | |
201 | 201 | $this->logger()->debug("Route acquired, type $route_type directed to $route_service."); |
202 | 202 | |
203 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route') ); |
|
203 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route')); |
|
204 | 204 | |
205 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type) ); |
|
205 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type)); |
|
206 | 206 | |
207 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service) ); |
|
207 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service)); |
|
208 | 208 | |
209 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') ); |
|
209 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.#')); |
|
210 | 210 | |
211 | 211 | // translate route to service |
212 | 212 | |
@@ -262,11 +262,11 @@ discard block |
||
262 | 262 | |
263 | 263 | private function shutdown() { |
264 | 264 | |
265 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response') ); |
|
265 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response')); |
|
266 | 266 | |
267 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get()) ); |
|
267 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get())); |
|
268 | 268 | |
269 | - $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.#') ); |
|
269 | + $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.#')); |
|
270 | 270 | |
271 | 271 | $this->logger()->debug("Composing return value."); |
272 | 272 |
@@ -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 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | public function set($content) { |
42 | 42 | |
43 | - if ( !is_scalar($content) ) { |
|
43 | + if (!is_scalar($content)) { |
|
44 | 44 | |
45 | 45 | throw new Exception("Invalid HTTP content"); |
46 | 46 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | public function type($type = null) { |
56 | 56 | |
57 | - if ( is_null($type) ) { |
|
57 | + if (is_null($type)) { |
|
58 | 58 | |
59 | 59 | return $this->type; |
60 | 60 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | public function charset($charset = null) { |
70 | 70 | |
71 | - if ( is_null($charset) ) { |
|
71 | + if (is_null($charset)) { |
|
72 | 72 | |
73 | 73 | return $this->charset; |
74 | 74 |
@@ -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 |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $supported_methods = $this->configuration()->get('dispatcher-supported-methods'); |
96 | 96 | |
97 | - if ( method_exists($this, 'any') ) { |
|
97 | + if (method_exists($this, 'any')) { |
|
98 | 98 | |
99 | 99 | return $supported_methods; |
100 | 100 | |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | |
103 | 103 | $implemented_methods = array(); |
104 | 104 | |
105 | - foreach ( $supported_methods as $method ) { |
|
105 | + foreach ($supported_methods as $method) { |
|
106 | 106 | |
107 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method); |
|
107 | + if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method); |
|
108 | 108 | |
109 | 109 | } |
110 | 110 | |
@@ -118,11 +118,11 @@ discard block |
||
118 | 118 | */ |
119 | 119 | final public function getMethod($method) { |
120 | 120 | |
121 | - if ( method_exists($this, strtolower($method)) ) { |
|
121 | + if (method_exists($this, strtolower($method))) { |
|
122 | 122 | |
123 | 123 | return strtolower($method); |
124 | 124 | |
125 | - } else if ( method_exists($this, strtolower('any')) ) { |
|
125 | + } else if (method_exists($this, strtolower('any'))) { |
|
126 | 126 | |
127 | 127 | return 'any'; |
128 | 128 |
@@ -104,7 +104,9 @@ |
||
104 | 104 | |
105 | 105 | foreach ( $supported_methods as $method ) { |
106 | 106 | |
107 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method); |
|
107 | + if ( method_exists($this, strtolower($method)) ) { |
|
108 | + array_push($implemented_methods,$method); |
|
109 | + } |
|
108 | 110 | |
109 | 111 | } |
110 | 112 |
@@ -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 |