awssat / laravel-visits

src/helpers.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (! function_exists('visits'))
+if (!function_exists('visits'))
 {
     function visits($subject, $tag = 'visits')
     {

src/VisitsServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -16,16 +16,16 @@ 
     public function boot()
     {
         $this->publishes([
-            __DIR__.'/config/visits.php' => config_path('visits.php'),
+            __DIR__ . '/config/visits.php' => config_path('visits.php'),
         ], 'config');
 
-        if (! class_exists('CreateVisitsTable')) {
+        if (!class_exists('CreateVisitsTable')) {
             $this->publishes([
-                __DIR__.'/../database/migrations/create_visits_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_create_visits_table.php'),
+                __DIR__ . '/../database/migrations/create_visits_table.php.stub' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_visits_table.php'),
             ], 'migrations');
         }
 
-        Carbon::macro('endOfxHours', function ($xhours) {
+        Carbon::macro('endOfxHours', function($xhours) {
             if ($xhours > 12) {
                 throw new \Exception('12 is the maximum period in xHours feature');
             }
@@ -47,7 +47,7 @@ 
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/config/visits.php',
+            __DIR__ . '/config/visits.php',
             'visits'
         );
 

src/Traits/Periods.php

Spacing +3 added lines, -3 removed lines

@@ -18,17 +18,17 @@
 
             if ($this->noExpiration($periodKey)) {
                 $expireInSeconds = $this->newExpiration($period);
-                $this->connection->increment($periodKey.'_total', 0);
+                $this->connection->increment($periodKey . '_total', 0);
                 $this->connection->increment($periodKey, 0, 0);
                 $this->connection->setExpiration($periodKey, $expireInSeconds);
-                $this->connection->setExpiration($periodKey.'_total', $expireInSeconds);
+                $this->connection->setExpiration($periodKey . '_total', $expireInSeconds);
             }
         }
     }
 
     protected function noExpiration($periodKey)
     {
-        return $this->connection->timeLeft($periodKey) == -1 || ! $this->connection->exists($periodKey);
+        return $this->connection->timeLeft($periodKey) == -1 || !$this->connection->exists($periodKey);
     }
 
     protected function newExpiration($period)

src/Traits/Record.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
      */
     protected function recordCountry($inc)
     {
-        $this->connection->increment($this->keys->visits."_countries:{$this->keys->id}", $inc, $this->getVisitorCountry());
+        $this->connection->increment($this->keys->visits . "_countries:{$this->keys->id}", $inc, $this->getVisitorCountry());
     }
 
     /**
@@ -19,7 +19,7 @@ 
      */
     protected function recordRefer($inc)
     {
-        $this->connection->increment($this->keys->visits."_referers:{$this->keys->id}", $inc, $this->getVisitorReferer());
+        $this->connection->increment($this->keys->visits . "_referers:{$this->keys->id}", $inc, $this->getVisitorReferer());
     }
 
     /**
@@ -27,7 +27,7 @@ 
      */
     protected function recordOperatingSystem($inc)
     {
-        $this->connection->increment($this->keys->visits."_OSes:{$this->keys->id}", $inc, $this->getVisitorOperatingSystem());
+        $this->connection->increment($this->keys->visits . "_OSes:{$this->keys->id}", $inc, $this->getVisitorOperatingSystem());
     }
 
     /**
@@ -35,7 +35,7 @@ 
      */
     protected function recordLanguage($inc)
     {
-        $this->connection->increment($this->keys->visits."_languages:{$this->keys->id}", $inc, $this->getVisitorLanguage());
+        $this->connection->increment($this->keys->visits . "_languages:{$this->keys->id}", $inc, $this->getVisitorLanguage());
     }
 
     /**
@@ -47,7 +47,7 @@ 
             $periodKey = $this->keys->period($period);
 
             $this->connection->increment($periodKey, $inc, $this->keys->id);
-            $this->connection->increment($periodKey.'_total', $inc);
+            $this->connection->increment($periodKey . '_total', $inc);
         }
     }
 

src/Reset.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
         if ($this->keys->id) {
             $this->connection->delete($this->keys->visits, $this->keys->id);
             foreach (['countries', 'referers', 'OSes', 'languages'] as $item) {
-                $this->connection->delete($this->keys->visits."_{$item}:{$this->keys->id}");
+                $this->connection->delete($this->keys->visits . "_{$item}:{$this->keys->id}");
             }
 
             foreach ($this->periods as $period => $_) {
@@ -53,13 +53,13 @@ 
             $this->ips();
         } else {
             $this->connection->delete($this->keys->visits);
-            $this->connection->delete($this->keys->visits.'_total');
+            $this->connection->delete($this->keys->visits . '_total');
         }
     }
 
     public function allrefs()
     {
-        $cc = $this->connection->search($this->keys->visits.'_referers:*');
+        $cc = $this->connection->search($this->keys->visits . '_referers:*');
 
         if (count($cc)) {
             $this->connection->delete($cc);
@@ -68,7 +68,7 @@ 
 
     public function allOperatingSystems()
     {
-        $cc = $this->connection->search($this->keys->visits.'_OSes:*');
+        $cc = $this->connection->search($this->keys->visits . '_OSes:*');
 
         if (count($cc)) {
             $this->connection->delete($cc);
@@ -77,7 +77,7 @@ 
 
     public function allLanguages()
     {
-        $cc = $this->connection->search($this->keys->visits.'_languages:*');
+        $cc = $this->connection->search($this->keys->visits . '_languages:*');
 
         if (count($cc)) {
             $this->connection->delete($cc);
@@ -86,7 +86,7 @@ 
 
     public function allcountries()
     {
-        $cc = $this->connection->search($this->keys->visits.'_countries:*');
+        $cc = $this->connection->search($this->keys->visits . '_countries:*');
 
         if (count($cc)) {
             $this->connection->delete($cc);
@@ -101,7 +101,7 @@ 
         foreach ($this->periods as $period => $_) {
             $periodKey = $this->keys->period($period);
             $this->connection->delete($periodKey);
-            $this->connection->delete($periodKey.'_total');
+            $this->connection->delete($periodKey . '_total');
         }
     }
 

src/Commands/CleanCommand.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     {
         $currentEngine = config('visits.engine') ?? '';
 
-        if($currentEngine == 'eloquent') {
+        if ($currentEngine == 'eloquent') {
             $this->cleanEloquent();
         }
     }

src/DataEngines/EloquentEngine.php

Indentation +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     public function get(string $key, $member = null)
     {
         if(! empty($member) || is_numeric($member)) {
-             return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member])
+                return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member])
             ->where(function($q) {
                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
             })
@@ -193,7 +193,7 @@ 
     {
         $time = \Carbon\Carbon::now()->addSeconds($time);
 
-         return $this->model->where(['primary_key' => $this->prefix.$key])
+            return $this->model->where(['primary_key' => $this->prefix.$key])
                             ->where(function($q) {
                                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                             })

Spacing +27 added lines, -27 removed lines

@@ -26,13 +26,13 @@ 
 
     public function increment(string $key, int $value, $member = null): bool
     {
-        if (! empty($member) || is_numeric($member)) {
-            $row = $this->model->firstOrNew(['primary_key' => $this->prefix.$key, 'secondary_key' => $member]);
+        if (!empty($member) || is_numeric($member)) {
+            $row = $this->model->firstOrNew(['primary_key' => $this->prefix . $key, 'secondary_key' => $member]);
         } else {
-            $row = $this->model->firstOrNew(['primary_key' => $this->prefix.$key, 'secondary_key' => null]);
+            $row = $this->model->firstOrNew(['primary_key' => $this->prefix . $key, 'secondary_key' => null]);
         }
    
-        if($row->expired_at !== null && \Carbon\Carbon::now()->gt($row->expired_at)) {
+        if ($row->expired_at !== null && \Carbon\Carbon::now()->gt($row->expired_at)) {
             $row->score = $value;
             $row->expired_at = null;
         } else {
@@ -49,30 +49,30 @@ 
 
     public function delete($key, $member = null): bool
     {
-        if(is_array($key)) {
+        if (is_array($key)) {
             array_walk($key, function($item) {
                 $this->delete($item);
             });
             return true;
         }
 
-        if(! empty($member) || is_numeric($member)) {
-            return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member])->delete();
+        if (!empty($member) || is_numeric($member)) {
+            return $this->model->where(['primary_key' => $this->prefix . $key, 'secondary_key' => $member])->delete();
         } else {
-            return $this->model->where(['primary_key' => $this->prefix.$key])->delete();
+            return $this->model->where(['primary_key' => $this->prefix . $key])->delete();
         }
     }
 
     public function get(string $key, $member = null)
     {
-        if(! empty($member) || is_numeric($member)) {
-             return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member])
+        if (!empty($member) || is_numeric($member)) {
+             return $this->model->where(['primary_key' => $this->prefix . $key, 'secondary_key' => $member])
             ->where(function($q) {
                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
             })
             ->value('score');
         } else {
-            return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => null])
+            return $this->model->where(['primary_key' => $this->prefix . $key, 'secondary_key' => null])
             ->where(function($q) {
                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
             })
@@ -82,15 +82,15 @@ 
 
     public function set(string $key, $value, $member = null): bool
     {
-        if(! empty($member) || is_numeric($member)) {
+        if (!empty($member) || is_numeric($member)) {
             return $this->model->updateOrCreate([
-                'primary_key' => $this->prefix.$key, 
+                'primary_key' => $this->prefix . $key, 
                 'secondary_key' => $member,
                 'score' => $value,
                 ]) instanceof Model;
         } else {
             return $this->model->updateOrCreate([
-                'primary_key' => $this->prefix.$key, 
+                'primary_key' => $this->prefix . $key, 
                 'score' => $value,
                 ]) instanceof Model;
         }
@@ -100,14 +100,14 @@ 
     {
         $results = [];
 
-        if($word == '*') {
+        if ($word == '*') {
             $results = $this->model
                         ->where(function($q) {
                             return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                         })
                         ->pluck('primary_key');
         } else {
-            $results = $this->model->where('primary_key', 'like', $this->prefix.str_replace('*', '%', $word))
+            $results = $this->model->where('primary_key', 'like', $this->prefix . str_replace('*', '%', $word))
                                 ->where(function($q) {
                                     return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                                 })
@@ -129,7 +129,7 @@ 
     public function flatList(string $key, int $limit = -1): array
     {
         return array_slice(
-            $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => null])
+            $this->model->where(['primary_key' => $this->prefix . $key, 'secondary_key' => null])
                         ->where(function($q) {
                             return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                         })
@@ -139,22 +139,22 @@ 
 
     public function addToFlatList(string $key, $value): bool
     {
-        $row = $this->model->firstOrNew(['primary_key' => $this->prefix.$key, 'secondary_key' => null]);
+        $row = $this->model->firstOrNew(['primary_key' => $this->prefix . $key, 'secondary_key' => null]);
 
-        if($row->expired_at !== null && \Carbon\Carbon::now()->gt($row->expired_at)) {
+        if ($row->expired_at !== null && \Carbon\Carbon::now()->gt($row->expired_at)) {
             $row->list = (array) $value;
             $row->expired_at = null;
         } else {
             $row->list = array_merge($row->list ?? [], (array) $value);
         }
 
-        $row->score =  $row->score ?? 0;
+        $row->score = $row->score ?? 0;
         return (bool) $row->save();
     }
 
     public function valueList(string $key, int $limit = -1, bool $orderByAsc = false, bool $withValues = false): array
     {
-        $rows = $this->model->where('primary_key', $this->prefix.$key)
+        $rows = $this->model->where('primary_key', $this->prefix . $key)
                             ->where(function($q) {
                                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                             })
@@ -162,7 +162,7 @@ 
                             ->whereNotNull('secondary_key')
                             ->orderBy('score', $orderByAsc ? 'asc' : 'desc')
                             ->when($limit > -1, function($q) use($limit) {
-                                return $q->limit($limit+1);
+                                return $q->limit($limit + 1);
                             })->pluck('score', 'secondary_key') ?? \Illuminate\Support\Collection::make();
 
         return $withValues ? $rows->toArray() : array_keys($rows->toArray());
@@ -170,7 +170,7 @@ 
 
     public function exists(string $key): bool
     {
-        return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => null])
+        return $this->model->where(['primary_key' => $this->prefix . $key, 'secondary_key' => null])
                             ->where(function($q) {
                                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                             })
@@ -179,13 +179,13 @@ 
 
     public function timeLeft(string $key): int
     {
-        $expired_at = $this->model->where(['primary_key' => $this->prefix.$key])->value('expired_at');
+        $expired_at = $this->model->where(['primary_key' => $this->prefix . $key])->value('expired_at');
 
-        if($expired_at === null) {
+        if ($expired_at === null) {
             return -2;
         }
 
-        $ttl =  $expired_at->timestamp - \Carbon\Carbon::now()->timestamp;
+        $ttl = $expired_at->timestamp - \Carbon\Carbon::now()->timestamp;
         return $ttl <= 0 ? -1 : $ttl;
     }
 
@@ -193,7 +193,7 @@ 
     {
         $time = \Carbon\Carbon::now()->addSeconds($time);
 
-         return $this->model->where(['primary_key' => $this->prefix.$key])
+         return $this->model->where(['primary_key' => $this->prefix . $key])
                             ->where(function($q) {
                                 return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at');
                             })

src/DataEngines/RedisEngine.php

Spacing +20 added lines, -20 removed lines

@@ -31,10 +31,10 @@ 
 
     public function increment(string $key, int $value, $member = null): bool
     {
-        if (! empty($member) || is_numeric($member)) {
-            $this->connection->zincrby($this->prefix.$key, $value, $member);
+        if (!empty($member) || is_numeric($member)) {
+            $this->connection->zincrby($this->prefix . $key, $value, $member);
         } else {
-            $this->connection->incrby($this->prefix.$key, $value);
+            $this->connection->incrby($this->prefix . $key, $value);
         }
 
         // both methods returns integer and raise an exception in case of an error.
@@ -48,35 +48,35 @@ 
 
     public function delete($key, $member = null): bool
     {
-        if(is_array($key)) {
+        if (is_array($key)) {
             array_walk($key, function($item) {
                 $this->delete($item);
             });
             return true;
         }
 
-        if(! empty($member) || is_numeric($member)) {
-            return $this->connection->zrem($this->prefix.$key, $member) > 0;
+        if (!empty($member) || is_numeric($member)) {
+            return $this->connection->zrem($this->prefix . $key, $member) > 0;
         } else {
-            return $this->connection->del($this->prefix.$key) > 0;
+            return $this->connection->del($this->prefix . $key) > 0;
         }
     }
 
     public function get(string $key, $member = null)
     {
-        if(! empty($member) || is_numeric($member)) {
-            return $this->connection->zscore($this->prefix.$key, $member);
+        if (!empty($member) || is_numeric($member)) {
+            return $this->connection->zscore($this->prefix . $key, $member);
         } else {
-            return $this->connection->get($this->prefix.$key);
+            return $this->connection->get($this->prefix . $key);
         }
     }
 
     public function set(string $key, $value, $member = null): bool
     {
-        if(! empty($member) || is_numeric($member)) {
-            return $this->connection->zAdd($this->prefix.$key, $value, $member) > 0;
+        if (!empty($member) || is_numeric($member)) {
+            return $this->connection->zAdd($this->prefix . $key, $value, $member) > 0;
         } else {
-            return (bool) $this->connection->set($this->prefix.$key, $value);
+            return (bool) $this->connection->set($this->prefix . $key, $value);
         }
     }
 
@@ -90,39 +90,39 @@ 
 
                 return $item;
             }, 
-            $this->connection->keys($this->prefix.$word) ?? []
+            $this->connection->keys($this->prefix . $word) ?? []
         );
     }
 
     public function flatList(string $key, int $limit = -1): array
     {
-        return $this->connection->lrange($this->prefix.$key, 0, $limit);
+        return $this->connection->lrange($this->prefix . $key, 0, $limit);
     }
 
     public function addToFlatList(string $key, $value): bool
     {
-        return $this->connection->rpush($this->prefix.$key, $value) !== false;
+        return $this->connection->rpush($this->prefix . $key, $value) !== false;
     }
 
     public function valueList(string $key, int $limit = -1, bool $orderByAsc = false, bool $withValues = false): array
     {
         $range = $orderByAsc ? 'zrange' : 'zrevrange';
 
-        return $this->connection->$range($this->prefix.$key, 0, $limit,  $this->isPHPRedis ? $withValues : ['withscores' => $withValues]) ?: [];
+        return $this->connection->$range($this->prefix . $key, 0, $limit, $this->isPHPRedis ? $withValues : ['withscores' => $withValues]) ?: [];
     }
 
     public function exists(string $key): bool
     {
-        return (bool) $this->connection->exists($this->prefix.$key);
+        return (bool) $this->connection->exists($this->prefix . $key);
     }
 
     public function timeLeft(string $key): int
     {
-        return $this->connection->ttl($this->prefix.$key);
+        return $this->connection->ttl($this->prefix . $key);
     }
 
     public function setExpiration(string $key, int $time): bool
     {
-        return $this->connection->expire($this->prefix.$key, $time);
+        return $this->connection->expire($this->prefix . $key, $time);
     }
 }
\ No newline at end of file

src/Visits.php

Spacing +13 added lines, -13 removed lines

@@ -81,7 +81,7 @@ 
                                 ->connect($this->config['connection'])
                                 ->setPrefix($this->config['keys_prefix'] ?? $this->config['redis_keys_prefix'] ?? 'visits');
 
-        if(! $this->connection) {
+        if (!$this->connection) {
             return;
         }
 
@@ -93,7 +93,7 @@ 
         $this->subject = $subject;
         $this->keys = new Keys($subject, preg_replace('/[^a-z0-9_]/i', '', $tag));
 
-        if (! empty($this->keys->id)) {
+        if (!empty($this->keys->id)) {
             $this->periodsSync();
         }
     }
@@ -105,7 +105,7 @@ 
             'eloquent' => \Awssat\Visits\DataEngines\EloquentEngine::class
         ];
 
-        if(! array_key_exists($name, $connections)) {
+        if (!array_key_exists($name, $connections)) {
             throw new \Exception("(Laravel-Visits) The selected engine `{$name}` is not supported! Please correct this issue from config/visits.php.");
         }
 
@@ -118,7 +118,7 @@ 
      */
     public function by($subject)
     {
-        if($subject instanceof Model) {
+        if ($subject instanceof Model) {
             $this->keys->append($this->keys->modelName($subject), $subject->{$subject->getKeyName()});
         } else if (is_array($subject)) {
             $this->keys->append(array_keys($subject)[0], Arr::first($subject));
@@ -145,7 +145,7 @@ 
      */
     public function recordedIp()
     {
-        if(! $this->connection->exists($this->keys->ip(request()->ip()))) {
+        if (!$this->connection->exists($this->keys->ip(request()->ip()))) {
             $this->connection->set($this->keys->ip(request()->ip()), true);
             $this->connection->setExpiration($this->keys->ip(request()->ip()), $this->ipSeconds);
 
@@ -162,13 +162,13 @@ 
     public function count()
     {
         if ($this->country) {
-            return $this->connection->get($this->keys->visits."_countries:{$this->keys->id}", $this->country);
+            return $this->connection->get($this->keys->visits . "_countries:{$this->keys->id}", $this->country);
         } else if ($this->referer) {
-            return $this->connection->get($this->keys->visits."_referers:{$this->keys->id}", $this->referer);
+            return $this->connection->get($this->keys->visits . "_referers:{$this->keys->id}", $this->referer);
         } else if ($this->operatingSystem) {
-            return $this->connection->get($this->keys->visits."_OSes:{$this->keys->id}", $this->operatingSystem);
+            return $this->connection->get($this->keys->visits . "_OSes:{$this->keys->id}", $this->operatingSystem);
         } else if ($this->language) {
-            return $this->connection->get($this->keys->visits."_languages:{$this->keys->id}", $this->language);
+            return $this->connection->get($this->keys->visits . "_languages:{$this->keys->id}", $this->language);
         }
 
         return intval(
@@ -212,14 +212,14 @@ 
             $this->connection->increment($this->keys->visits, $inc, $this->keys->id);
             $this->connection->increment($this->keys->visitsTotal(), $inc);
 
-            if(is_array($this->globalIgnore) && sizeof($this->globalIgnore) > 0) {
+            if (is_array($this->globalIgnore) && sizeof($this->globalIgnore) > 0) {
                 $ignore = array_merge($ignore, $this->globalIgnore);
             }
 
             //NOTE: $$method is parameter also .. ($periods,$country,$refer)
             foreach (['country', 'refer', 'periods', 'operatingSystem', 'language'] as $method) {
-                if(! in_array($method, $ignore))  {
-                    $this->{'record'.Str::studly($method)}($inc);
+                if (!in_array($method, $ignore)) {
+                    $this->{'record' . Str::studly($method)}($inc);
                 }
             }
 
@@ -280,6 +280,6 @@ 
     {
         $prefix = $this->config['keys_prefix'] ?? $this->config['redis_keys_prefix'] ?? 'visits';
         
-        return $this->subject->hasOne(Visit::class, 'secondary_key')->where('primary_key', $prefix.':'.$this->keys->visits);
+        return $this->subject->hasOne(Visit::class, 'secondary_key')->where('primary_key', $prefix . ':' . $this->keys->visits);
     }
 }