Upgrade to Laravel 9 (#4413)

Co-authored-by: DaneEveritt <dane@daneeveritt.com>

app/Http/Controllers/Admin/MountController.php

@@ -3,11 +3,15 @@
 namespace Pterodactyl\Http\Controllers\Admin;
 
 use Ramsey\Uuid\Uuid;
+use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Nest;
+use Illuminate\Http\Response;
 use Pterodactyl\Models\Mount;
 use Pterodactyl\Models\Location;
+use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\View\Factory as ViewFactory;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Http\Requests\Admin\MountFormRequest;
 use Pterodactyl\Repositories\Eloquent\MountRepository;
@@ -16,49 +20,24 @@ use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class MountController extends Controller
 {
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $nestRepository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
-     */
-    protected $locationRepository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\MountRepository
-     */
-    protected $repository;
-
     /**
      * MountController constructor.
      */
     public function __construct(
-        AlertsMessageBag $alert,
-        NestRepositoryInterface $nestRepository,
-        LocationRepositoryInterface $locationRepository,
-        MountRepository $repository
+        protected AlertsMessageBag $alert,
+        protected NestRepositoryInterface $nestRepository,
+        protected LocationRepositoryInterface $locationRepository,
+        protected MountRepository $repository,
+        protected ViewFactory $view
     ) {
-        $this->alert = $alert;
-        $this->nestRepository = $nestRepository;
-        $this->locationRepository = $locationRepository;
-        $this->repository = $repository;
     }
 
     /**
      * Return the mount overview page.
-     *
-     * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(): View
     {
-        return view('admin.mounts.index', [
+        return $this->view->make('admin.mounts.index', [
             'mounts' => $this->repository->getAllWithDetails(),
         ]);
     }
@@ -66,18 +45,14 @@ class MountController extends Controller
     /**
      * Return the mount view page.
      *
-     * @param string $id
-     *
-     * @return \Illuminate\View\View
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function view($id)
+    public function view(string $id): View
     {
         $nests = Nest::query()->with('eggs')->get();
         $locations = Location::query()->with('nodes')->get();
 
-        return view('admin.mounts.view', [
+        return $this->view->make('admin.mounts.view', [
             'mount' => $this->repository->getWithRelations($id),
             'nests' => $nests,
             'locations' => $locations,
@@ -87,11 +62,9 @@ class MountController extends Controller
     /**
      * Handle request to create new mount.
      *
-     * @return \Illuminate\Http\RedirectResponse
-     *
      * @throws \Throwable
      */
-    public function create(MountFormRequest $request)
+    public function create(MountFormRequest $request): RedirectResponse
     {
         $model = (new Mount())->fill($request->validated());
         $model->forceFill(['uuid' => Uuid::uuid4()->toString()]);
@@ -107,11 +80,9 @@ class MountController extends Controller
     /**
      * Handle request to update or delete location.
      *
-     * @return \Illuminate\Http\RedirectResponse
-     *
      * @throws \Throwable
      */
-    public function update(MountFormRequest $request, Mount $mount)
+    public function update(MountFormRequest $request, Mount $mount): RedirectResponse
     {
         if ($request->input('action') === 'delete') {
             return $this->delete($mount);
@@ -127,11 +98,9 @@ class MountController extends Controller
     /**
      * Delete a location from the system.
      *
-     * @return \Illuminate\Http\RedirectResponse
-     *
      * @throws \Exception
      */
-    public function delete(Mount $mount)
+    public function delete(Mount $mount): RedirectResponse
     {
         $mount->delete();
 
@@ -139,11 +108,9 @@ class MountController extends Controller
     }
 
     /**
-     * Adds eggs to the mount's many to many relation.
-     *
-     * @return \Illuminate\Http\RedirectResponse
+     * Adds eggs to the mount's many-to-many relation.
      */
-    public function addEggs(Request $request, Mount $mount)
+    public function addEggs(Request $request, Mount $mount): RedirectResponse
     {
         $validatedData = $request->validate([
             'eggs' => 'required|exists:eggs,id',
@@ -160,11 +127,9 @@ class MountController extends Controller
     }
 
     /**
-     * Adds nodes to the mount's many to many relation.
-     *
-     * @return \Illuminate\Http\RedirectResponse
+     * Adds nodes to the mount's many-to-many relation.
      */
-    public function addNodes(Request $request, Mount $mount)
+    public function addNodes(Request $request, Mount $mount): RedirectResponse
     {
         $data = $request->validate(['nodes' => 'required|exists:nodes,id']);
 
@@ -179,11 +144,9 @@ class MountController extends Controller
     }
 
     /**
-     * Deletes an egg from the mount's many to many relation.
-     *
-     * @return \Illuminate\Http\Response
+     * Deletes an egg from the mount's many-to-many relation.
      */
-    public function deleteEgg(Mount $mount, int $egg_id)
+    public function deleteEgg(Mount $mount, int $egg_id): Response
     {
         $mount->eggs()->detach($egg_id);
 
@@ -191,11 +154,9 @@ class MountController extends Controller
     }
 
     /**
-     * Deletes an node from the mount's many to many relation.
-     *
-     * @return \Illuminate\Http\Response
+     * Deletes a node from the mount's many-to-many relation.
      */
-    public function deleteNode(Mount $mount, int $node_id)
+    public function deleteNode(Mount $mount, int $node_id): Response
     {
         $mount->nodes()->detach($node_id);