Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Apply fixes from StyleCI #104

Merged
merged 1 commit into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/MyAccountController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Controllers;

use App\Http\Requests\ModifyAccountRequest;
use Illuminate\Http\Request;

class MyAccountController extends Controller
{
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Requests/ModifyAccountRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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'],
];
}
}
2 changes: 0 additions & 2 deletions app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/RegisterControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down