@@ -8,10 +8,10 @@ |
||
8 | 8 | { |
9 | 9 | return collect($this->eagerLoad) |
10 | 10 | ->keys() |
11 | - ->map(function ($relationName) { |
|
11 | + ->map(function($relationName) { |
|
12 | 12 | $relation = collect(explode('.', $relationName)) |
13 | - ->reduce(function ($carry, $name) { |
|
14 | - if (! $carry) { |
|
13 | + ->reduce(function($carry, $name) { |
|
14 | + if (!$carry) { |
|
15 | 15 | $carry = $this->model; |
16 | 16 | } |
17 | 17 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | protected function getLimitClause() : string |
27 | 27 | { |
28 | - if (! $this->query->limit) { |
|
28 | + if (!$this->query->limit) { |
|
29 | 29 | return ''; |
30 | 30 | } |
31 | 31 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | protected function getOffsetClause() : string |
41 | 41 | { |
42 | - if (! $this->query->offset) { |
|
42 | + if (!$this->query->offset) { |
|
43 | 43 | return ''; |
44 | 44 | } |
45 | 45 | |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | { |
51 | 51 | $orders = collect($this->query->orders); |
52 | 52 | |
53 | - return $orders->reduce(function($carry, $order){ |
|
54 | - return $carry . '_orderBy_' . $order['column'] . '_' . $order['direction']; |
|
53 | + return $orders->reduce(function($carry, $order) { |
|
54 | + return $carry.'_orderBy_'.$order['column'].'_'.$order['direction']; |
|
55 | 55 | }) |
56 | 56 | ?: ''; |
57 | 57 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | return ''; |
63 | 63 | } |
64 | 64 | |
65 | - return '_' . implode('_', $columns); |
|
65 | + return '_'.implode('_', $columns); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | protected function getTypeClause($where) : string |
@@ -75,16 +75,16 @@ discard block |
||
75 | 75 | protected function getValuesClause(array $where = null) : string |
76 | 76 | { |
77 | 77 | return is_array(array_get($where, 'values')) |
78 | - ? '_' . implode('_', $where['values']) |
|
78 | + ? '_'.implode('_', $where['values']) |
|
79 | 79 | : ''; |
80 | 80 | } |
81 | 81 | |
82 | 82 | protected function getWhereClauses(array $wheres = []) : string |
83 | 83 | { |
84 | 84 | return $this->getWheres($wheres) |
85 | - ->reduce(function ($carry, $where) { |
|
85 | + ->reduce(function($carry, $where) { |
|
86 | 86 | if (in_array($where['type'], ['Exists', 'Nested', 'NotExists'])) { |
87 | - return '_' . strtolower($where['type']) . $this->getWhereClauses($where['query']->wheres); |
|
87 | + return '_'.strtolower($where['type']).$this->getWhereClauses($where['query']->wheres); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | if ($where['type'] === 'Column') { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | if ($where['type'] === 'raw') { |
95 | - return "_{$where['boolean']}_" . str_slug($where['sql']); |
|
95 | + return "_{$where['boolean']}_".str_slug($where['sql']); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $value = array_get($where, 'value'); |
@@ -123,6 +123,6 @@ discard block |
||
123 | 123 | return ''; |
124 | 124 | } |
125 | 125 | |
126 | - return '-' . implode('-', $eagerLoads->keys()->toArray()); |
|
126 | + return '-'.implode('-', $eagerLoads->keys()->toArray()); |
|
127 | 127 | } |
128 | 128 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | public function avg($column) |
15 | 15 | { |
16 | 16 | return $this->cache($this->makeCacheTags()) |
17 | - ->rememberForever($this->makeCacheKey() . "-avg_{$column}", function () use ($column) { |
|
17 | + ->rememberForever($this->makeCacheKey()."-avg_{$column}", function() use ($column) { |
|
18 | 18 | return parent::avg($column); |
19 | 19 | }); |
20 | 20 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function count($columns = ['*']) |
23 | 23 | { |
24 | 24 | return $this->cache($this->makeCacheTags()) |
25 | - ->rememberForever($this->makeCacheKey() . "-count", function () use ($columns) { |
|
25 | + ->rememberForever($this->makeCacheKey()."-count", function() use ($columns) { |
|
26 | 26 | return parent::count($columns); |
27 | 27 | }); |
28 | 28 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | public function cursor() |
31 | 31 | { |
32 | 32 | return $this->cache($this->makeCacheTags()) |
33 | - ->rememberForever($this->makeCacheKey() . "-cursor", function () { |
|
33 | + ->rememberForever($this->makeCacheKey()."-cursor", function() { |
|
34 | 34 | return collect(parent::cursor()); |
35 | 35 | }); |
36 | 36 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | public function find($id, $columns = ['*']) |
42 | 42 | { |
43 | 43 | return $this->cache($this->makeCacheTags()) |
44 | - ->rememberForever($this->makeCacheKey($columns, $id), function () use ($id, $columns) { |
|
44 | + ->rememberForever($this->makeCacheKey($columns, $id), function() use ($id, $columns) { |
|
45 | 45 | return parent::find($id, $columns); |
46 | 46 | }); |
47 | 47 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function first($columns = ['*']) |
50 | 50 | { |
51 | 51 | return $this->cache($this->makeCacheTags()) |
52 | - ->rememberForever($this->makeCacheKey($columns) . '-first', function () use ($columns) { |
|
52 | + ->rememberForever($this->makeCacheKey($columns).'-first', function() use ($columns) { |
|
53 | 53 | return parent::first($columns); |
54 | 54 | }); |
55 | 55 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | public function get($columns = ['*']) |
58 | 58 | { |
59 | 59 | return $this->cache($this->makeCacheTags()) |
60 | - ->rememberForever($this->makeCacheKey($columns), function () use ($columns) { |
|
60 | + ->rememberForever($this->makeCacheKey($columns), function() use ($columns) { |
|
61 | 61 | return parent::get($columns); |
62 | 62 | }); |
63 | 63 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function max($column) |
66 | 66 | { |
67 | 67 | return $this->cache($this->makeCacheTags()) |
68 | - ->rememberForever($this->makeCacheKey() . "-max_{$column}", function () use ($column) { |
|
68 | + ->rememberForever($this->makeCacheKey()."-max_{$column}", function() use ($column) { |
|
69 | 69 | return parent::max($column); |
70 | 70 | }); |
71 | 71 | } |
@@ -73,21 +73,21 @@ discard block |
||
73 | 73 | public function min($column) |
74 | 74 | { |
75 | 75 | return $this->cache($this->makeCacheTags()) |
76 | - ->rememberForever($this->makeCacheKey() . "-min_{$column}", function () use ($column) { |
|
76 | + ->rememberForever($this->makeCacheKey()."-min_{$column}", function() use ($column) { |
|
77 | 77 | return parent::min($column); |
78 | 78 | }); |
79 | 79 | } |
80 | 80 | |
81 | 81 | public function pluck($column, $key = null) |
82 | 82 | { |
83 | - $cacheKey = $this->makeCacheKey([$column]) . "-pluck_{$column}"; |
|
83 | + $cacheKey = $this->makeCacheKey([$column])."-pluck_{$column}"; |
|
84 | 84 | |
85 | 85 | if ($key) { |
86 | 86 | $cacheKey .= "_{$key}"; |
87 | 87 | } |
88 | 88 | |
89 | 89 | return $this->cache($this->makeCacheTags()) |
90 | - ->rememberForever($cacheKey, function () use ($column, $key) { |
|
90 | + ->rememberForever($cacheKey, function() use ($column, $key) { |
|
91 | 91 | return parent::pluck($column, $key); |
92 | 92 | }); |
93 | 93 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public function sum($column) |
96 | 96 | { |
97 | 97 | return $this->cache($this->makeCacheTags()) |
98 | - ->rememberForever($this->makeCacheKey() . "-sum_{$column}", function () use ($column) { |
|
98 | + ->rememberForever($this->makeCacheKey()."-sum_{$column}", function() use ($column) { |
|
99 | 99 | return parent::sum($column); |
100 | 100 | }); |
101 | 101 | } |