fix some psr2 code
This commit is contained in:
@@ -77,7 +77,8 @@ class BookmarkController extends Controller
|
|||||||
|
|
||||||
preg_match('/http/', $metas['favicon'], $matches);
|
preg_match('/http/', $metas['favicon'], $matches);
|
||||||
if (empty($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));
|
//dd($metas['favicon'], $matches, !isset($matches[1]), empty($matches));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -18,6 +18,5 @@ class MeteoController extends Controller
|
|||||||
$response = $promise->wait();
|
$response = $promise->wait();
|
||||||
|
|
||||||
return $response->getBody()->getContents();
|
return $response->getBody()->getContents();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class ToDoController extends Controller
|
|||||||
{
|
{
|
||||||
$this->authorize('update', $toDoList);
|
$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();
|
$toDo->save();
|
||||||
|
|
||||||
return (new ToDoResource($toDo))
|
return (new ToDoResource($toDo))
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Mail\newUserInvitation;
|
use App\Mail\NewUserInvitation;
|
||||||
use App\User;
|
use App\User;
|
||||||
use App\Http\Resources\User as UserResource;
|
use App\Http\Resources\User as UserResource;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -27,7 +27,7 @@ class UserController extends Controller
|
|||||||
request()['password'] = Hash::make(Str::random(30));
|
request()['password'] = Hash::make(Str::random(30));
|
||||||
$user = User::create($this->validateData());
|
$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))
|
return (new UserResource($user))
|
||||||
->response()
|
->response()
|
||||||
@@ -36,7 +36,7 @@ class UserController extends Controller
|
|||||||
|
|
||||||
public function show(User $user)
|
public function show(User $user)
|
||||||
{
|
{
|
||||||
return New UserResource($user);
|
return new UserResource($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function validateData()
|
private function validateData()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
|||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
class newUserInvitation extends Mailable
|
class NewUserInvitation extends Mailable
|
||||||
{
|
{
|
||||||
use Queueable, SerializesModels;
|
use Queueable, SerializesModels;
|
||||||
|
|
||||||
Reference in New Issue
Block a user