@@ -169,7 +169,7 @@ |
||
169 | 169 | /** |
170 | 170 | * Sets up and returns all the objects we'll use |
171 | 171 | * |
172 | - * @return \JaegerApp\Language|\Pimple\Container |
|
172 | + * @return Container |
|
173 | 173 | */ |
174 | 174 | public function getServices() |
175 | 175 | { |
@@ -11,7 +11,6 @@ |
||
11 | 11 | namespace JaegerApp; |
12 | 12 | |
13 | 13 | use Pimple\Container; |
14 | -use JaegerApp\Exceptions\BootstrapException; |
|
15 | 14 | use JaegerApp\Encrypt; |
16 | 15 | use JaegerApp\Db; |
17 | 16 | use JaegerApp\Language; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | */ |
162 | 162 | public function getService($service) |
163 | 163 | { |
164 | - if(isset($this->container[$service])) { |
|
164 | + if (isset($this->container[$service])) { |
|
165 | 165 | return $this->container[$service]; |
166 | 166 | } |
167 | 167 | } |
@@ -173,11 +173,11 @@ discard block |
||
173 | 173 | */ |
174 | 174 | public function getServices() |
175 | 175 | { |
176 | - $this->container['db'] = function ($c) { |
|
176 | + $this->container['db'] = function($c) { |
|
177 | 177 | $db = new Db(); |
178 | 178 | $db->setCredentials($this->getDbConfig()); |
179 | 179 | $type = 'pdo'; |
180 | - if( function_exists('mysqli_select_db')) |
|
180 | + if (function_exists('mysqli_select_db')) |
|
181 | 181 | { |
182 | 182 | $type = 'mysqli'; |
183 | 183 | } |
@@ -186,14 +186,14 @@ discard block |
||
186 | 186 | return $db; |
187 | 187 | }; |
188 | 188 | |
189 | - $this->container['encrypt'] = function ($c) { |
|
189 | + $this->container['encrypt'] = function($c) { |
|
190 | 190 | $encrypt = new Encrypt(); |
191 | 191 | $new_key = $c['platform']->getEncryptionKey(); |
192 | 192 | $encrypt->setKey($new_key); |
193 | 193 | return $encrypt; |
194 | 194 | }; |
195 | 195 | |
196 | - $this->container['lang'] = function ($c) { |
|
196 | + $this->container['lang'] = function($c) { |
|
197 | 197 | $lang = new Language(); |
198 | 198 | if (is_array($this->getLangPath())) { |
199 | 199 | foreach ($this->getLangPath() as $path) { |
@@ -205,29 +205,29 @@ discard block |
||
205 | 205 | return $lang; |
206 | 206 | }; |
207 | 207 | |
208 | - $this->container['validate'] = function ($c) { |
|
208 | + $this->container['validate'] = function($c) { |
|
209 | 209 | $validate = new Validate(); |
210 | 210 | $validate->setRegex($this->container['regex']); |
211 | 211 | return $validate; |
212 | 212 | }; |
213 | 213 | |
214 | - $this->container['files'] = function ($c) { |
|
214 | + $this->container['files'] = function($c) { |
|
215 | 215 | $file = new Files(); |
216 | 216 | return $file; |
217 | 217 | }; |
218 | 218 | |
219 | - $this->container['errors'] = function ($c) { |
|
219 | + $this->container['errors'] = function($c) { |
|
220 | 220 | $errors = new Errors(); |
221 | 221 | $errors->setValidation($c['validate']); |
222 | 222 | return $errors; |
223 | 223 | }; |
224 | 224 | |
225 | - $this->container['license'] = function ($c) { |
|
225 | + $this->container['license'] = function($c) { |
|
226 | 226 | $license = new License(); |
227 | 227 | return $license; |
228 | 228 | }; |
229 | 229 | |
230 | - $this->container['email'] = function ($c) { |
|
230 | + $this->container['email'] = function($c) { |
|
231 | 231 | |
232 | 232 | $email = new Email(); |
233 | 233 | $email->setView($c['view']); |
@@ -235,25 +235,25 @@ discard block |
||
235 | 235 | return $email; |
236 | 236 | }; |
237 | 237 | |
238 | - $this->container['view'] = function ($c) { |
|
238 | + $this->container['view'] = function($c) { |
|
239 | 239 | $view = new View(); |
240 | 240 | $helpers = array( |
241 | - 'file_size' => function ($text) { |
|
241 | + 'file_size' => function($text) { |
|
242 | 242 | return $this->container['view_helpers']->m62FileSize($text, false); |
243 | 243 | }, |
244 | - 'lang' => function ($text) { |
|
244 | + 'lang' => function($text) { |
|
245 | 245 | return $this->container['view_helpers']->m62Lang($text); |
246 | 246 | }, |
247 | - 'date_time' => function ($text, $html = true) { |
|
247 | + 'date_time' => function($text, $html = true) { |
|
248 | 248 | return $this->container['view_helpers']->m62DateTime($text, false); |
249 | 249 | }, |
250 | - 'relative_time' => function ($date) { |
|
250 | + 'relative_time' => function($date) { |
|
251 | 251 | return $this->container['view_helpers']->m62RelativeDateTime($date); |
252 | 252 | }, |
253 | - 'encode' => function ($text) { |
|
253 | + 'encode' => function($text) { |
|
254 | 254 | return $this->container['view_helpers']->m62Encode($text); |
255 | 255 | }, |
256 | - 'decode' => function ($text) { |
|
256 | + 'decode' => function($text) { |
|
257 | 257 | return $this->container['view_helpers']->m62Decode($text); |
258 | 258 | } |
259 | 259 | ); |
@@ -262,17 +262,17 @@ discard block |
||
262 | 262 | return $view; |
263 | 263 | }; |
264 | 264 | |
265 | - $this->container['regex'] = function ($c) { |
|
265 | + $this->container['regex'] = function($c) { |
|
266 | 266 | $regex = new Regex(); |
267 | 267 | return $regex; |
268 | 268 | }; |
269 | 269 | |
270 | - $this->container['shell'] = function ($c) { |
|
270 | + $this->container['shell'] = function($c) { |
|
271 | 271 | $shell = new Shell(); |
272 | 272 | return $shell; |
273 | 273 | }; |
274 | 274 | |
275 | - $this->container['console'] = function ($c) { |
|
275 | + $this->container['console'] = function($c) { |
|
276 | 276 | $console = new Console(); |
277 | 277 | $console->setLang($c['lang']); |
278 | 278 | return $console; |