diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php
index 224a899076..2c158c6ea5 100644
--- a/app/Api/V1/Controllers/Autocomplete/BillController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php
@@ -65,13 +65,11 @@ class BillController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Bill $item) {
-                return [
-                    'id'     => (string) $item->id,
-                    'name'   => $item->name,
-                    'active' => $item->active,
-                ];
-            }
+            static fn(Bill $item) => [
+                'id'     => (string) $item->id,
+                'name'   => $item->name,
+                'active' => $item->active,
+            ]
         );
 
         return response()->api($filtered->toArray());
diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
index 97fa37418a..5f9aea4988 100644
--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php
+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php
@@ -65,12 +65,10 @@ class BudgetController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Budget $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn(Budget $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());
diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
index 39085c1f06..09dfd0797a 100644
--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php
@@ -65,12 +65,10 @@ class CategoryController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn(Category $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());
diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php
index dd2c277c5e..8053d5c122 100644
--- a/app/Api/V1/Controllers/Chart/CategoryController.php
+++ b/app/Api/V1/Controllers/Chart/CategoryController.php
@@ -119,9 +119,7 @@ class CategoryController extends Controller
         $return     = array_values($return);
 
         // order by amount
-        usort($return, static function (array $a, array $b) {
-            return (float) $a['amount'] < (float) $b['amount'] ? 1 : -1;
-        });
+        usort($return, static fn(array $a, array $b) => (float) $a['amount'] < (float) $b['amount'] ? 1 : -1);
 
         return response()->json($this->clean($return));
     }
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
index acac15728d..0c9883e1e6 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -177,9 +177,7 @@ class ListController extends Controller
 
         // filter and paginate list:
         $collection  = $unfiltered->filter(
-            static function (Bill $bill) use ($currency) {
-                return $bill->transaction_currency_id === $currency->id;
-            }
+            static fn(Bill $bill) => $bill->transaction_currency_id === $currency->id
         );
         $count       = $collection->count();
         $bills       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
diff --git a/app/Api/V1/Requests/Chart/ChartRequest.php b/app/Api/V1/Requests/Chart/ChartRequest.php
index a52c2e8245..7d3f0e4a94 100644
--- a/app/Api/V1/Requests/Chart/ChartRequest.php
+++ b/app/Api/V1/Requests/Chart/ChartRequest.php
@@ -85,7 +85,7 @@ class ChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
index f3dacae241..3ada80f591 100644
--- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
+++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php
@@ -74,7 +74,7 @@ class MoveTransactionsRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
index 9bee14442d..544d65b1f6 100644
--- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
+++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php
@@ -74,7 +74,7 @@ class TransactionRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php
index 4d718460e7..dbe30eab1b 100644
--- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php
@@ -144,7 +144,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
index 68fa02319f..b50b77c141 100644
--- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php
@@ -58,9 +58,7 @@ class StoreRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn(string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);
diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
index fd0eee86b8..be3e13aad9 100644
--- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php
@@ -60,9 +60,7 @@ class UpdateRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn(string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);
diff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.php
index 5b0adb3b52..ccf7e4d030 100644
--- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php
+++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php
@@ -90,7 +90,7 @@ class Request extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php
index 9925b66a1c..40194a33f4 100644
--- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php
@@ -129,7 +129,7 @@ class StoreRequest extends FormRequest
             $failed = false;
         }
         if ($failed) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php
index be00edb215..5931fc7bd2 100644
--- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php
@@ -110,7 +110,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.php
index c650674c78..f6a96a6941 100644
--- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php
@@ -94,7 +94,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php
index 01d9099ea7..1319df36e6 100644
--- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php
@@ -106,7 +106,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
index 34a191c2a7..1fb3d53ca9 100644
--- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
@@ -96,7 +96,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
index 6ee29d70d9..e7ae890499 100644
--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
@@ -126,7 +126,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
index dd2aa5fb82..f8f5091ed0 100644
--- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
@@ -193,7 +193,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
index f81fca7b8c..5449a5edda 100644
--- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
@@ -208,7 +208,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php
index fb5b511f4b..dd65d648a0 100644
--- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php
@@ -148,7 +148,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
index d9fecdc314..13a8a97676 100644
--- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
@@ -168,7 +168,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
index 4e07711c9d..e651e5a1d6 100644
--- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php
@@ -300,7 +300,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
index 2d18b028e3..f53b5ba6df 100644
--- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
@@ -359,7 +359,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
index d395da5fd8..638bda8306 100644
--- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php
@@ -80,7 +80,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
index 5aaeb892cb..0ab51bccd0 100644
--- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php
@@ -80,7 +80,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 
diff --git a/app/Api/V1/Requests/System/UserUpdateRequest.php b/app/Api/V1/Requests/System/UserUpdateRequest.php
index 1fc0df7bb3..553f8e54e4 100644
--- a/app/Api/V1/Requests/System/UserUpdateRequest.php
+++ b/app/Api/V1/Requests/System/UserUpdateRequest.php
@@ -99,7 +99,7 @@ class UserUpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V2/Controllers/Autocomplete/CategoryController.php b/app/Api/V2/Controllers/Autocomplete/CategoryController.php
index de0d566888..1c0abe3db9 100644
--- a/app/Api/V2/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V2/Controllers/Autocomplete/CategoryController.php
@@ -61,13 +61,11 @@ class CategoryController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']);
         $filtered        = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->name,
-                    'meta'  => [],
-                ];
-            }
+            static fn(Category $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->name,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);
diff --git a/app/Api/V2/Controllers/Autocomplete/TagController.php b/app/Api/V2/Controllers/Autocomplete/TagController.php
index de80a16b92..dc296da528 100644
--- a/app/Api/V2/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V2/Controllers/Autocomplete/TagController.php
@@ -61,15 +61,13 @@ class TagController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchTag($queryParameters['query']);
         $filtered        = $result->map(
-            static function (Tag $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->tag,
-                    'value' => (string) $item->id,
-                    'label' => $item->tag,
-                    'meta'  => [],
-                ];
-            }
+            static fn(Tag $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->tag,
+                'value' => (string) $item->id,
+                'label' => $item->tag,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);
diff --git a/app/Api/V2/Controllers/Chart/CategoryController.php b/app/Api/V2/Controllers/Chart/CategoryController.php
index 0a0639a94c..7d66f5080b 100644
--- a/app/Api/V2/Controllers/Chart/CategoryController.php
+++ b/app/Api/V2/Controllers/Chart/CategoryController.php
@@ -134,9 +134,7 @@ class CategoryController extends Controller
         $return     = array_values($return);
 
         // order by native amount
-        usort($return, static function (array $a, array $b) {
-            return (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1;
-        });
+        usort($return, static fn(array $a, array $b) => (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1);
         $converter->summarize();
 
         return response()->json($this->clean($return));
diff --git a/app/Api/V2/Request/Chart/BalanceChartRequest.php b/app/Api/V2/Request/Chart/BalanceChartRequest.php
index 3f60442a89..bdbb141b65 100644
--- a/app/Api/V2/Request/Chart/BalanceChartRequest.php
+++ b/app/Api/V2/Request/Chart/BalanceChartRequest.php
@@ -84,7 +84,7 @@ class BalanceChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V2/Request/Chart/ChartRequest.php b/app/Api/V2/Request/Chart/ChartRequest.php
index 4221166e8c..6ca32ea6e8 100644
--- a/app/Api/V2/Request/Chart/ChartRequest.php
+++ b/app/Api/V2/Request/Chart/ChartRequest.php
@@ -86,7 +86,7 @@ class ChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V2/Request/Chart/DashboardChartRequest.php b/app/Api/V2/Request/Chart/DashboardChartRequest.php
index e3673eb2da..96f66e1095 100644
--- a/app/Api/V2/Request/Chart/DashboardChartRequest.php
+++ b/app/Api/V2/Request/Chart/DashboardChartRequest.php
@@ -83,7 +83,7 @@ class DashboardChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V2/Request/Model/Transaction/StoreRequest.php b/app/Api/V2/Request/Model/Transaction/StoreRequest.php
index 542fc71f8b..4e95b69e9f 100644
--- a/app/Api/V2/Request/Model/Transaction/StoreRequest.php
+++ b/app/Api/V2/Request/Model/Transaction/StoreRequest.php
@@ -311,7 +311,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Api/V2/Request/Model/Transaction/UpdateRequest.php b/app/Api/V2/Request/Model/Transaction/UpdateRequest.php
index ce5d6a95d3..c4d8140c79 100644
--- a/app/Api/V2/Request/Model/Transaction/UpdateRequest.php
+++ b/app/Api/V2/Request/Model/Transaction/UpdateRequest.php
@@ -64,6 +64,7 @@ class UpdateRequest extends Request
      *
      * @throws FireflyException
      */
+    #[\Override]
     public function getAll(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -247,6 +248,7 @@ class UpdateRequest extends Request
     /**
      * The rules that the incoming request must be matched against.
      */
+    #[\Override]
     public function rules(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -330,6 +332,7 @@ class UpdateRequest extends Request
     /**
      * Configure the validator instance.
      */
+    #[\Override]
     public function withValidator(Validator $validator): void
     {
         app('log')->debug('Now in withValidator');
@@ -361,7 +364,7 @@ class UpdateRequest extends Request
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }
diff --git a/app/Console/Commands/Correction/CorrectsAmounts.php b/app/Console/Commands/Correction/CorrectsAmounts.php
index e1b8520e76..3dc797dbb7 100644
--- a/app/Console/Commands/Correction/CorrectsAmounts.php
+++ b/app/Console/Commands/Correction/CorrectsAmounts.php
@@ -175,7 +175,7 @@ class CorrectsAmounts extends Command
     {
         try {
             $check = bccomp((string) $item->trigger_value, '0');
-        } catch (\ValueError $e) {
+        } catch (\ValueError) {
             $this->friendlyError(sprintf('Rule #%d contained invalid %s-trigger "%s". The trigger has been removed, and the rule is disabled.', $item->rule_id, $item->trigger_type, $item->trigger_value));
             $item->rule->active = false;
             $item->rule->save();
diff --git a/app/Console/Commands/Correction/CorrectsCurrencies.php b/app/Console/Commands/Correction/CorrectsCurrencies.php
index 0f621fe5be..8d7623ea18 100644
--- a/app/Console/Commands/Correction/CorrectsCurrencies.php
+++ b/app/Console/Commands/Correction/CorrectsCurrencies.php
@@ -115,9 +115,7 @@ class CorrectsCurrencies extends Command
         $found           = array_values(
             array_filter(
                 $found,
-                static function (int $currencyId) {
-                    return 0 !== $currencyId;
-                }
+                static fn(int $currencyId) => 0 !== $currencyId
             )
         );
 
diff --git a/app/Console/Commands/Correction/CorrectsNativeAmounts.php b/app/Console/Commands/Correction/CorrectsNativeAmounts.php
index abf952000f..5bfce8187e 100644
--- a/app/Console/Commands/Correction/CorrectsNativeAmounts.php
+++ b/app/Console/Commands/Correction/CorrectsNativeAmounts.php
@@ -128,9 +128,7 @@ class CorrectsNativeAmounts extends Command
         $repository->setUserGroup($userGroup);
         $set        = $repository->getPiggyBanks();
         $set        = $set->filter(
-            static function (PiggyBank $piggyBank) use ($currency) {
-                return $currency->id !== $piggyBank->transaction_currency_id;
-            }
+            static fn(PiggyBank $piggyBank) => $currency->id !== $piggyBank->transaction_currency_id
         );
         foreach ($set as $piggyBank) {
             $piggyBank->encrypted = false;
diff --git a/app/Console/Commands/Correction/CorrectsTransactionTypes.php b/app/Console/Commands/Correction/CorrectsTransactionTypes.php
index bb185d5d87..e88c0f7db8 100644
--- a/app/Console/Commands/Correction/CorrectsTransactionTypes.php
+++ b/app/Console/Commands/Correction/CorrectsTransactionTypes.php
@@ -115,9 +115,7 @@ class CorrectsTransactionTypes extends Command
     private function getSourceAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount < 0;
-            }
+            static fn(Transaction $transaction) => $transaction->amount < 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
@@ -144,9 +142,7 @@ class CorrectsTransactionTypes extends Command
     private function getDestinationAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount > 0;
-            }
+            static fn(Transaction $transaction) => $transaction->amount > 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300004: Journal #%d has no destination transaction.', $journal->id));
diff --git a/app/Console/Commands/Upgrade/UpgradesToGroups.php b/app/Console/Commands/Upgrade/UpgradesToGroups.php
index f294db33a8..07b92e00a4 100644
--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -179,9 +179,7 @@ class UpgradesToGroups extends Command
     private function getDestinationTransactions(TransactionJournal $journal): Collection
     {
         return $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount > 0;
-            }
+            static fn(Transaction $transaction) => $transaction->amount > 0
         );
     }
 
diff --git a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
index eec9c08e44..a06b63a69e 100644
--- a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
+++ b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
@@ -46,12 +46,12 @@ class UpgradesTransferCurrencies extends Command
     private JournalCLIRepositoryInterface $cliRepos;
     private int                           $count;
 
-    private ?Account             $destinationAccount;
-    private ?TransactionCurrency $destinationCurrency;
-    private ?Transaction         $destinationTransaction;
-    private ?Account             $sourceAccount;
-    private ?TransactionCurrency $sourceCurrency;
-    private ?Transaction         $sourceTransaction;
+    private ?Account             $destinationAccount = null;
+    private ?TransactionCurrency $destinationCurrency = null;
+    private ?Transaction         $destinationTransaction = null;
+    private ?Account             $sourceAccount = null;
+    private ?TransactionCurrency $sourceCurrency = null;
+    private ?Transaction         $sourceTransaction = null;
 
     /**
      * Execute the console command.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 8e2776a54e..e29ec31305 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -35,6 +35,7 @@ class Kernel extends ConsoleKernel
     /**
      * Register the commands for the application.
      */
+    #[\Override]
     protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
@@ -45,6 +46,7 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      */
+    #[\Override]
     protected function schedule(Schedule $schedule): void
     {
         $schedule->call(
diff --git a/app/Events/Admin/InvitationCreated.php b/app/Events/Admin/InvitationCreated.php
index c057b35b06..7d6ae6af9c 100644
--- a/app/Events/Admin/InvitationCreated.php
+++ b/app/Events/Admin/InvitationCreated.php
@@ -36,15 +36,12 @@ class InvitationCreated extends Event
 {
     use SerializesModels;
 
-    public InvitedUser $invitee;
-
     public TransactionGroup $transactionGroup;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(InvitedUser $invitee)
+    public function __construct(public InvitedUser $invitee)
     {
-        $this->invitee = $invitee;
     }
 }
diff --git a/app/Events/DestroyedTransactionGroup.php b/app/Events/DestroyedTransactionGroup.php
index 9911864c1e..f6692981f9 100644
--- a/app/Events/DestroyedTransactionGroup.php
+++ b/app/Events/DestroyedTransactionGroup.php
@@ -34,14 +34,11 @@ class DestroyedTransactionGroup extends Event
 {
     use SerializesModels;
 
-    public TransactionGroup $transactionGroup;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(TransactionGroup $transactionGroup)
+    public function __construct(public TransactionGroup $transactionGroup)
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
-        $this->transactionGroup = $transactionGroup;
     }
 }
diff --git a/app/Events/DestroyedTransactionLink.php b/app/Events/DestroyedTransactionLink.php
index b32c677ddd..374f870465 100644
--- a/app/Events/DestroyedTransactionLink.php
+++ b/app/Events/DestroyedTransactionLink.php
@@ -32,15 +32,12 @@ use Illuminate\Queue\SerializesModels;
  */
 class DestroyedTransactionLink extends Event
 {
-    use SerializesModels;
-
-    private TransactionJournalLink $link; // @phpstan-ignore-line
+    use SerializesModels; // @phpstan-ignore-line
 
     /**
      * DestroyedTransactionLink constructor.
      */
-    public function __construct(TransactionJournalLink $link)
+    public function __construct(private TransactionJournalLink $link)
     {
-        $this->link = $link;
     }
 }
diff --git a/app/Events/DetectedNewIPAddress.php b/app/Events/DetectedNewIPAddress.php
index a04d65cb7c..189c8a379d 100644
--- a/app/Events/DetectedNewIPAddress.php
+++ b/app/Events/DetectedNewIPAddress.php
@@ -34,13 +34,10 @@ class DetectedNewIPAddress extends Event
 {
     use SerializesModels;
 
-    public User $user;
-
     /**
      * Create a new event instance. This event is triggered when a new user registers.
      */
-    public function __construct(User $user)
+    public function __construct(public User $user)
     {
-        $this->user = $user;
     }
 }
diff --git a/app/Events/Model/Account/Updated.php b/app/Events/Model/Account/Updated.php
index 8f86723bd3..5edbde05d0 100644
--- a/app/Events/Model/Account/Updated.php
+++ b/app/Events/Model/Account/Updated.php
@@ -31,10 +31,7 @@ class Updated
 {
     use SerializesModels;
 
-    public Account $account;
-
-    public function __construct(Account $account)
+    public function __construct(public Account $account)
     {
-        $this->account = $account;
     }
 }
diff --git a/app/Events/Model/BudgetLimit/Created.php b/app/Events/Model/BudgetLimit/Created.php
index 2600c41632..96158fe3f3 100644
--- a/app/Events/Model/BudgetLimit/Created.php
+++ b/app/Events/Model/BudgetLimit/Created.php
@@ -35,10 +35,7 @@ class Created extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
+    public function __construct(public BudgetLimit $budgetLimit)
     {
-        $this->budgetLimit = $budgetLimit;
     }
 }
diff --git a/app/Events/Model/BudgetLimit/Deleted.php b/app/Events/Model/BudgetLimit/Deleted.php
index 06aab6e0ca..dd3f4c44e1 100644
--- a/app/Events/Model/BudgetLimit/Deleted.php
+++ b/app/Events/Model/BudgetLimit/Deleted.php
@@ -35,10 +35,7 @@ class Deleted extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
+    public function __construct(public BudgetLimit $budgetLimit)
     {
-        $this->budgetLimit = $budgetLimit;
     }
 }
diff --git a/app/Events/Model/BudgetLimit/Updated.php b/app/Events/Model/BudgetLimit/Updated.php
index 6429635ea0..c043387013 100644
--- a/app/Events/Model/BudgetLimit/Updated.php
+++ b/app/Events/Model/BudgetLimit/Updated.php
@@ -35,10 +35,7 @@ class Updated extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
+    public function __construct(public BudgetLimit $budgetLimit)
     {
-        $this->budgetLimit = $budgetLimit;
     }
 }
diff --git a/app/Events/Model/PiggyBank/ChangedAmount.php b/app/Events/Model/PiggyBank/ChangedAmount.php
index 9521641ab3..24bb9b36e9 100644
--- a/app/Events/Model/PiggyBank/ChangedAmount.php
+++ b/app/Events/Model/PiggyBank/ChangedAmount.php
@@ -39,18 +39,14 @@ class ChangedAmount extends Event
 
     public string              $amount;
     public PiggyBank           $piggyBank;
-    public ?TransactionGroup   $transactionGroup;
-    public ?TransactionJournal $transactionJournal;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(PiggyBank $piggyBank, string $amount, ?TransactionJournal $transactionJournal, ?TransactionGroup $transactionGroup)
+    public function __construct(PiggyBank $piggyBank, string $amount, public ?TransactionJournal $transactionJournal, public ?TransactionGroup $transactionGroup)
     {
         app('log')->debug(sprintf('Created piggy bank event for piggy bank #%d with amount %s', $piggyBank->id, $amount));
         $this->piggyBank          = $piggyBank;
-        $this->transactionJournal = $transactionJournal;
-        $this->transactionGroup   = $transactionGroup;
         $this->amount             = $amount;
     }
 }
diff --git a/app/Events/Model/Rule/RuleActionFailedOnArray.php b/app/Events/Model/Rule/RuleActionFailedOnArray.php
index 8c6ca6aa9d..fc537cb430 100644
--- a/app/Events/Model/Rule/RuleActionFailedOnArray.php
+++ b/app/Events/Model/Rule/RuleActionFailedOnArray.php
@@ -34,15 +34,8 @@ class RuleActionFailedOnArray
 {
     use SerializesModels;
 
-    public string     $error;
-    public array      $journal;
-    public RuleAction $ruleAction;
-
-    public function __construct(RuleAction $ruleAction, array $journal, string $error)
+    public function __construct(public RuleAction $ruleAction, public array $journal, public string $error)
     {
         app('log')->debug('Created new RuleActionFailedOnArray');
-        $this->ruleAction = $ruleAction;
-        $this->journal    = $journal;
-        $this->error      = $error;
     }
 }
diff --git a/app/Events/Model/Rule/RuleActionFailedOnObject.php b/app/Events/Model/Rule/RuleActionFailedOnObject.php
index bfc14bd78d..bde5cacdec 100644
--- a/app/Events/Model/Rule/RuleActionFailedOnObject.php
+++ b/app/Events/Model/Rule/RuleActionFailedOnObject.php
@@ -35,15 +35,8 @@ class RuleActionFailedOnObject
 {
     use SerializesModels;
 
-    public string             $error;
-    public TransactionJournal $journal;
-    public RuleAction         $ruleAction;
-
-    public function __construct(RuleAction $ruleAction, TransactionJournal $journal, string $error)
+    public function __construct(public RuleAction $ruleAction, public TransactionJournal $journal, public string $error)
     {
         app('log')->debug('Created new RuleActionFailedOnObject');
-        $this->ruleAction = $ruleAction;
-        $this->journal    = $journal;
-        $this->error      = $error;
     }
 }
diff --git a/app/Events/NewVersionAvailable.php b/app/Events/NewVersionAvailable.php
index 5d08de0d71..64c93f01f4 100644
--- a/app/Events/NewVersionAvailable.php
+++ b/app/Events/NewVersionAvailable.php
@@ -34,14 +34,11 @@ class NewVersionAvailable extends Event
 {
     use SerializesModels;
 
-    public string $message;
-
     /**
      * Create a new event instance. This event is triggered when a new version is available.
      */
-    public function __construct(string $message)
+    public function __construct(public string $message)
     {
         Log::debug(__METHOD__);
-        $this->message = $message;
     }
 }
diff --git a/app/Events/Preferences/UserGroupChangedDefaultCurrency.php b/app/Events/Preferences/UserGroupChangedDefaultCurrency.php
index baa392f605..5eb709b3e2 100644
--- a/app/Events/Preferences/UserGroupChangedDefaultCurrency.php
+++ b/app/Events/Preferences/UserGroupChangedDefaultCurrency.php
@@ -33,11 +33,8 @@ class UserGroupChangedDefaultCurrency extends Event
 {
     use SerializesModels;
 
-    public UserGroup $userGroup;
-
-    public function __construct(UserGroup $userGroup)
+    public function __construct(public UserGroup $userGroup)
     {
         Log::debug('User group changed default currency.');
-        $this->userGroup = $userGroup;
     }
 }
diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php
index 51539a856a..4dd01adc72 100644
--- a/app/Events/RegisteredUser.php
+++ b/app/Events/RegisteredUser.php
@@ -35,15 +35,10 @@ class RegisteredUser extends Event
 {
     use SerializesModels;
 
-    public OwnerNotifiable $owner;
-    public User            $user;
-
     /**
      * Create a new event instance. This event is triggered when a new user registers.
      */
-    public function __construct(OwnerNotifiable $owner, User $user)
+    public function __construct(public OwnerNotifiable $owner, public User $user)
     {
-        $this->user  = $user;
-        $this->owner = $owner;
     }
 }
diff --git a/app/Events/RequestedReportOnJournals.php b/app/Events/RequestedReportOnJournals.php
index 01ed141159..8805776832 100644
--- a/app/Events/RequestedReportOnJournals.php
+++ b/app/Events/RequestedReportOnJournals.php
@@ -39,17 +39,12 @@ class RequestedReportOnJournals
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Collection $groups;
-    public int        $userId;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(int $userId, Collection $groups)
+    public function __construct(public int $userId, public Collection $groups)
     {
         app('log')->debug('In event RequestedReportOnJournals.');
-        $this->userId = $userId;
-        $this->groups = $groups;
     }
 
     /**
diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php
index 63b9f4f898..27e6bf24eb 100644
--- a/app/Events/RequestedVersionCheckStatus.php
+++ b/app/Events/RequestedVersionCheckStatus.php
@@ -34,14 +34,11 @@ class RequestedVersionCheckStatus extends Event
 {
     use SerializesModels;
 
-    public User $user;
-
     /**
      * Create a new event instance. This event is triggered when Firefly III wants to know
      * what the deal is with the version checker.
      */
-    public function __construct(User $user)
+    public function __construct(public User $user)
     {
-        $this->user = $user;
     }
 }
diff --git a/app/Events/Security/MFABackupFewLeft.php b/app/Events/Security/MFABackupFewLeft.php
index dd1129c7d3..141c6f1e69 100644
--- a/app/Events/Security/MFABackupFewLeft.php
+++ b/app/Events/Security/MFABackupFewLeft.php
@@ -32,15 +32,12 @@ use Illuminate\Queue\SerializesModels;
 class MFABackupFewLeft extends Event
 {
     use SerializesModels;
-
-    public int  $count;
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user, int $count)
+    public function __construct(null|Authenticatable|User $user, public int $count)
     {
         if ($user instanceof User) {
             $this->user = $user;
         }
-        $this->count = $count;
     }
 }
diff --git a/app/Events/Security/MFAManyFailedAttempts.php b/app/Events/Security/MFAManyFailedAttempts.php
index 6363dc3a3d..0bbaf6ea08 100644
--- a/app/Events/Security/MFAManyFailedAttempts.php
+++ b/app/Events/Security/MFAManyFailedAttempts.php
@@ -32,15 +32,12 @@ use Illuminate\Queue\SerializesModels;
 class MFAManyFailedAttempts extends Event
 {
     use SerializesModels;
-
-    public int  $count;
     public User $user;
 
-    public function __construct(null|Authenticatable|User $user, int $count)
+    public function __construct(null|Authenticatable|User $user, public int $count)
     {
         if ($user instanceof User) {
             $this->user = $user;
         }
-        $this->count = $count;
     }
 }
diff --git a/app/Events/Security/UnknownUserAttemptedLogin.php b/app/Events/Security/UnknownUserAttemptedLogin.php
index 871b0b7316..641e26e06d 100644
--- a/app/Events/Security/UnknownUserAttemptedLogin.php
+++ b/app/Events/Security/UnknownUserAttemptedLogin.php
@@ -30,10 +30,7 @@ class UnknownUserAttemptedLogin
 {
     use SerializesModels;
 
-    public string $address;
-
-    public function __construct(string $address)
+    public function __construct(public string $address)
     {
-        $this->address = $address;
     }
 }
diff --git a/app/Events/StoredAccount.php b/app/Events/StoredAccount.php
index 441afed64a..2c6e783660 100644
--- a/app/Events/StoredAccount.php
+++ b/app/Events/StoredAccount.php
@@ -34,13 +34,10 @@ class StoredAccount extends Event
 {
     use SerializesModels;
 
-    public Account $account;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Account $account)
+    public function __construct(public Account $account)
     {
-        $this->account = $account;
     }
 }
diff --git a/app/Events/StoredTransactionGroup.php b/app/Events/StoredTransactionGroup.php
index 268525635f..d7559d3741 100644
--- a/app/Events/StoredTransactionGroup.php
+++ b/app/Events/StoredTransactionGroup.php
@@ -34,17 +34,10 @@ class StoredTransactionGroup extends Event
 {
     use SerializesModels;
 
-    public bool             $applyRules;
-    public bool             $fireWebhooks;
-    public TransactionGroup $transactionGroup;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(TransactionGroup $transactionGroup, bool $applyRules, bool $fireWebhooks)
+    public function __construct(public TransactionGroup $transactionGroup, public bool $applyRules, public bool $fireWebhooks)
     {
-        $this->transactionGroup = $transactionGroup;
-        $this->fireWebhooks     = $fireWebhooks;
-        $this->applyRules       = $applyRules;
     }
 }
diff --git a/app/Events/Test/OwnerTestNotificationChannel.php b/app/Events/Test/OwnerTestNotificationChannel.php
index c246520c2d..904076aac2 100644
--- a/app/Events/Test/OwnerTestNotificationChannel.php
+++ b/app/Events/Test/OwnerTestNotificationChannel.php
@@ -32,15 +32,13 @@ class OwnerTestNotificationChannel
     use SerializesModels;
 
     public string          $channel;
-    public OwnerNotifiable $owner;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(string $channel, OwnerNotifiable $owner)
+    public function __construct(string $channel, public OwnerNotifiable $owner)
     {
         app('log')->debug(sprintf('Triggered OwnerTestNotificationChannel("%s")', $channel));
-        $this->owner   = $owner;
         $this->channel = $channel;
     }
 }
diff --git a/app/Events/Test/UserTestNotificationChannel.php b/app/Events/Test/UserTestNotificationChannel.php
index aff68cc409..4d028459d1 100644
--- a/app/Events/Test/UserTestNotificationChannel.php
+++ b/app/Events/Test/UserTestNotificationChannel.php
@@ -32,15 +32,13 @@ class UserTestNotificationChannel
     use SerializesModels;
 
     public string $channel;
-    public User   $user;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(string $channel, User $user)
+    public function __construct(string $channel, public User $user)
     {
         app('log')->debug(sprintf('Triggered UserTestNotificationChannel("%s")', $channel));
-        $this->user    = $user;
         $this->channel = $channel;
     }
 }
diff --git a/app/Events/TriggeredAuditLog.php b/app/Events/TriggeredAuditLog.php
index 11febd18ff..eb758cd594 100644
--- a/app/Events/TriggeredAuditLog.php
+++ b/app/Events/TriggeredAuditLog.php
@@ -34,23 +34,12 @@ class TriggeredAuditLog extends Event
 {
     use SerializesModels;
 
-    public mixed  $after;
-    public Model  $auditable;
-    public mixed  $before;
-    public Model  $changer;
-    public string $field;
-
     /**
      * Create a new event instance.
      *
      * @SuppressWarnings("PHPMD.ExcessiveParameterList")
      */
-    public function __construct(Model $changer, Model $auditable, string $field, mixed $before, mixed $after)
+    public function __construct(public Model $changer, public Model $auditable, public string $field, public mixed $before, public mixed $after)
     {
-        $this->changer   = $changer;
-        $this->auditable = $auditable;
-        $this->field     = $field;
-        $this->before    = $before;
-        $this->after     = $after;
     }
 }
diff --git a/app/Events/UpdatedAccount.php b/app/Events/UpdatedAccount.php
index 3deceba692..c4a317c4a7 100644
--- a/app/Events/UpdatedAccount.php
+++ b/app/Events/UpdatedAccount.php
@@ -34,13 +34,10 @@ class UpdatedAccount extends Event
 {
     use SerializesModels;
 
-    public Account $account;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Account $account)
+    public function __construct(public Account $account)
     {
-        $this->account = $account;
     }
 }
diff --git a/app/Events/UpdatedTransactionGroup.php b/app/Events/UpdatedTransactionGroup.php
index 9827d81d06..c5d41e7860 100644
--- a/app/Events/UpdatedTransactionGroup.php
+++ b/app/Events/UpdatedTransactionGroup.php
@@ -34,17 +34,10 @@ class UpdatedTransactionGroup extends Event
 {
     use SerializesModels;
 
-    public bool             $applyRules;
-    public bool             $fireWebhooks;
-    public TransactionGroup $transactionGroup;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(TransactionGroup $transactionGroup, bool $applyRules, bool $fireWebhooks)
+    public function __construct(public TransactionGroup $transactionGroup, public bool $applyRules, public bool $fireWebhooks)
     {
-        $this->transactionGroup = $transactionGroup;
-        $this->fireWebhooks     = $fireWebhooks;
-        $this->applyRules       = $applyRules;
     }
 }
diff --git a/app/Events/UserChangedEmail.php b/app/Events/UserChangedEmail.php
index 1d2e11fcf7..f69c5ed238 100644
--- a/app/Events/UserChangedEmail.php
+++ b/app/Events/UserChangedEmail.php
@@ -34,17 +34,10 @@ class UserChangedEmail extends Event
 {
     use SerializesModels;
 
-    public string $newEmail;
-    public string $oldEmail;
-    public User   $user;
-
     /**
      * UserChangedEmail constructor.
      */
-    public function __construct(User $user, string $newEmail, string $oldEmail)
+    public function __construct(public User $user, public string $newEmail, public string $oldEmail)
     {
-        $this->user     = $user;
-        $this->oldEmail = $oldEmail;
-        $this->newEmail = $newEmail;
     }
 }
diff --git a/app/Events/WarnUserAboutBill.php b/app/Events/WarnUserAboutBill.php
index 98b7d5c449..968d2f95d9 100644
--- a/app/Events/WarnUserAboutBill.php
+++ b/app/Events/WarnUserAboutBill.php
@@ -34,14 +34,7 @@ class WarnUserAboutBill extends Event
 {
     use SerializesModels;
 
-    public Bill   $bill;
-    public int    $diff;
-    public string $field;
-
-    public function __construct(Bill $bill, string $field, int $diff)
+    public function __construct(public Bill $bill, public string $field, public int $diff)
     {
-        $this->bill  = $bill;
-        $this->field = $field;
-        $this->diff  = $diff;
     }
 }
diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php
index 371add870f..46bef0b640 100644
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -49,6 +49,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
      *
      * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
+    #[\Override]
     public function render($request, \Throwable $e): Response
     {
         $route = $request->route();
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 021d3513b9..b2cd742b2f 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -69,6 +69,7 @@ class Handler extends ExceptionHandler
     /**
      * Register the exception handling callbacks for the application.
      */
+    #[\Override]
     public function register(): void {}
 
     /**
@@ -82,6 +83,7 @@ class Handler extends ExceptionHandler
      * @SuppressWarnings("PHPMD.NPathComplexity")
      * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
+    #[\Override]
     public function render($request, \Throwable $e): Response
     {
         $expectsJson = $request->expectsJson();
@@ -149,12 +151,12 @@ class Handler extends ExceptionHandler
 
             $isDebug   = (bool) config('app.debug', false);
             if ($isDebug) {
-                app('log')->debug(sprintf('Return JSON %s with debug.', get_class($e)));
+                app('log')->debug(sprintf('Return JSON %s with debug.', $e::class));
 
                 return response()->json(
                     [
                         'message'   => $e->getMessage(),
-                        'exception' => get_class($e),
+                        'exception' => $e::class,
                         'line'      => $e->getLine(),
                         'file'      => $e->getFile(),
                         'trace'     => $e->getTrace(),
@@ -162,7 +164,7 @@ class Handler extends ExceptionHandler
                     $errorCode
                 );
             }
-            app('log')->debug(sprintf('Return JSON %s.', get_class($e)));
+            app('log')->debug(sprintf('Return JSON %s.', $e::class));
 
             return response()->json(
                 ['message' => sprintf('Internal Firefly III Exception: %s', $e->getMessage()), 'exception' => 'UndisclosedException'],
@@ -192,7 +194,7 @@ class Handler extends ExceptionHandler
             return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500);
         }
 
-        app('log')->debug(sprintf('Error "%s" has no Firefly III treatment, parent will handle.', get_class($e)));
+        app('log')->debug(sprintf('Error "%s" has no Firefly III treatment, parent will handle.', $e::class));
 
         return parent::render($request, $e);
     }
@@ -202,6 +204,7 @@ class Handler extends ExceptionHandler
      *
      * @throws \Throwable
      */
+    #[\Override]
     public function report(\Throwable $e): void
     {
         $doMailError = (bool) config('firefly.send_error_message');
@@ -222,7 +225,7 @@ class Handler extends ExceptionHandler
         $headers     = request()->headers->all();
 
         $data        = [
-            'class'        => get_class($e),
+            'class'        => $e::class,
             'errorMessage' => $e->getMessage(),
             'time'         => \Safe\date('r'),
             'stackTrace'   => $e->getTraceAsString(),
@@ -250,9 +253,7 @@ class Handler extends ExceptionHandler
     {
         return null !== Arr::first(
             $this->dontReport,
-            static function ($type) use ($e) {
-                return $e instanceof $type;
-            }
+            static fn($type) => $e instanceof $type
         );
     }
 
@@ -261,6 +262,7 @@ class Handler extends ExceptionHandler
      *
      * @param Request $request
      */
+    #[\Override]
     protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response|JsonResponse|RedirectResponse
     {
         // protect against open redirect when submitting invalid forms.
diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php
index 6fe9dbb539..83294e2045 100644
--- a/app/Factory/TransactionFactory.php
+++ b/app/Factory/TransactionFactory.php
@@ -41,7 +41,7 @@ class TransactionFactory
     private Account              $account;
     private array                $accountInformation;
     private TransactionCurrency  $currency;
-    private ?TransactionCurrency $foreignCurrency;
+    private ?TransactionCurrency $foreignCurrency = null;
     private TransactionJournal   $journal;
     private bool                 $reconciled;
 
diff --git a/app/Factory/TransactionGroupFactory.php b/app/Factory/TransactionGroupFactory.php
index 38eb4e095a..f28153f4e6 100644
--- a/app/Factory/TransactionGroupFactory.php
+++ b/app/Factory/TransactionGroupFactory.php
@@ -35,7 +35,7 @@ use FireflyIII\User;
  */
 class TransactionGroupFactory
 {
-    private TransactionJournalFactory $journalFactory;
+    private readonly TransactionJournalFactory $journalFactory;
     private User                      $user;
     private UserGroup $userGroup;
 
diff --git a/app/Generator/Report/Account/MultiYearReportGenerator.php b/app/Generator/Report/Account/MultiYearReportGenerator.php
index 06619ce900..ff59598046 100644
--- a/app/Generator/Report/Account/MultiYearReportGenerator.php
+++ b/app/Generator/Report/Account/MultiYearReportGenerator.php
@@ -31,6 +31,7 @@ class MultiYearReportGenerator extends MonthReportGenerator
     /**
      * Returns the preferred period.
      */
+    #[\Override]
     protected function preferredPeriod(): string
     {
         return 'year';
diff --git a/app/Generator/Report/Account/YearReportGenerator.php b/app/Generator/Report/Account/YearReportGenerator.php
index e911928c85..4b39570840 100644
--- a/app/Generator/Report/Account/YearReportGenerator.php
+++ b/app/Generator/Report/Account/YearReportGenerator.php
@@ -31,6 +31,7 @@ class YearReportGenerator extends MonthReportGenerator
     /**
      * Returns the preferred period.
      */
+    #[\Override]
     protected function preferredPeriod(): string
     {
         return 'month';
diff --git a/app/Generator/Webhook/StandardMessageGenerator.php b/app/Generator/Webhook/StandardMessageGenerator.php
index 2d8770e99d..2f93fe2303 100644
--- a/app/Generator/Webhook/StandardMessageGenerator.php
+++ b/app/Generator/Webhook/StandardMessageGenerator.php
@@ -106,7 +106,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
      */
     private function generateMessage(Webhook $webhook, Model $model): void
     {
-        $class        = get_class($model);
+        $class        = $model::class;
         // Line is ignored because all of Firefly III's Models have an id property.
         app('log')->debug(sprintf('Now in generateMessage(#%d, %s#%d)', $webhook->id, $class, $model->id));
 
diff --git a/app/Handlers/Events/WebhookEventHandler.php b/app/Handlers/Events/WebhookEventHandler.php
index bcab140724..679863e43c 100644
--- a/app/Handlers/Events/WebhookEventHandler.php
+++ b/app/Handlers/Events/WebhookEventHandler.php
@@ -42,9 +42,7 @@ class WebhookEventHandler
         $messages = WebhookMessage::where('webhook_messages.sent', false)
             ->get(['webhook_messages.*'])
             ->filter(
-                static function (WebhookMessage $message) {
-                    return $message->webhookAttempts()->count() <= 2;
-                }
+                static fn(WebhookMessage $message) => $message->webhookAttempts()->count() <= 2
             )->splice(0, 5)
         ;
         app('log')->debug(sprintf('Found %d webhook message(s) ready to be send.', $messages->count()));
diff --git a/config/ide-helper.php b/config/ide-helper.php
index 1ec85c18d8..1e110ae779 100644
--- a/config/ide-helper.php
+++ b/config/ide-helper.php
@@ -114,8 +114,8 @@ return [
     */
 
     'extra'                       => [
-        'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'],
-        'Session'  => ['Illuminate\Session\Store'],
+        'Eloquent' => [\Illuminate\Database\Eloquent\Builder::class, \Illuminate\Database\Query\Builder::class],
+        'Session'  => [\Illuminate\Session\Store::class],
     ],
 
     'magic'                       => [