@@ -239,7 +239,7 @@ |
||
239 | 239 | /** |
240 | 240 | * Get a specific data from composer.json file by given the key. |
241 | 241 | * |
242 | - * @param $key |
|
242 | + * @param string $key |
|
243 | 243 | * @param null $default |
244 | 244 | * |
245 | 245 | * @return mixed |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | */ |
51 | 51 | protected function getCached() |
52 | 52 | { |
53 | - if(!$this->config->get('modules.cache.enabled')) return $this->readJson(); |
|
53 | + if (!$this->config->get('modules.cache.enabled')) return $this->readJson(); |
|
54 | 54 | |
55 | - return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () { |
|
55 | + return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function() { |
|
56 | 56 | return $this->readJson(); |
57 | 57 | }); |
58 | 58 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | protected function config(string $key, $default = null) |
76 | 76 | { |
77 | - return $this->config->get('modules.activators.file.' . $key, $default); |
|
77 | + return $this->config->get('modules.activators.file.'.$key, $default); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | protected function readJson() |
86 | 86 | { |
87 | - if(!$this->files->exists($this->fileInstalled)) return []; |
|
87 | + if (!$this->files->exists($this->fileInstalled)) return []; |
|
88 | 88 | return json_decode($this->files->get($this->fileInstalled), true); |
89 | 89 | } |
90 | 90 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function isStatus(Module $module, $status) |
119 | 119 | { |
120 | - if(!isset($this->installed[$module->getName()])) return false; |
|
120 | + if (!isset($this->installed[$module->getName()])) return false; |
|
121 | 121 | return $this->installed[$module->getName()] == $status; |
122 | 122 | } |
123 | 123 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function setActiveByName(string $name, $status) |
136 | 136 | { |
137 | - $this->installed[$name] = (int)$status; |
|
137 | + $this->installed[$name] = (int) $status; |
|
138 | 138 | $this->writeJson(); |
139 | 139 | $this->forgetCache(); |
140 | 140 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function delete(Module $module) |
146 | 146 | { |
147 | - if(!isset($this->installed[$module->getName()])) return; |
|
147 | + if (!isset($this->installed[$module->getName()])) return; |
|
148 | 148 | unset($this->installed[$module->getName()]); |
149 | 149 | $this->writeJson(); |
150 | 150 | $this->forgetCache(); |
@@ -50,7 +50,9 @@ discard block |
||
50 | 50 | */ |
51 | 51 | protected function getCached() |
52 | 52 | { |
53 | - if(!$this->config->get('modules.cache.enabled')) return $this->readJson(); |
|
53 | + if(!$this->config->get('modules.cache.enabled')) { |
|
54 | + return $this->readJson(); |
|
55 | + } |
|
54 | 56 | |
55 | 57 | return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () { |
56 | 58 | return $this->readJson(); |
@@ -84,7 +86,9 @@ discard block |
||
84 | 86 | */ |
85 | 87 | protected function readJson() |
86 | 88 | { |
87 | - if(!$this->files->exists($this->fileInstalled)) return []; |
|
89 | + if(!$this->files->exists($this->fileInstalled)) { |
|
90 | + return []; |
|
91 | + } |
|
88 | 92 | return json_decode($this->files->get($this->fileInstalled), true); |
89 | 93 | } |
90 | 94 | |
@@ -117,7 +121,9 @@ discard block |
||
117 | 121 | */ |
118 | 122 | public function isStatus(Module $module, $status) |
119 | 123 | { |
120 | - if(!isset($this->installed[$module->getName()])) return false; |
|
124 | + if(!isset($this->installed[$module->getName()])) { |
|
125 | + return false; |
|
126 | + } |
|
121 | 127 | return $this->installed[$module->getName()] == $status; |
122 | 128 | } |
123 | 129 | |
@@ -144,7 +150,9 @@ discard block |
||
144 | 150 | */ |
145 | 151 | public function delete(Module $module) |
146 | 152 | { |
147 | - if(!isset($this->installed[$module->getName()])) return; |
|
153 | + if(!isset($this->installed[$module->getName()])) { |
|
154 | + return; |
|
155 | + } |
|
148 | 156 | unset($this->installed[$module->getName()]); |
149 | 157 | $this->writeJson(); |
150 | 158 | $this->forgetCache(); |
@@ -11,120 +11,120 @@ discard block |
||
11 | 11 | |
12 | 12 | class FileActivator implements ActivatorInterface |
13 | 13 | { |
14 | - /** |
|
15 | - * Laravel cache instance |
|
16 | - * |
|
17 | - * @var CacheManager |
|
18 | - */ |
|
19 | - protected $cache; |
|
20 | - |
|
21 | - /** |
|
22 | - * Laravel Filesystem instance |
|
23 | - * |
|
24 | - * @var Filesystem |
|
25 | - */ |
|
26 | - protected $files; |
|
27 | - |
|
28 | - /** |
|
29 | - * Laravel config instance |
|
30 | - * @var Config |
|
31 | - */ |
|
32 | - protected $config; |
|
33 | - |
|
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
37 | - protected $cacheKey; |
|
38 | - |
|
39 | - /** |
|
40 | - * @var string |
|
41 | - */ |
|
42 | - protected $cacheLifetime; |
|
43 | - |
|
44 | - /** |
|
45 | - * Array of modules activation statuses |
|
46 | - * |
|
47 | - * @var array |
|
48 | - */ |
|
49 | - protected $installed; |
|
50 | - |
|
51 | - /** |
|
52 | - * File used to store activation statuses |
|
53 | - * |
|
54 | - * @var string |
|
55 | - */ |
|
56 | - protected $fileInstalled; |
|
57 | - |
|
58 | - public function __construct(Container $app) |
|
59 | - { |
|
60 | - $this->cache = $app['cache']; |
|
61 | - $this->files = $app['files']; |
|
62 | - $this->config = $app['config']; |
|
63 | - $this->fileInstalled = $this->config('file'); |
|
64 | - $this->cacheKey = $this->config('cache-key'); |
|
65 | - $this->cacheLifetime = $this->config('cache-lifetime'); |
|
66 | - $this->installed = $this->getCached(); |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * Get installed cache |
|
71 | - * |
|
72 | - * @return array |
|
73 | - */ |
|
74 | - protected function getCached() |
|
75 | - { |
|
76 | - if(!$this->config->get('modules.cache.enabled')) return $this->readJson(); |
|
14 | + /** |
|
15 | + * Laravel cache instance |
|
16 | + * |
|
17 | + * @var CacheManager |
|
18 | + */ |
|
19 | + protected $cache; |
|
20 | + |
|
21 | + /** |
|
22 | + * Laravel Filesystem instance |
|
23 | + * |
|
24 | + * @var Filesystem |
|
25 | + */ |
|
26 | + protected $files; |
|
27 | + |
|
28 | + /** |
|
29 | + * Laravel config instance |
|
30 | + * @var Config |
|
31 | + */ |
|
32 | + protected $config; |
|
33 | + |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | + protected $cacheKey; |
|
38 | + |
|
39 | + /** |
|
40 | + * @var string |
|
41 | + */ |
|
42 | + protected $cacheLifetime; |
|
43 | + |
|
44 | + /** |
|
45 | + * Array of modules activation statuses |
|
46 | + * |
|
47 | + * @var array |
|
48 | + */ |
|
49 | + protected $installed; |
|
50 | + |
|
51 | + /** |
|
52 | + * File used to store activation statuses |
|
53 | + * |
|
54 | + * @var string |
|
55 | + */ |
|
56 | + protected $fileInstalled; |
|
57 | + |
|
58 | + public function __construct(Container $app) |
|
59 | + { |
|
60 | + $this->cache = $app['cache']; |
|
61 | + $this->files = $app['files']; |
|
62 | + $this->config = $app['config']; |
|
63 | + $this->fileInstalled = $this->config('file'); |
|
64 | + $this->cacheKey = $this->config('cache-key'); |
|
65 | + $this->cacheLifetime = $this->config('cache-lifetime'); |
|
66 | + $this->installed = $this->getCached(); |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * Get installed cache |
|
71 | + * |
|
72 | + * @return array |
|
73 | + */ |
|
74 | + protected function getCached() |
|
75 | + { |
|
76 | + if(!$this->config->get('modules.cache.enabled')) return $this->readJson(); |
|
77 | 77 | |
78 | - return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () { |
|
78 | + return $this->cache->remember($this->cacheKey, $this->cacheLifetime, function () { |
|
79 | 79 | return $this->readJson(); |
80 | 80 | }); |
81 | - } |
|
82 | - |
|
83 | - /** |
|
84 | - * Forgets the installed cache |
|
85 | - */ |
|
86 | - protected function forgetCache() |
|
87 | - { |
|
88 | - $this->cache->forget($this->cacheKey); |
|
89 | - } |
|
90 | - |
|
91 | - /** |
|
92 | - * Reads a config parameter |
|
93 | - * |
|
94 | - * @param string $key [description] |
|
95 | - * @param $default |
|
96 | - * @return mixed |
|
97 | - */ |
|
98 | - protected function config(string $key, $default = null) |
|
81 | + } |
|
82 | + |
|
83 | + /** |
|
84 | + * Forgets the installed cache |
|
85 | + */ |
|
86 | + protected function forgetCache() |
|
87 | + { |
|
88 | + $this->cache->forget($this->cacheKey); |
|
89 | + } |
|
90 | + |
|
91 | + /** |
|
92 | + * Reads a config parameter |
|
93 | + * |
|
94 | + * @param string $key [description] |
|
95 | + * @param $default |
|
96 | + * @return mixed |
|
97 | + */ |
|
98 | + protected function config(string $key, $default = null) |
|
99 | 99 | { |
100 | 100 | return $this->config->get('modules.activators.file.' . $key, $default); |
101 | 101 | } |
102 | 102 | |
103 | - /** |
|
104 | - * Reads the installed json file |
|
105 | - * |
|
106 | - * @return array |
|
107 | - */ |
|
108 | - protected function readJson() |
|
109 | - { |
|
110 | - if(!$this->files->exists($this->fileInstalled)) return []; |
|
111 | - return json_decode($this->files->get($this->fileInstalled), true); |
|
112 | - } |
|
113 | - |
|
114 | - /** |
|
115 | - * Writes the installed json file |
|
116 | - */ |
|
117 | - protected function writeJson() |
|
118 | - { |
|
119 | - $this->files->put($this->fileInstalled, json_encode($this->installed, JSON_PRETTY_PRINT)); |
|
120 | - } |
|
121 | - |
|
122 | - /** |
|
103 | + /** |
|
104 | + * Reads the installed json file |
|
105 | + * |
|
106 | + * @return array |
|
107 | + */ |
|
108 | + protected function readJson() |
|
109 | + { |
|
110 | + if(!$this->files->exists($this->fileInstalled)) return []; |
|
111 | + return json_decode($this->files->get($this->fileInstalled), true); |
|
112 | + } |
|
113 | + |
|
114 | + /** |
|
115 | + * Writes the installed json file |
|
116 | + */ |
|
117 | + protected function writeJson() |
|
118 | + { |
|
119 | + $this->files->put($this->fileInstalled, json_encode($this->installed, JSON_PRETTY_PRINT)); |
|
120 | + } |
|
121 | + |
|
122 | + /** |
|
123 | 123 | * @inheritDoc |
124 | 124 | */ |
125 | 125 | public function enable(Module $module) |
126 | 126 | { |
127 | - $this->setActiveByName($module->getName(), 1); |
|
127 | + $this->setActiveByName($module->getName(), 1); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function disable(Module $module) |
134 | 134 | { |
135 | - $this->setActiveByName($module->getName(), 0); |
|
135 | + $this->setActiveByName($module->getName(), 0); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | */ |
141 | 141 | public function isStatus(Module $module, $status) |
142 | 142 | { |
143 | - if(!isset($this->installed[$module->getName()])) return false; |
|
144 | - return $this->installed[$module->getName()] == $status; |
|
143 | + if(!isset($this->installed[$module->getName()])) return false; |
|
144 | + return $this->installed[$module->getName()] == $status; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function setActive(Module $module, $active) |
151 | 151 | { |
152 | - $this->setActiveByName($module->getName(), $active); |
|
152 | + $this->setActiveByName($module->getName(), $active); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -157,9 +157,9 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function setActiveByName(string $name, $status) |
159 | 159 | { |
160 | - $this->installed[$name] = (int)$status; |
|
161 | - $this->writeJson(); |
|
162 | - $this->forgetCache(); |
|
160 | + $this->installed[$name] = (int)$status; |
|
161 | + $this->writeJson(); |
|
162 | + $this->forgetCache(); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
@@ -167,9 +167,9 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function delete(Module $module) |
169 | 169 | { |
170 | - if(!isset($this->installed[$module->getName()])) return; |
|
171 | - unset($this->installed[$module->getName()]); |
|
172 | - $this->writeJson(); |
|
173 | - $this->forgetCache(); |
|
170 | + if(!isset($this->installed[$module->getName()])) return; |
|
171 | + unset($this->installed[$module->getName()]); |
|
172 | + $this->writeJson(); |
|
173 | + $this->forgetCache(); |
|
174 | 174 | } |
175 | 175 | } |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function setupStubPath() |
33 | 33 | { |
34 | - Stub::setBasePath(__DIR__ . '/Commands/stubs'); |
|
34 | + Stub::setBasePath(__DIR__.'/Commands/stubs'); |
|
35 | 35 | |
36 | - $this->app->booted(function ($app) { |
|
36 | + $this->app->booted(function($app) { |
|
37 | 37 | /** @var RepositoryInterface $moduleRepository */ |
38 | 38 | $moduleRepository = $app[RepositoryInterface::class]; |
39 | 39 | if ($moduleRepository->config('stubs.enabled') === true) { |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | */ |
48 | 48 | protected function registerServices() |
49 | 49 | { |
50 | - $this->app->singleton(Contracts\RepositoryInterface::class, function ($app) { |
|
50 | + $this->app->singleton(Contracts\RepositoryInterface::class, function($app) { |
|
51 | 51 | $path = $app['config']->get('modules.paths.modules'); |
52 | 52 | |
53 | 53 | return new Laravel\LaravelFileRepository($app, $path); |
54 | 54 | }); |
55 | - $this->app->singleton(Contracts\ActivatorInterface::class, function ($app) { |
|
55 | + $this->app->singleton(Contracts\ActivatorInterface::class, function($app) { |
|
56 | 56 | $activator = $app['config']->get('modules.activator'); |
57 | - $class = $app['config']->get('modules.activators.' . $activator)['class']; |
|
57 | + $class = $app['config']->get('modules.activators.'.$activator)['class']; |
|
58 | 58 | |
59 | 59 | return new $class($app); |
60 | 60 | }); |