@@ -16,8 +16,7 @@ |
||
| 16 | 16 | \Queue::push('Understand\UnderstandLaravel5\Handlers\LaravelQueueListener@listen', [ |
| 17 | 17 | 'requestData' => $requestData |
| 18 | 18 | ]); |
| 19 | - } |
|
| 20 | - catch (\Exception $ex) |
|
| 19 | + } catch (\Exception $ex) |
|
| 21 | 20 | { |
| 22 | 21 | if ( ! $this->silent) |
| 23 | 22 | { |
@@ -315,8 +315,7 @@ discard block |
||
| 315 | 315 | { |
| 316 | 316 | return $userId; |
| 317 | 317 | } |
| 318 | - } |
|
| 319 | - catch (\Exception $e) |
|
| 318 | + } catch (\Exception $e) |
|
| 320 | 319 | {} |
| 321 | 320 | |
| 322 | 321 | try |
@@ -325,8 +324,7 @@ discard block |
||
| 325 | 324 | { |
| 326 | 325 | return $user->id; |
| 327 | 326 | } |
| 328 | - } |
|
| 329 | - catch (\Exception $e) |
|
| 327 | + } catch (\Exception $e) |
|
| 330 | 328 | {} |
| 331 | 329 | |
| 332 | 330 | try |
@@ -335,8 +333,7 @@ discard block |
||
| 335 | 333 | { |
| 336 | 334 | return $user->id; |
| 337 | 335 | } |
| 338 | - } |
|
| 339 | - catch (\Exception $e) |
|
| 336 | + } catch (\Exception $e) |
|
| 340 | 337 | {} |
| 341 | 338 | } |
| 342 | 339 | |
@@ -125,8 +125,7 @@ |
||
| 125 | 125 | try |
| 126 | 126 | { |
| 127 | 127 | return $this->handler->handle($event); |
| 128 | - } |
|
| 129 | - catch (\Exception $ex) |
|
| 128 | + } catch (\Exception $ex) |
|
| 130 | 129 | { |
| 131 | 130 | if (! $this->silent) |
| 132 | 131 | { |
@@ -125,32 +125,25 @@ |
||
| 125 | 125 | if (is_array($arg)) |
| 126 | 126 | { |
| 127 | 127 | $params[] = 'array(' . count($arg) . ')'; |
| 128 | - } |
|
| 129 | - else if (is_object($arg)) |
|
| 128 | + } else if (is_object($arg)) |
|
| 130 | 129 | { |
| 131 | 130 | $params[] = get_class($arg); |
| 132 | - } |
|
| 133 | - else if (is_string($arg)) |
|
| 131 | + } else if (is_string($arg)) |
|
| 134 | 132 | { |
| 135 | 133 | $params[] = 'string(' . $arg . ')'; |
| 136 | - } |
|
| 137 | - else if (is_int($arg)) |
|
| 134 | + } else if (is_int($arg)) |
|
| 138 | 135 | { |
| 139 | 136 | $params[] = 'int(' . $arg . ')'; |
| 140 | - } |
|
| 141 | - else if (is_float($arg)) |
|
| 137 | + } else if (is_float($arg)) |
|
| 142 | 138 | { |
| 143 | 139 | $params[] = 'float(' . $arg . ')'; |
| 144 | - } |
|
| 145 | - else if (is_bool($arg)) |
|
| 140 | + } else if (is_bool($arg)) |
|
| 146 | 141 | { |
| 147 | 142 | $params[] = 'bool(' . ($arg ? 'true' : 'false') . ')'; |
| 148 | - } |
|
| 149 | - else if ($arg instanceof \__PHP_Incomplete_Class) |
|
| 143 | + } else if ($arg instanceof \__PHP_Incomplete_Class) |
|
| 150 | 144 | { |
| 151 | 145 | $params[] = 'object(__PHP_Incomplete_Class)'; |
| 152 | - } |
|
| 153 | - else |
|
| 146 | + } else |
|
| 154 | 147 | { |
| 155 | 148 | $params[] = gettype($arg); |
| 156 | 149 | } |
@@ -240,8 +240,7 @@ discard block |
||
| 240 | 240 | { |
| 241 | 241 | $this->handleEvent($level, $message, $context); |
| 242 | 242 | }); |
| 243 | - } |
|
| 244 | - else |
|
| 243 | + } else |
|
| 245 | 244 | { |
| 246 | 245 | // starting from L5.4 MessageLogged event class was introduced |
| 247 | 246 | // https://github.com/laravel/framework/commit/57c82d095c356a0fe0f9381536afec768cdcc072 |
@@ -268,8 +267,7 @@ discard block |
||
| 268 | 267 | if ($message instanceof Exceptions\HandlerException) |
| 269 | 268 | { |
| 270 | 269 | return; |
| 271 | - } |
|
| 272 | - else if ($message instanceof \Exception) |
|
| 270 | + } else if ($message instanceof \Exception) |
|
| 273 | 271 | { |
| 274 | 272 | $log = $this->app['understand.exception-encoder']->exceptionToArray($message); |
| 275 | 273 | $log['tags'] = ['exception_log']; |
@@ -279,8 +277,7 @@ discard block |
||
| 279 | 277 | { |
| 280 | 278 | $log['message'] = $message; |
| 281 | 279 | $log['tags'] = ['laravel_log']; |
| 282 | - } |
|
| 283 | - else |
|
| 280 | + } else |
|
| 284 | 281 | { |
| 285 | 282 | $log = (array)$message; |
| 286 | 283 | $log['tags'] = ['laravel_log']; |
@@ -323,8 +320,7 @@ discard block |
||
| 323 | 320 | |
| 324 | 321 | $modelLogger->logModelEvent($eventName, $model, $modelLevelEventName); |
| 325 | 322 | }); |
| 326 | - } |
|
| 327 | - else |
|
| 323 | + } else |
|
| 328 | 324 | { |
| 329 | 325 | $this->app['events']->listen($listenerName, function($modelLevelEventName, $eventPayload) use($modelLogger, $eventName) |
| 330 | 326 | { |