@@ -62,7 +62,9 @@ |
||
62 | 62 | |
63 | 63 | public function description($code=null) { |
64 | 64 | |
65 | - if ( is_null($code) ) return $this->codes->getMessage($this->status_code); |
|
65 | + if ( is_null($code) ) { |
|
66 | + return $this->codes->getMessage($this->status_code); |
|
67 | + } |
|
66 | 68 | |
67 | 69 | return $this->codes->getMessage($code); |
68 | 70 |
@@ -60,9 +60,9 @@ |
||
60 | 60 | |
61 | 61 | } |
62 | 62 | |
63 | - public function description($code=null) { |
|
63 | + public function description($code = null) { |
|
64 | 64 | |
65 | - if ( is_null($code) ) return $this->codes->getMessage($this->status_code); |
|
65 | + if (is_null($code)) return $this->codes->getMessage($this->status_code); |
|
66 | 66 | |
67 | 67 | return $this->codes->getMessage($code); |
68 | 68 |
@@ -207,7 +207,10 @@ |
||
207 | 207 | */ |
208 | 208 | if ( preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches) ) { |
209 | 209 | |
210 | - if ( count($matches) == 1 ) $matches = $matches[0]; // This is the case where no backreferences are present or available. |
|
210 | + if ( count($matches) == 1 ) { |
|
211 | + $matches = $matches[0]; |
|
212 | + } |
|
213 | + // This is the case where no backreferences are present or available. |
|
211 | 214 | |
212 | 215 | // The extracted value (with any backreference available) is added to the query parameters. |
213 | 216 | $this->setRequestParameter($key, $matches); |
@@ -80,8 +80,8 @@ |
||
80 | 80 | protected $error_message; |
81 | 81 | |
82 | 82 | /** |
83 | - * @var array |
|
84 | - */ |
|
83 | + * @var array |
|
84 | + */ |
|
85 | 85 | protected $parameters = []; |
86 | 86 | |
87 | 87 | /** |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | |
136 | 136 | public function setRedirectCode($code) { |
137 | 137 | |
138 | - if ( $code < 300 || $code >= 400 ) { |
|
138 | + if ($code < 300 || $code >= 400) { |
|
139 | 139 | throw new InvalidArgumentException("Invalid redirection code $code"); |
140 | 140 | } |
141 | 141 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | public function setRedirectType($type) { |
183 | 183 | |
184 | - if ( !in_array($type, [self::REDIRECT_REFRESH, self::REDIRECT_LOCATION]) ) { |
|
184 | + if (!in_array($type, [self::REDIRECT_REFRESH, self::REDIRECT_LOCATION])) { |
|
185 | 185 | throw new InvalidArgumentException("Invalid redirection type $type"); |
186 | 186 | } |
187 | 187 | |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | |
200 | 200 | public function setErrorCode($code) { |
201 | 201 | |
202 | - if ( $code < 400 || $code >= 600 ) { |
|
202 | + if ($code < 400 || $code >= 600) { |
|
203 | 203 | throw new InvalidArgumentException("Invalid error code $code"); |
204 | 204 | } |
205 | 205 | |
@@ -359,13 +359,13 @@ discard block |
||
359 | 359 | // Because of the nature of the global regular expression, all the bits of the matched route are associated with a parameter key |
360 | 360 | foreach ($this->query as $key => $value) { |
361 | 361 | |
362 | - if ( isset($path[$key]) ) { |
|
362 | + if (isset($path[$key])) { |
|
363 | 363 | /* if it's available a bit associated with the parameter name, it is compared against |
364 | 364 | * it's regular expression in order to extrect backreferences |
365 | 365 | */ |
366 | - if ( preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches) ) { |
|
366 | + if (preg_match('/^'.$value['regex'].'$/', $path[$key], $matches)) { |
|
367 | 367 | |
368 | - if ( count($matches) == 1 ) $matches = $matches[0]; // This is the case where no backreferences are present or available. |
|
368 | + if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available. |
|
369 | 369 | |
370 | 370 | // The extracted value (with any backreference available) is added to the query parameters. |
371 | 371 | $this->setRequestParameter($key, $matches); |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | */ |
392 | 392 | public function serialize() { |
393 | 393 | |
394 | - return serialize( (object) [ |
|
394 | + return serialize((object)[ |
|
395 | 395 | 'classname' => $this->classname, |
396 | 396 | 'type' => $this->type, |
397 | 397 | 'service' => $this->service, |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | use ResponseTrait; |
49 | 49 | use ExtraTrait; |
50 | 50 | |
51 | - protected static $supported_methods = ['GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE']; |
|
51 | + protected static $supported_methods = ['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT', 'PURGE']; |
|
52 | 52 | |
53 | 53 | public function __construct( |
54 | 54 | Configuration $configuration, |
@@ -81,9 +81,9 @@ discard block |
||
81 | 81 | |
82 | 82 | $supported_methods = $this->getConfiguration()->get('supported-http-methods'); |
83 | 83 | |
84 | - if ( is_null($supported_methods) ) $supported_methods = self::$supported_methods; |
|
84 | + if (is_null($supported_methods)) $supported_methods = self::$supported_methods; |
|
85 | 85 | |
86 | - if ( method_exists($this, 'any') ) { |
|
86 | + if (method_exists($this, 'any')) { |
|
87 | 87 | |
88 | 88 | return $supported_methods; |
89 | 89 | |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | |
92 | 92 | $implemented_methods = []; |
93 | 93 | |
94 | - foreach ( $supported_methods as $method ) { |
|
94 | + foreach ($supported_methods as $method) { |
|
95 | 95 | |
96 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods, $method); |
|
96 | + if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method); |
|
97 | 97 | |
98 | 98 | } |
99 | 99 | |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | |
110 | 110 | $method = strtolower($method); |
111 | 111 | |
112 | - if ( method_exists($this, $method) ) { |
|
112 | + if (method_exists($this, $method)) { |
|
113 | 113 | |
114 | 114 | return $method; |
115 | 115 | |
116 | - } else if ( method_exists($this, 'any') ) { |
|
116 | + } else if (method_exists($this, 'any')) { |
|
117 | 117 | |
118 | 118 | return 'any'; |
119 | 119 |
@@ -81,7 +81,9 @@ discard block |
||
81 | 81 | |
82 | 82 | $supported_methods = $this->getConfiguration()->get('supported-http-methods'); |
83 | 83 | |
84 | - if ( is_null($supported_methods) ) $supported_methods = self::$supported_methods; |
|
84 | + if ( is_null($supported_methods) ) { |
|
85 | + $supported_methods = self::$supported_methods; |
|
86 | + } |
|
85 | 87 | |
86 | 88 | if ( method_exists($this, 'any') ) { |
87 | 89 | |
@@ -93,7 +95,9 @@ discard block |
||
93 | 95 | |
94 | 96 | foreach ( $supported_methods as $method ) { |
95 | 97 | |
96 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods, $method); |
|
98 | + if ( method_exists($this, strtolower($method)) ) { |
|
99 | + array_push($implemented_methods, $method); |
|
100 | + } |
|
97 | 101 | |
98 | 102 | } |
99 | 103 |
@@ -47,7 +47,9 @@ |
||
47 | 47 | |
48 | 48 | $cache_object = $this->getCache()->setNamespace(self::$cache_namespace)->get($name); |
49 | 49 | |
50 | - if (is_null($cache_object)) return false; |
|
50 | + if (is_null($cache_object)) { |
|
51 | + return false; |
|
52 | + } |
|
51 | 53 | |
52 | 54 | $response->import($cache_object); |
53 | 55 |
@@ -102,7 +102,9 @@ |
||
102 | 102 | |
103 | 103 | public function getMessage($code) { |
104 | 104 | |
105 | - if ($this->exists($code)) return $this->codes[$code]; |
|
105 | + if ($this->exists($code)) { |
|
106 | + return $this->codes[$code]; |
|
107 | + } |
|
106 | 108 | |
107 | 109 | throw new Exception("Invalid HTTP status code $code"); |
108 | 110 |
@@ -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 |
@@ -123,7 +123,9 @@ |
||
123 | 123 | |
124 | 124 | if ($this->bypass_routing === false) { |
125 | 125 | |
126 | - if (!$this->parse()) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404); |
|
126 | + if (!$this->parse()) { |
|
127 | + throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404); |
|
128 | + } |
|
127 | 129 | |
128 | 130 | } |
129 | 131 |
@@ -107,7 +107,7 @@ |
||
107 | 107 | |
108 | 108 | public function route(Request $request) { |
109 | 109 | |
110 | - $method = (string) $request->getMethod(); |
|
110 | + $method = (string)$request->getMethod(); |
|
111 | 111 | |
112 | 112 | $methods = $this->configuration->get('allowed-http-methods'); |
113 | 113 |
@@ -75,7 +75,9 @@ |
||
75 | 75 | |
76 | 76 | $status = $response->getStatus()->get(); |
77 | 77 | |
78 | - if (!$this->codes->exists($status)) throw new Exception("Invalid HTTP status code in response"); |
|
78 | + if (!$this->codes->exists($status)) { |
|
79 | + throw new Exception("Invalid HTTP status code in response"); |
|
80 | + } |
|
79 | 81 | |
80 | 82 | $message = $this->codes->getMessage($status); |
81 | 83 |
@@ -28,11 +28,13 @@ |
||
28 | 28 | |
29 | 29 | public function get($header = null) { |
30 | 30 | |
31 | - if (is_null($header)) return $this->headers; |
|
32 | - |
|
33 | - else if (array_key_exists($header, $this->headers)) return $this->headers[$header]; |
|
34 | - |
|
35 | - else return null; |
|
31 | + if (is_null($header)) { |
|
32 | + return $this->headers; |
|
33 | + } else if (array_key_exists($header, $this->headers)) { |
|
34 | + return $this->headers[$header]; |
|
35 | + } else { |
|
36 | + return null; |
|
37 | + } |
|
36 | 38 | |
37 | 39 | } |
38 | 40 |