chore: Add php code sniffer and apply fixes

This commit is contained in:
Attila Jozsef Kerekes
2022-11-25 01:35:56 +01:00
committed by Attila Kerekes
parent 181b7564e8
commit 7565bd4028
1532 changed files with 166809 additions and 151 deletions

View File

@@ -4,11 +4,17 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\User;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\URL;
use Illuminate\Validation\ValidationException;
use Symfony\Component\HttpFoundation\Response;
class LoginController extends Controller
{
@@ -30,7 +36,7 @@ class LoginController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected string $redirectTo = '/';
/**
* Create a new controller instance.
@@ -43,7 +49,10 @@ class LoginController extends Controller
$this->middleware('guest')->except('logout');
}
public function username()
/**
* @return string
*/
public function username(): string
{
return 'username';
}
@@ -51,12 +60,12 @@ class LoginController extends Controller
/**
* Handle a login request to the application.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
* @param Request $request
* @return Response
*
* @throws \Illuminate\Validation\ValidationException
* @throws ValidationException
*/
public function login(Request $request)
public function login(Request $request): Response
{
$current_user = User::currentUser();
$request->merge(['username' => $current_user->username, 'remember' => true]);
@@ -88,7 +97,11 @@ class LoginController extends Controller
{
}
public function setUser(User $user)
/**
* @param User $user
* @return RedirectResponse
*/
public function setUser(User $user): RedirectResponse
{
Auth::logout();
session(['current_user' => $user]);
@@ -96,7 +109,11 @@ class LoginController extends Controller
return redirect()->route('dash');
}
public function autologin($uuid)
/**
* @param $uuid
* @return RedirectResponse
*/
public function autologin($uuid): RedirectResponse
{
$user = User::where('autologin', $uuid)->first();
Auth::login($user, true);
@@ -108,18 +125,26 @@ class LoginController extends Controller
/**
* Show the application's login form.
*
* @return \Illuminate\Http\Response
* @return Application|Factory|View
*/
public function showLoginForm()
{
return view('auth.login');
}
protected function authenticated(Request $request, $user)
/**
* @param Request $request
* @param $user
* @return RedirectResponse
*/
protected function authenticated(Request $request, $user): RedirectResponse
{
return back();
}
/**
* @return mixed|string
*/
public function redirectTo()
{
return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;

View File

@@ -27,7 +27,7 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected string $redirectTo = '/';
/**
* Create a new controller instance.
@@ -45,7 +45,7 @@ class RegisterController extends Controller
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
protected function validator(array $data): \Illuminate\Contracts\Validation\Validator
{
return Validator::make($data, [
'name' => 'required|string|max:255',
@@ -58,7 +58,7 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
* @return User
*/
protected function create(array $data)
{

View File

@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected string $redirectTo = '/';
/**
* Create a new controller instance.

View File

@@ -9,6 +9,7 @@ use App\User;
use Artisan;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Exception\ServerException;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
@@ -204,7 +205,7 @@ class ItemController extends Controller
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
);
$contents = file_get_contents($request->input('icon'), false, stream_context_create($options));
if ($application) {
@@ -219,9 +220,9 @@ class ItemController extends Controller
// Private apps could have here duplicated icons folder
if (strpos($path, 'icons/icons/') !== false) {
$path = str_replace('icons/icons/','icons/',$path);
$path = str_replace('icons/icons/', 'icons/', $path);
}
if(! Storage::disk('public')->exists($path)) {
if (! Storage::disk('public')->exists($path)) {
Storage::disk('public')->put($path, $contents);
}
$request->merge([
@@ -360,6 +361,7 @@ class ItemController extends Controller
*
* @param Request $request
* @return string|null
* @throws GuzzleException
*/
public function appload(Request $request): ?string
{
@@ -386,9 +388,9 @@ class ItemController extends Controller
$output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
if(strpos($app->icon, '://') !== false) {
if (strpos($app->icon, '://') !== false) {
$output['iconview'] = $app->icon;
} elseif(strpos($app->icon, 'icons/') !== false) {
} elseif (strpos($app->icon, 'icons/') !== false) {
// Private apps have the icon locally
$output['iconview'] = URL::to('/').'/storage/'.$app->icon;
$output['icon'] = str_replace('icons/', '', $output['icon']);

View File

@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
use App\Item;
use App\User;
use DB;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -20,7 +22,7 @@ class TagController extends Controller
/**
* Display a listing of the resource.
*
* @return Response
* @return Application|Factory|View
*/
public function index(Request $request)
{
@@ -38,7 +40,7 @@ class TagController extends Controller
/**
* Show the form for creating a new resource.
*
* @return Response
* @return Application|Factory|View
*/
public function create()
{
@@ -155,6 +157,7 @@ class TagController extends Controller
/**
* Remove the specified resource from storage.
*
* @param Request $request
* @param int $id
* @return RedirectResponse
*/