GeneaLabs / laravel-model-caching

src/Providers/Service.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
     public function boot()
     {
-        $configPath = __DIR__ . '/../../config/laravel-model-caching.php';
+        $configPath = __DIR__.'/../../config/laravel-model-caching.php';
         $this->mergeConfigFrom($configPath, 'laravel-model-caching');
         $this->commands(Flush::class);
     }

src/Console/Commands/Flush.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     {
         $option = $this->option('model');
 
-        if (! $option) {
+        if (!$option) {
             cache()
                 ->store(config('laravel-model-caching.store'))
                 ->flush();
@@ -25,7 +25,7 @@ 
         $usesCachableTrait = collect(class_uses($model))
             ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
 
-        if (! $usesCachableTrait) {
+        if (!$usesCachableTrait) {
             $this->error("'{$option}' is not an instance of CachedModel.");
             $this->line("Only CachedModel instances can be flushed.");
 

src/CacheTags.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
     {
         return "genealabs:laravel-model-caching:"
             . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                ? config('laravel-model-caching.cache-prefix', '').":"
                 : "");
     }
 
@@ -27,10 +27,10 @@ 
     {
         $tags = collect($this->eagerLoad)
             ->keys()
-            ->map(function ($relationName) {
+            ->map(function($relationName) {
                 $relation = collect(explode('.', $relationName))
-                    ->reduce(function ($carry, $name) {
-                        if (! $carry) {
+                    ->reduce(function($carry, $name) {
+                        if (!$carry) {
                             $carry = $this->model;
                         }
 

src/CacheKey.php

Spacing +15 added lines, -15 removed lines

@@ -14,7 +14,7 @@ 
     {
         return "genealabs:laravel-model-caching:"
             . (config("laravel-model-caching.cache-prefix")
-                ? config("laravel-model-caching.cache-prefix", "") . ":"
+                ? config("laravel-model-caching.cache-prefix", "").":"
                 : "");
     }
 
@@ -54,7 +54,7 @@ 
 
     protected function getLimitClause() : string
     {
-        if (! $this->query->limit) {
+        if (!$this->query->limit) {
             return "";
         }
 
@@ -68,7 +68,7 @@ 
 
     protected function getOffsetClause() : string
     {
-        if (! $this->query->offset) {
+        if (!$this->query->offset) {
             return "";
         }
 
@@ -80,12 +80,12 @@ 
         $orders = collect($this->query->orders);
 
         return $orders
-            ->reduce(function ($carry, $order) {
+            ->reduce(function($carry, $order) {
                 if (($order["type"] ?? "") === "Raw") {
-                    return $carry . "_orderByRaw_" . str_slug($order["sql"]);
+                    return $carry."_orderByRaw_".str_slug($order["sql"]);
                 }
 
-                return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
+                return $carry."_orderBy_".$order["column"]."_".$order["direction"];
             })
             ?: "";
     }
@@ -96,12 +96,12 @@ 
             return "";
         }
 
-        return "_" . implode("_", $columns);
+        return "_".implode("_", $columns);
     }
 
     protected function getTypeClause($where) : string
     {
-        $type =in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between"])
+        $type = in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between"])
             ? strtolower($where["type"])
             : strtolower($where["operator"]);
 
@@ -118,17 +118,17 @@ 
             ? implode("_", $where["values"])
             : "";
 
-        if (! $values && $this->query->bindings["where"] ?? false) {
+        if (!$values && $this->query->bindings["where"] ?? false) {
             $values = implode("_", $this->query->bindings["where"]);
         }
 
-        return "_" . $values;
+        return "_".$values;
     }
 
     protected function getWhereClauses(array $wheres = []) : string
     {
         return $this->getWheres($wheres)
-            ->reduce(function ($carry, $where) {
+            ->reduce(function($carry, $where) {
                 $value = $this->getNestedClauses($where);
                 $value .= $this->getColumnClauses($where);
                 $value .= $this->getRawClauses($where);
@@ -141,11 +141,11 @@ 
 
     protected function getNestedClauses(array $where) : string
     {
-        if (! in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
+        if (!in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
             return "";
         }
 
-        return "_" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres);
+        return "_".strtolower($where["type"]).$this->getWhereClauses($where["query"]->wheres);
     }
 
     protected function getColumnClauses(array $where) : string
@@ -163,7 +163,7 @@ 
             return "";
         }
 
-        return "_{$where["boolean"]}_" . str_slug($where["sql"]);
+        return "_{$where["boolean"]}_".str_slug($where["sql"]);
     }
 
     protected function getOtherClauses(array $where, string $carry = null) : string
@@ -197,6 +197,6 @@ 
             return "";
         }
 
-        return "-" . implode("-", $eagerLoads->keys()->toArray());
+        return "-".implode("-", $eagerLoads->keys()->toArray());
     }
 }

src/Traits/Cachable.php

Spacing +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
         $usesCachableTrait = collect(class_uses($this))
             ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
 
-        if (! $usesCachableTrait) {
+        if (!$usesCachableTrait) {
             array_push($tags, str_slug(get_called_class()));
         }
 
@@ -61,13 +61,13 @@ 
         if ($cacheCooldown) {
             $cachePrefix = "genealabs:laravel-model-caching:"
                 . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
+                    ? config('laravel-model-caching.cache-prefix', '').":"
                     : "");
             $modelClassName = get_class($this);
             $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
             $this->cache()
-                ->rememberForever($cacheKey, function () {
+                ->rememberForever($cacheKey, function() {
                     return now();
                 });
         }
@@ -98,7 +98,7 @@ 
     {
         $cachePrefix = "genealabs:laravel-model-caching:"
             . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                ? config('laravel-model-caching.cache-prefix', '').":"
                 : "");
         $modelClassName = get_class($instance);
 
@@ -106,7 +106,7 @@ 
             ->cache()
             ->get("{$cachePrefix}:{$modelClassName}-cooldown:seconds");
 
-        if (! $cacheCooldown) {
+        if (!$cacheCooldown) {
             return [null, null, null];
         }
 
@@ -129,14 +129,14 @@ 
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown) {
+        if (!$cacheCooldown) {
             return;
         }
 
         if (now()->diffInSeconds($invalidatedAt) >= $cacheCooldown) {
             $cachePrefix = "genealabs:laravel-model-caching:"
                 . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
+                    ? config('laravel-model-caching.cache-prefix', '').":"
                     : "");
             $modelClassName = get_class($instance);
 
@@ -157,7 +157,7 @@ 
     {
         [$cacheCooldown, $invalidatedAt, $savedAt] = $instance->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown) {
+        if (!$cacheCooldown) {
             $instance->flushCache();
 
             return;
@@ -166,13 +166,13 @@ 
         if ($cacheCooldown) {
             $cachePrefix = "genealabs:laravel-model-caching:"
                 . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
+                    ? config('laravel-model-caching.cache-prefix', '').":"
                     : "");
             $modelClassName = get_class($instance);
             $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
             $instance->cache()
-                ->rememberForever($cacheKey, function () {
+                ->rememberForever($cacheKey, function() {
                     return now();
                 });
         }
@@ -187,7 +187,7 @@ 
     public static function bootCachable()
     {
         // TODO: add for deleted,updated,etc?
-        static::saved(function ($instance) {
+        static::saved(function($instance) {
             $instance->checkCooldownAndFlushAfterPersiting($instance);
         });
     }
@@ -204,14 +204,14 @@ 
         $key = $instance->makeCacheKey();
 
         return $instance->cache($tags)
-            ->rememberForever($key, function () use ($columns) {
+            ->rememberForever($key, function() use ($columns) {
                 return parent::all($columns);
             });
     }
 
     public function newEloquentBuilder($query)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             $this->isCachable = true;
 
             return new EloquentBuilder($query);
@@ -223,7 +223,7 @@ 
     public function isCachable() : bool
     {
         return $this->isCachable
-            && ! config('laravel-model-caching.disabled');
+            && !config('laravel-model-caching.disabled');
     }
 
     public function scopeWithCacheCooldownSeconds(
@@ -232,19 +232,19 @@ 
     ) : EloquentBuilder {
         $cachePrefix = "genealabs:laravel-model-caching:"
             . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                ? config('laravel-model-caching.cache-prefix', '').":"
                 : "");
         $modelClassName = get_class($this);
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:seconds";
 
         $this->cache()
-            ->rememberForever($cacheKey, function () use ($seconds) {
+            ->rememberForever($cacheKey, function() use ($seconds) {
                 return $seconds;
             });
 
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at";
         $this->cache()
-            ->rememberForever($cacheKey, function () use ($seconds) {
+            ->rememberForever($cacheKey, function() use ($seconds) {
                 return now();
             });
 

src/CachedBuilder.php

Spacing +14 added lines, -14 removed lines

@@ -12,7 +12,7 @@ 
 
     public function avg($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::avg($column);
         }
 
@@ -23,7 +23,7 @@ 
 
     public function count($columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::count($columns);
         }
 
@@ -34,7 +34,7 @@ 
 
     public function cursor()
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return collect(parent::cursor());
         }
 
@@ -56,7 +56,7 @@ 
      */
     public function find($id, $columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::find($id, $columns);
         }
 
@@ -67,7 +67,7 @@ 
 
     public function first($columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::first($columns);
         }
 
@@ -78,7 +78,7 @@ 
 
     public function get($columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::get($columns);
         }
 
@@ -89,7 +89,7 @@ 
 
     public function max($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::max($column);
         }
 
@@ -100,7 +100,7 @@ 
 
     public function min($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::min($column);
         }
 
@@ -115,7 +115,7 @@ 
         $pageName = "page",
         $page = null
     ) {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
@@ -127,11 +127,11 @@ 
 
     public function pluck($column, $key = null)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::pluck($column, $key);
         }
 
-        $keyDifferentiator = "-pluck_{$column}" . ($key ? "_{$key}" : "");
+        $keyDifferentiator = "-pluck_{$column}".($key ? "_{$key}" : "");
         $cacheKey = $this->makeCacheKey([$column], null, $keyDifferentiator);
 
         return $this->cachedValue(func_get_args(), $cacheKey);
@@ -139,7 +139,7 @@ 
 
     public function sum($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::sum($column);
         }
 
@@ -150,7 +150,7 @@ 
 
     public function value($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::value($column);
         }
 
@@ -219,7 +219,7 @@ 
         return $this->cache($cacheTags)
             ->rememberForever(
                 $hashedCacheKey,
-                function () use ($arguments, $cacheKey, $method) {
+                function() use ($arguments, $cacheKey, $method) {
                     return [
                         "key" => $cacheKey,
                         "value" => parent::{$method}(...$arguments),