refactor: apply auto fixes from idea

2025-11-02 22:17:48 +09:00 · 2022-11-14 13:21:47 +01:00
parent d4f7ad842c
commit b390a719e9
22 changed files with 154 additions and 159 deletions
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Auth;

 class Controller extends BaseController
 {
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,7 +2,7 @@

 namespace App\Http\Controllers;

-use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;

 class HomeController extends Controller
 {
@@ -13,15 +13,16 @@ class HomeController extends Controller
     */
    public function __construct()
    {
+        parent::__construct();
        $this->middleware('auth');
    }

    /**
     * Show the application dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @return RedirectResponse
     */
-    public function index()
+    public function index(): RedirectResponse
    {
        return redirect()->route('dash');
    }
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -5,17 +5,16 @@ namespace App\Http\Controllers;
 use App\Application;
 use App\Item;
 use App\Jobs\ProcessApps;
-use App\Search;
-use App\Setting;
-use App\SupportedApps;
 use App\User;
 use Artisan;
-use GrahamCampbell\GitHub\Facades\GitHub;
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\ServerException;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;

@@ -23,15 +22,16 @@ class ItemController extends Controller
 {
    public function __construct()
    {
+        parent::__construct();
        $this->middleware('allowed');
    }

    /**
     * Display a listing of the resource on the dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @return View
     */
-    public function dash()
+    public function dash(): View
    {
        $data['apps'] = Item::whereHas('parents', function ($query) {
            $query->where('id', 0);
@@ -49,7 +49,7 @@ class ItemController extends Controller
    /**
     * Set order on the dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @return void
     */
    public function setOrder(Request $request)
    {
@@ -64,9 +64,10 @@ class ItemController extends Controller
    /**
     * Pin item on the dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @param $id
+     * @return RedirectResponse
     */
-    public function pin($id)
+    public function pin($id): RedirectResponse
    {
        $item = Item::findOrFail($id);
        $item->pinned = true;
@@ -79,9 +80,10 @@ class ItemController extends Controller
    /**
     * Unpin item on the dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @param $id
+     * @return RedirectResponse
     */
-    public function unpin($id)
+    public function unpin($id): RedirectResponse
    {
        $item = Item::findOrFail($id);
        $item->pinned = false;
@@ -94,12 +96,12 @@ class ItemController extends Controller
    /**
     * Unpin item on the dashboard.
     *
-     * @return \Illuminate\Http\Response
+     * @return RedirectResponse|View
     */
    public function pinToggle($id, $ajax = false, $tag = false)
    {
        $item = Item::findOrFail($id);
-        $new = ((bool) $item->pinned === true) ? false : true;
+        $new = !(((bool)$item->pinned === true));
        $item->pinned = $new;
        $item->save();
        if ($ajax) {
@@ -122,7 +124,7 @@ class ItemController extends Controller
    /**
     * Display a listing of the resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return View
     */
    public function index(Request $request)
    {
@@ -140,9 +142,9 @@ class ItemController extends Controller
    /**
     * Show the form for creating a new resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return View
     */
-    public function create()
+    public function create(): View
    {
        //
        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
@@ -155,10 +157,10 @@ class ItemController extends Controller
    /**
     * Show the form for editing the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return View
     */
-    public function edit($id)
+    public function edit(int $id): View
    {
        // Get the item
        $item = Item::find($id);
@@ -226,7 +228,7 @@ class ItemController extends Controller
        $current_user = User::currentUser();
        $request->merge([
            'description' => $config,
-            'user_id' => $current_user->id,
+            'user_id' => $current_user->getId(),
        ]);

        if ($request->input('appid') === 'null') {
@@ -252,10 +254,10 @@ class ItemController extends Controller
    /**
     * Store a newly created resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @return RedirectResponse
     */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
    {
        $this->storelogic($request);

@@ -268,10 +270,10 @@ class ItemController extends Controller
    /**
     * Display the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return void
     */
-    public function show($id)
+    public function show(int $id): void
    {
        //
    }
@@ -279,11 +281,11 @@ class ItemController extends Controller
    /**
     * Update the specified resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
    {
        $this->storelogic($request, $id);
        $route = route('dash', []);
@@ -295,10 +297,11 @@ class ItemController extends Controller
    /**
     * Remove the specified resource from storage.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function destroy(Request $request, $id)
+    public function destroy(Request $request, int $id): RedirectResponse
    {
        //
        $force = (bool) $request->input('force');
@@ -319,10 +322,10 @@ class ItemController extends Controller
    /**
     * Restore the specified resource from soft deletion.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function restore($id)
+    public function restore(int $id): RedirectResponse
    {
        //
        Item::withTrashed()
@@ -338,9 +341,10 @@ class ItemController extends Controller
    /**
     * Return details for supported apps
     *
-     * @return Json
+     * @param Request $request
+     * @return string|null
     */
-    public function appload(Request $request)
+    public function appload(Request $request): ?string
    {
        $output = [];
        $appid = $request->input('app');
@@ -429,10 +433,10 @@ class ItemController extends Controller

        try {
            return $client->request($method, $url, $attrs);
-        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+        } catch (ConnectException $e) {
            Log::error('Connection refused');
            Log::debug($e->getMessage());
-        } catch (\GuzzleHttp\Exception\ServerException $e) {
+        } catch (ServerException $e) {
            Log::debug($e->getMessage());
        }

@@ -441,7 +445,7 @@ class ItemController extends Controller

    public function websitelookup($url)
    {
-        $url = \base64_decode($url);
+        $url = base64_decode($url);
        $data = $this->execute($url);

        return $data->getBody();
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -2,7 +2,6 @@

 namespace App\Http\Controllers;

-use App\Http\Controllers\Controller;
 use App\Search;
 use Illuminate\Http\Request;

--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -2,24 +2,24 @@

 namespace App\Http\Controllers;

-use App\Http\Controllers\Controller;
 use App\Setting;
 use App\SettingGroup;
-use App\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;

 class SettingsController extends Controller
 {
    public function __construct()
    {
+        parent::__construct();
        $this->middleware('allowed');
    }

    /**
-     * @return \Illuminate\View\View
+     * @return View
     */
-    public function index()
+    public function index(): View
    {
        $settings = SettingGroup::with([
            'settings',
@@ -33,9 +33,9 @@ class SettingsController extends Controller
    /**
     * @param int $id
     *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse|View
     */
-    public function edit($id)
+    public function edit(int $id)
    {
        $setting = Setting::find($id);
        //die("s: ".$setting->label);
@@ -59,11 +59,12 @@ class SettingsController extends Controller
    }

    /**
+     * @param Request $request
     * @param int $id
     *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
     */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
    {
        $setting = Setting::find($id);
        $user = $this->user();
@@ -104,9 +105,9 @@ class SettingsController extends Controller
    /**
     * @param int $id
     *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse
     */
-    public function clear($id)
+    public function clear(int $id): RedirectResponse
    {
        $user = $this->user();
        $setting = Setting::find($id);
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -5,7 +5,10 @@ namespace App\Http\Controllers;
 use App\Item;
 use App\User;
 use DB;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;

 class TagController extends Controller
 {
@@ -17,7 +20,7 @@ class TagController extends Controller
    /**
     * Display a listing of the resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return Response
     */
    public function index(Request $request)
    {
@@ -35,7 +38,7 @@ class TagController extends Controller
    /**
     * Show the form for creating a new resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return Response
     */
    public function create()
    {
@@ -47,10 +50,10 @@ class TagController extends Controller
    /**
     * Store a newly created resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @return RedirectResponse
     */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
    {
        $validatedData = $request->validate([
            'title' => 'required|max:255',
@@ -71,7 +74,7 @@ class TagController extends Controller
        $request->merge([
            'type' => '1',
            'url' => $slug,
-            'user_id' => $current_user->id,
+            'user_id' => $current_user->getId(),
        ]);
        //die(print_r($request->all()));
        Item::create($request->all());
@@ -85,10 +88,10 @@ class TagController extends Controller
    /**
     * Display the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param $slug
+     * @return View
     */
-    public function show($slug)
+    public function show($slug): View
    {
        $item = Item::whereUrl($slug)->first();
        //print_r($item);
@@ -102,10 +105,10 @@ class TagController extends Controller
    /**
     * Show the form for editing the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return View
     */
-    public function edit($id)
+    public function edit(int $id): View
    {
        // Get the item
        $item = Item::find($id);
@@ -118,11 +121,11 @@ class TagController extends Controller
    /**
     * Update the specified resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
    {
        $validatedData = $request->validate([
            'title' => 'required|max:255',
@@ -152,10 +155,10 @@ class TagController extends Controller
    /**
     * Remove the specified resource from storage.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function destroy(Request $request, $id)
+    public function destroy(Request $request, int $id): RedirectResponse
    {
        //
        $force = (bool) $request->input('force');
@@ -176,10 +179,10 @@ class TagController extends Controller
    /**
     * Restore the specified resource from soft deletion.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return RedirectResponse
     */
-    public function restore($id)
+    public function restore(int $id): RedirectResponse
    {
        //
        Item::withTrashed()
@@ -191,9 +194,15 @@ class TagController extends Controller
            ->with('success', __('app.alert.success.item_restored'));
    }

-    public function add($tag, $item)
+    /**
+     * Add item to tag
+     *
+     * @param $tag
+     * @param $item
+     * @return int 1|0
+     */
+    public function add($tag, $item): int
    {
-        $output = 0;
        $tag = Item::find($tag);
        $item = Item::find($item);
        if ($tag && $item) {
@@ -205,6 +214,6 @@ class TagController extends Controller
            }
        }

-        return $output;
+        return 0;
    }
 }
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -2,8 +2,9 @@

 namespace App\Http\Controllers;

-use App\Http\Controllers\Controller;
 use App\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
@@ -12,15 +13,16 @@ class UserController extends Controller
 {
    public function __construct()
    {
+        parent::__construct();
        $this->middleware('allowed')->except(['selectUser']);
    }

    /**
     * Display a listing of the resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return View
     */
-    public function index()
+    public function index(): View
    {
        $data['users'] = User::all();

@@ -30,9 +32,9 @@ class UserController extends Controller
    /**
     * Show the form for creating a new resource.
     *
-     * @return \Illuminate\Http\Response
+     * @return View
     */
-    public function create()
+    public function create(): View
    {
        $data = [];

@@ -50,10 +52,10 @@ class UserController extends Controller
    /**
     * Store a newly created resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @return RedirectResponse
     */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
    {
        $validatedData = $request->validate([
            'username' => 'required|max:255|unique:users',
@@ -92,10 +94,10 @@ class UserController extends Controller
    /**
     * Display the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param int $id
+     * @return void
     */
-    public function show($id)
+    public function show(int $id): void
    {
        //
    }
@@ -103,10 +105,10 @@ class UserController extends Controller
    /**
     * Show the form for editing the specified resource.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param User $user
+     * @return View
     */
-    public function edit(User $user)
+    public function edit(User $user): View
    {
        $data['user'] = $user;

@@ -116,11 +118,11 @@ class UserController extends Controller
    /**
     * Update the specified resource in storage.
     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param User $user
+     * @return RedirectResponse
     */
-    public function update(Request $request, User $user)
+    public function update(Request $request, User $user): RedirectResponse
    {
        $validatedData = $request->validate([
            'username' => 'required|max:255|unique:users,username,'.$user->id,
@@ -163,10 +165,10 @@ class UserController extends Controller
    /**
     * Remove the specified resource from storage.
     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param User $user
+     * @return RedirectResponse | void
     */
-    public function destroy(User $user)
+    public function destroy(User $user): RedirectResponse
    {
        if ($user->id !== 1) {
            $user->delete();