Completed
Pull Request — master (#403)
by
unknown
28s
created
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.
src/CacheKey.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
     protected function getBindingsSlug() : string
62 62
     {
63
-        if (! method_exists($this->model, 'query')) {
63
+        if (!method_exists($this->model, 'query')) {
64 64
             return '';
65 65
         }
66 66
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
     protected function getHavingClauses()
93 93
     {
94
-        return Collection::make($this->query->havings)->reduce(function ($carry, $having) {
94
+        return Collection::make($this->query->havings)->reduce(function($carry, $having) {
95 95
             $value = $carry;
96 96
             $value .= $this->getHavingClause($having);
97 97
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
         $return = '-having';
105 105
 
106 106
         foreach ($having as $key => $value) {
107
-            $return .= '_' . $key . '_' . str_replace(' ', '_', $value);
107
+            $return .= '_'.$key.'_'.str_replace(' ', '_', $value);
108 108
         }
109 109
 
110 110
         return $return;
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 
118 118
     protected function getInAndNotInClauses(array $where) : string
119 119
     {
120
-        if (! in_array($where["type"], ["In", "NotIn", "InRaw"])) {
120
+        if (!in_array($where["type"], ["In", "NotIn", "InRaw"])) {
121 121
             return "";
122 122
         }
123 123
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
             $this->currentBinding += count($where["values"]);
130 130
         }
131 131
 
132
-        if (! is_numeric($subquery) && ! is_numeric(str_replace("_", "", $subquery))) {
132
+        if (!is_numeric($subquery) && !is_numeric(str_replace("_", "", $subquery))) {
133 133
             try {
134 134
                 $subquery = Uuid::fromBytes($subquery);
135 135
                 $values = $this->recursiveImplode([$subquery], "_");
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 
150 150
     protected function getLimitClause() : string
151 151
     {
152
-        if (! property_exists($this->query, "limit")
153
-            || ! $this->query->limit
152
+        if (!property_exists($this->query, "limit")
153
+            || !$this->query->limit
154 154
         ) {
155 155
             return "";
156 156
         }
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 
166 166
     protected function getNestedClauses(array $where) : string
167 167
     {
168
-        if (! in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
168
+        if (!in_array($where["type"], ["Exists", "Nested", "NotExists"])) {
169 169
             return "";
170 170
         }
171 171
 
172
-        return "-" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres);
172
+        return "-".strtolower($where["type"]).$this->getWhereClauses($where["query"]->wheres);
173 173
     }
174 174
 
175 175
     protected function getOffsetClause() : string
176 176
     {
177
-        if (! property_exists($this->query, "offset")
178
-            || ! $this->query->offset
177
+        if (!property_exists($this->query, "offset")
178
+            || !$this->query->offset
179 179
         ) {
180 180
             return "";
181 181
         }
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
 
186 186
     protected function getOrderByClauses() : string
187 187
     {
188
-        if (! property_exists($this->query, "orders")
189
-            || ! $this->query->orders
188
+        if (!property_exists($this->query, "orders")
189
+            || !$this->query->orders
190 190
         ) {
191 191
             return "";
192 192
         }
@@ -194,12 +194,12 @@  discard block
 block discarded – undo
194 194
         $orders = collect($this->query->orders);
195 195
 
196 196
         return $orders
197
-            ->reduce(function ($carry, $order) {
197
+            ->reduce(function($carry, $order) {
198 198
                 if (($order["type"] ?? "") === "Raw") {
199
-                    return $carry . "_orderByRaw_" . (new Str)->slug($order["sql"]);
199
+                    return $carry."_orderByRaw_".(new Str)->slug($order["sql"]);
200 200
                 }
201 201
 
202
-                return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
202
+                return $carry."_orderBy_".$order["column"]."_".$order["direction"];
203 203
             })
204 204
             ?: "";
205 205
     }
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
     {
225 225
         if (($columns === ["*"]
226 226
                 || $columns === [])
227
-            && (! property_exists($this->query, "columns")
228
-                || ! $this->query->columns)
227
+            && (!property_exists($this->query, "columns")
228
+                || !$this->query->columns)
229 229
         ) {
230 230
             return "";
231 231
         }
@@ -233,15 +233,15 @@  discard block
 block discarded – undo
233 233
         if (property_exists($this->query, "columns")
234 234
             && $this->query->columns
235 235
         ) {
236
-            return "_" . implode("_", $this->query->columns);
236
+            return "_".implode("_", $this->query->columns);
237 237
         }
238 238
 
239
-        return "_" . implode("_", $columns);
239
+        return "_".implode("_", $columns);
240 240
     }
241 241
 
242 242
     protected function getRawClauses(array $where) : string
243 243
     {
244
-        if (! in_array($where["type"], ["raw"])) {
244
+        if (!in_array($where["type"], ["raw"])) {
245 245
             return "";
246 246
         }
247 247
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         $clause = "_{$where["boolean"]}";
250 250
 
251 251
         while (count($queryParts) > 1) {
252
-            $clause .= "_" . array_shift($queryParts);
252
+            $clause .= "_".array_shift($queryParts);
253 253
             $clause .= $this->getCurrentBinding("where");
254 254
             $this->currentBinding++;
255 255
         }
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
         $lastPart = array_shift($queryParts);
258 258
 
259 259
         if ($lastPart) {
260
-            $clause .= "_" . $lastPart;
260
+            $clause .= "_".$lastPart;
261 261
         }
262 262
 
263
-        return "-" . str_replace(" ", "_", $clause);
263
+        return "-".str_replace(" ", "_", $clause);
264 264
     }
265 265
 
266 266
     protected function getTableSlug() : string
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 
281 281
     protected function getValuesClause(array $where = []) : string
282 282
     {
283
-        if (! $where
283
+        if (!$where
284 284
             || in_array($where["type"], ["NotNull", "Null"])
285 285
         ) {
286 286
             return "";
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
         $values = $this->getValuesFromWhere($where);
290 290
         $values = $this->getValuesFromBindings($where, $values);
291 291
 
292
-        return "_" . $values;
292
+        return "_".$values;
293 293
     }
294 294
 
295 295
     protected function getValuesFromWhere(array $where) : string
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
     protected function getValuesFromBindings(array $where, string $values) : string
320 320
     {
321
-        $bindingFallback = __CLASS__ . ':UNKNOWN_BINDING';
321
+        $bindingFallback = __CLASS__.':UNKNOWN_BINDING';
322 322
         $currentBinding = $this->getCurrentBinding("where", $bindingFallback);
323 323
 
324 324
         if ($currentBinding !== $bindingFallback) {
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
             $this->currentBinding++;
327 327
 
328 328
             if ($where["type"] === "between") {
329
-                $values .= "_" . $this->getCurrentBinding("where");
329
+                $values .= "_".$this->getCurrentBinding("where");
330 330
                 $this->currentBinding++;
331 331
             }
332 332
         }
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 
343 343
     protected function getWhereClauses(array $wheres = []) : string
344 344
     {
345
-        return "" . $this->getWheres($wheres)
346
-            ->reduce(function ($carry, $where) {
345
+        return "".$this->getWheres($wheres)
346
+            ->reduce(function($carry, $where) {
347 347
                 $value = $carry;
348 348
                 $value .= $this->getNestedClauses($where);
349 349
                 $value .= $this->getColumnClauses($where);
@@ -376,8 +376,8 @@  discard block
 block discarded – undo
376 376
             return "";
377 377
         }
378 378
 
379
-        return $eagerLoads->keys()->reduce(function ($carry, $related) {
380
-            if (! method_exists($this->model, $related)) {
379
+        return $eagerLoads->keys()->reduce(function($carry, $related) {
380
+            if (!method_exists($this->model, $related)) {
381 381
                 return "{$carry}-{$related}";
382 382
             }
383 383
 
@@ -409,13 +409,13 @@  discard block
 block discarded – undo
409 409
                 continue;
410 410
             }
411 411
 
412
-            $result .= $glue . $value;
412
+            $result .= $glue.$value;
413 413
         }
414 414
 
415 415
         return $result;
416 416
     }
417 417
 
418
-    private function processEnum(\BackedEnum|\UnitEnum|string $value): string
418
+    private function processEnum(\BackedEnum | \UnitEnum | string $value): string
419 419
     {
420 420
         if ($value instanceof \BackedEnum) {
421 421
             return $value->value;
Please login to merge, or discard this patch.