@@ -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 | } |
@@ -10,20 +10,20 @@ discard block |
||
| 10 | 10 | class UnderstandLaravel5ServiceProvider extends ServiceProvider |
| 11 | 11 | { |
| 12 | 12 | |
| 13 | - /** |
|
| 14 | - * Indicates if loading of the provider is deferred. |
|
| 15 | - * |
|
| 16 | - * @var bool |
|
| 17 | - */ |
|
| 18 | - protected $defer = false; |
|
| 19 | - |
|
| 20 | - /** |
|
| 21 | - * Bootstrap the application events. |
|
| 22 | - * |
|
| 23 | - * @return void |
|
| 24 | - */ |
|
| 25 | - public function boot() |
|
| 26 | - { |
|
| 13 | + /** |
|
| 14 | + * Indicates if loading of the provider is deferred. |
|
| 15 | + * |
|
| 16 | + * @var bool |
|
| 17 | + */ |
|
| 18 | + protected $defer = false; |
|
| 19 | + |
|
| 20 | + /** |
|
| 21 | + * Bootstrap the application events. |
|
| 22 | + * |
|
| 23 | + * @return void |
|
| 24 | + */ |
|
| 25 | + public function boot() |
|
| 26 | + { |
|
| 27 | 27 | $configPath = __DIR__ . '/../../config/understand-laravel.php'; |
| 28 | 28 | $this->publishes([$configPath => config_path('understand-laravel.php')], 'config'); |
| 29 | 29 | $enabled = $this->app['config']->get('understand-laravel.enabled'); |
@@ -37,23 +37,23 @@ discard block |
||
| 37 | 37 | { |
| 38 | 38 | $this->listenQueryEvents(); |
| 39 | 39 | } |
| 40 | - } |
|
| 41 | - |
|
| 42 | - /** |
|
| 43 | - * Register the service provider. |
|
| 44 | - * |
|
| 45 | - * @return void |
|
| 46 | - */ |
|
| 47 | - public function register() |
|
| 48 | - { |
|
| 49 | - $this->registerConfig(); |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * Register the service provider. |
|
| 44 | + * |
|
| 45 | + * @return void |
|
| 46 | + */ |
|
| 47 | + public function register() |
|
| 48 | + { |
|
| 49 | + $this->registerConfig(); |
|
| 50 | 50 | $this->registerFieldProvider(); |
| 51 | 51 | $this->registerDataCollector(); |
| 52 | 52 | $this->registerTokenProvider(); |
| 53 | 53 | $this->registerLogger(); |
| 54 | 54 | $this->registerExceptionEncoder(); |
| 55 | 55 | $this->registerEventLoggers(); |
| 56 | - } |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Register config |
@@ -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 | } |
@@ -430,10 +430,8 @@ discard block |
||
| 430 | 430 | { |
| 431 | 431 | return $userId; |
| 432 | 432 | } |
| 433 | - } |
|
| 434 | - catch (\Throwable $e) |
|
| 435 | - {} |
|
| 436 | - catch (\Exception $e) |
|
| 433 | + } catch (\Throwable $e) |
|
| 434 | + {} catch (\Exception $e) |
|
| 437 | 435 | {} |
| 438 | 436 | |
| 439 | 437 | try |
@@ -442,10 +440,8 @@ discard block |
||
| 442 | 440 | { |
| 443 | 441 | return $user->id; |
| 444 | 442 | } |
| 445 | - } |
|
| 446 | - catch (\Throwable $e) |
|
| 447 | - {} |
|
| 448 | - catch (\Exception $e) |
|
| 443 | + } catch (\Throwable $e) |
|
| 444 | + {} catch (\Exception $e) |
|
| 449 | 445 | {} |
| 450 | 446 | |
| 451 | 447 | try |
@@ -454,10 +450,8 @@ discard block |
||
| 454 | 450 | { |
| 455 | 451 | return $user->id; |
| 456 | 452 | } |
| 457 | - } |
|
| 458 | - catch (\Throwable $e) |
|
| 459 | - {} |
|
| 460 | - catch (\Exception $e) |
|
| 453 | + } catch (\Throwable $e) |
|
| 454 | + {} catch (\Exception $e) |
|
| 461 | 455 | {} |
| 462 | 456 | } |
| 463 | 457 | |
@@ -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 | } |