Code cleanup

app/Providers/AppServiceProvider.php

@@ -22,11 +22,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Providers;
 
+use Adldap\Laravel\Middleware\WindowsAuthenticate;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Passport;
 use URL;
-use Adldap\Laravel\Middleware\WindowsAuthenticate;
 
 /**
  * @codeCoverageIgnore

app/Providers/EventServiceProvider.php

@@ -49,6 +49,7 @@ use Session;
 
 /**
  * Class EventServiceProvider.
+ *
  * @codeCoverageIgnore
  */
 class EventServiceProvider extends ServiceProvider
@@ -61,55 +62,55 @@ class EventServiceProvider extends ServiceProvider
     protected $listen
         = [
             // is a User related event.
-            RegisteredUser::class              => [
+            RegisteredUser::class               => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
                 'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
             ],
             // is a User related event.
-            Login::class                       => [
+            Login::class                        => [
                 'FireflyIII\Handlers\Events\UserEventHandler@checkSingleUserIsAdmin',
                 'FireflyIII\Handlers\Events\UserEventHandler@demoUserBackToEnglish',
                 'FireflyIII\Handlers\Events\UserEventHandler@storeUserIPAddress',
             ],
-            DetectedNewIPAddress::class => [
+            DetectedNewIPAddress::class         => [
                 'FireflyIII\Handlers\Events\UserEventHandler@notifyNewIPAddress',
             ],
-            RequestedVersionCheckStatus::class => [
+            RequestedVersionCheckStatus::class  => [
                 'FireflyIII\Handlers\Events\VersionCheckEventHandler@checkForUpdates',
             ],
-            RequestedReportOnJournals::class   => [
+            RequestedReportOnJournals::class    => [
                 'FireflyIII\Handlers\Events\AutomationHandler@reportJournals',
             ],
 
             // is a User related event.
-            RequestedNewPassword::class        => [
+            RequestedNewPassword::class         => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendNewPassword',
             ],
             // is a User related event.
-            UserChangedEmail::class            => [
+            UserChangedEmail::class             => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendEmailChangeConfirmMail',
                 'FireflyIII\Handlers\Events\UserEventHandler@sendEmailChangeUndoMail',
             ],
             // admin related
-            AdminRequestedTestMessage::class   => [
+            AdminRequestedTestMessage::class    => [
                 'FireflyIII\Handlers\Events\AdminEventHandler@sendTestMessage',
             ],
             // is a Transaction Journal related event.
-            StoredTransactionGroup::class    => [
+            StoredTransactionGroup::class       => [
                 'FireflyIII\Handlers\Events\StoredGroupEventHandler@processRules',
                 'FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerWebhooks',
             ],
             // is a Transaction Journal related event.
-            UpdatedTransactionGroup::class   => [
+            UpdatedTransactionGroup::class      => [
                 'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@unifyAccounts',
                 'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@processRules',
                 'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@triggerWebhooks',
             ],
-            DestroyedTransactionGroup::class => [
+            DestroyedTransactionGroup::class    => [
                 'FireflyIII\Handlers\Events\DestroyedGroupEventHandler@triggerWebhooks',
             ],
             // API related events:
-            AccessTokenCreated::class          => [
+            AccessTokenCreated::class           => [
                 'FireflyIII\Handlers\Events\APIEventHandler@accessTokenCreated',
             ],
 

app/Providers/FireflyServiceProvider.php

@@ -234,7 +234,7 @@ class FireflyServiceProvider extends ServiceProvider
 
         // webhooks:
         $this->app->bind(MessageGeneratorInterface::class, StandardMessageGenerator::class);
-        $this->app->bind(SignatureGeneratorInterface::class,Sha3SignatureGenerator::class);
+        $this->app->bind(SignatureGeneratorInterface::class, Sha3SignatureGenerator::class);
         $this->app->bind(WebhookSenderInterface::class, StandardWebhookSender::class);
 
         // password verifier thing

app/Providers/FireflySessionProvider.php

@@ -44,6 +44,19 @@ class FireflySessionProvider extends ServiceProvider
         $this->app->singleton(StartFireflySession::class);
     }
 
+    /**
+     * Register the session manager instance.
+     */
+    protected function registerSessionManager(): void
+    {
+        $this->app->singleton(
+            'session',
+            function ($app) {
+                return new SessionManager($app);
+            }
+        );
+    }
+
     /**
      * Register the session driver instance.
      */
@@ -59,17 +72,4 @@ class FireflySessionProvider extends ServiceProvider
             }
         );
     }
-
-    /**
-     * Register the session manager instance.
-     */
-    protected function registerSessionManager(): void
-    {
-        $this->app->singleton(
-            'session',
-            function ($app) {
-                return new SessionManager($app);
-            }
-        );
-    }
 }

app/Providers/JournalServiceProvider.php

@@ -58,44 +58,6 @@ class JournalServiceProvider extends ServiceProvider
         $this->registerGroupCollector();
     }
 
-    /**
-     *
-     */
-    private function registerGroupCollector(): void
-    {
-        $this->app->bind(
-            GroupCollectorInterface::class,
-            static function (Application $app) {
-                /** @var GroupCollectorInterface $collector */
-                $collector = app(GroupCollector::class);
-                if ($app->auth->check()) {
-                    $collector->setUser(auth()->user());
-                }
-
-                return $collector;
-            }
-        );
-    }
-
-    /**
-     * Register group repos.
-     */
-    private function registerGroupRepository(): void
-    {
-        $this->app->bind(
-            TransactionGroupRepositoryInterface::class,
-            static function (Application $app) {
-                /** @var TransactionGroupRepositoryInterface $repository */
-                $repository = app(TransactionGroupRepository::class);
-                if ($app->auth->check()) {
-                    $repository->setUser(auth()->user());
-                }
-
-                return $repository;
-            }
-        );
-    }
-
     /**
      * Register repository.
      */
@@ -142,4 +104,42 @@ class JournalServiceProvider extends ServiceProvider
             }
         );
     }
+
+    /**
+     * Register group repos.
+     */
+    private function registerGroupRepository(): void
+    {
+        $this->app->bind(
+            TransactionGroupRepositoryInterface::class,
+            static function (Application $app) {
+                /** @var TransactionGroupRepositoryInterface $repository */
+                $repository = app(TransactionGroupRepository::class);
+                if ($app->auth->check()) {
+                    $repository->setUser(auth()->user());
+                }
+
+                return $repository;
+            }
+        );
+    }
+
+    /**
+     *
+     */
+    private function registerGroupCollector(): void
+    {
+        $this->app->bind(
+            GroupCollectorInterface::class,
+            static function (Application $app) {
+                /** @var GroupCollectorInterface $collector */
+                $collector = app(GroupCollector::class);
+                if ($app->auth->check()) {
+                    $collector->setUser(auth()->user());
+                }
+
+                return $collector;
+            }
+        );
+    }
 }