From 9ea8709835dda396805bd439de0df267346159bd Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 4 May 2025 17:08:42 +0200
Subject: [PATCH] Fix nullpointers.

---
 app/Http/Controllers/Auth/LoginController.php    | 2 +-
 app/Http/Controllers/Auth/RegisterController.php | 2 +-
 resources/views/partials/menu-sidebar.twig       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 0ba8369ee8..9ea25e154a 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -220,7 +220,7 @@ class LoginController extends Controller
      *
      * @throws FireflyException
      */
-    public function showLoginForm(?Request $request = null)
+    public function showLoginForm(Request $request)
     {
         Log::channel('audit')->info('Show login form (1.1).');
 
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index d15c6c0d59..d058c527ae 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -175,7 +175,7 @@ class RegisterController extends Controller
      *
      * @throws FireflyException
      */
-    public function showRegistrationForm(?Request $request = null)
+    public function showRegistrationForm(Request $request)
     {
         $isDemoSite        = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index f90624f178..a4f8aaf0ec 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -15,10 +15,10 @@
         </a>
     </li>
 
-    <li class="{{ activeRoutePartial('bills') }}">
+    <li class="{{ activeRoutePartial('subscriptions') }}">
         <a href="{{ route('subscriptions.index') }}">
             <em class="fa fa-calendar-o fa-fw"></em>
-            <span>{{ 'bills'|_ }}</span>
+            <span>{{ 'subscriptions'|_ }}</span>
         </a>
     </li>