@@ -23,8 +23,9 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public static function cache(): ModelCacheOOP |
| 25 | 25 | { |
| 26 | - if (!isset(static::$caching)) |
|
| 27 | - static::$caching = new ModelCacheOOP(static::class, get_class_property(static::class, 'secondaryCacheIndexes'), get_class_property(static::class, 'cacheTime')); |
|
| 26 | + if (!isset(static::$caching)) { |
|
| 27 | + static::$caching = new ModelCacheOOP(static::class, get_class_property(static::class, 'secondaryCacheIndexes'), get_class_property(static::class, 'cacheTime')); |
|
| 28 | + } |
|
| 28 | 29 | return static::$caching; |
| 29 | 30 | } |
| 30 | 31 | |
@@ -57,8 +58,9 @@ discard block |
||
| 57 | 58 | |
| 58 | 59 | private static function filterFromColumns($model, $columns) |
| 59 | 60 | { |
| 60 | - if ($model === null) |
|
| 61 | - return null; |
|
| 61 | + if ($model === null) { |
|
| 62 | + return null; |
|
| 63 | + } |
|
| 62 | 64 | |
| 63 | 65 | if ($columns !== ['*']) { |
| 64 | 66 | return collect($model)->first($columns); |
@@ -41,8 +41,9 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $model = Cache::get(self::getCacheName($id)); |
| 43 | 43 | |
| 44 | - if ($eagerLoad) |
|
| 45 | - return $this->eagerLoadRelations($model); |
|
| 44 | + if ($eagerLoad) { |
|
| 45 | + return $this->eagerLoadRelations($model); |
|
| 46 | + } |
|
| 46 | 47 | |
| 47 | 48 | return $model; |
| 48 | 49 | } |
@@ -54,15 +55,17 @@ discard block |
||
| 54 | 55 | } |
| 55 | 56 | $modelId = $this->findSecondaryIndex($index, $key); |
| 56 | 57 | |
| 57 | - if ($modelId === null) |
|
| 58 | - return ($this->model)::where($index, $key)->first(); |
|
| 58 | + if ($modelId === null) { |
|
| 59 | + return ($this->model)::where($index, $key)->first(); |
|
| 60 | + } |
|
| 59 | 61 | return $this->find($modelId, $eagerLoad); |
| 60 | 62 | } |
| 61 | 63 | |
| 62 | 64 | protected function eagerLoadRelations($model) |
| 63 | 65 | { |
| 64 | - if ($model !== null) |
|
| 65 | - return $model::eagerLoadRelations(array($model))[0]; |
|
| 66 | + if ($model !== null) { |
|
| 67 | + return $model::eagerLoadRelations(array($model))[0]; |
|
| 68 | + } |
|
| 66 | 69 | return null; |
| 67 | 70 | } |
| 68 | 71 | |
@@ -104,8 +107,9 @@ discard block |
||
| 104 | 107 | { |
| 105 | 108 | foreach ($this->secondaryIndexes as $index) { |
| 106 | 109 | $indexValue = $model->$index; |
| 107 | - if ($indexValue !== null) |
|
| 108 | - Cache::put($this->getCacheName($indexValue, $index), $model->getKey(), $this->getCacheTime()); |
|
| 110 | + if ($indexValue !== null) { |
|
| 111 | + Cache::put($this->getCacheName($indexValue, $index), $model->getKey(), $this->getCacheTime()); |
|
| 112 | + } |
|
| 109 | 113 | } |
| 110 | 114 | } |
| 111 | 115 | |