@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
| 160 | - * @param $relativePath |
|
| 160 | + * @param string|null $relativePath |
|
| 161 | 161 | * @param $line |
| 162 | 162 | * @param int $linesAround |
| 163 | 163 | * @return array|void |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | * Return stack trace file |
| 218 | 218 | * |
| 219 | 219 | * @param array $trace |
| 220 | - * @return mixed |
|
| 220 | + * @return string|null |
|
| 221 | 221 | */ |
| 222 | 222 | protected function getStackTraceFile(array $trace) |
| 223 | 223 | { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function exceptionToArray($exception) |
| 44 | 44 | { |
| 45 | - if ( ! ($exception instanceof Exception || $exception instanceof Throwable)) |
|
| 45 | + if (!($exception instanceof Exception || $exception instanceof Throwable)) |
|
| 46 | 46 | { |
| 47 | 47 | throw new InvalidArgumentException('$exception must be instance of Exception or Throwable'); |
| 48 | 48 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $stackTrace = $this->getCurrentStackTrace($level); |
| 72 | 72 | $firstLineSet = false; |
| 73 | 73 | |
| 74 | - foreach($stackTrace as $trace) |
|
| 74 | + foreach ($stackTrace as $trace) |
|
| 75 | 75 | { |
| 76 | 76 | if ($firstLineSet) |
| 77 | 77 | { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $stackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, $this->stackTraceLimit); |
| 99 | 99 | $vendorExcluded = false; |
| 100 | 100 | |
| 101 | - foreach($stackTrace as $index => $trace) |
|
| 101 | + foreach ($stackTrace as $index => $trace) |
|
| 102 | 102 | { |
| 103 | 103 | // exclude Understand service provider and helper classes |
| 104 | 104 | if (isset($trace['class']) && strpos($trace['class'], 'Understand\UnderstandLaravel5\\') === 0) |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | unset($stackTrace[$index]); |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if ( ! isset($trace['file'])) |
|
| 109 | + if (!isset($trace['file'])) |
|
| 110 | 110 | { |
| 111 | 111 | $vendorExcluded = true; |
| 112 | 112 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | // exclude `vendor` folder until project path reached |
| 120 | - if (strpos($trace['file'], $this->projectRoot . 'vendor' . DIRECTORY_SEPARATOR) === 0) |
|
| 120 | + if (strpos($trace['file'], $this->projectRoot.'vendor'.DIRECTORY_SEPARATOR) === 0) |
|
| 121 | 121 | { |
| 122 | 122 | unset($stackTrace[$index]); |
| 123 | 123 | } |
@@ -185,12 +185,12 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | public function getCode($relativePath, $line, $linesAround = 6) |
| 187 | 187 | { |
| 188 | - if ( ! $relativePath || ! $line) |
|
| 188 | + if (!$relativePath || !$line) |
|
| 189 | 189 | { |
| 190 | 190 | return; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - $filePath = $this->projectRoot . $relativePath; |
|
| 193 | + $filePath = $this->projectRoot.$relativePath; |
|
| 194 | 194 | |
| 195 | 195 | try |
| 196 | 196 | { |
@@ -200,11 +200,11 @@ discard block |
||
| 200 | 200 | $codeLines = []; |
| 201 | 201 | |
| 202 | 202 | $from = max(0, $line - $linesAround - 2); |
| 203 | - $to = min($line + $linesAround -1, $file->key() + 1); |
|
| 203 | + $to = min($line + $linesAround - 1, $file->key() + 1); |
|
| 204 | 204 | |
| 205 | 205 | $file->seek($from); |
| 206 | 206 | |
| 207 | - while ($file->key() < $to && ! $file->eof()) |
|
| 207 | + while ($file->key() < $to && !$file->eof()) |
|
| 208 | 208 | { |
| 209 | 209 | $file->next(); |
| 210 | 210 | // `key()` returns 0 as the first line |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | protected function stackTraceCallToString(array $trace) |
| 258 | 258 | { |
| 259 | - if (! isset($trace['type'])) |
|
| 259 | + if (!isset($trace['type'])) |
|
| 260 | 260 | { |
| 261 | 261 | return 'function'; |
| 262 | 262 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | { |
| 283 | 283 | $params = []; |
| 284 | 284 | |
| 285 | - if (! isset($trace['args'])) |
|
| 285 | + if (!isset($trace['args'])) |
|
| 286 | 286 | { |
| 287 | 287 | return $params; |
| 288 | 288 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | { |
| 292 | 292 | if (is_array($arg)) |
| 293 | 293 | { |
| 294 | - $params[] = 'array(' . count($arg) . ')'; |
|
| 294 | + $params[] = 'array('.count($arg).')'; |
|
| 295 | 295 | } |
| 296 | 296 | else if (is_object($arg)) |
| 297 | 297 | { |
@@ -299,19 +299,19 @@ discard block |
||
| 299 | 299 | } |
| 300 | 300 | else if (is_string($arg)) |
| 301 | 301 | { |
| 302 | - $params[] = 'string(' . $arg . ')'; |
|
| 302 | + $params[] = 'string('.$arg.')'; |
|
| 303 | 303 | } |
| 304 | 304 | else if (is_int($arg)) |
| 305 | 305 | { |
| 306 | - $params[] = 'int(' . $arg . ')'; |
|
| 306 | + $params[] = 'int('.$arg.')'; |
|
| 307 | 307 | } |
| 308 | 308 | else if (is_float($arg)) |
| 309 | 309 | { |
| 310 | - $params[] = 'float(' . $arg . ')'; |
|
| 310 | + $params[] = 'float('.$arg.')'; |
|
| 311 | 311 | } |
| 312 | 312 | else if (is_bool($arg)) |
| 313 | 313 | { |
| 314 | - $params[] = 'bool(' . ($arg ? 'true' : 'false') . ')'; |
|
| 314 | + $params[] = 'bool('.($arg ? 'true' : 'false').')'; |
|
| 315 | 315 | } |
| 316 | 316 | else if ($arg instanceof \__PHP_Incomplete_Class) |
| 317 | 317 | { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | protected $app; |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * @return void |
|
| 90 | + * @return Application |
|
| 91 | 91 | */ |
| 92 | 92 | public function __construct() |
| 93 | 93 | { |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | /** |
| 109 | 109 | * Set session store |
| 110 | 110 | * |
| 111 | - * @param type $service |
|
| 111 | + * @param SessionStore $service |
|
| 112 | 112 | */ |
| 113 | 113 | public function setSessionStore(SessionStore $service) |
| 114 | 114 | { |
@@ -157,7 +157,6 @@ discard block |
||
| 157 | 157 | * Register a custom HTML macro. |
| 158 | 158 | * |
| 159 | 159 | * @param string $name |
| 160 | - * @param mixed $macro |
|
| 161 | 160 | * @return void |
| 162 | 161 | */ |
| 163 | 162 | public function extend($name, $provider) |
@@ -168,7 +167,7 @@ discard block |
||
| 168 | 167 | /** |
| 169 | 168 | * Set token provider |
| 170 | 169 | * |
| 171 | - * @param UniqueProcessIdentifier $tokenProvider |
|
| 170 | + * @param TokenProvider $tokenProvider |
|
| 172 | 171 | */ |
| 173 | 172 | public function setTokenProvider(TokenProvider $tokenProvider) |
| 174 | 173 | { |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | protected function getSessionId() |
| 232 | 232 | { |
| 233 | - if ( ! $this->session) |
|
| 233 | + if (!$this->session) |
|
| 234 | 234 | { |
| 235 | 235 | return null; |
| 236 | 236 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | protected function getSqlQueries() |
| 258 | 258 | { |
| 259 | - if ( ! $this->dataCollector) |
|
| 259 | + if (!$this->dataCollector) |
|
| 260 | 260 | { |
| 261 | 261 | return []; |
| 262 | 262 | } |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | protected function getRouteName() |
| 278 | 278 | { |
| 279 | - if ( ! $this->router) |
|
| 279 | + if (!$this->router) |
|
| 280 | 280 | { |
| 281 | 281 | return null; |
| 282 | 282 | } |
@@ -291,23 +291,23 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | protected function getUrl() |
| 293 | 293 | { |
| 294 | - if ( ! $this->request) |
|
| 294 | + if (!$this->request) |
|
| 295 | 295 | { |
| 296 | 296 | return null; |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | $url = $this->request->path(); |
| 300 | 300 | |
| 301 | - if ( ! starts_with($url, '/')) |
|
| 301 | + if (!starts_with($url, '/')) |
|
| 302 | 302 | { |
| 303 | - $url = '/' . $url; |
|
| 303 | + $url = '/'.$url; |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | $queryString = $this->request->getQueryString(); |
| 307 | 307 | |
| 308 | 308 | if ($queryString) |
| 309 | 309 | { |
| 310 | - $url .= '?' . $queryString; |
|
| 310 | + $url .= '?'.$queryString; |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | return $url; |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | protected function getRequestMethod() |
| 322 | 322 | { |
| 323 | - if ( ! $this->request) |
|
| 323 | + if (!$this->request) |
|
| 324 | 324 | { |
| 325 | 325 | return null; |
| 326 | 326 | } |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | */ |
| 336 | 336 | protected function getServerIp() |
| 337 | 337 | { |
| 338 | - if ( ! $this->request) |
|
| 338 | + if (!$this->request) |
|
| 339 | 339 | { |
| 340 | 340 | return null; |
| 341 | 341 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | */ |
| 351 | 351 | protected function getClientIp() |
| 352 | 352 | { |
| 353 | - if ( ! $this->request) |
|
| 353 | + if (!$this->request) |
|
| 354 | 354 | { |
| 355 | 355 | return null; |
| 356 | 356 | } |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | */ |
| 366 | 366 | protected function getClientUserAgent() |
| 367 | 367 | { |
| 368 | - if ( ! $this->request) |
|
| 368 | + if (!$this->request) |
|
| 369 | 369 | { |
| 370 | 370 | return null; |
| 371 | 371 | } |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | */ |
| 392 | 392 | protected function getFromSession($key) |
| 393 | 393 | { |
| 394 | - if ( ! $this->session) |
|
| 394 | + if (!$this->session) |
|
| 395 | 395 | { |
| 396 | 396 | return null; |
| 397 | 397 | } |
@@ -409,9 +409,9 @@ discard block |
||
| 409 | 409 | { |
| 410 | 410 | $parts = []; |
| 411 | 411 | |
| 412 | - foreach(['class', 'file', 'line'] as $field) |
|
| 412 | + foreach (['class', 'file', 'line'] as $field) |
|
| 413 | 413 | { |
| 414 | - $parts[] = isset($log[$field]) ? (string)$log[$field] : null; |
|
| 414 | + $parts[] = isset($log[$field]) ? (string) $log[$field] : null; |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | return sha1(implode('#', $parts)); |
@@ -28,7 +28,6 @@ discard block |
||
| 28 | 28 | /** |
| 29 | 29 | * @param FieldProvider $fieldProvider |
| 30 | 30 | * @param BaseHandler $handler |
| 31 | - * @param bool $silent |
|
| 32 | 31 | */ |
| 33 | 32 | public function __construct(FieldProvider $fieldProvider, BaseHandler $handler) |
| 34 | 33 | { |
@@ -144,7 +143,6 @@ discard block |
||
| 144 | 143 | /** |
| 145 | 144 | * Send data to storage |
| 146 | 145 | * |
| 147 | - * @param array $requestData |
|
| 148 | 146 | * @return mixed |
| 149 | 147 | */ |
| 150 | 148 | protected function send(array $event) |
@@ -107,9 +107,9 @@ |
||
| 107 | 107 | */ |
| 108 | 108 | protected function formatMessage($message) |
| 109 | 109 | { |
| 110 | - if ( ! is_bool($message)) |
|
| 110 | + if (!is_bool($message)) |
|
| 111 | 111 | { |
| 112 | - return (string)$message; |
|
| 112 | + return (string) $message; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // cast boolean values to "1" or "0" strings |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | public function log($error) |
| 57 | 57 | { |
| 58 | - if ( ! $this->canHandle($error)) |
|
| 58 | + if (!$this->canHandle($error)) |
|
| 59 | 59 | { |
| 60 | 60 | return; |
| 61 | 61 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function logError($level, $message, $context) |
| 75 | 75 | { |
| 76 | - if ( ! $this->canHandle($message)) |
|
| 76 | + if (!$this->canHandle($message)) |
|
| 77 | 77 | { |
| 78 | 78 | return; |
| 79 | 79 | } |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | else |
| 95 | 95 | { |
| 96 | - $log = (array)$message; |
|
| 96 | + $log = (array) $message; |
|
| 97 | 97 | $log = $this->encoder->setCurrentStackTrace($log); |
| 98 | 98 | } |
| 99 | 99 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | if ($context) |
| 103 | 103 | { |
| 104 | - $log['context'] = (array)$context; |
|
| 104 | + $log['context'] = (array) $context; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | return $this->dispatch($log); |
@@ -150,6 +150,6 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | protected function canHandle($error) |
| 152 | 152 | { |
| 153 | - return (bool)$this->config->get('understand-laravel.enabled'); |
|
| 153 | + return (bool) $this->config->get('understand-laravel.enabled'); |
|
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | \ No newline at end of file |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | else |
| 50 | 50 | { |
| 51 | - $log = (array)$message; |
|
| 51 | + $log = (array) $message; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | $log['tags'] = ['laravel_log']; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | if ($context) |
| 58 | 58 | { |
| 59 | - $log['context'] = (array)$context; |
|
| 59 | + $log['context'] = (array) $context; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | $additionalFields = $this->getMetaFields(); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | /** |
| 24 | 24 | * Project root folder |
| 25 | 25 | */ |
| 26 | - 'project_root' => base_path() . DIRECTORY_SEPARATOR, |
|
| 26 | + 'project_root' => base_path().DIRECTORY_SEPARATOR, |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Collect SQL queries without bindings |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | /** |
| 216 | 216 | * Detect Laravel version |
| 217 | 217 | * |
| 218 | - * @param array $versions |
|
| 219 | - * @return type |
|
| 218 | + * @param string[] $versions |
|
| 219 | + * @return boolean |
|
| 220 | 220 | */ |
| 221 | 221 | protected function detectLaravelVersion(array $versions) |
| 222 | 222 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
| 320 | - * @param $level |
|
| 320 | + * @param string $level |
|
| 321 | 321 | * @param $message |
| 322 | 322 | * @param $context |
| 323 | 323 | * @return bool |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | /** |
| 338 | 338 | * Get the services provided by the provider. |
| 339 | 339 | * |
| 340 | - * @return array |
|
| 340 | + * @return string[] |
|
| 341 | 341 | */ |
| 342 | 342 | public function provides() |
| 343 | 343 | { |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | public function boot() |
| 26 | 26 | { |
| 27 | - $configPath = __DIR__ . '/../../config/understand-laravel.php'; |
|
| 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'); |
| 30 | 30 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | protected function registerConfig() |
| 64 | 64 | { |
| 65 | - $configPath = __DIR__ . '/../../config/understand-laravel.php'; |
|
| 65 | + $configPath = __DIR__.'/../../config/understand-laravel.php'; |
|
| 66 | 66 | $this->mergeConfigFrom($configPath, 'understand-laravel'); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | return new Handlers\SyncHandler($inputToken, $apiUrl, $sslBundlePath); |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - throw new \ErrorException('understand-laravel handler misconfiguration:' . $handlerType); |
|
| 212 | + throw new \ErrorException('understand-laravel handler misconfiguration:'.$handlerType); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | /** |
@@ -298,13 +298,13 @@ discard block |
||
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | // `\Log::info`, `\Log::debug` and NOT `\Exception` or `\Throwable` |
| 301 | - if (in_array($level, ['info', 'debug']) && ! ($message instanceof Exception || $message instanceof Throwable)) |
|
| 301 | + if (in_array($level, ['info', 'debug']) && !($message instanceof Exception || $message instanceof Throwable)) |
|
| 302 | 302 | { |
| 303 | 303 | $this->app['understand.eventLogger']->logEvent($level, $message, $context); |
| 304 | 304 | } |
| 305 | 305 | // `\Log::notice`, `\Log::warning`, `\Log::error`, `\Log::critical`, `\Log::alert`, `\Log::emergency` and `\Exception`, `\Throwable` |
| 306 | 306 | // '5.5', '5.6', '5.7', '5.8' |
| 307 | - else if ( ! $this->detectLaravelVersion(['5.0', '5.1', '5.2', '5.3', '5.4']) && isset($context['exception']) && ($context['exception'] instanceof Exception || $context['exception'] instanceof Throwable)) |
|
| 307 | + else if (!$this->detectLaravelVersion(['5.0', '5.1', '5.2', '5.3', '5.4']) && isset($context['exception']) && ($context['exception'] instanceof Exception || $context['exception'] instanceof Throwable)) |
|
| 308 | 308 | { |
| 309 | 309 | $exception = $context['exception']; |
| 310 | 310 | unset($context['exception']); |
@@ -325,9 +325,9 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | protected function shouldIgnoreEvent($level, $message, $context) |
| 327 | 327 | { |
| 328 | - $ignoredEventTypes = (array)$this->app['config']->get('understand-laravel.ignored_logs'); |
|
| 328 | + $ignoredEventTypes = (array) $this->app['config']->get('understand-laravel.ignored_logs'); |
|
| 329 | 329 | |
| 330 | - if ( ! $ignoredEventTypes) |
|
| 330 | + if (!$ignoredEventTypes) |
|
| 331 | 331 | { |
| 332 | 332 | return false; |
| 333 | 333 | } |