Apply fixes from StyleCI (#102)

[ci skip] [skip ci]
marky291 · Jun 3, 2019 · 98216ce · 98216ce
1 parent a5a5dfd
commit 98216ce
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Notifications\WelcomeNotification;
 use App\User;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use App\Notifications\WelcomeNotification;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller

diff --git a/app/Http/Controllers/MyAccountController.php b/app/Http/Controllers/MyAccountController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\ModifyAccountRequest;
-use Illuminate\Http\Request;
 
 class MyAccountController extends Controller
 {

diff --git a/app/Http/Requests/ModifyAccountRequest.php b/app/Http/Requests/ModifyAccountRequest.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Illuminate\Foundation\Http\FormRequest;
 
 class ModifyAccountRequest extends FormRequest
 {
@@ -28,7 +28,7 @@ public function rules()
             'username' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users')->ignore($this->request->get('email'), 'email')],
             'password' => ['required', 'string', 'min:6', 'confirmed', 'sometimes'],
-            'avatarUrl' => ['string', 'active_url', 'min:3', 'max:600']
+            'avatarUrl' => ['string', 'active_url', 'min:3', 'max:600'],
         ];
     }
 }
diff --git a/app/User.php b/app/User.php
@@ -7,10 +7,8 @@
 use App\Interactions\Review;
 use App\Jobs\RoleAssignment;
 use Gstt\Achievements\Achiever;
-use Illuminate\Validation\Rule;
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;

diff --git a/tests/Feature/RegisterControllerTest.php b/tests/Feature/RegisterControllerTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use App\Notifications\WelcomeNotification;
 use App\User;
-use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
+use App\Notifications\WelcomeNotification;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class RegisterControllerTest extends TestCase