Merge pull request #492 from antonioribeiro/analysis-AD3QRy

antonioribeiro · web-flow · commit 8118a70c5f87 · 2020-05-04T20:30:05.000+02:00
Apply fixes from StyleCI

[ci skip] [skip ci]
diff --git a/src/Data/Repositories/Event.php b/src/Data/Repositories/Event.php
@@ -165,9 +165,9 @@ private function getEventId($event)
     {
         return $event['event']
             ? $this->findOrCreate(
-                    ['name' => $event['event']],
-                    ['name']
-                )
+                ['name' => $event['event']],
+                ['name']
+            )
             : null;
     }
 
diff --git a/src/Data/Repositories/SqlQuery.php b/src/Data/Repositories/SqlQuery.php
@@ -38,13 +38,14 @@ class SqlQuery extends Repository
      */
     private $config;
 
-    public function __construct($model,
-                                SqlQueryLog $sqlQueryLogRepository,
-                                SqlQueryBinding $sqlQueryBindingRepository,
-                                SqlQueryBindingParameter $sqlQueryBindingParameterRepository,
-                                Connection $connectionRepository,
-                                Log $logRepository,
-                                Config $config
+    public function __construct(
+        $model,
+        SqlQueryLog $sqlQueryLogRepository,
+        SqlQueryBinding $sqlQueryBindingRepository,
+        SqlQueryBindingParameter $sqlQueryBindingParameterRepository,
+        Connection $connectionRepository,
+        Log $logRepository,
+        Config $config
     ) {
         parent::__construct($model);
 
diff --git a/src/Services/Authentication.php b/src/Services/Authentication.php
@@ -38,7 +38,7 @@ private function executeAuthMethod($method)
                 // Call guard() if not null
                 if ($guard && $guard != 'null') {
                     $auth = $auth->guard($guard);
-                }                
+                }
             }
             if (is_callable([$auth, $method], true, $callable_name)) {
                 if ($data = $auth->$method()) {
diff --git a/src/Support/MobileDetect.php b/src/Support/MobileDetect.php
@@ -14,11 +14,11 @@ class MobileDetect extends Agent
     public function detectDevice()
     {
         return [
-                    'kind'      => $this->getDeviceKind(),
-                    'model'     => $this->device(),
-                    'is_mobile' => $this->isMobile(),
-                    'is_robot'  => $this->isRobot(),
-                ];
+            'kind'      => $this->getDeviceKind(),
+            'model'     => $this->device(),
+            'is_mobile' => $this->isMobile(),
+            'is_robot'  => $this->isRobot(),
+        ];
     }
 
     /**
diff --git a/src/Vendor/Laravel/Controllers/Stats.php b/src/Vendor/Laravel/Controllers/Stats.php
@@ -106,19 +106,19 @@ public function apiLog($uuid)
         $query = Tracker::sessionLog($uuid, false);
 
         $query->select([
-                            'id',
-                            'session_id',
-                            'method',
-                            'path_id',
-                            'query_id',
-                            'route_path_id',
-                            'is_ajax',
-                            'is_secure',
-                            'is_json',
-                            'wants_json',
-                            'error_id',
-                            'created_at',
-                        ]);
+            'id',
+            'session_id',
+            'method',
+            'path_id',
+            'query_id',
+            'route_path_id',
+            'is_ajax',
+            'is_secure',
+            'is_json',
+            'wants_json',
+            'error_id',
+            'created_at',
+        ]);
 
         return Datatables::of($query)
             ->edit_column('route_name', function ($row) {
@@ -203,12 +203,12 @@ public function apiErrors(Session $session)
         $query = Tracker::errors($session->getMinutes(), false);
 
         $query->select([
-                            'id',
-                            'error_id',
-                            'session_id',
-                            'path_id',
-                            'updated_at',
-                        ]);
+            'id',
+            'error_id',
+            'session_id',
+            'path_id',
+            'updated_at',
+        ]);
 
         return Datatables::of($query)
                 ->edit_column('updated_at', function ($row) {
@@ -245,18 +245,18 @@ public function apiVisits(Session $session)
         $query = Tracker::sessions($session->getMinutes(), false);
 
         $query->select([
-                'id',
-                'uuid',
-                'user_id',
-                'device_id',
-                'agent_id',
-                'client_ip',
-                'referer_id',
-                'cookie_id',
-                'geoip_id',
-                'language_id',
-                'is_robot',
-                'updated_at',
+            'id',
+            'uuid',
+            'user_id',
+            'device_id',
+            'agent_id',
+            'client_ip',
+            'referer_id',
+            'cookie_id',
+            'geoip_id',
+            'language_id',
+            'is_robot',
+            'updated_at',
         ]);
 
         return Datatables::of($query)
diff --git a/src/Vendor/Laravel/Models/Log.php b/src/Vendor/Laravel/Models/Log.php
@@ -48,8 +48,8 @@ public function routePath()
     public function pageViews($minutes, $results)
     {
         $query = $this->select(
-                $this->getConnection()->raw('DATE(created_at) as date, count(*) as total')
-            )->groupBy(
+            $this->getConnection()->raw('DATE(created_at) as date, count(*) as total')
+        )->groupBy(
                 $this->getConnection()->raw('DATE(created_at)')
             )
             ->period($minutes)
@@ -67,7 +67,8 @@ public function pageViewsByCountry($minutes, $results)
         $query =
             $this
             ->select(
-                'tracker_geoip.country_name as label', $this->getConnection()->raw('count(tracker_log.id) as value')
+                'tracker_geoip.country_name as label',
+                $this->getConnection()->raw('count(tracker_log.id) as value')
             )
             ->join('tracker_sessions', 'tracker_log.session_id', '=', 'tracker_sessions.id')
             ->join('tracker_geoip', 'tracker_sessions.geoip_id', '=', 'tracker_geoip.id')
diff --git a/src/Vendor/Laravel/ServiceProvider.php b/src/Vendor/Laravel/ServiceProvider.php
@@ -156,14 +156,14 @@ protected function registerTracker()
             $app['tracker.loaded'] = true;
 
             return new Tracker(
-                                    $app['tracker.config'],
-                                    $app['tracker.repositories'],
-                                    $app['request'],
-                                    $app['router'],
-                                    $app['log'],
-                                    $app,
-                                    $app['tracker.messages']
-                                );
+                $app['tracker.config'],
+                $app['tracker.repositories'],
+                $app['request'],
+                $app['router'],
+                $app['log'],
+                $app,
+                $app['tracker.messages']
+            );
         });
     }
 
@@ -271,77 +271,50 @@ public function registerRepositories()
 
             $manager = new RepositoryManager(
                 new GeoIp($this->getConfig('geoip_database_path')),
-
                 new MobileDetect(),
-
                 $uaParser,
-
                 $app['tracker.authentication'],
-
                 $app['session.store'],
-
                 $app['tracker.config'],
-
-                new Session($sessionModel,
-                            $app['tracker.config'],
-                            new PhpSession()),
-
+                new Session(
+                    $sessionModel,
+                    $app['tracker.config'],
+                    new PhpSession()
+                ),
                 $logRepository,
-
                 new Path($pathModel),
-
                 new Query($queryModel),
-
                 new QueryArgument($queryArgumentModel),
-
                 new Agent($agentModel),
-
                 new Device($deviceModel),
-
-                new Cookie($cookieModel,
-                            $app['tracker.config'],
-                            $app['request'],
-                            $app['cookie']),
-
+                new Cookie(
+                    $cookieModel,
+                    $app['tracker.config'],
+                    $app['request'],
+                    $app['cookie']
+                ),
                 new Domain($domainModel),
-
                 new Referer(
                     $refererModel,
                     $refererSearchTermModel,
                     $this->getAppUrl(),
                     $app->make('PragmaRX\Tracker\Support\RefererParser')
                 ),
-
                 $routeRepository,
-
                 new RoutePath($routePathModel),
-
                 new RoutePathParameter($routePathParameterModel),
-
                 new Error($errorModel),
-
                 new GeoIpRepository($geoipModel),
-
                 $sqlQueryRepository,
-
                 $sqlQueryBindingRepository,
-
                 $sqlQueryBindingParameterRepository,
-
                 $sqlQueryLogRepository,
-
                 $connectionRepository,
-
                 $eventRepository,
-
                 $eventLogRepository,
-
                 $systemClassRepository,
-
                 $crawlerDetect,
-
                 new Language($languageModel),
-
                 new LanguageDetect()
             );
 
@@ -434,10 +407,12 @@ protected function registerSqlQueryLogWatcher()
         $me = $this;
 
         if (!class_exists('Illuminate\Database\Events\QueryExecuted')) {
-            $this->app['events']->listen('illuminate.query', function ($query,
-                                                                        $bindings,
-                                                                        $time,
-                                                                        $name) use ($me) {
+            $this->app['events']->listen('illuminate.query', function (
+                $query,
+                $bindings,
+                $time,
+                $name
+            ) use ($me) {
                 $me->logSqlQuery($query, $bindings, $time, $name);
             });
         } else {

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,9 @@ private function getEventId($event)`
`165`	`165`	`{`
`166`	`166`	`return $event['event']`
`167`	`167`	`? $this->findOrCreate(`
`168`		`- ['name' => $event['event']],`
`169`		`- ['name']`
`170`		`- )`
	`168`	`+ ['name' => $event['event']],`
	`169`	`+ ['name']`
	`170`	`+ )`
`171`	`171`	`: null;`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ private function executeAuthMethod($method)`
`38`	`38`	`// Call guard() if not null`
`39`	`39`	`if ($guard && $guard != 'null') {`
`40`	`40`	`$auth = $auth->guard($guard);`
`41`		`- }`
	`41`	`+ }`
`42`	`42`	`}`
`43`	`43`	`if (is_callable([$auth, $method], true, $callable_name)) {`
`44`	`44`	`if ($data = $auth->$method()) {`