@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('role_user', function (Blueprint $table) { |
|
16 | + Schema::create('role_user', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->integer('user_id')->unsigned()->index(); |
19 | 19 | $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function down() |
32 | 32 | { |
33 | - Schema::table('role_user', function (Blueprint $table) { |
|
33 | + Schema::table('role_user', function(Blueprint $table) { |
|
34 | 34 | Schema::drop('role_user'); |
35 | 35 | }); |
36 | 36 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('roles', function (Blueprint $table) { |
|
16 | + Schema::create('roles', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->text('name'); |
19 | 19 | $table->timestamps(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function down() |
29 | 29 | { |
30 | - Schema::table('roles', function (Blueprint $table) { |
|
30 | + Schema::table('roles', function(Blueprint $table) { |
|
31 | 31 | Schema::drop('roles'); |
32 | 32 | }); |
33 | 33 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('hits', function (Blueprint $table) { |
|
16 | + Schema::create('hits', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->integer('link_id')->unsigned()->nullable(); |
19 | 19 | $table->string('ip')->nullable(); |
@@ -13,11 +13,11 @@ 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->integer('activated')->default(0); |
18 | 18 | }); |
19 | 19 | |
20 | - Schema::table('users', function (Blueprint $table) { |
|
20 | + Schema::table('users', function(Blueprint $table) { |
|
21 | 21 | $table->string('email_token')->nullable(); |
22 | 22 | }); |
23 | 23 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function down() |
31 | 31 | { |
32 | - Schema::table('users', function (Blueprint $table) { |
|
32 | + Schema::table('users', function(Blueprint $table) { |
|
33 | 33 | $table->dropColumn('activated'); |
34 | 34 | }); |
35 | 35 | |
36 | - Schema::table('users', function (Blueprint $table) { |
|
36 | + Schema::table('users', function(Blueprint $table) { |
|
37 | 37 | $table->dropColumn('email_token'); |
38 | 38 | }); |
39 | 39 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function boot() |
27 | 27 | { |
28 | 28 | // |
29 | - Route::bind('linkHash', function ($hash) { |
|
29 | + Route::bind('linkHash', function($hash) { |
|
30 | 30 | try { |
31 | 31 | return Link::where('hash', $hash)->firstOrFail(); |
32 | 32 | } catch (ModelNotFoundException $e) { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers\Admin; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | 5 | use App\Http\Controllers\Controller; |
6 | +use Illuminate\Http\Request; |
|
7 | 7 | |
8 | 8 | class SettingsController extends Controller |
9 | 9 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers\Admin; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | 5 | use App\Http\Controllers\Controller; |
7 | 6 | use App\Link; |
8 | 7 | use App\User; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * |
42 | 42 | * @param Link $link |
43 | 43 | * |
44 | - * @return \Illuminate\Http\Response |
|
44 | + * @return \Illuminate\Http\RedirectResponse |
|
45 | 45 | * @internal param int $id |
46 | 46 | */ |
47 | 47 | public function destroy(Link $link) |
@@ -2,12 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers\Admin; |
4 | 4 | |
5 | -use App\Http\Requests\Admin\LinksRequest; |
|
6 | -use App\Session\Flash; |
|
7 | -use Illuminate\Http\Request; |
|
5 | +use App\Hit; |
|
8 | 6 | use App\Http\Controllers\Controller; |
9 | 7 | use App\Link; |
10 | -use App\Hit; |
|
8 | +use App\Session\Flash; |
|
11 | 9 | |
12 | 10 | class LinksController extends Controller |
13 | 11 | { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @param UserRequest|Request $request |
43 | 43 | * |
44 | - * @return \Illuminate\Http\Response |
|
44 | + * @return \Illuminate\Http\RedirectResponse |
|
45 | 45 | */ |
46 | 46 | public function store(UserRequest $request) |
47 | 47 | { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param UserRequest|Request $request |
95 | 95 | * @param User $user |
96 | 96 | * |
97 | - * @return \Illuminate\Http\Response |
|
97 | + * @return \Illuminate\Http\RedirectResponse |
|
98 | 98 | * @internal param int $id |
99 | 99 | */ |
100 | 100 | public function update(UserRequest $request, User $user) |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @param User $user |
126 | 126 | * |
127 | - * @return \Illuminate\Http\Response |
|
127 | + * @return \Illuminate\Http\RedirectResponse |
|
128 | 128 | * @internal param int $id |
129 | 129 | */ |
130 | 130 | public function destroy(User $user) |
@@ -6,9 +6,9 @@ |
||
6 | 6 | use App\Http\Requests\Admin\UserRequest; |
7 | 7 | use App\Notifications\EmailVerification; |
8 | 8 | use App\Role; |
9 | +use App\Session\Flash; |
|
9 | 10 | use App\User; |
10 | 11 | use Illuminate\Http\Request; |
11 | -use App\Session\Flash; |
|
12 | 12 | use Illuminate\Support\Facades\Hash; |
13 | 13 | |
14 | 14 | class UsersController extends Controller |
@@ -101,7 +101,7 @@ |
||
101 | 101 | { |
102 | 102 | $user->fill(['name' => $request->name, 'email' => $request->email, 'activated' => $request->activated])->save(); |
103 | 103 | |
104 | - if (!empty($request->password)) { |
|
104 | + if ( ! empty($request->password)) { |
|
105 | 105 | $user->password = Hash::make($request->password); |
106 | 106 | } |
107 | 107 |