Completed
Push — master ( 7c4b04...3b0324 )
by Mike
34s
created
src/CacheKey.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
     protected function getBindingsSlug() : string
55 55
     {
56
-        if (! method_exists($this->model, 'query')) {
56
+        if (!method_exists($this->model, 'query')) {
57 57
             return '';
58 58
         }
59 59
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
     protected function getInAndNotInClauses(array $where) : string
83 83
     {
84
-        if (! in_array($where["type"], ["In", "NotIn", "InRaw"])) {
84
+        if (!in_array($where["type"], ["In", "NotIn", "InRaw"])) {
85 85
             return "";
86 86
         }
87 87
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $this->currentBinding += count($where["values"]);
94 94
         }
95 95
 
96
-        if (! is_numeric($subquery) && ! is_numeric(str_replace("_", "", $subquery))) {
96
+        if (!is_numeric($subquery) && !is_numeric(str_replace("_", "", $subquery))) {
97 97
             try {
98 98
                 $subquery = Uuid::fromBytes($subquery);
99 99
                 $values = $this->recursiveImplode([$subquery], "_");
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 
114 114
     protected function getLimitClause() : string
115 115
     {
116
-        if (! property_exists($this->query, "limit")
117
-            || ! $this->query->limit
116
+        if (!property_exists($this->query, "limit")
117
+            || !$this->query->limit
118 118
         ) {
119 119
             return "";
120 120
         }
@@ -129,17 +129,17 @@  discard block
 block discarded – undo
129 129
 
130 130
     protected function getNestedClauses(array $where) : string
131 131
     {
132
-        if (! in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
132
+        if (!in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
133 133
             return "";
134 134
         }
135 135
 
136
-        return "-" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres);
136
+        return "-".strtolower($where["type"]).$this->getWhereClauses($where["query"]->wheres);
137 137
     }
138 138
 
139 139
     protected function getOffsetClause() : string
140 140
     {
141
-        if (! property_exists($this->query, "offset")
142
-            || ! $this->query->offset
141
+        if (!property_exists($this->query, "offset")
142
+            || !$this->query->offset
143 143
         ) {
144 144
             return "";
145 145
         }
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 
150 150
     protected function getOrderByClauses() : string
151 151
     {
152
-        if (! property_exists($this->query, "orders")
153
-            || ! $this->query->orders
152
+        if (!property_exists($this->query, "orders")
153
+            || !$this->query->orders
154 154
         ) {
155 155
             return "";
156 156
         }
@@ -158,12 +158,12 @@  discard block
 block discarded – undo
158 158
         $orders = collect($this->query->orders);
159 159
 
160 160
         return $orders
161
-            ->reduce(function ($carry, $order) {
161
+            ->reduce(function($carry, $order) {
162 162
                 if (($order["type"] ?? "") === "Raw") {
163
-                    return $carry . "_orderByRaw_" . (new Str)->slug($order["sql"]);
163
+                    return $carry."_orderByRaw_".(new Str)->slug($order["sql"]);
164 164
                 }
165 165
 
166
-                return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
166
+                return $carry."_orderBy_".$order["column"]."_".$order["direction"];
167 167
             })
168 168
             ?: "";
169 169
     }
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
     {
185 185
         if (($columns === ["*"]
186 186
                 || $columns === [])
187
-            && (! property_exists($this->query, "columns")
188
-                || ! $this->query->columns)
187
+            && (!property_exists($this->query, "columns")
188
+                || !$this->query->columns)
189 189
         ) {
190 190
             return "";
191 191
         }
@@ -193,15 +193,15 @@  discard block
 block discarded – undo
193 193
         if (property_exists($this->query, "columns")
194 194
             && $this->query->columns
195 195
         ) {
196
-            return "_" . implode("_", $this->query->columns);
196
+            return "_".implode("_", $this->query->columns);
197 197
         }
198 198
 
199
-        return "_" . implode("_", $columns);
199
+        return "_".implode("_", $columns);
200 200
     }
201 201
 
202 202
     protected function getRawClauses(array $where) : string
203 203
     {
204
-        if (! in_array($where["type"], ["raw"])) {
204
+        if (!in_array($where["type"], ["raw"])) {
205 205
             return "";
206 206
         }
207 207
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
         $clause = "_{$where["boolean"]}";
210 210
 
211 211
         while (count($queryParts) > 1) {
212
-            $clause .= "_" . array_shift($queryParts);
212
+            $clause .= "_".array_shift($queryParts);
213 213
             $clause .= $this->getCurrentBinding("where");
214 214
             $this->currentBinding++;
215 215
         }
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
         $lastPart = array_shift($queryParts);
218 218
 
219 219
         if ($lastPart) {
220
-            $clause .= "_" . $lastPart;
220
+            $clause .= "_".$lastPart;
221 221
         }
222 222
 
223
-        return "-" . str_replace(" ", "_", $clause);
223
+        return "-".str_replace(" ", "_", $clause);
224 224
     }
225 225
 
226 226
     protected function getTableSlug() : string
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 
241 241
     protected function getValuesClause(array $where = []) : string
242 242
     {
243
-        if (! $where
243
+        if (!$where
244 244
             || in_array($where["type"], ["NotNull", "Null"])
245 245
         ) {
246 246
             return "";
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         $values = $this->getValuesFromWhere($where);
250 250
         $values = $this->getValuesFromBindings($where, $values);
251 251
 
252
-        return "_" . $values;
252
+        return "_".$values;
253 253
     }
254 254
 
255 255
     protected function getValuesFromWhere(array $where) : string
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 
275 275
     protected function getValuesFromBindings(array $where, string $values) : string
276 276
     {
277
-        $bindingFallback = __CLASS__ . ':UNKNOWN_BINDING';
277
+        $bindingFallback = __CLASS__.':UNKNOWN_BINDING';
278 278
         $currentBinding = $this->getCurrentBinding("where", $bindingFallback);
279 279
 
280 280
         if ($currentBinding !== $bindingFallback) {
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
             $this->currentBinding++;
283 283
 
284 284
             if ($where["type"] === "between") {
285
-                $values .= "_" . $this->getCurrentBinding("where");
285
+                $values .= "_".$this->getCurrentBinding("where");
286 286
                 $this->currentBinding++;
287 287
             }
288 288
         }
@@ -298,8 +298,8 @@  discard block
 block discarded – undo
298 298
 
299 299
     protected function getWhereClauses(array $wheres = []) : string
300 300
     {
301
-        return "" . $this->getWheres($wheres)
302
-            ->reduce(function ($carry, $where) {
301
+        return "".$this->getWheres($wheres)
302
+            ->reduce(function($carry, $where) {
303 303
                 $value = $carry;
304 304
                 $value .= $this->getNestedClauses($where);
305 305
                 $value .= $this->getColumnClauses($where);
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
             return "";
333 333
         }
334 334
 
335
-        return $eagerLoads->keys()->reduce(function ($carry, $related) {
336
-            if (! method_exists($this->model, $related)) {
335
+        return $eagerLoads->keys()->reduce(function($carry, $related) {
336
+            if (!method_exists($this->model, $related)) {
337 337
                 return "{$carry}-{$related}";
338 338
             }
339 339
 
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
                 continue;
366 366
             }
367 367
 
368
-            $result .= $glue . $value;
368
+            $result .= $glue.$value;
369 369
         }
370 370
 
371 371
         return $result;
Please login to merge, or discard this patch.
tests/Integration/CachedBuilder/ScopeTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $this->actingAs($user);
112 112
         $authorsA = (new AuthorBeginsWithScoped)
113 113
             ->all()
114
-            ->map(function ($author) {
114
+            ->map(function($author) {
115 115
                 return (new Str)->substr($author->name, 0, 1);
116 116
             })
117 117
             ->unique();
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         $this->actingAs($user);
120 120
         $authorsB = (new AuthorBeginsWithScoped)
121 121
             ->all()
122
-            ->map(function ($author) {
122
+            ->map(function($author) {
123 123
                 return (new Str)->substr($author->name, 0, 1);
124 124
             })
125 125
             ->unique();
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         $this->actingAs($user);
138 138
         $authorsA = (new AuthorBeginsWithScoped)
139 139
             ->get()
140
-            ->map(function ($author) {
140
+            ->map(function($author) {
141 141
                 return (new Str)->substr($author->name, 0, 1);
142 142
             })
143 143
             ->unique();
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $this->actingAs($user);
146 146
         $authorsB = (new AuthorBeginsWithScoped)
147 147
             ->get()
148
-            ->map(function ($author) {
148
+            ->map(function($author) {
149 149
                 return (new Str)->substr($author->name, 0, 1);
150 150
             })
151 151
             ->unique();
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $authorsA = (new AuthorBeginsWithScoped)
165 165
             ->withoutGlobalScopes()
166 166
             ->get()
167
-            ->map(function ($author) {
167
+            ->map(function($author) {
168 168
                 return (new Str)->substr($author->name, 0, 1);
169 169
             })
170 170
             ->unique();
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         $authorsB = (new AuthorBeginsWithScoped)
174 174
             ->withoutGlobalScopes(['GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith'])
175 175
             ->get()
176
-            ->map(function ($author) {
176
+            ->map(function($author) {
177 177
                 return (new Str)->substr($author->name, 0, 1);
178 178
             })
179 179
             ->unique();
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
         $authorsA = (new AuthorBeginsWithScoped)
191 191
             ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
192 192
             ->get()
193
-            ->map(function ($author) {
193
+            ->map(function($author) {
194 194
                 return (new Str)->substr($author->name, 0, 1);
195 195
             })
196 196
             ->unique();
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
         $authorsB = (new AuthorBeginsWithScoped)
200 200
             ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
201 201
             ->get()
202
-            ->map(function ($author) {
202
+            ->map(function($author) {
203 203
                 return (new Str)->substr($author->name, 0, 1);
204 204
             })
205 205
             ->unique();
@@ -213,13 +213,13 @@  discard block
 block discarded – undo
213 213
         $first = "A";
214 214
         $second = "B";
215 215
         $authors1 = (new Author)
216
-            ->with(['books' => static function (HasMany $model) use ($first) {
216
+            ->with(['books' => static function(HasMany $model) use ($first) {
217 217
                 $model->startsWith($first);
218 218
             }])
219 219
             ->get();
220 220
         $authors2 = (new Author)
221 221
             ->disableModelCaching()
222
-            ->with(['books' => static function (HasMany $model) use ($second) {
222
+            ->with(['books' => static function(HasMany $model) use ($second) {
223 223
                 $model->startsWith($second);
224 224
             }])
225 225
             ->get();
Please login to merge, or discard this patch.
src/Traits/Caching.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     protected function applyScopesToInstance()
49 49
     {
50 50
         if (
51
-            ! property_exists($this, "scopes")
51
+            !property_exists($this, "scopes")
52 52
             || $this->scopesAreApplied
53 53
             || $this->withoutAllGlobalScopes
54 54
         ) {
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 
58 58
         foreach ($this->scopes as $identifier => $scope) {
59 59
             if (
60
-                ! isset($this->scopes[$identifier])
60
+                !isset($this->scopes[$identifier])
61 61
                 || isset($this->withoutGlobalScopes[$identifier])
62 62
             ) {
63 63
                 continue;
64 64
             }
65 65
 
66
-            $this->callScope(function () use ($scope) {
66
+            $this->callScope(function() use ($scope) {
67 67
                 if ($scope instanceof Closure) {
68 68
                     $scope($this);
69 69
                 }
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
123 123
 
124 124
             $this->cache()
125
-                ->rememberForever($cacheKey, function () {
125
+                ->rememberForever($cacheKey, function() {
126 126
                     return (new Carbon)->now();
127 127
                 });
128 128
         }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 
202 202
     public function getModelCacheCooldown(Model $instance) : array
203 203
     {
204
-        if (! $instance->cacheCooldownSeconds) {
204
+        if (!$instance->cacheCooldownSeconds) {
205 205
             return [null, null, null];
206 206
         }
207 207
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
         [$cacheCooldown, $invalidatedAt, $savedAt] = $this
211 211
             ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName);
212 212
 
213
-        if (! $cacheCooldown || $cacheCooldown === 0) {
213
+        if (!$cacheCooldown || $cacheCooldown === 0) {
214 214
             return [null, null, null];
215 215
         }
216 216
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
241 241
 
242 242
         if (
243
-            ! $cacheCooldown
243
+            !$cacheCooldown
244 244
             || (new Carbon)->now()->diffInSeconds($invalidatedAt) < $cacheCooldown
245 245
         ) {
246 246
             return;
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
     {
266 266
         [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance);
267 267
 
268
-        if (! $cacheCooldown) {
268
+        if (!$cacheCooldown) {
269 269
             $instance->flushCache();
270 270
 
271 271
             if ($relationship) {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 
293 293
     public function isCachable() : bool
294 294
     {
295
-        $isCacheDisabled = ! Container::getInstance()
295
+        $isCacheDisabled = !Container::getInstance()
296 296
             ->make("config")
297 297
             ->get("laravel-model-caching.enabled");
298 298
         $allRelationshipsAreCachable = true;
@@ -304,9 +304,9 @@  discard block
 block discarded – undo
304 304
             $allRelationshipsAreCachable = collect($this
305 305
                 ->eagerLoad)
306 306
                 ->keys()
307
-                ->reduce(function ($carry, $related) {
307
+                ->reduce(function($carry, $related) {
308 308
                     if (
309
-                        ! method_exists($this->model, $related)
309
+                        !method_exists($this->model, $related)
310 310
                         || $carry === false
311 311
                     ) {
312 312
                         return $carry;
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
                     $relatedModel = $this->model->$related()->getRelated();
316 316
 
317 317
                     if (
318
-                        ! method_exists($relatedModel, "isCachable")
319
-                        || ! $relatedModel->isCachable()
318
+                        !method_exists($relatedModel, "isCachable")
319
+                        || !$relatedModel->isCachable()
320 320
                     ) {
321 321
                         return false;
322 322
                     }
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         }
328 328
 
329 329
         return $this->isCachable
330
-            && ! $isCacheDisabled
330
+            && !$isCacheDisabled
331 331
             && $allRelationshipsAreCachable;
332 332
     }
333 333
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
339 339
 
340 340
         $instance->cache()
341
-            ->rememberForever($cacheKey, function () {
341
+            ->rememberForever($cacheKey, function() {
342 342
                 return (new Carbon)->now();
343 343
             });
344 344
     }
Please login to merge, or discard this patch.