@@ -6,7 +6,7 @@ |
||
6 | 6 | { |
7 | 7 | public function all($columns = ['*']) : Collection |
8 | 8 | { |
9 | - if (! $this->isCachable()) { |
|
9 | + if (!$this->isCachable()) { |
|
10 | 10 | $this->model->disableModelCaching(); |
11 | 11 | } |
12 | 12 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | $option = $this->option('model'); |
14 | 14 | |
15 | - if (! $option) { |
|
15 | + if (!$option) { |
|
16 | 16 | return $this->flushEntireCache(); |
17 | 17 | } |
18 | 18 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $usesCachableTrait = $this->getAllTraitsUsedByClass($option) |
37 | 37 | ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable"); |
38 | 38 | |
39 | - if (! $usesCachableTrait) { |
|
39 | + if (!$usesCachableTrait) { |
|
40 | 40 | $this->error("'{$option}' is not an instance of CachedModel."); |
41 | 41 | $this->line("Only CachedModel instances can be flushed."); |
42 | 42 |
@@ -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(Clear::class); |
15 | 15 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | { |
29 | 29 | $tags = collect($this->eagerLoad) |
30 | 30 | ->keys() |
31 | - ->map(function ($relationName) { |
|
31 | + ->map(function($relationName) { |
|
32 | 32 | $relation = $this->getRelation($relationName); |
33 | 33 | |
34 | 34 | return $this->getCachePrefix() |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | protected function getRelation(string $relationName) : Relation |
54 | 54 | { |
55 | 55 | return collect(explode('.', $relationName)) |
56 | - ->reduce(function ($carry, $name) { |
|
56 | + ->reduce(function($carry, $name) { |
|
57 | 57 | $carry = $carry ?: $this->model; |
58 | 58 | $carry = $this->getRelatedModel($carry); |
59 | 59 |
@@ -5,10 +5,10 @@ |
||
5 | 5 | protected function getCachePrefix() : string |
6 | 6 | { |
7 | 7 | return "genealabs:laravel-model-caching:" |
8 | - . $this->getConnectionName() . ":" |
|
9 | - . $this->getDatabaseName() . ":" |
|
8 | + . $this->getConnectionName().":" |
|
9 | + . $this->getDatabaseName().":" |
|
10 | 10 | . (config("laravel-model-caching.cache-prefix") |
11 | - ? config("laravel-model-caching.cache-prefix", "") . ":" |
|
11 | + ? config("laravel-model-caching.cache-prefix", "").":" |
|
12 | 12 | : ""); |
13 | 13 | } |
14 | 14 |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
50 | 50 | |
51 | 51 | $this->cache() |
52 | - ->rememberForever($cacheKey, function () { |
|
52 | + ->rememberForever($cacheKey, function() { |
|
53 | 53 | return (new Carbon)->now(); |
54 | 54 | }); |
55 | 55 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | { |
60 | 60 | return "genealabs:laravel-model-caching:" |
61 | 61 | . (config('laravel-model-caching.cache-prefix') |
62 | - ? config('laravel-model-caching.cache-prefix', '') . ":" |
|
62 | + ? config('laravel-model-caching.cache-prefix', '').":" |
|
63 | 63 | : ""); |
64 | 64 | } |
65 | 65 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | public function getModelCacheCooldown(Model $instance) : array |
95 | 95 | { |
96 | - if (! $instance->cacheCooldownSeconds) { |
|
96 | + if (!$instance->cacheCooldownSeconds) { |
|
97 | 97 | return [null, null, null]; |
98 | 98 | } |
99 | 99 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | [$cacheCooldown, $invalidatedAt, $savedAt] = $this |
103 | 103 | ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName); |
104 | 104 | |
105 | - if (! $cacheCooldown || $cacheCooldown === 0) { |
|
105 | + if (!$cacheCooldown || $cacheCooldown === 0) { |
|
106 | 106 | return [null, null, null]; |
107 | 107 | } |
108 | 108 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | { |
132 | 132 | [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance); |
133 | 133 | |
134 | - if (! $cacheCooldown |
|
134 | + if (!$cacheCooldown |
|
135 | 135 | || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown |
136 | 136 | ) { |
137 | 137 | return; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | { |
157 | 157 | [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance); |
158 | 158 | |
159 | - if (! $cacheCooldown) { |
|
159 | + if (!$cacheCooldown) { |
|
160 | 160 | $instance->flushCache(); |
161 | 161 | |
162 | 162 | return; |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | public function isCachable() : bool |
173 | 173 | { |
174 | 174 | return $this->isCachable |
175 | - && ! config('laravel-model-caching.disabled'); |
|
175 | + && !config('laravel-model-caching.disabled'); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | protected function setCacheCooldownSavedAtTimestamp(Model $instance) |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at"; |
183 | 183 | |
184 | 184 | $instance->cache() |
185 | - ->rememberForever($cacheKey, function () { |
|
185 | + ->rememberForever($cacheKey, function() { |
|
186 | 186 | return (new Carbon)->now(); |
187 | 187 | }); |
188 | 188 | } |
@@ -20,22 +20,22 @@ discard block |
||
20 | 20 | $key = $instance->makeCacheKey(); |
21 | 21 | |
22 | 22 | return $instance->cache($tags) |
23 | - ->rememberForever($key, function () use ($columns) { |
|
23 | + ->rememberForever($key, function() use ($columns) { |
|
24 | 24 | return parent::all($columns); |
25 | 25 | }); |
26 | 26 | } |
27 | 27 | |
28 | 28 | public static function bootCachable() |
29 | 29 | { |
30 | - static::created(function ($instance) { |
|
30 | + static::created(function($instance) { |
|
31 | 31 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
32 | 32 | }); |
33 | 33 | |
34 | - static::deleted(function ($instance) { |
|
34 | + static::deleted(function($instance) { |
|
35 | 35 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
36 | 36 | }); |
37 | 37 | |
38 | - static::saved(function ($instance) { |
|
38 | + static::saved(function($instance) { |
|
39 | 39 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
40 | 40 | }); |
41 | 41 | |
@@ -44,15 +44,15 @@ discard block |
||
44 | 44 | // $instance->checkCooldownAndFlushAfterPersisting($instance); |
45 | 45 | // }); |
46 | 46 | |
47 | - static::pivotAttached(function ($instance) { |
|
47 | + static::pivotAttached(function($instance) { |
|
48 | 48 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
49 | 49 | }); |
50 | 50 | |
51 | - static::pivotDetached(function ($instance) { |
|
51 | + static::pivotDetached(function($instance) { |
|
52 | 52 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
53 | 53 | }); |
54 | 54 | |
55 | - static::pivotUpdated(function ($instance) { |
|
55 | + static::pivotUpdated(function($instance) { |
|
56 | 56 | $instance->checkCooldownAndFlushAfterPersisting($instance); |
57 | 57 | }); |
58 | 58 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | public function newEloquentBuilder($query) |
70 | 70 | { |
71 | - if (! $this->isCachable()) { |
|
71 | + if (!$this->isCachable()) { |
|
72 | 72 | $this->isCachable = false; |
73 | 73 | |
74 | 74 | return new EloquentBuilder($query); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | EloquentBuilder $query, |
91 | 91 | int $seconds = null |
92 | 92 | ) : EloquentBuilder { |
93 | - if (! $seconds) { |
|
93 | + if (!$seconds) { |
|
94 | 94 | $seconds = $this->cacheCooldownSeconds; |
95 | 95 | } |
96 | 96 | |
@@ -99,13 +99,13 @@ discard block |
||
99 | 99 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:seconds"; |
100 | 100 | |
101 | 101 | $this->cache() |
102 | - ->rememberForever($cacheKey, function () use ($seconds) { |
|
102 | + ->rememberForever($cacheKey, function() use ($seconds) { |
|
103 | 103 | return $seconds; |
104 | 104 | }); |
105 | 105 | |
106 | 106 | $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at"; |
107 | 107 | $this->cache() |
108 | - ->rememberForever($cacheKey, function () { |
|
108 | + ->rememberForever($cacheKey, function() { |
|
109 | 109 | return (new Carbon)->now(); |
110 | 110 | }); |
111 | 111 |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | public function avg($column) |
17 | 17 | { |
18 | - if (! $this->isCachable()) { |
|
18 | + if (!$this->isCachable()) { |
|
19 | 19 | return parent::avg($column); |
20 | 20 | } |
21 | 21 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | public function count($columns = "*") |
28 | 28 | { |
29 | - if (! $this->isCachable()) { |
|
29 | + if (!$this->isCachable()) { |
|
30 | 30 | return parent::count($columns); |
31 | 31 | } |
32 | 32 | |
@@ -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 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | public function first($columns = ["*"]) |
74 | 74 | { |
75 | - if (! $this->isCachable()) { |
|
75 | + if (!$this->isCachable()) { |
|
76 | 76 | return parent::first($columns); |
77 | 77 | } |
78 | 78 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | public function get($columns = ["*"]) |
93 | 93 | { |
94 | - if (! $this->isCachable()) { |
|
94 | + if (!$this->isCachable()) { |
|
95 | 95 | return parent::get($columns); |
96 | 96 | } |
97 | 97 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | public function max($column) |
126 | 126 | { |
127 | - if (! $this->isCachable()) { |
|
127 | + if (!$this->isCachable()) { |
|
128 | 128 | return parent::max($column); |
129 | 129 | } |
130 | 130 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | |
136 | 136 | public function min($column) |
137 | 137 | { |
138 | - if (! $this->isCachable()) { |
|
138 | + if (!$this->isCachable()) { |
|
139 | 139 | return parent::min($column); |
140 | 140 | } |
141 | 141 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $pageName = "page", |
151 | 151 | $page = null |
152 | 152 | ) { |
153 | - if (! $this->isCachable()) { |
|
153 | + if (!$this->isCachable()) { |
|
154 | 154 | return parent::paginate($perPage, $columns, $pageName, $page); |
155 | 155 | } |
156 | 156 | |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | { |
171 | 171 | $relation = parent::getRelation($name); |
172 | 172 | |
173 | - if (! $this->isCachable() |
|
173 | + if (!$this->isCachable() |
|
174 | 174 | && is_a($relation->getQuery(), self::class) |
175 | 175 | ) { |
176 | 176 | $relation->getQuery()->disableModelCaching(); |
@@ -185,12 +185,12 @@ discard block |
||
185 | 185 | |
186 | 186 | foreach ($items as $key => $value) { |
187 | 187 | if (is_array($value)) { |
188 | - $result .= $key . $glue . $this->recursiveImplodeWithKey($value, $glue); |
|
188 | + $result .= $key.$glue.$this->recursiveImplodeWithKey($value, $glue); |
|
189 | 189 | |
190 | 190 | continue; |
191 | 191 | } |
192 | 192 | |
193 | - $result .= $glue . $key . $glue . $value; |
|
193 | + $result .= $glue.$key.$glue.$value; |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | return $result; |
@@ -198,11 +198,11 @@ discard block |
||
198 | 198 | |
199 | 199 | public function pluck($column, $key = null) |
200 | 200 | { |
201 | - if (! $this->isCachable()) { |
|
201 | + if (!$this->isCachable()) { |
|
202 | 202 | return parent::pluck($column, $key); |
203 | 203 | } |
204 | 204 | |
205 | - $keyDifferentiator = "-pluck_{$column}" . ($key ? "_{$key}" : ""); |
|
205 | + $keyDifferentiator = "-pluck_{$column}".($key ? "_{$key}" : ""); |
|
206 | 206 | $cacheKey = $this->makeCacheKey([$column], null, $keyDifferentiator); |
207 | 207 | |
208 | 208 | return $this->cachedValue(func_get_args(), $cacheKey); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | public function sum($column) |
212 | 212 | { |
213 | - if (! $this->isCachable()) { |
|
213 | + if (!$this->isCachable()) { |
|
214 | 214 | return parent::sum($column); |
215 | 215 | } |
216 | 216 | |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | |
229 | 229 | public function value($column) |
230 | 230 | { |
231 | - if (! $this->isCachable()) { |
|
231 | + if (!$this->isCachable()) { |
|
232 | 232 | return parent::value($column); |
233 | 233 | } |
234 | 234 | |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | return $this->cache($cacheTags) |
298 | 298 | ->rememberForever( |
299 | 299 | $hashedCacheKey, |
300 | - function () use ($arguments, $cacheKey, $method) { |
|
300 | + function() use ($arguments, $cacheKey, $method) { |
|
301 | 301 | return [ |
302 | 302 | "key" => $cacheKey, |
303 | 303 | "value" => parent::{$method}(...$arguments), |
@@ -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 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | protected function getOffsetClause() : string |
76 | 76 | { |
77 | - if (! $this->query->offset) { |
|
77 | + if (!$this->query->offset) { |
|
78 | 78 | return ""; |
79 | 79 | } |
80 | 80 | |
@@ -86,12 +86,12 @@ discard block |
||
86 | 86 | $orders = collect($this->query->orders); |
87 | 87 | |
88 | 88 | return $orders |
89 | - ->reduce(function ($carry, $order) { |
|
89 | + ->reduce(function($carry, $order) { |
|
90 | 90 | if (($order["type"] ?? "") === "Raw") { |
91 | - return $carry . "_orderByRaw_" . (new Str)->slug($order["sql"]); |
|
91 | + return $carry."_orderByRaw_".(new Str)->slug($order["sql"]); |
|
92 | 92 | } |
93 | 93 | |
94 | - return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"]; |
|
94 | + return $carry."_orderBy_".$order["column"]."_".$order["direction"]; |
|
95 | 95 | }) |
96 | 96 | ?: ""; |
97 | 97 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | return ""; |
103 | 103 | } |
104 | 104 | |
105 | - return "_" . implode("_", $columns); |
|
105 | + return "_".implode("_", $columns); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | protected function getTypeClause($where) : string |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | protected function getValuesClause(array $where = []) : string |
118 | 118 | { |
119 | - if (! $where |
|
119 | + if (!$where |
|
120 | 120 | || in_array($where["type"], ["NotNull", "Null"]) |
121 | 121 | ) { |
122 | 122 | return ""; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $values = $this->getValuesFromWhere($where); |
126 | 126 | $values = $this->getValuesFromBindings($where, $values); |
127 | 127 | |
128 | - return "_" . $values; |
|
128 | + return "_".$values; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | protected function getValuesFromWhere(array $where) : string |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $subKey = str_replace($prefix, "", $subKey); |
138 | 138 | $subKey = str_replace($this->getModelSlug(), "", $subKey); |
139 | 139 | $classParts = explode("\\", get_class($this->model)); |
140 | - $subKey = strtolower(array_pop($classParts)) . $subKey; |
|
140 | + $subKey = strtolower(array_pop($classParts)).$subKey; |
|
141 | 141 | |
142 | 142 | return $subKey; |
143 | 143 | } |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $this->currentBinding++; |
157 | 157 | |
158 | 158 | if ($where["type"] === "between") { |
159 | - $values .= "_" . $this->query->bindings["where"][$this->currentBinding]; |
|
159 | + $values .= "_".$this->query->bindings["where"][$this->currentBinding]; |
|
160 | 160 | $this->currentBinding++; |
161 | 161 | } |
162 | 162 | } |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | |
167 | 167 | protected function getWhereClauses(array $wheres = []) : string |
168 | 168 | { |
169 | - return "" . $this->getWheres($wheres) |
|
170 | - ->reduce(function ($carry, $where) { |
|
169 | + return "".$this->getWheres($wheres) |
|
170 | + ->reduce(function($carry, $where) { |
|
171 | 171 | $value = $carry; |
172 | 172 | $value .= $this->getNestedClauses($where); |
173 | 173 | $value .= $this->getColumnClauses($where); |
@@ -181,11 +181,11 @@ discard block |
||
181 | 181 | |
182 | 182 | protected function getNestedClauses(array $where) : string |
183 | 183 | { |
184 | - if (! in_array($where["type"], ["Exists", "Nested", "NotExists"])) { |
|
184 | + if (!in_array($where["type"], ["Exists", "Nested", "NotExists"])) { |
|
185 | 185 | return ""; |
186 | 186 | } |
187 | 187 | |
188 | - return "-" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres); |
|
188 | + return "-".strtolower($where["type"]).$this->getWhereClauses($where["query"]->wheres); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | protected function getColumnClauses(array $where) : string |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | |
200 | 200 | protected function getInClauses(array $where) : string |
201 | 201 | { |
202 | - if (! in_array($where["type"], ["In"])) { |
|
202 | + if (!in_array($where["type"], ["In"])) { |
|
203 | 203 | return ""; |
204 | 204 | } |
205 | 205 | |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | |
212 | 212 | protected function getInAndNotInClauses(array $where) : string |
213 | 213 | { |
214 | - if (! in_array($where["type"], ["In", "NotIn"])) { |
|
214 | + if (!in_array($where["type"], ["In", "NotIn"])) { |
|
215 | 215 | return ""; |
216 | 216 | } |
217 | 217 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | continue; |
250 | 250 | } |
251 | 251 | |
252 | - $result .= $glue . $value; |
|
252 | + $result .= $glue.$value; |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | return $result; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $clause = "_{$where["boolean"]}"; |
266 | 266 | |
267 | 267 | while (count($queryParts) > 1) { |
268 | - $clause .= "_" . array_shift($queryParts); |
|
268 | + $clause .= "_".array_shift($queryParts); |
|
269 | 269 | $clause .= $this->query->bindings["where"][$this->currentBinding]; |
270 | 270 | $this->currentBinding++; |
271 | 271 | } |
@@ -273,10 +273,10 @@ discard block |
||
273 | 273 | $lastPart = array_shift($queryParts); |
274 | 274 | |
275 | 275 | if ($lastPart) { |
276 | - $clause .= "_" . $lastPart; |
|
276 | + $clause .= "_".$lastPart; |
|
277 | 277 | } |
278 | 278 | |
279 | - return "-" . str_replace(" ", "_", $clause); |
|
279 | + return "-".str_replace(" ", "_", $clause); |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | protected function getOtherClauses(array $where) : string |
@@ -310,8 +310,8 @@ discard block |
||
310 | 310 | return ""; |
311 | 311 | } |
312 | 312 | |
313 | - return $eagerLoads->keys()->reduce(function ($carry, $related) { |
|
314 | - if (! method_exists($this->model, $related)) { |
|
313 | + return $eagerLoads->keys()->reduce(function($carry, $related) { |
|
314 | + if (!method_exists($this->model, $related)) { |
|
315 | 315 | return "{$carry}-{$related}"; |
316 | 316 | } |
317 | 317 |