@@ -133,12 +133,10 @@ discard block |
||
133 | 133 | if ($pos === null) |
134 | 134 | { |
135 | 135 | $this->paths[] = $this->prepPath($path); |
136 | - } |
|
137 | - elseif ($pos === -1) |
|
136 | + } elseif ($pos === -1) |
|
138 | 137 | { |
139 | 138 | array_unshift($this->paths, $this->prepPath($path)); |
140 | - } |
|
141 | - else |
|
139 | + } else |
|
142 | 140 | { |
143 | 141 | if ($pos > count($this->paths)) |
144 | 142 | { |
@@ -170,12 +168,10 @@ discard block |
||
170 | 168 | if (is_null($extension)) |
171 | 169 | { |
172 | 170 | $extension = '.php'; |
173 | - } |
|
174 | - elseif (isset($extension)) |
|
171 | + } elseif (isset($extension)) |
|
175 | 172 | { |
176 | 173 | $extension = ".{$extension}"; |
177 | - } |
|
178 | - else |
|
174 | + } else |
|
179 | 175 | { |
180 | 176 | $extension = ''; |
181 | 177 | } |
@@ -183,8 +179,7 @@ discard block |
||
183 | 179 | if ( ! empty($file) || ! is_null($file)) |
184 | 180 | { |
185 | 181 | $file = str_replace(['::', '.'], DIRECTORY_SEPARATOR, $file); |
186 | - } |
|
187 | - else |
|
182 | + } else |
|
188 | 183 | { |
189 | 184 | $file = $file ?: 'empty'; |
190 | 185 |
@@ -173,53 +173,53 @@ |
||
173 | 173 | } |
174 | 174 | |
175 | 175 | /** |
176 | - * Magic method. Searches for the given variable and returns its value. |
|
177 | - * |
|
178 | - * @param string $key Variable name |
|
179 | - * |
|
180 | - * @return mixed |
|
181 | - */ |
|
182 | - public function __get($key) |
|
183 | - { |
|
184 | - return $this->get($key); |
|
185 | - } |
|
186 | - |
|
187 | - /** |
|
188 | - * Magic method. Calls [$this->set] with the same parameters. |
|
189 | - * |
|
190 | - * @param string $key Variable name |
|
191 | - * @param mixed $value Value |
|
192 | - * |
|
193 | - * @return void |
|
194 | - */ |
|
195 | - public function __set($key, $value) |
|
196 | - { |
|
197 | - $this->offsetSet($key, $value); |
|
198 | - } |
|
199 | - |
|
200 | - /** |
|
201 | - * Magic method. Determines if a variable is set. |
|
202 | - * |
|
203 | - * @param string $key variable name |
|
204 | - * |
|
205 | - * @return boolean |
|
206 | - */ |
|
207 | - public function __isset($key) |
|
208 | - { |
|
209 | - return $this->offsetExists($key); |
|
210 | - } |
|
211 | - |
|
212 | - /** |
|
213 | - * Magic method. Unsets a given variable. |
|
214 | - * |
|
215 | - * @param string $key Variable name |
|
216 | - * |
|
217 | - * @return void |
|
218 | - */ |
|
219 | - public function __unset($key) |
|
220 | - { |
|
221 | - $this->offsetUnset($$key); |
|
222 | - } |
|
176 | + * Magic method. Searches for the given variable and returns its value. |
|
177 | + * |
|
178 | + * @param string $key Variable name |
|
179 | + * |
|
180 | + * @return mixed |
|
181 | + */ |
|
182 | + public function __get($key) |
|
183 | + { |
|
184 | + return $this->get($key); |
|
185 | + } |
|
186 | + |
|
187 | + /** |
|
188 | + * Magic method. Calls [$this->set] with the same parameters. |
|
189 | + * |
|
190 | + * @param string $key Variable name |
|
191 | + * @param mixed $value Value |
|
192 | + * |
|
193 | + * @return void |
|
194 | + */ |
|
195 | + public function __set($key, $value) |
|
196 | + { |
|
197 | + $this->offsetSet($key, $value); |
|
198 | + } |
|
199 | + |
|
200 | + /** |
|
201 | + * Magic method. Determines if a variable is set. |
|
202 | + * |
|
203 | + * @param string $key variable name |
|
204 | + * |
|
205 | + * @return boolean |
|
206 | + */ |
|
207 | + public function __isset($key) |
|
208 | + { |
|
209 | + return $this->offsetExists($key); |
|
210 | + } |
|
211 | + |
|
212 | + /** |
|
213 | + * Magic method. Unsets a given variable. |
|
214 | + * |
|
215 | + * @param string $key Variable name |
|
216 | + * |
|
217 | + * @return void |
|
218 | + */ |
|
219 | + public function __unset($key) |
|
220 | + { |
|
221 | + $this->offsetUnset($$key); |
|
222 | + } |
|
223 | 223 | |
224 | 224 | /** |
225 | 225 | * Handle dynamic calls to the container to set attributes. |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | if (isset($config->psr4)) |
81 | 81 | { |
82 | - $this->addNamespace($config->addPsr4((array) $this->classOrNamespaceListMap[0])); |
|
82 | + $this->addNamespace($config->addPsr4((array) $this->classOrNamespaceListMap[0])); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | if (isset($config->classmap)) |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | include_once $config[$class]; |
352 | 352 | |
353 | 353 | }, true, // Throw exception |
354 | - true // Prepend |
|
354 | + true // Prepend |
|
355 | 355 | ); |
356 | 356 | |
357 | 357 | // Autoloading for the files helpers, hooks or functions |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | } |
366 | 366 | |
367 | 367 | }, true, |
368 | - true |
|
368 | + true |
|
369 | 369 | ); |
370 | 370 | } |
371 | 371 |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | // Now prepend another loader for the files in our class map |
342 | 342 | $config = is_array($this->classmap) ? $this->classmap : []; |
343 | 343 | |
344 | - spl_autoload_register(function ($class) use ($config) { |
|
344 | + spl_autoload_register(function($class) use ($config) { |
|
345 | 345 | |
346 | 346 | if (empty($config[$class])) |
347 | 347 | { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | // Autoloading for the files helpers, hooks or functions |
358 | 358 | $files = is_array($this->includeFiles) ? $this->includeFiles : []; |
359 | 359 | |
360 | - spl_autoload_register(function () use ($files) { |
|
360 | + spl_autoload_register(function() use ($files) { |
|
361 | 361 | |
362 | 362 | foreach ($files as $fileIdentifier => $file) |
363 | 363 | { |
@@ -130,8 +130,7 @@ |
||
130 | 130 | |
131 | 131 | $this->prefixes[$prefix][] = rtrim($path, '/').'/'; |
132 | 132 | } |
133 | - } |
|
134 | - else |
|
133 | + } else |
|
135 | 134 | { |
136 | 135 | $this->prefixes[trim($namespace, '\\')][] = rtrim($path, '/').'/'; |
137 | 136 | } |
@@ -257,9 +257,9 @@ discard block |
||
257 | 257 | { |
258 | 258 | if ( ! empty($this->buildStack)) |
259 | 259 | { |
260 | - $reset = implode(', ', $this->buildStack); |
|
260 | + $reset = implode(', ', $this->buildStack); |
|
261 | 261 | |
262 | - $message = "Target [ {$class} ] is not instantiable while building [ {$reset} ]."; |
|
262 | + $message = "Target [ {$class} ] is not instantiable while building [ {$reset} ]."; |
|
263 | 263 | } |
264 | 264 | else |
265 | 265 | { |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | |
718 | 718 | array_pop($this->across); |
719 | 719 | |
720 | - return $this->resolveObject($id, $object); |
|
720 | + return $this->resolveObject($id, $object); |
|
721 | 721 | } |
722 | 722 | |
723 | 723 | /** |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | */ |
190 | 190 | protected function getClosure($id, string $value) |
191 | 191 | { |
192 | - return function ($container, $parameters = []) use ($id, $value) |
|
192 | + return function($container, $parameters = []) use ($id, $value) |
|
193 | 193 | { |
194 | 194 | if ($id == $value) |
195 | 195 | { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | */ |
449 | 449 | public function factory($id) |
450 | 450 | { |
451 | - return function () use ($id) { |
|
451 | + return function() use ($id) { |
|
452 | 452 | return $this->make($id); |
453 | 453 | }; |
454 | 454 | } |
@@ -855,7 +855,7 @@ discard block |
||
855 | 855 | */ |
856 | 856 | public function bound($id) |
857 | 857 | { |
858 | - return isset($this->bindings[$id]) || |
|
858 | + return isset($this->bindings[$id]) || |
|
859 | 859 | isset($this->instances[$id]) || |
860 | 860 | $this->isAlias($id); |
861 | 861 | } |
@@ -260,8 +260,7 @@ discard block |
||
260 | 260 | $reset = implode(', ', $this->buildStack); |
261 | 261 | |
262 | 262 | $message = "Target [ {$class} ] is not instantiable while building [ {$reset} ]."; |
263 | - } |
|
264 | - else |
|
263 | + } else |
|
265 | 264 | { |
266 | 265 | $message = "Target [ {$class} ] is not instantiable."; |
267 | 266 | } |
@@ -345,8 +344,7 @@ discard block |
||
345 | 344 | try |
346 | 345 | { |
347 | 346 | return $this->make($parameter->getClass()->name); |
348 | - } |
|
349 | - catch (BindingResolutionException $e) |
|
347 | + } catch (BindingResolutionException $e) |
|
350 | 348 | { |
351 | 349 | if ($parameter->isOptional()) |
352 | 350 | { |
@@ -400,8 +398,7 @@ discard block |
||
400 | 398 | $this->instances[$id] = $closure($this->instances[$id], $this); |
401 | 399 | |
402 | 400 | $this->reHas($id); |
403 | - } |
|
404 | - else |
|
401 | + } else |
|
405 | 402 | { |
406 | 403 | $this->services[$id][] = $closure; |
407 | 404 | |
@@ -702,8 +699,7 @@ discard block |
||
702 | 699 | if ($this->isBuildable($value, $id)) |
703 | 700 | { |
704 | 701 | $object = $this->build($value); |
705 | - } |
|
706 | - else |
|
702 | + } else |
|
707 | 703 | { |
708 | 704 | $object = $this->make($value); |
709 | 705 | } |
@@ -822,8 +818,7 @@ discard block |
||
822 | 818 | try |
823 | 819 | { |
824 | 820 | return $this->resolve($id); |
825 | - } |
|
826 | - catch (Exception $e) |
|
821 | + } catch (Exception $e) |
|
827 | 822 | { |
828 | 823 | if ( ! $this->has($id)) |
829 | 824 | { |
@@ -39,13 +39,13 @@ |
||
39 | 39 | */ |
40 | 40 | public function register() |
41 | 41 | { |
42 | - $this->app->singleton('redis', function ($app) { |
|
42 | + $this->app->singleton('redis', function($app) { |
|
43 | 43 | $config = $app['config']->get('database.redis', []); |
44 | 44 | |
45 | 45 | return new RedisManager($config); |
46 | 46 | }); |
47 | 47 | |
48 | - $this->app->bind('redis.connection', function ($app) { |
|
48 | + $this->app->bind('redis.connection', function($app) { |
|
49 | 49 | return $app['redis']->connection(); |
50 | 50 | }); |
51 | 51 | } |
@@ -51,8 +51,7 @@ |
||
51 | 51 | if (isset($servers['cluster']) && $servers['cluster']) |
52 | 52 | { |
53 | 53 | $this->clients = $this->createAggregateClient($servers); |
54 | - } |
|
55 | - else |
|
54 | + } else |
|
56 | 55 | { |
57 | 56 | $this->clients = $this->createSingleClient($servers); |
58 | 57 | } |
@@ -88,6 +88,6 @@ |
||
88 | 88 | public static function longVersion() |
89 | 89 | { |
90 | 90 | return self::COPY.' '.self::YEAR.' '.self::COPYRIGHT.' - '.self::PRODUCT.' ' .self::RELEASE. ' '. |
91 | - self::STATUS.' [ '.self::CODENAME.' ] '.self::RELEASEDATE; |
|
91 | + self::STATUS.' [ '.self::CODENAME.' ] '.self::RELEASEDATE; |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | \ No newline at end of file |
@@ -87,7 +87,7 @@ |
||
87 | 87 | */ |
88 | 88 | public static function longVersion() |
89 | 89 | { |
90 | - return self::COPY.' '.self::YEAR.' '.self::COPYRIGHT.' - '.self::PRODUCT.' ' .self::RELEASE. ' '. |
|
90 | + return self::COPY.' '.self::YEAR.' '.self::COPYRIGHT.' - '.self::PRODUCT.' '.self::RELEASE.' '. |
|
91 | 91 | self::STATUS.' [ '.self::CODENAME.' ] '.self::RELEASEDATE; |
92 | 92 | } |
93 | 93 | } |
94 | 94 | \ No newline at end of file |
@@ -22,11 +22,21 @@ |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | // Define the absolute paths for configured directories |
25 | -if ( ! defined('APP_PATH')) define('APP_PATH', realpath($paths['path.app']).DIRECTORY_SEPARATOR); |
|
26 | -if ( ! defined('BST_PATH')) define('BST_PATH', realpath($paths['path.bootstrap']).DIRECTORY_SEPARATOR); |
|
27 | -if ( ! defined('CON_PATH')) define('CON_PATH', realpath($paths['path.config']).DIRECTORY_SEPARATOR); |
|
28 | -if ( ! defined('RES_PATH')) define('RES_PATH', realpath($paths['path.resources']).DIRECTORY_SEPARATOR); |
|
29 | -if ( ! defined('SYS_PATH')) define('SYS_PATH', realpath($paths['path.sys']).DIRECTORY_SEPARATOR); |
|
25 | +if ( ! defined('APP_PATH')) { |
|
26 | + define('APP_PATH', realpath($paths['path.app']).DIRECTORY_SEPARATOR); |
|
27 | +} |
|
28 | +if ( ! defined('BST_PATH')) { |
|
29 | + define('BST_PATH', realpath($paths['path.bootstrap']).DIRECTORY_SEPARATOR); |
|
30 | +} |
|
31 | +if ( ! defined('CON_PATH')) { |
|
32 | + define('CON_PATH', realpath($paths['path.config']).DIRECTORY_SEPARATOR); |
|
33 | +} |
|
34 | +if ( ! defined('RES_PATH')) { |
|
35 | + define('RES_PATH', realpath($paths['path.resources']).DIRECTORY_SEPARATOR); |
|
36 | +} |
|
37 | +if ( ! defined('SYS_PATH')) { |
|
38 | + define('SYS_PATH', realpath($paths['path.sys']).DIRECTORY_SEPARATOR); |
|
39 | +} |
|
30 | 40 | |
31 | 41 | // Call the file constants |
32 | 42 | require CON_PATH.'constants.php'; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function processColumnListing($results) |
43 | 43 | { |
44 | - return array_map(function ($result) { |
|
44 | + return array_map(function($result) { |
|
45 | 45 | return ((object) $result)->column_name; |
46 | 46 | }, $results); |
47 | 47 | } |