From 885779911c9f5fce7c11bd34b5acd1ecf2eb223c Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Mon, 10 Aug 2020 08:19:29 +0200 Subject: [PATCH] fix some psr2 code --- app/Http/Controllers/BookmarkController.php | 3 ++- app/Http/Controllers/MeteoController.php | 1 - app/Http/Controllers/ToDoController.php | 2 +- app/Http/Controllers/UserController.php | 6 +++--- app/Mail/{newUserInvitation.php => NewUserInvitation.php} | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename app/Mail/{newUserInvitation.php => NewUserInvitation.php} (94%) diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index 869c2aa..24d6d72 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -77,7 +77,8 @@ class BookmarkController extends Controller preg_match('/http/', $metas['favicon'], $matches); if (empty($matches)) { - $metas['favicon'] = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).$metas['favicon']; + $url = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST); + $metas['favicon'] = $url.$metas['favicon']; } //dd($metas['favicon'], $matches, !isset($matches[1]), empty($matches)); } else { diff --git a/app/Http/Controllers/MeteoController.php b/app/Http/Controllers/MeteoController.php index 00c8ffd..f51e4bf 100644 --- a/app/Http/Controllers/MeteoController.php +++ b/app/Http/Controllers/MeteoController.php @@ -18,6 +18,5 @@ class MeteoController extends Controller $response = $promise->wait(); return $response->getBody()->getContents(); - } } diff --git a/app/Http/Controllers/ToDoController.php b/app/Http/Controllers/ToDoController.php index 94f29d2..5d2e4d1 100644 --- a/app/Http/Controllers/ToDoController.php +++ b/app/Http/Controllers/ToDoController.php @@ -63,7 +63,7 @@ class ToDoController extends Controller { $this->authorize('update', $toDoList); - ($toDo->checked_at) ? $toDo->checked_at = NULL : $toDo->checked_at = now(); + ($toDo->checked_at) ? $toDo->checked_at = null : $toDo->checked_at = now(); $toDo->save(); return (new ToDoResource($toDo)) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 72c0b68..2376322 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Mail\newUserInvitation; +use App\Mail\NewUserInvitation; use App\User; use App\Http\Resources\User as UserResource; use Illuminate\Http\Request; @@ -27,7 +27,7 @@ class UserController extends Controller request()['password'] = Hash::make(Str::random(30)); $user = User::create($this->validateData()); - Mail::to($user->email)->send(new newUserInvitation($user)); + Mail::to($user->email)->send(new NewUserInvitation($user)); return (new UserResource($user)) ->response() @@ -36,7 +36,7 @@ class UserController extends Controller public function show(User $user) { - return New UserResource($user); + return new UserResource($user); } private function validateData() diff --git a/app/Mail/newUserInvitation.php b/app/Mail/NewUserInvitation.php similarity index 94% rename from app/Mail/newUserInvitation.php rename to app/Mail/NewUserInvitation.php index 6bfb574..4aa3acc 100644 --- a/app/Mail/newUserInvitation.php +++ b/app/Mail/NewUserInvitation.php @@ -8,7 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -class newUserInvitation extends Mailable +class NewUserInvitation extends Mailable { use Queueable, SerializesModels;