@@ -167,12 +167,14 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function match(UriInterface $uri, array $defaults): ?array |
169 | 169 | { |
170 | - if (!$this->isCompiled()) { |
|
170 | + if (!$this->isCompiled()) |
|
171 | + { |
|
171 | 172 | $this->compile(); |
172 | 173 | } |
173 | 174 | |
174 | 175 | $matches = []; |
175 | - if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) { |
|
176 | + if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) |
|
177 | + { |
|
176 | 178 | return null; |
177 | 179 | } |
178 | 180 | |
@@ -190,7 +192,8 @@ discard block |
||
190 | 192 | */ |
191 | 193 | public function uri($parameters = [], array $defaults = []): UriInterface |
192 | 194 | { |
193 | - if (!$this->isCompiled()) { |
|
195 | + if (!$this->isCompiled()) |
|
196 | + { |
|
194 | 197 | $this->compile(); |
195 | 198 | } |
196 | 199 | |
@@ -200,8 +203,10 @@ discard block |
||
200 | 203 | $this->fetchOptions($parameters, $query) |
201 | 204 | ); |
202 | 205 | |
203 | - foreach ($this->constrains as $key => $values) { |
|
204 | - if (empty($parameters[$key])) { |
|
206 | + foreach ($this->constrains as $key => $values) |
|
207 | + { |
|
208 | + if (empty($parameters[$key])) |
|
209 | + { |
|
205 | 210 | throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing"); |
206 | 211 | } |
207 | 212 | } |
@@ -227,18 +232,23 @@ discard block |
||
227 | 232 | $allowed = array_keys($this->options); |
228 | 233 | |
229 | 234 | $result = []; |
230 | - foreach ($parameters as $key => $parameter) { |
|
231 | - if (is_numeric($key) && isset($allowed[$key])) { |
|
235 | + foreach ($parameters as $key => $parameter) |
|
236 | + { |
|
237 | + if (is_numeric($key) && isset($allowed[$key])) |
|
238 | + { |
|
232 | 239 | // this segment fetched keys from given parameters either by name or by position |
233 | 240 | $key = $allowed[$key]; |
234 | - } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) { |
|
241 | + } |
|
242 | + elseif (!array_key_exists($key, $this->options) && is_array($parameters)) |
|
243 | + { |
|
235 | 244 | // all additional parameters given in array form can be glued to query string |
236 | 245 | $query[$key] = $parameter; |
237 | 246 | continue; |
238 | 247 | } |
239 | 248 | |
240 | 249 | //String must be normalized here |
241 | - if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) { |
|
250 | + if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) |
|
251 | + { |
|
242 | 252 | $result[$key] = $this->slugify->slugify($parameter); |
243 | 253 | continue; |
244 | 254 | } |
@@ -259,15 +269,20 @@ discard block |
||
259 | 269 | { |
260 | 270 | $path = $uri->getPath(); |
261 | 271 | |
262 | - if (empty($path) || $path[0] !== '/') { |
|
272 | + if (empty($path) || $path[0] !== '/') |
|
273 | + { |
|
263 | 274 | $path = '/' . $path; |
264 | 275 | } |
265 | 276 | |
266 | - if ($this->matchHost) { |
|
277 | + if ($this->matchHost) |
|
278 | + { |
|
267 | 279 | $uriString = $uri->getHost() . $path; |
268 | - } else { |
|
280 | + } |
|
281 | + else |
|
282 | + { |
|
269 | 283 | $uriString = substr($path, strlen($this->prefix)); |
270 | - if ($uriString === false) { |
|
284 | + if ($uriString === false) |
|
285 | + { |
|
271 | 286 | $uriString = ''; |
272 | 287 | } |
273 | 288 | } |
@@ -280,7 +295,8 @@ discard block |
||
280 | 295 | */ |
281 | 296 | private function compile(): void |
282 | 297 | { |
283 | - if ($this->pattern === null) { |
|
298 | + if ($this->pattern === null) |
|
299 | + { |
|
284 | 300 | throw new UriHandlerException('Unable to compile UriHandler, pattern is not set'); |
285 | 301 | } |
286 | 302 | |
@@ -288,14 +304,17 @@ discard block |
||
288 | 304 | $pattern = rtrim(ltrim($this->pattern, ':/'), '/'); |
289 | 305 | |
290 | 306 | // correct [/ first occurrence] |
291 | - if (strpos($pattern, '[/') === 0) { |
|
307 | + if (strpos($pattern, '[/') === 0) |
|
308 | + { |
|
292 | 309 | $pattern = '[' . substr($pattern, 2); |
293 | 310 | } |
294 | 311 | |
295 | - if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) { |
|
312 | + if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) |
|
313 | + { |
|
296 | 314 | $variables = array_combine($matches[1], $matches[2]); |
297 | 315 | |
298 | - foreach ($variables as $key => $segment) { |
|
316 | + foreach ($variables as $key => $segment) |
|
317 | + { |
|
299 | 318 | $segment = $this->prepareSegment($key, $segment); |
300 | 319 | $replaces["<$key>"] = "(?P<$key>$segment)"; |
301 | 320 | $options[] = $key; |
@@ -305,13 +324,16 @@ discard block |
||
305 | 324 | $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern); |
306 | 325 | $options = array_fill_keys($options, null); |
307 | 326 | |
308 | - foreach ($this->constrains as $key => $value) { |
|
309 | - if ($value instanceof Autofill) { |
|
327 | + foreach ($this->constrains as $key => $value) |
|
328 | + { |
|
329 | + if ($value instanceof Autofill) |
|
330 | + { |
|
310 | 331 | // only forces value replacement, not required to be presented as parameter |
311 | 332 | continue; |
312 | 333 | } |
313 | 334 | |
314 | - if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) { |
|
335 | + if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) |
|
336 | + { |
|
315 | 337 | throw new ConstrainException( |
316 | 338 | sprintf( |
317 | 339 | 'Route `%s` does not define routing parameter `<%s>`.', |
@@ -337,7 +359,8 @@ discard block |
||
337 | 359 | private function interpolate(string $string, array $values): string |
338 | 360 | { |
339 | 361 | $replaces = []; |
340 | - foreach ($values as $key => $value) { |
|
362 | + foreach ($values as $key => $value) |
|
363 | + { |
|
341 | 364 | $value = (is_array($value) || $value instanceof \Closure) ? '' : $value; |
342 | 365 | $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value; |
343 | 366 | } |
@@ -354,15 +377,18 @@ discard block |
||
354 | 377 | */ |
355 | 378 | private function prepareSegment(string $name, string $segment): string |
356 | 379 | { |
357 | - if ($segment !== '') { |
|
380 | + if ($segment !== '') |
|
381 | + { |
|
358 | 382 | return self::SEGMENT_TYPES[$segment] ?? $segment; |
359 | 383 | } |
360 | 384 | |
361 | - if (!isset($this->constrains[$name])) { |
|
385 | + if (!isset($this->constrains[$name])) |
|
386 | + { |
|
362 | 387 | return self::DEFAULT_SEGMENT; |
363 | 388 | } |
364 | 389 | |
365 | - if (is_array($this->constrains[$name])) { |
|
390 | + if (is_array($this->constrains[$name])) |
|
391 | + { |
|
366 | 392 | $values = array_map([$this, 'filterSegment'], $this->constrains[$name]); |
367 | 393 | |
368 | 394 | return implode('|', $values); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | 'integer' => '\d+', |
33 | 33 | 'uuid' => '0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}', |
34 | 34 | ]; |
35 | - private const URI_FIXERS = [ |
|
35 | + private const URI_FIXERS = [ |
|
36 | 36 | '[]' => '', |
37 | 37 | '[/]' => '', |
38 | 38 | '[' => '', |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | public function __construct( |
79 | 79 | UriFactoryInterface $uriFactory, |
80 | 80 | SlugifyInterface $slugify = null |
81 | - ) { |
|
81 | + ){ |
|
82 | 82 | $this->uriFactory = $uriFactory; |
83 | 83 | $this->slugify = $slugify ?? new Slugify(); |
84 | 84 | } |
@@ -167,12 +167,12 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function match(UriInterface $uri, array $defaults): ?array |
169 | 169 | { |
170 | - if (!$this->isCompiled()) { |
|
170 | + if (!$this->isCompiled()){ |
|
171 | 171 | $this->compile(); |
172 | 172 | } |
173 | 173 | |
174 | 174 | $matches = []; |
175 | - if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) { |
|
175 | + if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)){ |
|
176 | 176 | return null; |
177 | 177 | } |
178 | 178 | |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function uri($parameters = [], array $defaults = []): UriInterface |
192 | 192 | { |
193 | - if (!$this->isCompiled()) { |
|
193 | + if (!$this->isCompiled()){ |
|
194 | 194 | $this->compile(); |
195 | 195 | } |
196 | 196 | |
@@ -200,8 +200,8 @@ discard block |
||
200 | 200 | $this->fetchOptions($parameters, $query) |
201 | 201 | ); |
202 | 202 | |
203 | - foreach ($this->constrains as $key => $values) { |
|
204 | - if (empty($parameters[$key])) { |
|
203 | + foreach ($this->constrains as $key => $values){ |
|
204 | + if (empty($parameters[$key])){ |
|
205 | 205 | throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing"); |
206 | 206 | } |
207 | 207 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $path = $this->interpolate($this->template, $parameters); |
211 | 211 | |
212 | 212 | //Uri with added prefix |
213 | - $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix) . trim($path, '/')); |
|
213 | + $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix).trim($path, '/')); |
|
214 | 214 | |
215 | 215 | return empty($query) ? $uri : $uri->withQuery(http_build_query($query)); |
216 | 216 | } |
@@ -227,18 +227,18 @@ discard block |
||
227 | 227 | $allowed = array_keys($this->options); |
228 | 228 | |
229 | 229 | $result = []; |
230 | - foreach ($parameters as $key => $parameter) { |
|
231 | - if (is_numeric($key) && isset($allowed[$key])) { |
|
230 | + foreach ($parameters as $key => $parameter){ |
|
231 | + if (is_numeric($key) && isset($allowed[$key])){ |
|
232 | 232 | // this segment fetched keys from given parameters either by name or by position |
233 | 233 | $key = $allowed[$key]; |
234 | - } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) { |
|
234 | + } elseif (!array_key_exists($key, $this->options) && is_array($parameters)){ |
|
235 | 235 | // all additional parameters given in array form can be glued to query string |
236 | 236 | $query[$key] = $parameter; |
237 | 237 | continue; |
238 | 238 | } |
239 | 239 | |
240 | 240 | //String must be normalized here |
241 | - if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) { |
|
241 | + if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)){ |
|
242 | 242 | $result[$key] = $this->slugify->slugify($parameter); |
243 | 243 | continue; |
244 | 244 | } |
@@ -259,15 +259,15 @@ discard block |
||
259 | 259 | { |
260 | 260 | $path = $uri->getPath(); |
261 | 261 | |
262 | - if (empty($path) || $path[0] !== '/') { |
|
263 | - $path = '/' . $path; |
|
262 | + if (empty($path) || $path[0] !== '/'){ |
|
263 | + $path = '/'.$path; |
|
264 | 264 | } |
265 | 265 | |
266 | - if ($this->matchHost) { |
|
267 | - $uriString = $uri->getHost() . $path; |
|
268 | - } else { |
|
266 | + if ($this->matchHost){ |
|
267 | + $uriString = $uri->getHost().$path; |
|
268 | + }else{ |
|
269 | 269 | $uriString = substr($path, strlen($this->prefix)); |
270 | - if ($uriString === false) { |
|
270 | + if ($uriString === false){ |
|
271 | 271 | $uriString = ''; |
272 | 272 | } |
273 | 273 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | */ |
281 | 281 | private function compile(): void |
282 | 282 | { |
283 | - if ($this->pattern === null) { |
|
283 | + if ($this->pattern === null){ |
|
284 | 284 | throw new UriHandlerException('Unable to compile UriHandler, pattern is not set'); |
285 | 285 | } |
286 | 286 | |
@@ -288,14 +288,14 @@ discard block |
||
288 | 288 | $pattern = rtrim(ltrim($this->pattern, ':/'), '/'); |
289 | 289 | |
290 | 290 | // correct [/ first occurrence] |
291 | - if (strpos($pattern, '[/') === 0) { |
|
292 | - $pattern = '[' . substr($pattern, 2); |
|
291 | + if (strpos($pattern, '[/') === 0){ |
|
292 | + $pattern = '['.substr($pattern, 2); |
|
293 | 293 | } |
294 | 294 | |
295 | - if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) { |
|
295 | + if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)){ |
|
296 | 296 | $variables = array_combine($matches[1], $matches[2]); |
297 | 297 | |
298 | - foreach ($variables as $key => $segment) { |
|
298 | + foreach ($variables as $key => $segment){ |
|
299 | 299 | $segment = $this->prepareSegment($key, $segment); |
300 | 300 | $replaces["<$key>"] = "(?P<$key>$segment)"; |
301 | 301 | $options[] = $key; |
@@ -305,13 +305,13 @@ discard block |
||
305 | 305 | $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern); |
306 | 306 | $options = array_fill_keys($options, null); |
307 | 307 | |
308 | - foreach ($this->constrains as $key => $value) { |
|
309 | - if ($value instanceof Autofill) { |
|
308 | + foreach ($this->constrains as $key => $value){ |
|
309 | + if ($value instanceof Autofill){ |
|
310 | 310 | // only forces value replacement, not required to be presented as parameter |
311 | 311 | continue; |
312 | 312 | } |
313 | 313 | |
314 | - if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) { |
|
314 | + if (!array_key_exists($key, $options) && !isset($this->defaults[$key])){ |
|
315 | 315 | throw new ConstrainException( |
316 | 316 | sprintf( |
317 | 317 | 'Route `%s` does not define routing parameter `<%s>`.', |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
325 | - $this->compiled = '/^' . strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu'; |
|
325 | + $this->compiled = '/^'.strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu'; |
|
326 | 326 | $this->template = stripslashes(str_replace('?', '', $template)); |
327 | 327 | $this->options = $options; |
328 | 328 | } |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | private function interpolate(string $string, array $values): string |
338 | 338 | { |
339 | 339 | $replaces = []; |
340 | - foreach ($values as $key => $value) { |
|
340 | + foreach ($values as $key => $value){ |
|
341 | 341 | $value = (is_array($value) || $value instanceof \Closure) ? '' : $value; |
342 | 342 | $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value; |
343 | 343 | } |
@@ -354,15 +354,15 @@ discard block |
||
354 | 354 | */ |
355 | 355 | private function prepareSegment(string $name, string $segment): string |
356 | 356 | { |
357 | - if ($segment !== '') { |
|
357 | + if ($segment !== ''){ |
|
358 | 358 | return self::SEGMENT_TYPES[$segment] ?? $segment; |
359 | 359 | } |
360 | 360 | |
361 | - if (!isset($this->constrains[$name])) { |
|
361 | + if (!isset($this->constrains[$name])){ |
|
362 | 362 | return self::DEFAULT_SEGMENT; |
363 | 363 | } |
364 | 364 | |
365 | - if (is_array($this->constrains[$name])) { |
|
365 | + if (is_array($this->constrains[$name])){ |
|
366 | 366 | $values = array_map([$this, 'filterSegment'], $this->constrains[$name]); |
367 | 367 | |
368 | 368 | return implode('|', $values); |
@@ -24,7 +24,7 @@ |
||
24 | 24 | { |
25 | 25 | public function tearDown(): void |
26 | 26 | { |
27 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
27 | + if ((int)session_status() === PHP_SESSION_ACTIVE){ |
|
28 | 28 | session_abort(); |
29 | 29 | } |
30 | 30 | } |
@@ -24,7 +24,8 @@ |
||
24 | 24 | { |
25 | 25 | public function tearDown(): void |
26 | 26 | { |
27 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
27 | + if ((int)session_status() === PHP_SESSION_ACTIVE) |
|
28 | + { |
|
28 | 29 | session_abort(); |
29 | 30 | } |
30 | 31 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | public function tearDown(): void |
53 | 53 | { |
54 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
54 | + if ((int)session_status() === PHP_SESSION_ACTIVE){ |
|
55 | 55 | session_abort(); |
56 | 56 | } |
57 | 57 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $this->assertSame('default', $section->getName()); |
126 | 126 | |
127 | 127 | $section->set('key', 'value'); |
128 | - foreach ($section as $key => $value) { |
|
128 | + foreach ($section as $key => $value){ |
|
129 | 129 | $this->assertSame('key', $key); |
130 | 130 | $this->assertSame('value', $value); |
131 | 131 | } |
@@ -51,7 +51,8 @@ discard block |
||
51 | 51 | |
52 | 52 | public function tearDown(): void |
53 | 53 | { |
54 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
54 | + if ((int)session_status() === PHP_SESSION_ACTIVE) |
|
55 | + { |
|
55 | 56 | session_abort(); |
56 | 57 | } |
57 | 58 | } |
@@ -125,7 +126,8 @@ discard block |
||
125 | 126 | $this->assertSame('default', $section->getName()); |
126 | 127 | |
127 | 128 | $section->set('key', 'value'); |
128 | - foreach ($section as $key => $value) { |
|
129 | + foreach ($section as $key => $value) |
|
130 | + { |
|
129 | 131 | $this->assertSame('key', $key); |
130 | 132 | $this->assertSame('value', $value); |
131 | 133 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function get(string $name, $default = null) |
129 | 129 | { |
130 | - if (!$this->has($name)) { |
|
130 | + if (!$this->has($name)){ |
|
131 | 131 | return $default; |
132 | 132 | } |
133 | 133 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | { |
203 | 203 | $this->session->resume(); |
204 | 204 | |
205 | - if (!isset($_SESSION[$this->name])) { |
|
205 | + if (!isset($_SESSION[$this->name])){ |
|
206 | 206 | $_SESSION[$this->name] = []; |
207 | 207 | } |
208 | 208 | } |
@@ -127,7 +127,8 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function get(string $name, $default = null) |
129 | 129 | { |
130 | - if (!$this->has($name)) { |
|
130 | + if (!$this->has($name)) |
|
131 | + { |
|
131 | 132 | return $default; |
132 | 133 | } |
133 | 134 | |
@@ -202,7 +203,8 @@ discard block |
||
202 | 203 | { |
203 | 204 | $this->session->resume(); |
204 | 205 | |
205 | - if (!isset($_SESSION[$this->name])) { |
|
206 | + if (!isset($_SESSION[$this->name])) |
|
207 | + { |
|
206 | 208 | $_SESSION[$this->name] = []; |
207 | 209 | } |
208 | 210 | } |
@@ -62,8 +62,8 @@ |
||
62 | 62 | */ |
63 | 63 | public function gc($maxlifetime): void |
64 | 64 | { |
65 | - foreach ($this->files->getFiles($this->directory) as $filename) { |
|
66 | - if ($this->files->time($filename) < time() - $maxlifetime) { |
|
65 | + foreach ($this->files->getFiles($this->directory) as $filename){ |
|
66 | + if ($this->files->time($filename) < time() - $maxlifetime){ |
|
67 | 67 | $this->files->delete($filename); |
68 | 68 | } |
69 | 69 | } |
@@ -62,8 +62,10 @@ |
||
62 | 62 | */ |
63 | 63 | public function gc($maxlifetime): void |
64 | 64 | { |
65 | - foreach ($this->files->getFiles($this->directory) as $filename) { |
|
66 | - if ($this->files->time($filename) < time() - $maxlifetime) { |
|
65 | + foreach ($this->files->getFiles($this->directory) as $filename) |
|
66 | + { |
|
67 | + if ($this->files->time($filename) < time() - $maxlifetime) |
|
68 | + { |
|
67 | 69 | $this->files->delete($filename); |
68 | 70 | } |
69 | 71 | } |
@@ -48,15 +48,15 @@ |
||
48 | 48 | */ |
49 | 49 | public function initSession(string $clientSignature, string $id = null): SessionInterface |
50 | 50 | { |
51 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
51 | + if ((int)session_status() === PHP_SESSION_ACTIVE){ |
|
52 | 52 | throw new MultipleSessionException('Unable to initiate session, session already started'); |
53 | 53 | } |
54 | 54 | |
55 | 55 | //Initiating proper session handler |
56 | - if ($this->config->getHandler() !== null) { |
|
57 | - try { |
|
56 | + if ($this->config->getHandler() !== null){ |
|
57 | + try{ |
|
58 | 58 | $handler = $this->config->getHandler()->resolve($this->factory); |
59 | - } catch (\Throwable | ContainerExceptionInterface $e) { |
|
59 | + }catch (\Throwable | ContainerExceptionInterface $e){ |
|
60 | 60 | throw new SessionException($e->getMessage(), $e->getCode(), $e); |
61 | 61 | } |
62 | 62 |
@@ -48,15 +48,20 @@ |
||
48 | 48 | */ |
49 | 49 | public function initSession(string $clientSignature, string $id = null): SessionInterface |
50 | 50 | { |
51 | - if ((int)session_status() === PHP_SESSION_ACTIVE) { |
|
51 | + if ((int)session_status() === PHP_SESSION_ACTIVE) |
|
52 | + { |
|
52 | 53 | throw new MultipleSessionException('Unable to initiate session, session already started'); |
53 | 54 | } |
54 | 55 | |
55 | 56 | //Initiating proper session handler |
56 | - if ($this->config->getHandler() !== null) { |
|
57 | - try { |
|
57 | + if ($this->config->getHandler() !== null) |
|
58 | + { |
|
59 | + try |
|
60 | + { |
|
58 | 61 | $handler = $this->config->getHandler()->resolve($this->factory); |
59 | - } catch (\Throwable | ContainerExceptionInterface $e) { |
|
62 | + } |
|
63 | + catch (\Throwable | ContainerExceptionInterface $e) |
|
64 | + { |
|
60 | 65 | throw new SessionException($e->getMessage(), $e->getCode(), $e); |
61 | 66 | } |
62 | 67 |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $this->clientSignature = $clientSignature; |
73 | 73 | $this->lifetime = $lifetime; |
74 | 74 | |
75 | - if (!empty($id) && $this->validID($id)) { |
|
75 | + if (!empty($id) && $this->validID($id)){ |
|
76 | 76 | $this->id = $id; |
77 | 77 | } |
78 | 78 | } |
@@ -103,24 +103,24 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function resume(): void |
105 | 105 | { |
106 | - if ($this->isStarted()) { |
|
106 | + if ($this->isStarted()){ |
|
107 | 107 | return; |
108 | 108 | } |
109 | 109 | |
110 | - if (!empty($this->id)) { |
|
110 | + if (!empty($this->id)){ |
|
111 | 111 | session_id($this->id); |
112 | - } else { |
|
112 | + }else{ |
|
113 | 113 | // always new id |
114 | 114 | session_id(session_create_id()); |
115 | 115 | } |
116 | 116 | |
117 | - try { |
|
117 | + try{ |
|
118 | 118 | session_start(['use_cookies' => false]); |
119 | - } catch (\Throwable $e) { |
|
119 | + }catch (\Throwable $e){ |
|
120 | 120 | throw new SessionException('Unable to start session', $e->getCode(), $e); |
121 | 121 | } |
122 | 122 | |
123 | - if (empty($this->id)) { |
|
123 | + if (empty($this->id)){ |
|
124 | 124 | //Sign newly created session |
125 | 125 | $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature; |
126 | 126 | $_SESSION[self::SESSION_CREATED] = time(); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $this->started = true; |
132 | 132 | |
133 | 133 | //Ensure that session is valid |
134 | - if (!$this->validSession()) { |
|
134 | + if (!$this->validSession()){ |
|
135 | 135 | $this->invalidateSession(); |
136 | 136 | } |
137 | 137 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function commit(): bool |
172 | 172 | { |
173 | - if (!$this->isStarted()) { |
|
173 | + if (!$this->isStarted()){ |
|
174 | 174 | return false; |
175 | 175 | } |
176 | 176 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function abort(): bool |
187 | 187 | { |
188 | - if (!$this->isStarted()) { |
|
188 | + if (!$this->isStarted()){ |
|
189 | 189 | return false; |
190 | 190 | } |
191 | 191 | |
@@ -228,17 +228,17 @@ discard block |
||
228 | 228 | if ( |
229 | 229 | !array_key_exists(self::CLIENT_SIGNATURE, $_SESSION) |
230 | 230 | || !array_key_exists(self::SESSION_CREATED, $_SESSION) |
231 | - ) { |
|
231 | + ){ |
|
232 | 232 | //Missing session signature or timestamp! |
233 | 233 | return false; |
234 | 234 | } |
235 | 235 | |
236 | - if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) { |
|
236 | + if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime){ |
|
237 | 237 | //Session expired |
238 | 238 | return false; |
239 | 239 | } |
240 | 240 | |
241 | - if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) { |
|
241 | + if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)){ |
|
242 | 242 | //Signatures do not match |
243 | 243 | return false; |
244 | 244 | } |
@@ -72,7 +72,8 @@ discard block |
||
72 | 72 | $this->clientSignature = $clientSignature; |
73 | 73 | $this->lifetime = $lifetime; |
74 | 74 | |
75 | - if (!empty($id) && $this->validID($id)) { |
|
75 | + if (!empty($id) && $this->validID($id)) |
|
76 | + { |
|
76 | 77 | $this->id = $id; |
77 | 78 | } |
78 | 79 | } |
@@ -103,24 +104,32 @@ discard block |
||
103 | 104 | */ |
104 | 105 | public function resume(): void |
105 | 106 | { |
106 | - if ($this->isStarted()) { |
|
107 | + if ($this->isStarted()) |
|
108 | + { |
|
107 | 109 | return; |
108 | 110 | } |
109 | 111 | |
110 | - if (!empty($this->id)) { |
|
112 | + if (!empty($this->id)) |
|
113 | + { |
|
111 | 114 | session_id($this->id); |
112 | - } else { |
|
115 | + } |
|
116 | + else |
|
117 | + { |
|
113 | 118 | // always new id |
114 | 119 | session_id(session_create_id()); |
115 | 120 | } |
116 | 121 | |
117 | - try { |
|
122 | + try |
|
123 | + { |
|
118 | 124 | session_start(['use_cookies' => false]); |
119 | - } catch (\Throwable $e) { |
|
125 | + } |
|
126 | + catch (\Throwable $e) |
|
127 | + { |
|
120 | 128 | throw new SessionException('Unable to start session', $e->getCode(), $e); |
121 | 129 | } |
122 | 130 | |
123 | - if (empty($this->id)) { |
|
131 | + if (empty($this->id)) |
|
132 | + { |
|
124 | 133 | //Sign newly created session |
125 | 134 | $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature; |
126 | 135 | $_SESSION[self::SESSION_CREATED] = time(); |
@@ -131,7 +140,8 @@ discard block |
||
131 | 140 | $this->started = true; |
132 | 141 | |
133 | 142 | //Ensure that session is valid |
134 | - if (!$this->validSession()) { |
|
143 | + if (!$this->validSession()) |
|
144 | + { |
|
135 | 145 | $this->invalidateSession(); |
136 | 146 | } |
137 | 147 | } |
@@ -170,7 +180,8 @@ discard block |
||
170 | 180 | */ |
171 | 181 | public function commit(): bool |
172 | 182 | { |
173 | - if (!$this->isStarted()) { |
|
183 | + if (!$this->isStarted()) |
|
184 | + { |
|
174 | 185 | return false; |
175 | 186 | } |
176 | 187 | |
@@ -185,7 +196,8 @@ discard block |
||
185 | 196 | */ |
186 | 197 | public function abort(): bool |
187 | 198 | { |
188 | - if (!$this->isStarted()) { |
|
199 | + if (!$this->isStarted()) |
|
200 | + { |
|
189 | 201 | return false; |
190 | 202 | } |
191 | 203 | |
@@ -233,12 +245,14 @@ discard block |
||
233 | 245 | return false; |
234 | 246 | } |
235 | 247 | |
236 | - if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) { |
|
248 | + if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) |
|
249 | + { |
|
237 | 250 | //Session expired |
238 | 251 | return false; |
239 | 252 | } |
240 | 253 | |
241 | - if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) { |
|
254 | + if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) |
|
255 | + { |
|
242 | 256 | //Signatures do not match |
243 | 257 | return false; |
244 | 258 | } |
@@ -64,15 +64,15 @@ |
||
64 | 64 | */ |
65 | 65 | public function getHandler(): ?Autowire |
66 | 66 | { |
67 | - if (empty($this->config['handler'])) { |
|
67 | + if (empty($this->config['handler'])){ |
|
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | - if ($this->config['handler'] instanceof Autowire) { |
|
71 | + if ($this->config['handler'] instanceof Autowire){ |
|
72 | 72 | return $this->config['handler']; |
73 | 73 | } |
74 | 74 | |
75 | - if (class_exists($this->config['handler'])) { |
|
75 | + if (class_exists($this->config['handler'])){ |
|
76 | 76 | return new Autowire($this->config['handler']); |
77 | 77 | } |
78 | 78 |
@@ -64,15 +64,18 @@ |
||
64 | 64 | */ |
65 | 65 | public function getHandler(): ?Autowire |
66 | 66 | { |
67 | - if (empty($this->config['handler'])) { |
|
67 | + if (empty($this->config['handler'])) |
|
68 | + { |
|
68 | 69 | return null; |
69 | 70 | } |
70 | 71 | |
71 | - if ($this->config['handler'] instanceof Autowire) { |
|
72 | + if ($this->config['handler'] instanceof Autowire) |
|
73 | + { |
|
72 | 74 | return $this->config['handler']; |
73 | 75 | } |
74 | 76 | |
75 | - if (class_exists($this->config['handler'])) { |
|
77 | + if (class_exists($this->config['handler'])) |
|
78 | + { |
|
76 | 79 | return new Autowire($this->config['handler']); |
77 | 80 | } |
78 | 81 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $this->expectException(LoaderException::class); |
25 | 25 | |
26 | 26 | $loader = new ViewLoader([ |
27 | - 'default' => __DIR__ . '/fixtures/default', |
|
27 | + 'default' => __DIR__.'/fixtures/default', |
|
28 | 28 | ]); |
29 | 29 | |
30 | 30 | $loader->exists('view'); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $this->expectException(LoaderException::class); |
36 | 36 | |
37 | 37 | $loader = new ViewLoader([ |
38 | - 'default' => __DIR__ . '/fixtures/default', |
|
38 | + 'default' => __DIR__.'/fixtures/default', |
|
39 | 39 | ]); |
40 | 40 | |
41 | 41 | $loader->list(); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $this->expectException(LoaderException::class); |
47 | 47 | |
48 | 48 | $loader = new ViewLoader([ |
49 | - 'default' => __DIR__ . '/fixtures/default', |
|
49 | + 'default' => __DIR__.'/fixtures/default', |
|
50 | 50 | ]); |
51 | 51 | |
52 | 52 | $loader->load('view'); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function testExists(): void |
56 | 56 | { |
57 | 57 | $loader = new ViewLoader([ |
58 | - 'default' => __DIR__ . '/fixtures/default', |
|
58 | + 'default' => __DIR__.'/fixtures/default', |
|
59 | 59 | ]); |
60 | 60 | |
61 | 61 | $loader = $loader->withExtension('php'); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function testList(): void |
87 | 87 | { |
88 | 88 | $loader = new ViewLoader([ |
89 | - 'default' => __DIR__ . '/fixtures/default', |
|
89 | + 'default' => __DIR__.'/fixtures/default', |
|
90 | 90 | ]); |
91 | 91 | |
92 | 92 | $loader = $loader->withExtension('php'); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $this->expectException(LoaderException::class); |
104 | 104 | |
105 | 105 | $loader = new ViewLoader([ |
106 | - 'default' => __DIR__ . '/fixtures/default', |
|
106 | + 'default' => __DIR__.'/fixtures/default', |
|
107 | 107 | ]); |
108 | 108 | |
109 | 109 | $loader = $loader->withExtension('php'); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function testLoad(): void |
147 | 147 | { |
148 | 148 | $loader = new ViewLoader([ |
149 | - 'default' => __DIR__ . '/fixtures/default', |
|
149 | + 'default' => __DIR__.'/fixtures/default', |
|
150 | 150 | ]); |
151 | 151 | |
152 | 152 | $loader = $loader->withExtension('php'); |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | public function testMultipleNamespaces(): void |
170 | 170 | { |
171 | 171 | $loader = new ViewLoader([ |
172 | - 'default' => __DIR__ . '/fixtures/default', |
|
173 | - 'other' => __DIR__ . '/fixtures/other', |
|
172 | + 'default' => __DIR__.'/fixtures/default', |
|
173 | + 'other' => __DIR__.'/fixtures/other', |
|
174 | 174 | |
175 | 175 | ]); |
176 | 176 |