@@ -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 |
@@ -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 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | public function cursor() |
36 | 36 | { |
37 | - if (! $this->isCachable()) { |
|
37 | + if (!$this->isCachable()) { |
|
38 | 38 | return collect(parent::cursor()); |
39 | 39 | } |
40 | 40 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function find($id, $columns = ["*"]) |
58 | 58 | { |
59 | - if (! $this->isCachable()) { |
|
59 | + if (!$this->isCachable()) { |
|
60 | 60 | return parent::find($id, $columns); |
61 | 61 | } |
62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | public function first($columns = ["*"]) |
69 | 69 | { |
70 | - if (! $this->isCachable()) { |
|
70 | + if (!$this->isCachable()) { |
|
71 | 71 | return parent::first($columns); |
72 | 72 | } |
73 | 73 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | public function get($columns = ["*"]) |
80 | 80 | { |
81 | - if (! $this->isCachable()) { |
|
81 | + if (!$this->isCachable()) { |
|
82 | 82 | return parent::get($columns); |
83 | 83 | } |
84 | 84 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | public function max($column) |
91 | 91 | { |
92 | - if (! $this->isCachable()) { |
|
92 | + if (!$this->isCachable()) { |
|
93 | 93 | return parent::max($column); |
94 | 94 | } |
95 | 95 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | public function min($column) |
102 | 102 | { |
103 | - if (! $this->isCachable()) { |
|
103 | + if (!$this->isCachable()) { |
|
104 | 104 | return parent::min($column); |
105 | 105 | } |
106 | 106 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $pageName = "page", |
116 | 116 | $page = null |
117 | 117 | ) { |
118 | - if (! $this->isCachable()) { |
|
118 | + if (!$this->isCachable()) { |
|
119 | 119 | return parent::paginate($perPage, $columns, $pageName, $page); |
120 | 120 | } |
121 | 121 | |
@@ -127,11 +127,11 @@ discard block |
||
127 | 127 | |
128 | 128 | public function pluck($column, $key = null) |
129 | 129 | { |
130 | - if (! $this->isCachable()) { |
|
130 | + if (!$this->isCachable()) { |
|
131 | 131 | return parent::pluck($column, $key); |
132 | 132 | } |
133 | 133 | |
134 | - $keyDifferentiator = "-pluck_{$column}" . ($key ? "_{$key}" : ""); |
|
134 | + $keyDifferentiator = "-pluck_{$column}".($key ? "_{$key}" : ""); |
|
135 | 135 | $cacheKey = $this->makeCacheKey([$column], null, $keyDifferentiator); |
136 | 136 | |
137 | 137 | return $this->cachedValue(func_get_args(), $cacheKey); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | public function sum($column) |
141 | 141 | { |
142 | - if (! $this->isCachable()) { |
|
142 | + if (!$this->isCachable()) { |
|
143 | 143 | return parent::sum($column); |
144 | 144 | } |
145 | 145 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | |
151 | 151 | public function value($column) |
152 | 152 | { |
153 | - if (! $this->isCachable()) { |
|
153 | + if (!$this->isCachable()) { |
|
154 | 154 | return parent::value($column); |
155 | 155 | } |
156 | 156 | |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | return $this->cache($cacheTags) |
220 | 220 | ->rememberForever( |
221 | 221 | $hashedCacheKey, |
222 | - function () use ($arguments, $cacheKey, $method) { |
|
222 | + function() use ($arguments, $cacheKey, $method) { |
|
223 | 223 | return [ |
224 | 224 | "key" => $cacheKey, |
225 | 225 | "value" => parent::{$method}(...$arguments), |
@@ -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 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $usesCachableTrait = collect(class_uses($this)) |
35 | 35 | ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable"); |
36 | 36 | |
37 | - if (! $usesCachableTrait) { |
|
37 | + if (!$usesCachableTrait) { |
|
38 | 38 | array_push($tags, str_slug(get_called_class())); |
39 | 39 | } |
40 | 40 | |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | if ($cacheCooldown) { |
62 | 62 | $cachePrefix = "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 | $modelClassName = get_class($this); |
67 | 67 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
68 | 68 | |
69 | 69 | $this->cache() |
70 | - ->rememberForever($cacheKey, function () { |
|
70 | + ->rememberForever($cacheKey, function() { |
|
71 | 71 | return now(); |
72 | 72 | }); |
73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | { |
78 | 78 | return "genealabs:laravel-model-caching:" |
79 | 79 | . (config('laravel-model-caching.cache-prefix') |
80 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
80 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
81 | 81 | : ""); |
82 | 82 | } |
83 | 83 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | ->cache() |
112 | 112 | ->get("{$cachePrefix}:{$modelClassName}-cooldown:seconds"); |
113 | 113 | |
114 | - if (! $cacheCooldown) { |
|
114 | + if (!$cacheCooldown) { |
|
115 | 115 | return [null, null, null]; |
116 | 116 | } |
117 | 117 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | { |
135 | 135 | [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance); |
136 | 136 | |
137 | - if (! $cacheCooldown |
|
137 | + if (!$cacheCooldown |
|
138 | 138 | || now()->diffInSeconds($invalidatedAt) < $cacheCooldown |
139 | 139 | ) { |
140 | 140 | return; |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | { |
160 | 160 | [$cacheCooldown, $invalidatedAt, $savedAt] = $instance->getModelCacheCooldown($instance); |
161 | 161 | |
162 | - if (! $cacheCooldown) { |
|
162 | + if (!$cacheCooldown) { |
|
163 | 163 | $instance->flushCache(); |
164 | 164 | |
165 | 165 | return; |
@@ -178,13 +178,13 @@ discard block |
||
178 | 178 | { |
179 | 179 | $cachePrefix = "genealabs:laravel-model-caching:" |
180 | 180 | . (config('laravel-model-caching.cache-prefix') |
181 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
181 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
182 | 182 | : ""); |
183 | 183 | $modelClassName = get_class($instance); |
184 | 184 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
185 | 185 | |
186 | 186 | $instance->cache() |
187 | - ->rememberForever($cacheKey, function () { |
|
187 | + ->rememberForever($cacheKey, function() { |
|
188 | 188 | return now(); |
189 | 189 | }); |
190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | public static function bootCachable() |
193 | 193 | { |
194 | 194 | // TODO: add for deleted,updated,etc? |
195 | - static::saved(function ($instance) { |
|
195 | + static::saved(function($instance) { |
|
196 | 196 | $instance->checkCooldownAndFlushAfterPersiting($instance); |
197 | 197 | }); |
198 | 198 | } |
@@ -209,14 +209,14 @@ discard block |
||
209 | 209 | $key = $instance->makeCacheKey(); |
210 | 210 | |
211 | 211 | return $instance->cache($tags) |
212 | - ->rememberForever($key, function () use ($columns) { |
|
212 | + ->rememberForever($key, function() use ($columns) { |
|
213 | 213 | return parent::all($columns); |
214 | 214 | }); |
215 | 215 | } |
216 | 216 | |
217 | 217 | public function newEloquentBuilder($query) |
218 | 218 | { |
219 | - if (! $this->isCachable()) { |
|
219 | + if (!$this->isCachable()) { |
|
220 | 220 | $this->isCachable = true; |
221 | 221 | |
222 | 222 | return new EloquentBuilder($query); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | public function isCachable() : bool |
229 | 229 | { |
230 | 230 | return $this->isCachable |
231 | - && ! config('laravel-model-caching.disabled'); |
|
231 | + && !config('laravel-model-caching.disabled'); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | public function scopeWithCacheCooldownSeconds( |
@@ -237,19 +237,19 @@ discard block |
||
237 | 237 | ) : EloquentBuilder { |
238 | 238 | $cachePrefix = "genealabs:laravel-model-caching:" |
239 | 239 | . (config('laravel-model-caching.cache-prefix') |
240 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
240 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
241 | 241 | : ""); |
242 | 242 | $modelClassName = get_class($this); |
243 | 243 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:seconds"; |
244 | 244 | |
245 | 245 | $this->cache() |
246 | - ->rememberForever($cacheKey, function () use ($seconds) { |
|
246 | + ->rememberForever($cacheKey, function() use ($seconds) { |
|
247 | 247 | return $seconds; |
248 | 248 | }); |
249 | 249 | |
250 | 250 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at"; |
251 | 251 | $this->cache() |
252 | - ->rememberForever($cacheKey, function () { |
|
252 | + ->rememberForever($cacheKey, function() { |
|
253 | 253 | return now(); |
254 | 254 | }); |
255 | 255 |
@@ -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 | } |