Code reordering and reformatting. I should really start employing style CI.

app/Handlers/Events/AutomationHandler.php

@@ -50,7 +50,7 @@ class AutomationHandler
         $sendReport = config('firefly.send_report_journals');
 
         if (false === $sendReport) {
-            return true; 
+            return true;
         }
 
         Log::debug('In reportJournals.');

app/Handlers/Events/StoredGroupEventHandler.php

@@ -77,6 +77,18 @@ class StoredGroupEventHandler
         $newRuleEngine->fire();
     }
 
+    /**
+     * @param StoredTransactionGroup $event
+     */
+    public function recalculateCredit(StoredTransactionGroup $event): void
+    {
+        $group = $event->transactionGroup;
+        /** @var CreditRecalculateService $object */
+        $object = app(CreditRecalculateService::class);
+        $object->setGroup($group);
+        $object->recalculate();
+    }
+
     /**
      * This method processes all webhooks that respond to the "stored transaction group" trigger (100)
      *
@@ -108,16 +120,4 @@ class StoredGroupEventHandler
         event(new RequestedSendWebhookMessages);
     }
 
-    /**
-     * @param StoredTransactionGroup $event
-     */
-    public function recalculateCredit(StoredTransactionGroup $event): void
-    {
-        $group = $event->transactionGroup;
-        /** @var CreditRecalculateService $object */
-        $object = app(CreditRecalculateService::class);
-        $object->setGroup($group);
-        $object->recalculate();
-    }
-
 }

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -77,6 +77,18 @@ class UpdatedGroupEventHandler
         $newRuleEngine->fire();
     }
 
+    /**
+     * @param UpdatedTransactionGroup $event
+     */
+    public function recalculateCredit(UpdatedTransactionGroup $event): void
+    {
+        $group = $event->transactionGroup;
+        /** @var CreditRecalculateService $object */
+        $object = app(CreditRecalculateService::class);
+        $object->setGroup($group);
+        $object->recalculate();
+    }
+
     /**
      * @param UpdatedTransactionGroup $updatedGroupEvent
      */
@@ -100,18 +112,6 @@ class UpdatedGroupEventHandler
         event(new RequestedSendWebhookMessages);
     }
 
-    /**
-     * @param UpdatedTransactionGroup $event
-     */
-    public function recalculateCredit(UpdatedTransactionGroup $event): void
-    {
-        $group = $event->transactionGroup;
-        /** @var CreditRecalculateService $object */
-        $object = app(CreditRecalculateService::class);
-        $object->setGroup($group);
-        $object->recalculate();
-    }
-
     /**
      * This method will make sure all source / destination accounts are the same.
      *

app/Handlers/Events/UserEventHandler.php

@@ -108,6 +108,34 @@ class UserEventHandler
         return true;
     }
 
+    /**
+     * @param RegisteredUser $event
+     *
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createGroupMembership(RegisteredUser $event): bool
+    {
+        $user = $event->user;
+        // create a new group.
+        $group = UserGroup::create(['title' => $user->email]);
+        $role  = UserRole::where('title', UserRole::OWNER)->first();
+        if (null === $role) {
+            throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
+        }
+        GroupMembership::create(
+            [
+                'user_id'       => $user->id,
+                'user_group_id' => $group->id,
+                'user_role_id'  => $role->id,
+            ]
+        );
+        $user->user_group_id = $group->id;
+        $user->save();
+
+        return true;
+    }
+
     /**
      * Set the demo user back to English.
      *
@@ -251,34 +279,6 @@ class UserEventHandler
         return true;
     }
 
-    /**
-     * @param RegisteredUser $event
-     *
-     * @return bool
-     * @throws FireflyException
-     */
-    public function createGroupMembership(RegisteredUser $event): bool
-    {
-        $user = $event->user;
-        // create a new group.
-        $group = UserGroup::create(['title' => $user->email]);
-        $role  = UserRole::where('title', UserRole::OWNER)->first();
-        if (null === $role) {
-            throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
-        }
-        GroupMembership::create(
-            [
-                'user_id'       => $user->id,
-                'user_group_id' => $group->id,
-                'user_role_id'  => $role->id,
-            ]
-        );
-        $user->user_group_id = $group->id;
-        $user->save();
-
-        return true;
-    }
-
     /**
      * This method will send the user a registration mail, welcoming him or her to Firefly III.
      * This message is only sent when the configuration of Firefly III says so.

app/Handlers/Events/VersionCheckEventHandler.php

@@ -61,7 +61,7 @@ class VersionCheckEventHandler
 
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
-        $user = $event->user;
+        $user       = $event->user;
         if (!$repository->hasRole($user, 'owner')) {
             Log::debug('User is not admin, done.');
 
@@ -88,13 +88,14 @@ class VersionCheckEventHandler
 
     /**
      * @param RequestedVersionCheckStatus $event
+     *
      * @throws FireflyException
      */
     protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void
     {
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
-        $user = $event->user;
+        $user       = $event->user;
         if (!$repository->hasRole($user, 'owner')) {
             Log::debug('User is not admin, done.');