@@ -9,7 +9,7 @@ |
||
| 9 | 9 | |
| 10 | 10 | public function boot() |
| 11 | 11 | { |
| 12 | - $configPath = __DIR__ . '/../../config/laravel-model-caching.php'; |
|
| 12 | + $configPath = __DIR__.'/../../config/laravel-model-caching.php'; |
|
| 13 | 13 | $this->mergeConfigFrom($configPath, 'laravel-model-caching'); |
| 14 | 14 | $this->commands(Flush::class); |
| 15 | 15 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | return "genealabs:laravel-model-caching:" |
| 21 | 21 | . (config('laravel-model-caching.cache-prefix') |
| 22 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
| 22 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
| 23 | 23 | : ""); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $tags = collect($this->eagerLoad) |
| 29 | 29 | ->keys() |
| 30 | - ->map(function ($relationName) { |
|
| 30 | + ->map(function($relationName) { |
|
| 31 | 31 | $relation = collect(explode('.', $relationName)) |
| 32 | - ->reduce(function ($carry, $name) { |
|
| 33 | - if (! $carry) { |
|
| 32 | + ->reduce(function($carry, $name) { |
|
| 33 | + if (!$carry) { |
|
| 34 | 34 | $carry = $this->model; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | { |
| 12 | 12 | $option = $this->option('model'); |
| 13 | 13 | |
| 14 | - if (! $option) { |
|
| 14 | + if (!$option) { |
|
| 15 | 15 | return $this->flushEntireCache(); |
| 16 | 16 | } |
| 17 | 17 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $usesCachableTrait = collect(class_uses($model)) |
| 36 | 36 | ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable"); |
| 37 | 37 | |
| 38 | - if (! $usesCachableTrait) { |
|
| 38 | + if (!$usesCachableTrait) { |
|
| 39 | 39 | $this->error("'{$option}' is not an instance of CachedModel."); |
| 40 | 40 | $this->line("Only CachedModel instances can be flushed."); |
| 41 | 41 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | return "genealabs:laravel-model-caching:" |
| 16 | 16 | . (config("laravel-model-caching.cache-prefix") |
| 17 | - ? config("laravel-model-caching.cache-prefix", "") . ":" |
|
| 17 | + ? config("laravel-model-caching.cache-prefix", "").":" |
|
| 18 | 18 | : ""); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | protected function getLimitClause() : string |
| 56 | 56 | { |
| 57 | - if (! $this->query->limit) { |
|
| 57 | + if (!$this->query->limit) { |
|
| 58 | 58 | return ""; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | protected function getOffsetClause() : string |
| 70 | 70 | { |
| 71 | - if (! $this->query->offset) { |
|
| 71 | + if (!$this->query->offset) { |
|
| 72 | 72 | return ""; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -80,12 +80,12 @@ discard block |
||
| 80 | 80 | $orders = collect($this->query->orders); |
| 81 | 81 | |
| 82 | 82 | return $orders |
| 83 | - ->reduce(function ($carry, $order) { |
|
| 83 | + ->reduce(function($carry, $order) { |
|
| 84 | 84 | if (($order["type"] ?? "") === "Raw") { |
| 85 | - return $carry . "_orderByRaw_" . str_slug($order["sql"]); |
|
| 85 | + return $carry."_orderByRaw_".str_slug($order["sql"]); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"]; |
|
| 88 | + return $carry."_orderBy_".$order["column"]."_".$order["direction"]; |
|
| 89 | 89 | }) |
| 90 | 90 | ?: ""; |
| 91 | 91 | } |
@@ -96,12 +96,12 @@ discard block |
||
| 96 | 96 | return ""; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - return "_" . implode("_", $columns); |
|
| 99 | + return "_".implode("_", $columns); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | protected function getTypeClause($where) : string |
| 103 | 103 | { |
| 104 | - $type =in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between"]) |
|
| 104 | + $type = in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between"]) |
|
| 105 | 105 | ? strtolower($where["type"]) |
| 106 | 106 | : strtolower($where["operator"]); |
| 107 | 107 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $values = $this->getValuesFromWhere($where); |
| 118 | 118 | $values = $this->getValuesFromBindings($values); |
| 119 | 119 | |
| 120 | - return "_" . $values; |
|
| 120 | + return "_".$values; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | protected function getValuesFromWhere(array $where) : string |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | protected function getValuesFromBindings(string $values) : string |
| 131 | 131 | { |
| 132 | - if (! $values && $this->query->bindings["where"] ?? false) { |
|
| 132 | + if (!$values && $this->query->bindings["where"] ?? false) { |
|
| 133 | 133 | $values = implode("_", $this->query->bindings["where"]); |
| 134 | 134 | } |
| 135 | 135 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | protected function getWhereClauses(array $wheres = []) : string |
| 140 | 140 | { |
| 141 | 141 | return $this->getWheres($wheres) |
| 142 | - ->reduce(function ($carry, $where) { |
|
| 142 | + ->reduce(function($carry, $where) { |
|
| 143 | 143 | $value = $this->getNestedClauses($where); |
| 144 | 144 | $value .= $this->getColumnClauses($where); |
| 145 | 145 | $value .= $this->getRawClauses($where); |
@@ -152,11 +152,11 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | protected function getNestedClauses(array $where) : string |
| 154 | 154 | { |
| 155 | - if (! in_array($where["type"], ["Exists", "Nested", "NotExists"])) { |
|
| 155 | + if (!in_array($where["type"], ["Exists", "Nested", "NotExists"])) { |
|
| 156 | 156 | return ""; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - return "_" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres); |
|
| 159 | + return "_".strtolower($where["type"]).$this->getWhereClauses($where["query"]->wheres); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | protected function getColumnClauses(array $where) : string |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | return ""; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - return "_{$where["boolean"]}_" . str_slug($where["sql"]); |
|
| 177 | + return "_{$where["boolean"]}_".str_slug($where["sql"]); |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | protected function getOtherClauses(array $where, string $carry = null) : string |
@@ -208,6 +208,6 @@ discard block |
||
| 208 | 208 | return ""; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - return "-" . implode("-", $eagerLoads->keys()->toArray()); |
|
| 211 | + return "-".implode("-", $eagerLoads->keys()->toArray()); |
|
| 212 | 212 | } |
| 213 | 213 | } |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function avg($column) |
| 14 | 14 | { |
| 15 | - if (! $this->isCachable()) { |
|
| 15 | + if (!$this->isCachable()) { |
|
| 16 | 16 | return parent::avg($column); |
| 17 | 17 | } |
| 18 | 18 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public function count($columns = ["*"]) |
| 25 | 25 | { |
| 26 | - if (! $this->isCachable()) { |
|
| 26 | + if (!$this->isCachable()) { |
|
| 27 | 27 | return parent::count($columns); |
| 28 | 28 | } |
| 29 | 29 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function find($id, $columns = ["*"]) |
| 47 | 47 | { |
| 48 | - if (! $this->isCachable()) { |
|
| 48 | + if (!$this->isCachable()) { |
|
| 49 | 49 | return parent::find($id, $columns); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | public function first($columns = ["*"]) |
| 58 | 58 | { |
| 59 | - if (! $this->isCachable()) { |
|
| 59 | + if (!$this->isCachable()) { |
|
| 60 | 60 | return parent::first($columns); |
| 61 | 61 | } |
| 62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function get($columns = ["*"]) |
| 69 | 69 | { |
| 70 | - if (! $this->isCachable()) { |
|
| 70 | + if (!$this->isCachable()) { |
|
| 71 | 71 | return parent::get($columns); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | public function max($column) |
| 80 | 80 | { |
| 81 | - if (! $this->isCachable()) { |
|
| 81 | + if (!$this->isCachable()) { |
|
| 82 | 82 | return parent::max($column); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | public function min($column) |
| 91 | 91 | { |
| 92 | - if (! $this->isCachable()) { |
|
| 92 | + if (!$this->isCachable()) { |
|
| 93 | 93 | return parent::min($column); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $pageName = "page", |
| 105 | 105 | $page = null |
| 106 | 106 | ) { |
| 107 | - if (! $this->isCachable()) { |
|
| 107 | + if (!$this->isCachable()) { |
|
| 108 | 108 | return parent::paginate($perPage, $columns, $pageName, $page); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -116,11 +116,11 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | public function pluck($column, $key = null) |
| 118 | 118 | { |
| 119 | - if (! $this->isCachable()) { |
|
| 119 | + if (!$this->isCachable()) { |
|
| 120 | 120 | return parent::pluck($column, $key); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $keyDifferentiator = "-pluck_{$column}" . ($key ? "_{$key}" : ""); |
|
| 123 | + $keyDifferentiator = "-pluck_{$column}".($key ? "_{$key}" : ""); |
|
| 124 | 124 | $cacheKey = $this->makeCacheKey([$column], null, $keyDifferentiator); |
| 125 | 125 | |
| 126 | 126 | return $this->cachedValue(func_get_args(), $cacheKey); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | public function sum($column) |
| 130 | 130 | { |
| 131 | - if (! $this->isCachable()) { |
|
| 131 | + if (!$this->isCachable()) { |
|
| 132 | 132 | return parent::sum($column); |
| 133 | 133 | } |
| 134 | 134 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | public function value($column) |
| 141 | 141 | { |
| 142 | - if (! $this->isCachable()) { |
|
| 142 | + if (!$this->isCachable()) { |
|
| 143 | 143 | return parent::value($column); |
| 144 | 144 | } |
| 145 | 145 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | return $this->cache($cacheTags) |
| 209 | 209 | ->rememberForever( |
| 210 | 210 | $hashedCacheKey, |
| 211 | - function () use ($arguments, $cacheKey, $method) { |
|
| 211 | + function() use ($arguments, $cacheKey, $method) { |
|
| 212 | 212 | return [ |
| 213 | 213 | "key" => $cacheKey, |
| 214 | 214 | "value" => parent::{$method}(...$arguments), |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
| 52 | 52 | |
| 53 | 53 | $this->cache() |
| 54 | - ->rememberForever($cacheKey, function () { |
|
| 54 | + ->rememberForever($cacheKey, function() { |
|
| 55 | 55 | return now(); |
| 56 | 56 | }); |
| 57 | 57 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | return "genealabs:laravel-model-caching:" |
| 63 | 63 | . (config('laravel-model-caching.cache-prefix') |
| 64 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
| 64 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
| 65 | 65 | : ""); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | [$cacheCooldown, $invalidatedAt, $savedAt] = $this |
| 94 | 94 | ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName); |
| 95 | 95 | |
| 96 | - if (! $cacheCooldown) { |
|
| 96 | + if (!$cacheCooldown) { |
|
| 97 | 97 | return [null, null, null]; |
| 98 | 98 | } |
| 99 | 99 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | { |
| 127 | 127 | [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance); |
| 128 | 128 | |
| 129 | - if (! $cacheCooldown |
|
| 129 | + if (!$cacheCooldown |
|
| 130 | 130 | || now()->diffInSeconds($invalidatedAt) < $cacheCooldown |
| 131 | 131 | ) { |
| 132 | 132 | return; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | { |
| 152 | 152 | [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance); |
| 153 | 153 | |
| 154 | - if (! $cacheCooldown) { |
|
| 154 | + if (!$cacheCooldown) { |
|
| 155 | 155 | $instance->flushCache(); |
| 156 | 156 | |
| 157 | 157 | return; |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
| 172 | 172 | |
| 173 | 173 | $instance->cache() |
| 174 | - ->rememberForever($cacheKey, function () { |
|
| 174 | + ->rememberForever($cacheKey, function() { |
|
| 175 | 175 | return now(); |
| 176 | 176 | }); |
| 177 | 177 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | public static function bootCachable() |
| 180 | 180 | { |
| 181 | 181 | // TODO: add for deleted,updated,etc? |
| 182 | - static::saved(function ($instance) { |
|
| 182 | + static::saved(function($instance) { |
|
| 183 | 183 | $instance->checkCooldownAndFlushAfterPersiting($instance); |
| 184 | 184 | }); |
| 185 | 185 | } |
@@ -196,14 +196,14 @@ discard block |
||
| 196 | 196 | $key = $instance->makeCacheKey(); |
| 197 | 197 | |
| 198 | 198 | return $instance->cache($tags) |
| 199 | - ->rememberForever($key, function () use ($columns) { |
|
| 199 | + ->rememberForever($key, function() use ($columns) { |
|
| 200 | 200 | return parent::all($columns); |
| 201 | 201 | }); |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | public function newEloquentBuilder($query) |
| 205 | 205 | { |
| 206 | - if (! $this->isCachable()) { |
|
| 206 | + if (!$this->isCachable()) { |
|
| 207 | 207 | $this->isCachable = true; |
| 208 | 208 | |
| 209 | 209 | return new EloquentBuilder($query); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | public function isCachable() : bool |
| 216 | 216 | { |
| 217 | 217 | return $this->isCachable |
| 218 | - && ! config('laravel-model-caching.disabled'); |
|
| 218 | + && !config('laravel-model-caching.disabled'); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | public function scopeWithCacheCooldownSeconds( |
@@ -227,13 +227,13 @@ discard block |
||
| 227 | 227 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:seconds"; |
| 228 | 228 | |
| 229 | 229 | $this->cache() |
| 230 | - ->rememberForever($cacheKey, function () use ($seconds) { |
|
| 230 | + ->rememberForever($cacheKey, function() use ($seconds) { |
|
| 231 | 231 | return $seconds; |
| 232 | 232 | }); |
| 233 | 233 | |
| 234 | 234 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at"; |
| 235 | 235 | $this->cache() |
| 236 | - ->rememberForever($cacheKey, function () { |
|
| 236 | + ->rememberForever($cacheKey, function() { |
|
| 237 | 237 | return now(); |
| 238 | 238 | }); |
| 239 | 239 | |