GeneaLabs / laravel-model-caching

src/Traits/BuilderCaching.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 {
     public function all($columns = ['*']) : Collection
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             $this->model->disableModelCaching();
         }
 

src/Console/Commands/Clear.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     {
         $option = $this->option('model');
 
-        if (! $option) {
+        if (!$option) {
             return $this->flushEntireCache();
         }
 
@@ -36,7 +36,7 @@ 
         $usesCachableTrait = $this->getAllTraitsUsedByClass($option)
             ->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 +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     {
         $tags = collect($this->eagerLoad)
             ->keys()
-            ->map(function ($relationName) {
+            ->map(function($relationName) {
                 $relation = $this->getRelation($relationName);
 
                 return $this->getCachePrefix()
@@ -53,7 +53,7 @@ 
     protected function getRelation(string $relationName) : Relation
     {
         return collect(explode('.', $relationName))
-            ->reduce(function ($carry, $name) {
+            ->reduce(function($carry, $name) {
                 $carry = $carry ?: $this->model;
                 $carry = $this->getRelatedModel($carry);
 

src/Traits/ModelCaching.php

Spacing +11 added lines, -11 removed lines

@@ -22,22 +22,22 @@ 
         $key = $instance->makeCacheKey();
 
         return $instance->cache($tags)
-            ->rememberForever($key, function () use ($columns) {
+            ->rememberForever($key, function() use ($columns) {
                 return parent::all($columns);
             });
     }
 
     public static function bootCachable()
     {
-        static::created(function ($instance) {
+        static::created(function($instance) {
             $instance->checkCooldownAndFlushAfterPersisting($instance);
         });
 
-        static::deleted(function ($instance) {
+        static::deleted(function($instance) {
             $instance->checkCooldownAndFlushAfterPersisting($instance);
         });
 
-        static::saved(function ($instance) {
+        static::saved(function($instance) {
             $instance->checkCooldownAndFlushAfterPersisting($instance);
         });
 
@@ -46,15 +46,15 @@ 
         //     $instance->checkCooldownAndFlushAfterPersisting($instance);
         // });
 
-        static::pivotAttached(function ($instance, $secondInstance, $relationship) {
+        static::pivotAttached(function($instance, $secondInstance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
 
-        static::pivotDetached(function ($instance, $secondInstance, $relationship) {
+        static::pivotDetached(function($instance, $secondInstance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
 
-        static::pivotUpdated(function ($instance, $secondInstance, $relationship) {
+        static::pivotUpdated(function($instance, $secondInstance, $relationship) {
             $instance->checkCooldownAndFlushAfterPersisting($instance, $relationship);
         });
     }
@@ -70,7 +70,7 @@ 
 
     public function newEloquentBuilder($query)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             $this->isCachable = false;
 
             return new EloquentBuilder($query);
@@ -114,7 +114,7 @@ 
         EloquentBuilder $query,
         int $seconds = null
     ) : EloquentBuilder {
-        if (! $seconds) {
+        if (!$seconds) {
             $seconds = $this->cacheCooldownSeconds;
         }
 
@@ -123,13 +123,13 @@ 
         $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 () {
+            ->rememberForever($cacheKey, function() {
                 return (new Carbon)->now();
             });
 

Indentation +3 added lines, -3 removed lines

@@ -43,9 +43,9 @@
         $class = get_called_class();
         $instance = new $class;
 
-	    if (!$instance->isCachable()) {
-		    return parent::all($columns);
-	    }
+        if (!$instance->isCachable()) {
+            return parent::all($columns);
+        }
 
         $tags = $instance->makeCacheTags();
         $key = $instance->makeCacheKey();

src/Traits/Buildable.php

Spacing +14 added lines, -14 removed lines

@@ -7,7 +7,7 @@ 
 {
     public function avg($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::avg($column);
         }
 
@@ -18,7 +18,7 @@ 
 
     public function count($columns = "*")
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::count($columns);
         }
 
@@ -48,7 +48,7 @@ 
      */
     public function find($id, $columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::find($id, $columns);
         }
 
@@ -64,7 +64,7 @@ 
 
     public function first($columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::first($columns);
         }
 
@@ -83,7 +83,7 @@ 
 
     public function get($columns = ["*"])
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::get($columns);
         }
 
@@ -116,7 +116,7 @@ 
 
     public function max($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::max($column);
         }
 
@@ -127,7 +127,7 @@ 
 
     public function min($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::min($column);
         }
 
@@ -142,7 +142,7 @@ 
         $pageName = "page",
         $page = null
     ) {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
@@ -163,7 +163,7 @@ 
         $result = "";
 
         foreach ($items as $key => $value) {
-            $result .= $glue . $key . $glue . $value;
+            $result .= $glue.$key.$glue.$value;
         }
 
         return $result;
@@ -171,11 +171,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);
@@ -183,7 +183,7 @@ 
 
     public function sum($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::sum($column);
         }
 
@@ -201,7 +201,7 @@ 
 
     public function value($column)
     {
-        if (! $this->isCachable()) {
+        if (!$this->isCachable()) {
             return parent::value($column);
         }
 
@@ -276,7 +276,7 @@ 
         return $this->cache($cacheTags)
             ->rememberForever(
                 $hashedCacheKey,
-                function () use ($arguments, $cacheKey, $method) {
+                function() use ($arguments, $cacheKey, $method) {
                     return [
                         "key" => $cacheKey,
                         "value" => parent::{$method}(...$arguments),

src/Traits/CachePrefixing.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
             ->get("laravel-model-caching.use-database-keying");
 
         if ($useDatabaseKeying) {
-            $cachePrefix .= $this->getConnectionName() . ":";
-            $cachePrefix .= $this->getDatabaseName() . ":";
+            $cachePrefix .= $this->getConnectionName().":";
+            $cachePrefix .= $this->getDatabaseName().":";
         }
 
         $cachePrefix .= Container::getInstance()
@@ -23,7 +23,7 @@ 
         if ($this->model
             && property_exists($this->model, "cachePrefix")
         ) {
-            $cachePrefix .= $this->model->cachePrefix . ":";
+            $cachePrefix .= $this->model->cachePrefix.":";
         }
 
         return $cachePrefix;

src/Providers/Service.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,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([
             Clear::class,

src/Traits/Caching.php

Spacing +15 added lines, -15 removed lines

@@ -34,18 +34,18 @@ 
 
     protected function applyScopesToInstance()
     {
-        if (! property_exists($this, "scopes")
+        if (!property_exists($this, "scopes")
             || $this->scopesAreApplied
         ) {
             return;
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier])) {
+            if (!isset($this->scopes[$identifier])) {
                 continue;
             }
 
-            $this->callScope(function () use ($scope) {
+            $this->callScope(function() use ($scope) {
                 if ($scope instanceof Closure) {
                     $scope($this);
                 }
@@ -103,7 +103,7 @@ 
             $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
             $this->cache()
-                ->rememberForever($cacheKey, function () {
+                ->rememberForever($cacheKey, function() {
                     return (new Carbon)->now();
                 });
         }
@@ -180,7 +180,7 @@ 
 
     public function getModelCacheCooldown(Model $instance) : array
     {
-        if (! $instance->cacheCooldownSeconds) {
+        if (!$instance->cacheCooldownSeconds) {
             return [null, null, null];
         }
 
@@ -189,7 +189,7 @@ 
         [$cacheCooldown, $invalidatedAt, $savedAt] = $this
             ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName);
 
-        if (! $cacheCooldown || $cacheCooldown === 0) {
+        if (!$cacheCooldown || $cacheCooldown === 0) {
             return [null, null, null];
         }
 
@@ -218,7 +218,7 @@ 
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown
+        if (!$cacheCooldown
             || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown
         ) {
             return;
@@ -243,7 +243,7 @@ 
     {
         [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown) {
+        if (!$cacheCooldown) {
             $instance->flushCache();
 
             if ($relationship) {
@@ -270,7 +270,7 @@ 
 
     public function isCachable() : bool
     {
-        $isCacheDisabled = ! Container::getInstance()
+        $isCacheDisabled = !Container::getInstance()
             ->make("config")
             ->get("laravel-model-caching.enabled");
         $allRelationshipsAreCachable = true;
@@ -281,8 +281,8 @@ 
             $allRelationshipsAreCachable = collect($this
                 ->eagerLoad)
                 ->keys()
-                ->reduce(function ($carry, $related) {
-                    if (! method_exists($this, $related)
+                ->reduce(function($carry, $related) {
+                    if (!method_exists($this, $related)
                         || $carry === false
                     ) {
                         return $carry;
@@ -290,8 +290,8 @@ 
         
                     $relatedModel = $this->model->$related()->getRelated();
 
-                    if (! method_exists($relatedModel, "isCachable")
-                        || ! $relatedModel->isCachable()
+                    if (!method_exists($relatedModel, "isCachable")
+                        || !$relatedModel->isCachable()
                     ) {
                         return false;
                     }
@@ -302,7 +302,7 @@ 
         }
 
         return $this->isCachable
-            && ! $isCacheDisabled
+            && !$isCacheDisabled
             && $allRelationshipsAreCachable;
     }
 
@@ -313,7 +313,7 @@ 
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
         $instance->cache()
-            ->rememberForever($cacheKey, function () {
+            ->rememberForever($cacheKey, function() {
                 return (new Carbon)->now();
             });
     }

src/CacheKey.php

Spacing +29 added lines, -29 removed lines

@@ -57,8 +57,8 @@ 
 
     protected function getLimitClause() : string
     {
-        if (! property_exists($this->query, "limit")
-            || ! $this->query->limit
+        if (!property_exists($this->query, "limit")
+            || !$this->query->limit
         ) {
             return "";
         }
@@ -79,8 +79,8 @@ 
 
     protected function getOffsetClause() : string
     {
-        if (! property_exists($this->query, "offset")
-            || ! $this->query->offset
+        if (!property_exists($this->query, "offset")
+            || !$this->query->offset
         ) {
             return "";
         }
@@ -90,8 +90,8 @@ 
 
     protected function getOrderByClauses() : string
     {
-        if (! property_exists($this->query, "orders")
-            || ! $this->query->orders
+        if (!property_exists($this->query, "orders")
+            || !$this->query->orders
         ) {
             return "";
         }
@@ -99,12 +99,12 @@ 
         $orders = collect($this->query->orders);
 
         return $orders
-            ->reduce(function ($carry, $order) {
+            ->reduce(function($carry, $order) {
                 if (($order["type"] ?? "") === "Raw") {
-                    return $carry . "_orderByRaw_" . (new Str)->slug($order["sql"]);
+                    return $carry."_orderByRaw_".(new Str)->slug($order["sql"]);
                 }
 
-                return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
+                return $carry."_orderBy_".$order["column"]."_".$order["direction"];
             })
             ?: "";
     }
@@ -113,8 +113,8 @@ 
     {
         if (($columns === ["*"]
                 || $columns === [])
-            && (! property_exists($this->query, "columns")
-                || ! $this->query->columns)
+            && (!property_exists($this->query, "columns")
+                || !$this->query->columns)
         ) {
             return "";
         }
@@ -122,10 +122,10 @@ 
         if (property_exists($this->query, "columns")
             && $this->query->columns
         ) {
-            return "_" . implode("_", $this->query->columns);
+            return "_".implode("_", $this->query->columns);
         }
 
-        return "_" . implode("_", $columns);
+        return "_".implode("_", $columns);
     }
 
     protected function getTypeClause($where) : string
@@ -139,7 +139,7 @@ 
 
     protected function getValuesClause(array $where = []) : string
     {
-        if (! $where
+        if (!$where
             || in_array($where["type"], ["NotNull", "Null"])
         ) {
             return "";
@@ -148,7 +148,7 @@ 
         $values = $this->getValuesFromWhere($where);
         $values = $this->getValuesFromBindings($where, $values);
 
-        return "_" . $values;
+        return "_".$values;
     }
 
     protected function getValuesFromWhere(array $where) : string
@@ -178,7 +178,7 @@ 
             $this->currentBinding++;
 
             if ($where["type"] === "between") {
-                $values .= "_" . $this->query->bindings["where"][$this->currentBinding];
+                $values .= "_".$this->query->bindings["where"][$this->currentBinding];
                 $this->currentBinding++;
             }
         }
@@ -194,8 +194,8 @@ 
 
     protected function getWhereClauses(array $wheres = []) : string
     {
-        return "" . $this->getWheres($wheres)
-            ->reduce(function ($carry, $where) {
+        return "".$this->getWheres($wheres)
+            ->reduce(function($carry, $where) {
                 $value = $carry;
                 $value .= $this->getNestedClauses($where);
                 $value .= $this->getColumnClauses($where);
@@ -209,11 +209,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
@@ -227,7 +227,7 @@ 
 
     protected function getInAndNotInClauses(array $where) : string
     {
-        if (! in_array($where["type"], ["In", "NotIn", "InRaw"])) {
+        if (!in_array($where["type"], ["In", "NotIn", "InRaw"])) {
             return "";
         }
 
@@ -239,7 +239,7 @@ 
             $this->currentBinding += count($where["values"]);
         }
 
-        if (! is_numeric($subquery) && ! is_numeric(str_replace("_", "", $subquery))) {
+        if (!is_numeric($subquery) && !is_numeric(str_replace("_", "", $subquery))) {
             try {
                 $subquery = Uuid::fromBytes($subquery);
                 $values = $this->recursiveImplode([$subquery], "_");
@@ -277,7 +277,7 @@ 
                 continue;
             }
 
-            $result .= $glue . $value;
+            $result .= $glue.$value;
         }
 
         return $result;
@@ -285,7 +285,7 @@ 
 
     protected function getRawClauses(array $where) : string
     {
-        if (! in_array($where["type"], ["raw"])) {
+        if (!in_array($where["type"], ["raw"])) {
             return "";
         }
 
@@ -293,7 +293,7 @@ 
         $clause = "_{$where["boolean"]}";
 
         while (count($queryParts) > 1) {
-            $clause .= "_" . array_shift($queryParts);
+            $clause .= "_".array_shift($queryParts);
             $clause .= $this->query->bindings["where"][$this->currentBinding];
             $this->currentBinding++;
         }
@@ -301,10 +301,10 @@ 
         $lastPart = array_shift($queryParts);
 
         if ($lastPart) {
-            $clause .= "_" . $lastPart;
+            $clause .= "_".$lastPart;
         }
 
-        return "-" . str_replace(" ", "_", $clause);
+        return "-".str_replace(" ", "_", $clause);
     }
 
     protected function getOtherClauses(array $where) : string
@@ -340,8 +340,8 @@ 
             return "";
         }
 
-        return $eagerLoads->keys()->reduce(function ($carry, $related) {
-            if (! method_exists($this->model, $related)) {
+        return $eagerLoads->keys()->reduce(function($carry, $related) {
+            if (!method_exists($this->model, $related)) {
                 return "{$carry}-{$related}";
             }