refactor: fix bad return types with Psalter (#2435)

app/Http/Controllers/Settings/MultiFAController.php

@@ -98,7 +98,8 @@ class MultiFAController extends Controller
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     *
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
      */
     public function disableTwoFactor(Request $request)
     {
@@ -150,7 +151,8 @@ class MultiFAController extends Controller
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     *
+     * @return \Illuminate\Http\JsonResponse
      */
     public function u2fRegisterData(Request $request)
     {
@@ -187,7 +189,8 @@ class MultiFAController extends Controller
      * Remove an existing security key.
      *
      * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     *
+     * @return \Illuminate\Http\JsonResponse
      */
     public function u2fRemove(Request $request, int $u2fKeyId)
     {

app/Http/Controllers/Settings/PersonalizationController.php

@@ -14,7 +14,8 @@ class PersonalizationController extends Controller
 
     /**
      * Display the personalization page.
-     * @return \Illuminate\Http\Response
+     *
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
      */
     public function index()
     {
@@ -60,9 +61,10 @@ class PersonalizationController extends Controller
      *
      * @param Request $request
      * @param ContactFieldType $contactFieldType
-     * @return \Illuminate\Http\Response
+     *
+     * @return ContactFieldType
      */
-    public function editContactFieldType(Request $request, ContactFieldType $contactFieldType)
+    public function editContactFieldType(Request $request, ContactFieldType $contactFieldType): ContactFieldType
     {
         Validator::make($request->all(), [
             'name' => 'required|max:255',

app/Http/Controllers/Settings/SubscriptionsController.php

@@ -12,7 +12,7 @@ class SubscriptionsController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      */
     public function index()
     {
@@ -37,7 +37,7 @@ class SubscriptionsController extends Controller
     /**
      * Display the upgrade view page.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      */
     public function upgrade(Request $request)
     {
@@ -60,7 +60,7 @@ class SubscriptionsController extends Controller
     /**
      * Display the upgrade success page.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      */
     public function upgradeSuccess(Request $request)
     {
@@ -74,7 +74,7 @@ class SubscriptionsController extends Controller
     /**
      * Display the downgrade success page.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      */
     public function downgradeSuccess(Request $request)
     {
@@ -88,7 +88,7 @@ class SubscriptionsController extends Controller
     /**
      * Display the downgrade view page.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      */
     public function downgrade()
     {
@@ -106,7 +106,7 @@ class SubscriptionsController extends Controller
     /**
      * Process the downgrade process.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function processDowngrade()
     {
@@ -126,7 +126,7 @@ class SubscriptionsController extends Controller
     /**
      * Process the upgrade payment.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function processPayment(Request $request)
     {