@@ -90,8 +90,7 @@ |
||
| 90 | 90 | ]; |
| 91 | 91 | |
| 92 | 92 | $log = $this->encoder->setCurrentStackTrace($log); |
| 93 | - } |
|
| 94 | - else |
|
| 93 | + } else |
|
| 95 | 94 | { |
| 96 | 95 | $log = (array)$message; |
| 97 | 96 | $log = $this->encoder->setCurrentStackTrace($log); |
@@ -45,8 +45,7 @@ |
||
| 45 | 45 | $log = [ |
| 46 | 46 | 'message' => $message |
| 47 | 47 | ]; |
| 48 | - } |
|
| 49 | - else |
|
| 48 | + } else |
|
| 50 | 49 | { |
| 51 | 50 | $log = (array)$message; |
| 52 | 51 | } |
@@ -237,8 +237,7 @@ discard block |
||
| 237 | 237 | { |
| 238 | 238 | $this->handleEvent($level, $message, $context); |
| 239 | 239 | }); |
| 240 | - } |
|
| 241 | - else |
|
| 240 | + } else |
|
| 242 | 241 | { |
| 243 | 242 | // starting from L5.4 MessageLogged event class was introduced |
| 244 | 243 | // https://github.com/laravel/framework/commit/57c82d095c356a0fe0f9381536afec768cdcc072 |
@@ -268,8 +267,7 @@ discard block |
||
| 268 | 267 | 'time' => $time, |
| 269 | 268 | ]); |
| 270 | 269 | }); |
| 271 | - } |
|
| 272 | - else |
|
| 270 | + } else |
|
| 273 | 271 | { |
| 274 | 272 | // https://laravel.com/api/5.3/Illuminate/Database/Events/QueryExecuted.html |
| 275 | 273 | $this->app['events']->listen('Illuminate\Database\Events\QueryExecuted', function($event) |
@@ -304,8 +302,7 @@ discard block |
||
| 304 | 302 | unset($context['exception']); |
| 305 | 303 | |
| 306 | 304 | $this->app['understand.exceptionLogger']->logError($level, $exception, $context); |
| 307 | - } |
|
| 308 | - else |
|
| 305 | + } else |
|
| 309 | 306 | { |
| 310 | 307 | $this->app['understand.exceptionLogger']->logError($level, $message, $context); |
| 311 | 308 | } |
@@ -152,12 +152,10 @@ |
||
| 152 | 152 | try |
| 153 | 153 | { |
| 154 | 154 | return $this->handler->handle($event); |
| 155 | - } |
|
| 156 | - catch (\Throwable $e) |
|
| 155 | + } catch (\Throwable $e) |
|
| 157 | 156 | { |
| 158 | 157 | return false; |
| 159 | - } |
|
| 160 | - catch (\Exception $ex) |
|
| 158 | + } catch (\Exception $ex) |
|
| 161 | 159 | { |
| 162 | 160 | return false; |
| 163 | 161 | } |
@@ -120,8 +120,7 @@ discard block |
||
| 120 | 120 | if (strpos($trace['file'], $this->projectRoot . 'vendor' . DIRECTORY_SEPARATOR) === 0) |
| 121 | 121 | { |
| 122 | 122 | unset($stackTrace[$index]); |
| 123 | - } |
|
| 124 | - else |
|
| 123 | + } else |
|
| 125 | 124 | { |
| 126 | 125 | $vendorExcluded = true; |
| 127 | 126 | } |
@@ -215,10 +214,8 @@ discard block |
||
| 215 | 214 | } |
| 216 | 215 | |
| 217 | 216 | return $codeLines; |
| 218 | - } |
|
| 219 | - catch (\Throwable $e) |
|
| 220 | - {} |
|
| 221 | - catch (\Exception $e) |
|
| 217 | + } catch (\Throwable $e) |
|
| 218 | + {} catch (\Exception $e) |
|
| 222 | 219 | {} |
| 223 | 220 | } |
| 224 | 221 | |
@@ -294,32 +291,25 @@ discard block |
||
| 294 | 291 | if (is_array($arg)) |
| 295 | 292 | { |
| 296 | 293 | $params[] = 'array(' . count($arg) . ')'; |
| 297 | - } |
|
| 298 | - else if (is_object($arg)) |
|
| 294 | + } else if (is_object($arg)) |
|
| 299 | 295 | { |
| 300 | 296 | $params[] = get_class($arg); |
| 301 | - } |
|
| 302 | - else if (is_string($arg)) |
|
| 297 | + } else if (is_string($arg)) |
|
| 303 | 298 | { |
| 304 | 299 | $params[] = 'string(' . $arg . ')'; |
| 305 | - } |
|
| 306 | - else if (is_int($arg)) |
|
| 300 | + } else if (is_int($arg)) |
|
| 307 | 301 | { |
| 308 | 302 | $params[] = 'int(' . $arg . ')'; |
| 309 | - } |
|
| 310 | - else if (is_float($arg)) |
|
| 303 | + } else if (is_float($arg)) |
|
| 311 | 304 | { |
| 312 | 305 | $params[] = 'float(' . $arg . ')'; |
| 313 | - } |
|
| 314 | - else if (is_bool($arg)) |
|
| 306 | + } else if (is_bool($arg)) |
|
| 315 | 307 | { |
| 316 | 308 | $params[] = 'bool(' . ($arg ? 'true' : 'false') . ')'; |
| 317 | - } |
|
| 318 | - else if ($arg instanceof \__PHP_Incomplete_Class) |
|
| 309 | + } else if ($arg instanceof \__PHP_Incomplete_Class) |
|
| 319 | 310 | { |
| 320 | 311 | $params[] = 'object(__PHP_Incomplete_Class)'; |
| 321 | - } |
|
| 322 | - else |
|
| 312 | + } else |
|
| 323 | 313 | { |
| 324 | 314 | $params[] = gettype($arg); |
| 325 | 315 | } |
@@ -299,12 +299,10 @@ discard block |
||
| 299 | 299 | if ($value instanceof \DateTimeInterface) |
| 300 | 300 | { |
| 301 | 301 | $binding = $value->format('Y-m-d H:i:s'); |
| 302 | - } |
|
| 303 | - elseif (is_bool($value)) |
|
| 302 | + } elseif (is_bool($value)) |
|
| 304 | 303 | { |
| 305 | 304 | $binding = (int) $value; |
| 306 | - } |
|
| 307 | - else |
|
| 305 | + } else |
|
| 308 | 306 | { |
| 309 | 307 | $binding = $value; |
| 310 | 308 | } |
@@ -381,8 +379,7 @@ discard block |
||
| 381 | 379 | try |
| 382 | 380 | { |
| 383 | 381 | $queryString[$key] = $this->parseRequestFieldValue($key, $value); |
| 384 | - } |
|
| 385 | - catch (\Exception $e) |
|
| 382 | + } catch (\Exception $e) |
|
| 386 | 383 | { |
| 387 | 384 | $queryString[$key] = '[handler error]'; |
| 388 | 385 | } |
@@ -415,8 +412,7 @@ discard block |
||
| 415 | 412 | try |
| 416 | 413 | { |
| 417 | 414 | $postData[$key] = $this->parseRequestFieldValue($key, $value); |
| 418 | - } |
|
| 419 | - catch (\Exception $e) |
|
| 415 | + } catch (\Exception $e) |
|
| 420 | 416 | { |
| 421 | 417 | $postData[$key] = '[handler error]'; |
| 422 | 418 | } |
@@ -574,10 +570,8 @@ discard block |
||
| 574 | 570 | { |
| 575 | 571 | return $userId; |
| 576 | 572 | } |
| 577 | - } |
|
| 578 | - catch (\Throwable $e) |
|
| 579 | - {} |
|
| 580 | - catch (\Exception $e) |
|
| 573 | + } catch (\Throwable $e) |
|
| 574 | + {} catch (\Exception $e) |
|
| 581 | 575 | {} |
| 582 | 576 | |
| 583 | 577 | try |
@@ -586,10 +580,8 @@ discard block |
||
| 586 | 580 | { |
| 587 | 581 | return $user->id; |
| 588 | 582 | } |
| 589 | - } |
|
| 590 | - catch (\Throwable $e) |
|
| 591 | - {} |
|
| 592 | - catch (\Exception $e) |
|
| 583 | + } catch (\Throwable $e) |
|
| 584 | + {} catch (\Exception $e) |
|
| 593 | 585 | {} |
| 594 | 586 | |
| 595 | 587 | try |
@@ -598,10 +590,8 @@ discard block |
||
| 598 | 590 | { |
| 599 | 591 | return $user->id; |
| 600 | 592 | } |
| 601 | - } |
|
| 602 | - catch (\Throwable $e) |
|
| 603 | - {} |
|
| 604 | - catch (\Exception $e) |
|
| 593 | + } catch (\Throwable $e) |
|
| 594 | + {} catch (\Exception $e) |
|
| 605 | 595 | {} |
| 606 | 596 | } |
| 607 | 597 | |