PHP 8.0 - use nullsafe operator

8 files changed, 9 insertions, 9 deletions

diff --git a/app/Http/RequestHandlers/AccountDelete.php b/app/Http/RequestHandlers/AccountDelete.php
index 2c80e546d1..844c8f7c00 100644
--- a/app/Http/RequestHandlers/AccountDelete.php
+++ b/app/Http/RequestHandlers/AccountDelete.php
@@ -65,6 +65,6 @@ class AccountDelete implements RequestHandlerInterface
             Auth::logout();
         }
 
-        return redirect(route(AccountEdit::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+        return redirect(route(AccountEdit::class, ['tree' => $tree?->name()]));
     }
 }
diff --git a/app/Http/RequestHandlers/AccountUpdate.php b/app/Http/RequestHandlers/AccountUpdate.php
index fb231a2a4d..3baea4443e 100644
--- a/app/Http/RequestHandlers/AccountUpdate.php
+++ b/app/Http/RequestHandlers/AccountUpdate.php
@@ -112,6 +112,6 @@ class AccountUpdate implements RequestHandlerInterface
 
         FlashMessages::addMessage(I18N::translate('The details for “%s” have been updated.', e($user->userName())), 'success');
 
-        return redirect(route(HomePage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+        return redirect(route(HomePage::class, ['tree' => $tree?->name()]));
     }
 }
diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php
index 0db2329f31..5aab8d839f 100644
--- a/app/Http/RequestHandlers/LoginAction.php
+++ b/app/Http/RequestHandlers/LoginAction.php
@@ -87,7 +87,7 @@ class LoginAction implements RequestHandlerInterface
             FlashMessages::addMessage($ex->getMessage(), 'danger');
 
             return redirect(route(LoginPage::class, [
-                'tree'     => $tree instanceof Tree ? $tree->name() : null,
+                'tree'     => $tree?->name(),
                 'username' => $username,
                 'url'      => $url,
             ]));
diff --git a/app/Http/RequestHandlers/PasswordRequestAction.php b/app/Http/RequestHandlers/PasswordRequestAction.php
index 16423369f8..0e6c048240 100644
--- a/app/Http/RequestHandlers/PasswordRequestAction.php
+++ b/app/Http/RequestHandlers/PasswordRequestAction.php
@@ -95,7 +95,7 @@ class PasswordRequestAction implements RequestHandlerInterface, StatusCodeInterf
             $expire = (string) (time() + self::TOKEN_VALIDITY_SECONDS);
             $url    = route(PasswordResetPage::class, [
                 'token' => $token,
-                'tree'  => $tree instanceof Tree ? $tree->name() : null,
+                'tree'  => $tree?->name(),
             ]);
 
             $user->setPreference('password-token', $token);
@@ -122,6 +122,6 @@ class PasswordRequestAction implements RequestHandlerInterface, StatusCodeInterf
         $message2 = I18N::translate('This link is valid for one hour.');
         FlashMessages::addMessage($message1 . '<br>' . $message2, 'success');
 
-        return redirect(route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+        return redirect(route(LoginPage::class, ['tree' => $tree?->name()]));
     }
 }
diff --git a/app/Http/RequestHandlers/PasswordRequestPage.php b/app/Http/RequestHandlers/PasswordRequestPage.php
index b30748fef5..7d2a9f48fd 100644
--- a/app/Http/RequestHandlers/PasswordRequestPage.php
+++ b/app/Http/RequestHandlers/PasswordRequestPage.php
@@ -50,7 +50,7 @@ class PasswordRequestPage implements RequestHandlerInterface
 
         // Already logged in?
         if ($user instanceof User) {
-            return redirect(route(AccountEdit::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+            return redirect(route(AccountEdit::class, ['tree' => $tree?->name()]));
         }
 
         $title = I18N::translate('Request a new password');
diff --git a/app/Http/RequestHandlers/PasswordResetAction.php b/app/Http/RequestHandlers/PasswordResetAction.php
index 04b6293fd6..b16bc5c6ce 100644
--- a/app/Http/RequestHandlers/PasswordResetAction.php
+++ b/app/Http/RequestHandlers/PasswordResetAction.php
@@ -84,6 +84,6 @@ class PasswordResetAction implements RequestHandlerInterface, StatusCodeInterfac
 
         FlashMessages::addMessage($message, 'danger');
 
-        return redirect(route(PasswordRequestPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+        return redirect(route(PasswordRequestPage::class, ['tree' => $tree?->name()]));
     }
 }
diff --git a/app/Http/RequestHandlers/PasswordResetPage.php b/app/Http/RequestHandlers/PasswordResetPage.php
index 25f9c13534..393bd5f53b 100644
--- a/app/Http/RequestHandlers/PasswordResetPage.php
+++ b/app/Http/RequestHandlers/PasswordResetPage.php
@@ -79,6 +79,6 @@ class PasswordResetPage implements RequestHandlerInterface, StatusCodeInterface
 
         FlashMessages::addMessage($message, 'danger');
 
-        return redirect(route(PasswordRequestPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null]));
+        return redirect(route(PasswordRequestPage::class, ['tree' => $tree?->name()]));
     }
 }
diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php
index fdf34f6c43..8765bf5d1e 100644
--- a/app/Http/RequestHandlers/RegisterAction.php
+++ b/app/Http/RequestHandlers/RegisterAction.php
@@ -147,7 +147,7 @@ class RegisterAction implements RequestHandlerInterface
         $verify_url = route(VerifyEmail::class, [
             'username' => $user->userName(),
             'token'    => $token,
-            'tree'     => $tree instanceof Tree ? $tree->name() : null,
+            'tree'     => $tree?->name(),
         ]);
 
         // Send a verification message to the user.