understand / understand-laravel5

src/Understand/UnderstandLaravel5/ExceptionEncoder.php

Doc Comments +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
     }
 
     /**
-     * @param $relativePath
+     * @param string|null $relativePath
      * @param $line
      * @param int $linesAround
      * @return array|void
@@ -217,7 +217,7 @@ 
      * Return stack trace file
      *
      * @param array $trace
-     * @return mixed
+     * @return string|null
      */
     protected function getStackTraceFile(array $trace)
     {

Spacing +16 added lines, -16 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function exceptionToArray($exception)
     {
-        if ( ! ($exception instanceof Exception || $exception instanceof Throwable))
+        if (!($exception instanceof Exception || $exception instanceof Throwable))
         {
             throw new InvalidArgumentException('$exception must be instance of Exception or Throwable');
         }
@@ -58,7 +58,7 @@ 
         $stackTrace = $this->getCurrentStackTrace($level);
         $firstLineSet = false;
 
-        foreach($stackTrace as $trace)
+        foreach ($stackTrace as $trace)
         {
             if ($firstLineSet)
             {
@@ -85,7 +85,7 @@ 
         $stackTrace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 100);
         $vendorExcluded = false;
 
-        foreach($stackTrace as $index => $trace)
+        foreach ($stackTrace as $index => $trace)
         {
             // exclude Understand service provider and helper classes
             if (isset($trace['class']) && strpos($trace['class'], 'Understand\UnderstandLaravel5\\') === 0)
@@ -93,7 +93,7 @@ 
                 unset($stackTrace[$index]);
             }
 
-            if ( ! isset($trace['file']))
+            if (!isset($trace['file']))
             {
                 $vendorExcluded = true;
             }
@@ -104,7 +104,7 @@ 
             }
 
             // exclude `vendor` folder until project path reached
-            if (strpos($trace['file'], $this->projectRoot . 'vendor' . DIRECTORY_SEPARATOR) === 0)
+            if (strpos($trace['file'], $this->projectRoot.'vendor'.DIRECTORY_SEPARATOR) === 0)
             {
                 unset($stackTrace[$index]);
             }
@@ -164,12 +164,12 @@ 
      */
     public function getCode($relativePath, $line, $linesAround = 6)
     {
-        if ( ! $relativePath || ! $line)
+        if (!$relativePath || !$line)
         {
             return;
         }
 
-        $filePath = $this->projectRoot . $relativePath;
+        $filePath = $this->projectRoot.$relativePath;
 
         try
         {
@@ -179,11 +179,11 @@ 
             $codeLines = [];
 
             $from = max(0, $line - $linesAround - 2);
-            $to = min($line + $linesAround -1, $file->key() + 1);
+            $to = min($line + $linesAround - 1, $file->key() + 1);
 
             $file->seek($from);
 
-            while ($file->key() < $to && ! $file->eof())
+            while ($file->key() < $to && !$file->eof())
             {
                 $file->next();
                 // `key()` returns 0 as the first line
@@ -235,7 +235,7 @@ 
      */
     protected function stackTraceCallToString(array $trace)
     {
-        if (! isset($trace['type']))
+        if (!isset($trace['type']))
         {
             return 'function';
         }
@@ -261,7 +261,7 @@ 
     {
         $params = [];
 
-        if (! isset($trace['args']))
+        if (!isset($trace['args']))
         {
             return $params;
         }
@@ -270,7 +270,7 @@ 
         {
             if (is_array($arg))
             {
-                $params[] = 'array(' . count($arg) . ')';
+                $params[] = 'array('.count($arg).')';
             }
             else if (is_object($arg))
             {
@@ -278,19 +278,19 @@ 
             }
             else if (is_string($arg))
             {
-                $params[] = 'string(' . $arg . ')';
+                $params[] = 'string('.$arg.')';
             }
             else if (is_int($arg))
             {
-                $params[] = 'int(' . $arg . ')';
+                $params[] = 'int('.$arg.')';
             }
             else if (is_float($arg))
             {
-                $params[] = 'float(' . $arg . ')';
+                $params[] = 'float('.$arg.')';
             }
             else if (is_bool($arg))
             {
-                $params[] = 'bool(' . ($arg ? 'true' : 'false') . ')';
+                $params[] = 'bool('.($arg ? 'true' : 'false').')';
             }
             else if ($arg instanceof \__PHP_Incomplete_Class)
             {

Braces +9 added lines, -18 removed lines

@@ -107,8 +107,7 @@ 
             if (strpos($trace['file'], $this->projectRoot . 'vendor' . DIRECTORY_SEPARATOR) === 0)
             {
                 unset($stackTrace[$index]);
-            }
-            else
+            } else
             {
                 $vendorExcluded = true;
             }
@@ -194,8 +193,7 @@ 
             }
 
             return $codeLines;
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {}
     }
 
@@ -271,32 +269,25 @@ 
             if (is_array($arg))
             {
                 $params[] = 'array(' . count($arg) . ')';
-            }
-            else if (is_object($arg))
+            } else if (is_object($arg))
             {
                 $params[] = get_class($arg);
-            }
-            else if (is_string($arg))
+            } else if (is_string($arg))
             {
                 $params[] = 'string(' . $arg . ')';
-            }
-            else if (is_int($arg))
+            } else if (is_int($arg))
             {
                 $params[] = 'int(' . $arg . ')';
-            }
-            else if (is_float($arg))
+            } else if (is_float($arg))
             {
                 $params[] = 'float(' . $arg . ')';
-            }
-            else if (is_bool($arg))
+            } else if (is_bool($arg))
             {
                 $params[] = 'bool(' . ($arg ? 'true' : 'false') . ')';
-            }
-            else if ($arg instanceof \__PHP_Incomplete_Class)
+            } else if ($arg instanceof \__PHP_Incomplete_Class)
             {
                 $params[] = 'object(__PHP_Incomplete_Class)'; 
-            }
-            else
+            } else
             {
                 $params[] = gettype($arg);
             }

src/Understand/UnderstandLaravel5/FieldProvider.php

Doc Comments +3 added lines, -4 removed lines

@@ -87,7 +87,7 @@ 
     protected $app;
 
     /**
-     * @return void
+     * @return Application
      */
     public function __construct()
     {
@@ -108,7 +108,7 @@ 
     /**
      * Set session store
      *
-     * @param type $service
+     * @param SessionStore $service
      */
     public function setSessionStore(SessionStore $service)
     {
@@ -157,7 +157,6 @@ 
      * Register a custom HTML macro.
      *
      * @param string $name
-     * @param  mixed  $macro
      * @return void
      */
     public function extend($name, $provider)
@@ -168,7 +167,7 @@ 
     /**
      * Set token provider
      *
-     * @param UniqueProcessIdentifier $tokenProvider
+     * @param TokenProvider $tokenProvider
      */
     public function setTokenProvider(TokenProvider $tokenProvider)
     {

Spacing +13 added lines, -13 removed lines

@@ -230,7 +230,7 @@ 
      */
     protected function getSessionId()
     {
-        if ( ! $this->session)
+        if (!$this->session)
         {
             return null;
         }
@@ -269,7 +269,7 @@ 
      */
     protected function getRouteName()
     {
-        if ( ! $this->router)
+        if (!$this->router)
         {
             return null;
         }
@@ -284,23 +284,23 @@ 
      */
     protected function getUrl()
     {
-        if ( ! $this->request)
+        if (!$this->request)
         {
             return null;
         }
 
         $url = $this->request->path();
 
-        if ( ! starts_with($url, '/'))
+        if (!starts_with($url, '/'))
         {
-            $url = '/' . $url;
+            $url = '/'.$url;
         }
 
         $queryString = $this->request->getQueryString();
 
         if ($queryString)
         {
-            $url .= '?' . $queryString;
+            $url .= '?'.$queryString;
         }
 
         return $url;
@@ -313,7 +313,7 @@ 
      */
     protected function getRequestMethod()
     {
-        if ( ! $this->request)
+        if (!$this->request)
         {
             return null;
         }
@@ -328,7 +328,7 @@ 
      */
     protected function getServerIp()
     {
-        if ( ! $this->request)
+        if (!$this->request)
         {
             return null;
         }
@@ -343,7 +343,7 @@ 
      */
     protected function getClientIp()
     {
-        if ( ! $this->request)
+        if (!$this->request)
         {
             return null;
         }
@@ -358,7 +358,7 @@ 
      */
     protected function getClientUserAgent()
     {
-        if ( ! $this->request)
+        if (!$this->request)
         {
             return null;
         }
@@ -384,7 +384,7 @@ 
      */
     protected function getFromSession($key)
     {
-        if ( ! $this->session)
+        if (!$this->session)
         {
             return null;
         }
@@ -402,9 +402,9 @@ 
     {
         $parts = [];
 
-        foreach(['class', 'file', 'line'] as $field)
+        foreach (['class', 'file', 'line'] as $field)
         {
-            $parts[] = isset($log[$field]) ? (string)$log[$field] : null;
+            $parts[] = isset($log[$field]) ? (string) $log[$field] : null;
         }
 
         return sha1(implode('#', $parts));

Braces +3 added lines, -6 removed lines

@@ -423,8 +423,7 @@ 
             {
                 return $userId;
             }
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {}
 
         try
@@ -433,8 +432,7 @@ 
             {
                 return $user->id;
             }
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {}
 
         try
@@ -443,8 +441,7 @@ 
             {
                 return $user->id;
             }
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {}
     }
 

src/Understand/UnderstandLaravel5/Logger.php

Doc Comments -2 removed lines

@@ -28,7 +28,6 @@ 
     /**
      * @param FieldProvider $fieldProvider
      * @param BaseHandler $handler
-     * @param bool $silent
      */
     public function __construct(FieldProvider $fieldProvider, BaseHandler $handler)
     {
@@ -144,7 +143,6 @@ 
     /**
      * Send data to storage
      *
-     * @param array $requestData
      * @return mixed
      */
     protected function send(array $event)

Spacing +2 added lines, -2 removed lines

@@ -107,9 +107,9 @@
      */
     protected function formatMessage($message)
     {
-        if ( ! is_bool($message))
+        if (!is_bool($message))
         {
-            return (string)$message;
+            return (string) $message;
         }
         
         // cast boolean values to "1" or "0" strings

Braces +1 added lines, -2 removed lines

@@ -152,8 +152,7 @@
         try
         {
             return $this->handler->handle($event);
-        }
-        catch (\Exception $ex)
+        } catch (\Exception $ex)
         {
             return false;
         }

src/Understand/UnderstandLaravel5/ExceptionLogger.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function log($error)
     {
-        if ( ! $this->canHandle($error))
+        if (!$this->canHandle($error))
         {
             return;
         }
@@ -73,7 +73,7 @@ 
      */
     public function logError($level, $message, $context)
     {
-        if ( ! $this->canHandle($message))
+        if (!$this->canHandle($message))
         {
             return;
         }
@@ -93,7 +93,7 @@ 
         }
         else
         {
-            $log = (array)$message;
+            $log = (array) $message;
             $log = $this->encoder->setCurrentStackTrace($log);
         }
 
@@ -101,7 +101,7 @@ 
 
         if ($context)
         {
-            $log['context'] = (array)$context;
+            $log['context'] = (array) $context;
         }
 
         return $this->dispatch($log);
@@ -150,6 +150,6 @@ 
      */
     protected function canHandle($error)
     {
-        return (bool)$this->config->get('understand-laravel.enabled');
+        return (bool) $this->config->get('understand-laravel.enabled');
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -90,8 +90,7 @@
             ];
 
             $log = $this->encoder->setCurrentStackTrace($log);
-        }
-        else
+        } else
         {
             $log = (array)$message;
             $log = $this->encoder->setCurrentStackTrace($log);

src/Understand/UnderstandLaravel5/EventLogger.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
         }
         else
         {
-            $log = (array)$message;
+            $log = (array) $message;
         }
 
         $log['tags'] = ['laravel_log'];
@@ -56,7 +56,7 @@ 
 
         if ($context)
         {
-            $log['context'] = (array)$context;
+            $log['context'] = (array) $context;
         }
 
         $additionalFields = $this->getMetaFields();

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
             $log = [
                 'message' => $message
             ];
-        }
-        else
+        } else
         {
             $log = (array)$message;
         }

src/Understand/UnderstandLaravel5/UnderstandLaravel5ServiceProvider.php

Indentation +23 added lines, -23 removed lines

@@ -10,20 +10,20 @@ 
 class UnderstandLaravel5ServiceProvider extends ServiceProvider
 {
 
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = false;
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = false;
 
-	/**
-	 * Bootstrap the application events.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
+    /**
+     * Bootstrap the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
         $configPath = __DIR__ . '/../../config/understand-laravel.php';
         $this->publishes([$configPath => config_path('understand-laravel.php')], 'config');
         $enabled = $this->app['config']->get('understand-laravel.enabled');
@@ -37,23 +37,23 @@ 
         {
             $this->listenQueryEvents();
         }
-	}
+    }
 
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		$this->registerConfig();
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerConfig();
         $this->registerFieldProvider();
         $this->registerDataCollector();
         $this->registerTokenProvider();
         $this->registerLogger();
         $this->registerExceptionEncoder();
         $this->registerEventLoggers();
-	}
+    }
 
     /**
      * Register config

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	 */
 	public function boot()
 	{
-        $configPath = __DIR__ . '/../../config/understand-laravel.php';
+        $configPath = __DIR__.'/../../config/understand-laravel.php';
         $this->publishes([$configPath => config_path('understand-laravel.php')], 'config');
         $enabled = $this->app['config']->get('understand-laravel.enabled');
 
@@ -62,7 +62,7 @@ 
      */
     protected function registerConfig()
     {
-        $configPath = __DIR__ . '/../../config/understand-laravel.php';
+        $configPath = __DIR__.'/../../config/understand-laravel.php';
         $this->mergeConfigFrom($configPath, 'understand-laravel');
     }
 
@@ -209,7 +209,7 @@ 
             return new Handlers\SyncHandler($inputToken, $apiUrl, $sslBundlePath);
         }
 
-        throw new \ErrorException('understand-laravel handler misconfiguration:' . $handlerType);
+        throw new \ErrorException('understand-laravel handler misconfiguration:'.$handlerType);
     }
     
     /**
@@ -293,7 +293,7 @@ 
     protected function handleEvent($level, $message, $context)
     {
         // `\Log::info`, `\Log::debug` and NOT `\Exception` or `\Throwable`
-        if (in_array($level, ['info', 'debug']) && ! ($message instanceof Exception || $message instanceof Throwable))
+        if (in_array($level, ['info', 'debug']) && !($message instanceof Exception || $message instanceof Throwable))
         {
             $this->app['understand.eventLogger']->logEvent($level, $message, $context);
         }

Braces +2 added lines, -4 removed lines

@@ -237,8 +237,7 @@ 
             {
                 $this->handleEvent($level, $message, $context);
             });
-        }
-        else
+        } else
         {
             // starting from L5.4 MessageLogged event class was introduced
             // https://github.com/laravel/framework/commit/57c82d095c356a0fe0f9381536afec768cdcc072
@@ -268,8 +267,7 @@ 
                     'time' => $time,
                 ]);
             });
-        }
-        else
+        } else
         {
             // https://laravel.com/api/5.3/Illuminate/Database/Events/QueryExecuted.html
             $this->app['events']->listen('Illuminate\Database\Events\QueryExecuted', function($event)

src/config/understand-laravel.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     /**
      * Project root folder
      */
-    'project_root' => base_path() . DIRECTORY_SEPARATOR,
+    'project_root' => base_path().DIRECTORY_SEPARATOR,
 
     /**
      * Collect SQL queries without bindings