@@ -2,10 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | - |
|
| 7 | -use App\Http\Requests; |
|
| 8 | -use App\User; |
|
| 9 | 5 | use Auth; |
| 10 | 6 | |
| 11 | 7 | class UserController extends Controller |
@@ -29,6 +29,7 @@ discard block |
||
| 29 | 29 | /** |
| 30 | 30 | * Get the content of the .env file. |
| 31 | 31 | * |
| 32 | + * @param Request $request |
|
| 32 | 33 | * @return string |
| 33 | 34 | */ |
| 34 | 35 | public function getEnvContent($request) |
@@ -48,7 +49,6 @@ discard block |
||
| 48 | 49 | /** |
| 49 | 50 | * Save the edited content to the file. |
| 50 | 51 | * |
| 51 | - * @param Request $input |
|
| 52 | 52 | * @return boolean |
| 53 | 53 | */ |
| 54 | 54 | public function saveFile(Request $request) |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | $data = $request->session()->all(); |
| 37 | 37 | |
| 38 | 38 | $env = ''; |
| 39 | - foreach($data as $key => $value) { |
|
| 40 | - if(preg_match('/^[A-Z]+_[A-Z]+$/', $key)) { |
|
| 41 | - $env .= "${key}=${value}" . PHP_EOL; |
|
| 39 | + foreach ($data as $key => $value) { |
|
| 40 | + if (preg_match('/^[A-Z]+_[A-Z]+$/', $key)) { |
|
| 41 | + $env .= "${key}=${value}".PHP_EOL; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | try { |
| 60 | 60 | file_put_contents($this->envPath, $request->get('envConfig')); |
| 61 | - } catch(Exception $e) { |
|
| 61 | + } catch (Exception $e) { |
|
| 62 | 62 | $status = false; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | * |
| 76 | 76 | * @param $folder |
| 77 | 77 | * @param $permission |
| 78 | - * @param $isSet |
|
| 78 | + * @param boolean $isSet |
|
| 79 | 79 | */ |
| 80 | 80 | private function addFileAndSetErrors($folder, $permission, $isSet) |
| 81 | 81 | { |
@@ -29,9 +29,9 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function check(array $folders) |
| 31 | 31 | { |
| 32 | - foreach($folders as $folder => $permission) |
|
| 32 | + foreach ($folders as $folder => $permission) |
|
| 33 | 33 | { |
| 34 | - if(!($this->getPermission($folder) >= $permission)) |
|
| 34 | + if (!($this->getPermission($folder) >= $permission)) |
|
| 35 | 35 | { |
| 36 | 36 | $this->addFileAndSetErrors($folder, $permission, false); |
| 37 | 37 | } |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | if(!($this->getPermission($folder) >= $permission)) |
| 35 | 35 | { |
| 36 | 36 | $this->addFileAndSetErrors($folder, $permission, false); |
| 37 | - } |
|
| 38 | - else { |
|
| 37 | + } else { |
|
| 39 | 38 | $this->addFile($folder, $permission, true); |
| 40 | 39 | } |
| 41 | 40 | } |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Middleware; |
| 4 | 4 | |
| 5 | 5 | use Closure; |
| 6 | -use Illuminate\Support\Facades\Auth; |
|
| 7 | 6 | use App\Http\Middleware\RedirectIfInstalled; |
| 8 | 7 | |
| 9 | 8 | class RedirectIfNotInstalled extends RedirectIfInstalled |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | * |
| 14 | 14 | * @param \Illuminate\Http\Request $request |
| 15 | 15 | * @param \Closure $next |
| 16 | - * @param string|null $guard |
|
| 17 | 16 | * @return mixed |
| 18 | 17 | */ |
| 19 | 18 | public function handle($request, Closure $next) |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function handle($request, Closure $next) |
| 17 | 17 | { |
| 18 | - if($this->alreadyInstalled() || !config('kleis.installer')) { |
|
| 18 | + if ($this->alreadyInstalled() || !config('kleis.installer')) { |
|
| 19 | 19 | return redirect('/'); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | { |
| 16 | 16 | $results = []; |
| 17 | 17 | |
| 18 | - foreach($requirements as $requirement) |
|
| 18 | + foreach ($requirements as $requirement) |
|
| 19 | 19 | { |
| 20 | 20 | $results['requirements'][$requirement] = true; |
| 21 | 21 | |
| 22 | - if(!extension_loaded($requirement)) |
|
| 22 | + if (!extension_loaded($requirement)) |
|
| 23 | 23 | { |
| 24 | 24 | $results['requirements'][$requirement] = false; |
| 25 | 25 | |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | - * check database type. If SQLite, then create the database file. |
|
| 76 | - */ |
|
| 75 | + * check database type. If SQLite, then create the database file. |
|
| 76 | + */ |
|
| 77 | 77 | private function sqlite() |
| 78 | 78 | { |
| 79 | 79 | if(DB::connection() instanceof SQLiteConnection) { |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | private function migrate() |
| 31 | 31 | { |
| 32 | - try{ |
|
| 33 | - Artisan::call('migrate', ["--force"=> true ]); |
|
| 32 | + try { |
|
| 33 | + Artisan::call('migrate', ["--force"=> true]); |
|
| 34 | 34 | } |
| 35 | - catch(Exception $e){ |
|
| 35 | + catch (Exception $e) { |
|
| 36 | 36 | return $this->response($e->getMessage()); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -46,10 +46,10 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | private function seed() |
| 48 | 48 | { |
| 49 | - try{ |
|
| 49 | + try { |
|
| 50 | 50 | Artisan::call('db:seed'); |
| 51 | 51 | } |
| 52 | - catch(Exception $e){ |
|
| 52 | + catch (Exception $e) { |
|
| 53 | 53 | return $this->response($e->getMessage()); |
| 54 | 54 | } |
| 55 | 55 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | private function sqlite() |
| 78 | 78 | { |
| 79 | - if(DB::connection() instanceof SQLiteConnection) { |
|
| 79 | + if (DB::connection() instanceof SQLiteConnection) { |
|
| 80 | 80 | $database = DB::connection()->getDatabaseName(); |
| 81 | - if(!file_exists($database)) { |
|
| 81 | + if (!file_exists($database)) { |
|
| 82 | 82 | touch($database); |
| 83 | 83 | DB::reconnect(Config::get('database.default')); |
| 84 | 84 | } |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | try{ |
| 33 | 33 | Artisan::call('migrate', ["--force"=> true ]); |
| 34 | - } |
|
| 35 | - catch(Exception $e){ |
|
| 34 | + } catch(Exception $e){ |
|
| 36 | 35 | return $this->response($e->getMessage()); |
| 37 | 36 | } |
| 38 | 37 | |
@@ -48,8 +47,7 @@ discard block |
||
| 48 | 47 | { |
| 49 | 48 | try{ |
| 50 | 49 | Artisan::call('db:seed'); |
| 51 | - } |
|
| 52 | - catch(Exception $e){ |
|
| 50 | + } catch(Exception $e){ |
|
| 53 | 51 | return $this->response($e->getMessage()); |
| 54 | 52 | } |
| 55 | 53 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | public function search(&$entities, $type = null, $search = null) |
| 11 | 11 | { |
| 12 | - $reflection = new ReflectionProperty($entities, 'model'); |
|
| 12 | + $reflection = new ReflectionProperty($entities, 'model'); |
|
| 13 | 13 | $reflection->setAccessible(true); |
| 14 | 14 | $classname = $reflection->getValue($entities); |
| 15 | 15 | |
@@ -20,14 +20,14 @@ discard block |
||
| 20 | 20 | $criteria = explode(' ', $search); |
| 21 | 21 | $columns = $classname::SEARCH_CRITERIA[$type]; |
| 22 | 22 | |
| 23 | - $entities = $entities->where( function($q) use ($columns, $criteria) { |
|
| 23 | + $entities = $entities->where(function($q) use ($columns, $criteria) { |
|
| 24 | 24 | foreach ($columns as $column) { |
| 25 | 25 | if (is_array($column)) { |
| 26 | 26 | $relation = $column; |
| 27 | - foreach($relation as $table => $column) { |
|
| 27 | + foreach ($relation as $table => $column) { |
|
| 28 | 28 | $q->whereHas($table, |
| 29 | 29 | function($query) use ($column, $criteria) { |
| 30 | - foreach($criteria as $value) { |
|
| 30 | + foreach ($criteria as $value) { |
|
| 31 | 31 | $query->orWhere($column, 'LIKE', $value); |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } else { |
| 37 | 37 | $q->orWhere( |
| 38 | 38 | function($query) use ($column, $criteria) { |
| 39 | - foreach($criteria as $value) { |
|
| 39 | + foreach ($criteria as $value) { |
|
| 40 | 40 | $query->orWhere($column, 'LIKE', $value); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | { |
| 55 | 55 | $router->group([ |
| 56 | 56 | 'namespace' => $this->namespace, 'middleware' => 'web', |
| 57 | - ], function ($router) { |
|
| 57 | + ], function($router) { |
|
| 58 | 58 | require app_path('Http/routes.php'); |
| 59 | 59 | }); |
| 60 | 60 | } |