Various nestor-related fixes.

app/Http/Middleware/AcceptHeaders.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use function Safe\preg_match;
 use FireflyIII\Exceptions\BadHttpHeaderException;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -71,7 +72,7 @@ class AcceptHeaders
 
         // throw bad request if trace id is not a UUID
         $uuid         = $request->header('X-Trace-Id');
-        if (is_string($uuid) && '' !== trim($uuid) && (1 !== \Safe\preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
+        if (is_string($uuid) && '' !== trim($uuid) && (1 !== preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
             throw new BadRequestHttpException('Bad X-Trace-Id header.');
         }
 

app/Http/Middleware/Authenticate.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\User;
 use Illuminate\Auth\AuthenticationException;
@@ -56,7 +57,7 @@ class Authenticate
      * @throws FireflyException
      * @throws AuthenticationException
      */
-    public function handle($request, \Closure $next, ...$guards)
+    public function handle($request, Closure $next, ...$guards)
     {
         $this->authenticate($request, $guards);
 
@@ -114,10 +115,10 @@ class Authenticate
      */
     private function validateBlockedUser(?User $user, array $guards): void
     {
-        if (null === $user) {
+        if (!$user instanceof User) {
             app('log')->warning('User is null, throw exception?');
         }
-        if (null !== $user) {
+        if ($user instanceof User) {
             // app('log')->debug(get_class($user));
             if (1 === (int) $user->blocked) {
                 $message = (string) trans('firefly.block_account_logout');

app/Http/Middleware/Binder.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Support\Domain;
 use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Http\Request;
@@ -63,7 +64,7 @@ class Binder
      *
      * @return mixed
      */
-    public function handle($request, \Closure $next)
+    public function handle($request, Closure $next)
     {
         foreach ($request->route()->parameters() as $key => $value) {
             if (array_key_exists($key, $this->binders)) {

app/Http/Middleware/InstallationId.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Support\System\GeneratesInstallationId;
 use Illuminate\Http\Request;
 
@@ -41,7 +42,7 @@ class InstallationId
      *
      * @return mixed
      */
-    public function handle($request, \Closure $next)
+    public function handle($request, Closure $next)
     {
         $this->generateInstallationId();
 

app/Http/Middleware/Installer.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Database\QueryException;
@@ -45,7 +46,7 @@ class Installer
      *
      * @throws FireflyException
      */
-    public function handle($request, \Closure $next)
+    public function handle($request, Closure $next)
     {
         // Log::debug(sprintf('Installer middleware for URL %s', $request->url()));
         // ignore installer in test environment.

app/Http/Middleware/InterestingMessage.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\GroupMembership;
@@ -45,7 +46,7 @@ class InterestingMessage
      *
      * @return mixed
      */
-    public function handle(Request $request, \Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if ($this->testing()) {
             return $next($request);

app/Http/Middleware/IsAdmin.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\Request;
@@ -40,7 +41,7 @@ class IsAdmin
      *
      * @return mixed
      */
-    public function handle(Request $request, \Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->guest()) {
             if ($request->ajax()) {

app/Http/Middleware/IsDemoUser.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\Request;
@@ -37,7 +38,7 @@ class IsDemoUser
      *
      * @return mixed
      */
-    public function handle(Request $request, \Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         /** @var null|User $user */
         $user       = $request->user();

app/Http/Middleware/Range.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
+use App;
 use Carbon\Carbon;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
@@ -42,7 +44,7 @@ class Range
      *
      * @return mixed
      */
-    public function handle(Request $request, \Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         if (null !== $request->user()) {
             // set start, end and finish:
@@ -101,7 +103,7 @@ class Range
         // get locale preference:
         $language          = app('steam')->getLanguage();
         $locale            = app('steam')->getLocale();
-        \App::setLocale($language);
+        App::setLocale($language);
         Carbon::setLocale(substr((string) $locale, 0, 2));
 
         $localeArray       = app('steam')->getLocaleArray($locale);

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -39,7 +40,7 @@ class RedirectIfAuthenticated
      *
      * @return mixed
      */
-    public function handle($request, \Closure $next, $guard = null)
+    public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
             return response()->redirectTo(route('index'));

app/Http/Middleware/SecureHeaders.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Closure;
+use Exception;
 use Barryvdh\Debugbar\Facades\Debugbar;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Vite;
@@ -38,9 +40,9 @@ class SecureHeaders
      *
      * @return mixed
      *
-     * @throws \Exception
+     * @throws Exception
      */
-    public function handle(Request $request, \Closure $next)
+    public function handle(Request $request, Closure $next)
     {
         // generate and share nonce.
         $nonce              = base64_encode(random_bytes(16));

app/Http/Middleware/StartFireflySession.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Override;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Http\Request;
 use Illuminate\Session\Middleware\StartSession;
@@ -37,7 +38,7 @@ class StartFireflySession extends StartSession
      *
      * @param Session $session
      */
-    #[\Override]
+    #[Override]
     protected function storeCurrentUrl(Request $request, $session): void
     {
         $url     = $request->fullUrl();

app/Http/Middleware/TrustHosts.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
+use Override;
 use Illuminate\Http\Middleware\TrustHosts as Middleware;
 
 class TrustHosts extends Middleware
@@ -33,7 +34,7 @@ class TrustHosts extends Middleware
      *
      * @return array<int, null|string>
      */
-    #[\Override]
+    #[Override]
     public function hosts(): array
     {
         return [