@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::table('users', function (Blueprint $table) { |
|
| 16 | + Schema::table('users', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('username')->unique()->nullable()->after('name'); |
| 18 | 18 | }); |
| 19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function down() |
| 27 | 27 | { |
| 28 | - Schema::table('users', function (Blueprint $table) { |
|
| 28 | + Schema::table('users', function(Blueprint $table) { |
|
| 29 | 29 | $table->dropColumn('username'); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | { |
| 65 | 65 | try { |
| 66 | 66 | $this->filesystem->overwrite( |
| 67 | - $path = database_path('seeds/' . config('AdminUserSeeder', 'AdminUserSeeder.php')), |
|
| 67 | + $path = database_path('seeds/'.config('AdminUserSeeder', 'AdminUserSeeder.php')), |
|
| 68 | 68 | $this->compiler->compile( |
| 69 | 69 | $this->filesystem->get($this->getStubPath()), |
| 70 | 70 | [ |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | ] |
| 74 | 74 | ) |
| 75 | 75 | ); |
| 76 | - $this->info('File ' . $path . ' created'); |
|
| 76 | + $this->info('File '.$path.' created'); |
|
| 77 | 77 | } catch (\Exception $e) { |
| 78 | 78 | print_r($e->getMessage()); |
| 79 | 79 | } |
@@ -86,6 +86,6 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | protected function getStubPath() |
| 88 | 88 | { |
| 89 | - return __DIR__ . '/stubs/AdminUserSeeder.php'; |
|
| 89 | + return __DIR__.'/stubs/AdminUserSeeder.php'; |
|
| 90 | 90 | } |
| 91 | 91 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | { |
| 54 | 54 | try { |
| 55 | 55 | $this->filesystem->make( |
| 56 | - $path = resource_path('views/' . $this->viewPath()), |
|
| 56 | + $path = resource_path('views/'.$this->viewPath()), |
|
| 57 | 57 | $this->filesystem->get($this->getStubPath()), |
| 58 | 58 | true |
| 59 | 59 | ); |
| 60 | - $this->info('File ' . $path . ' created'); |
|
| 60 | + $this->info('File '.$path.' created'); |
|
| 61 | 61 | } catch (\Exception $e) { |
| 62 | 62 | $this->error($e->getMessage()); |
| 63 | 63 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | protected function getStubPath() |
| 70 | 70 | { |
| 71 | - return __DIR__ . '/stubs/view.blade.php'; |
|
| 71 | + return __DIR__.'/stubs/view.blade.php'; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | protected function constructViewBladeName($name) |
| 91 | 91 | { |
| 92 | - return $this->dottedPathToSlashesPath($name) . '.blade.php'; |
|
| 92 | + return $this->dottedPathToSlashesPath($name).'.blade.php'; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | * Get the response for a failed password reset link. |
| 66 | 66 | * |
| 67 | 67 | * @param Request $request |
| 68 | - * @param $response |
|
| 68 | + * @param string $response |
|
| 69 | 69 | * @return mixed |
| 70 | 70 | */ |
| 71 | 71 | protected function sendResetLinkFailedResponse(Request $request, $response) |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | ], 422); |
| 80 | 80 | } |
| 81 | 81 | return back()->withErrors( |
| 82 | - ['email' => trans($response)] |
|
| 82 | + [ 'email' => trans($response) ] |
|
| 83 | 83 | ); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -7,9 +7,6 @@ |
||
| 7 | 7 | |
| 8 | 8 | namespace App\Http\Controllers; |
| 9 | 9 | |
| 10 | -use App\Http\Requests; |
|
| 11 | -use Illuminate\Http\Request; |
|
| 12 | - |
|
| 13 | 10 | /** |
| 14 | 11 | * Class HomeController |
| 15 | 12 | * @package App\Http\Controllers |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers\Auth; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use Validator; |
|
| 7 | 5 | use App\Http\Controllers\Controller; |
| 6 | +use App\User; |
|
| 8 | 7 | use Illuminate\Foundation\Auth\RegistersUsers; |
| 8 | +use Validator; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Class RegisterController |
@@ -79,12 +79,12 @@ |
||
| 79 | 79 | protected function create(array $data) |
| 80 | 80 | { |
| 81 | 81 | $fields = [ |
| 82 | - 'name' => $data['name'], |
|
| 83 | - 'email' => $data['email'], |
|
| 84 | - 'password' => bcrypt($data['password']), |
|
| 82 | + 'name' => $data[ 'name' ], |
|
| 83 | + 'email' => $data[ 'email' ], |
|
| 84 | + 'password' => bcrypt($data[ 'password' ]), |
|
| 85 | 85 | ]; |
| 86 | - if (config('auth.providers.users.field', 'email') === 'username' && isset($data['username'])) { |
|
| 87 | - $fields['username'] = $data['username']; |
|
| 86 | + if (config('auth.providers.users.field', 'email') === 'username' && isset($data[ 'username' ])) { |
|
| 87 | + $fields[ 'username' ] = $data[ 'username' ]; |
|
| 88 | 88 | } |
| 89 | 89 | return User::create($fields); |
| 90 | 90 | } |
@@ -4,9 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Http\Controllers\Controller; |
| 6 | 6 | use Illuminate\Foundation\Auth\ResetsPasswords; |
| 7 | +use Illuminate\Http\JsonResponse; |
|
| 7 | 8 | use Illuminate\Http\Request; |
| 8 | 9 | use Illuminate\Support\Facades\Password; |
| 9 | -use Illuminate\Http\JsonResponse; |
|
| 10 | 10 | |
| 11 | 11 | class ResetPasswordController extends Controller |
| 12 | 12 | { |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | // database. Otherwise we will parse the error and return the response. |
| 39 | 39 | $response = $this->broker()->reset( |
| 40 | 40 | $this->credentials($request), |
| 41 | - function ($user, $password) { |
|
| 41 | + function($user, $password) { |
|
| 42 | 42 | $this->resetPassword($user, $password); |
| 43 | 43 | } |
| 44 | 44 | ); |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | protected function sendResetFailedResponse(Request $request, $response) |
| 80 | 80 | { |
| 81 | 81 | if ($request->expectsJson()) { |
| 82 | - return new JsonResponse(['email' => trans($response) ], 422); |
|
| 82 | + return new JsonResponse([ 'email' => trans($response) ], 422); |
|
| 83 | 83 | } |
| 84 | 84 | return redirect()->back() |
| 85 | 85 | ->withInput($request->only('email')) |
| 86 | - ->withErrors(['email' => trans($response)]); |
|
| 86 | + ->withErrors([ 'email' => trans($response) ]); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | public function showResetForm(Request $request, $token = null) |
| 99 | 99 | { |
| 100 | 100 | return view('adminlte::auth.passwords.reset')->with( |
| 101 | - ['token' => $token, 'email' => $request->email] |
|
| 101 | + [ 'token' => $token, 'email' => $request->email ] |
|
| 102 | 102 | ); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | * @var array |
| 16 | 16 | */ |
| 17 | 17 | protected $fillable = [ |
| 18 | - 'name', 'email', 'password','username' |
|
| 18 | + 'name', 'email', 'password', 'username' |
|
| 19 | 19 | ]; |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -26,25 +26,25 @@ discard block |
||
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | if ($this->app->runningInConsole()) { |
| 29 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTE::class]); |
|
| 30 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTEAlt::class]); |
|
| 31 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebar::class]); |
|
| 32 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebarAlt::class]); |
|
| 33 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeAdminUserSeeder::class]); |
|
| 34 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdmin::class]); |
|
| 35 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdminAlt::class]); |
|
| 36 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeView::class]); |
|
| 37 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenu::class]); |
|
| 38 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenuAlt::class]); |
|
| 39 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeRoute::class]); |
|
| 40 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeMenu::class]); |
|
| 41 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeV::class]); |
|
| 42 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeVC::class]); |
|
| 43 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeMVC::class]); |
|
| 44 | - $this->commands([\Acacha\AdminLTETemplateLaravel\Console\Username::class]); |
|
| 29 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTE::class ]); |
|
| 30 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTEAlt::class ]); |
|
| 31 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebar::class ]); |
|
| 32 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebarAlt::class ]); |
|
| 33 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeAdminUserSeeder::class ]); |
|
| 34 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdmin::class ]); |
|
| 35 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdminAlt::class ]); |
|
| 36 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeView::class ]); |
|
| 37 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenu::class ]); |
|
| 38 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenuAlt::class ]); |
|
| 39 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeRoute::class ]); |
|
| 40 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeMenu::class ]); |
|
| 41 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeV::class ]); |
|
| 42 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeVC::class ]); |
|
| 43 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeMVC::class ]); |
|
| 44 | + $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\Username::class ]); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - $this->app->bind('AdminLTE', function () { |
|
| 47 | + $this->app->bind('AdminLTE', function() { |
|
| 48 | 48 | return new \Acacha\AdminLTETemplateLaravel\AdminLTE(); |
| 49 | 49 | }); |
| 50 | 50 | |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | if (config('adminlte.guestuser', true)) { |
| 56 | 56 | $this->registerGuestUserProvider(); |
| 57 | 57 | } |
| 58 | - if (config('auth.providers.users.field', 'email') === 'username' && |
|
| 58 | + if (config('auth.providers.users.field', 'email') === 'username' && |
|
| 59 | 59 | config('adminlte.add_nullable_username', true)) { |
| 60 | - $this->loadMigrationsFrom(ADMINLTETEMPLATE_PATH .'/database/migrations/username_login'); |
|
| 60 | + $this->loadMigrationsFrom(ADMINLTETEMPLATE_PATH.'/database/migrations/username_login'); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if (!$this->app->routesAreCached()) { |
| 120 | 120 | $router = app('router'); |
| 121 | 121 | |
| 122 | - $router->group(['namespace' => $this->getAppNamespace().'Http\Controllers'], function () { |
|
| 122 | + $router->group([ 'namespace' => $this->getAppNamespace().'Http\Controllers' ], function() { |
|
| 123 | 123 | require __DIR__.'/../Http/routes.php'; |
| 124 | 124 | }); |
| 125 | 125 | } |