Code cleanup.

app/Services/Internal/Update/GroupUpdateService.php

@@ -30,7 +30,6 @@ use FireflyIII\Factory\TransactionJournalFactory;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
-use JsonException;
 
 /**
  * Class GroupUpdateService
@@ -40,18 +39,15 @@ class GroupUpdateService
     /**
      * Update a transaction group.
      *
-     * @param TransactionGroup $transactionGroup
-     * @param array            $data
-     *
-     * @return TransactionGroup
      * @throws DuplicateTransactionException
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
         app('log')->debug('Now in group update service', $data);
+
         /** @var array $transactions */
         $transactions = $data['transactions'] ?? [];
         // update group name.
@@ -71,7 +67,6 @@ class GroupUpdateService
             );
         }
 
-
         if (0 === count($transactions)) {
             app('log')->debug('No transactions submitted, do nothing.');
 
@@ -112,6 +107,7 @@ class GroupUpdateService
             foreach ($result as $deletedId) {
                 /** @var TransactionJournal $journal */
                 $journal = $transactionGroup->transactionJournals()->find((int)$deletedId);
+
                 /** @var JournalDestroyService $service */
                 $service = app(JournalDestroyService::class);
                 $service->destroy($journal);
@@ -126,17 +122,12 @@ class GroupUpdateService
 
     /**
      * Update single journal.
-     *
-     * @param TransactionGroup   $transactionGroup
-     * @param TransactionJournal $journal
-     * @param array              $data
      */
     private function updateTransactionJournal(
         TransactionGroup   $transactionGroup,
         TransactionJournal $journal,
         array              $data
-    ): void
-    {
+    ): void {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
         if (0 === count($data)) {
             return;
@@ -144,6 +135,7 @@ class GroupUpdateService
         if (1 === count($data) && array_key_exists('transaction_journal_id', $data)) {
             return;
         }
+
         /** @var JournalUpdateService $updateService */
         $updateService = app(JournalUpdateService::class);
         $updateService->setTransactionGroup($transactionGroup);
@@ -153,27 +145,25 @@ class GroupUpdateService
     }
 
     /**
-     * @param TransactionGroup $transactionGroup
-     * @param array            $transactions
-     *
-     * @return array
      * @throws DuplicateTransactionException
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     private function updateTransactions(TransactionGroup $transactionGroup, array $transactions): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
         // updated or created transaction journals:
         $updated = [];
+
         /**
          * @var int   $index
          * @var array $transaction
          */
         foreach ($transactions as $index => $transaction) {
-            app('log')->debug(sprintf('Now at #%d of %d', ($index + 1), count($transactions)), $transaction);
+            app('log')->debug(sprintf('Now at #%d of %d', $index + 1, count($transactions)), $transaction);
             $journalId = (int)($transaction['transaction_journal_id'] ?? 0);
-            /** @var TransactionJournal|null $journal */
+
+            /** @var null|TransactionJournal $journal */
             $journal = $transactionGroup->transactionJournals()->find($journalId);
             if (null === $journal) {
                 app('log')->debug('This entry has no existing journal: make a new split.');
@@ -181,7 +171,8 @@ class GroupUpdateService
                 // by plucking it from another journal in the group:
                 if (!array_key_exists('type', $transaction)) {
                     app('log')->debug('No transaction type is indicated.');
-                    /** @var TransactionJournal|null $randomJournal */
+
+                    /** @var null|TransactionJournal $randomJournal */
                     $randomJournal = $transactionGroup->transactionJournals()->inRandomOrder()->with(
                         ['transactionType']
                     )->first();
@@ -212,14 +203,9 @@ class GroupUpdateService
     }
 
     /**
-     * @param TransactionGroup $transactionGroup
-     * @param array            $data
-     *
-     * @return TransactionJournal|null
-     *
      * @throws DuplicateTransactionException
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     private function createTransactionJournal(TransactionGroup $transactionGroup, array $data): ?TransactionJournal
     {
@@ -228,14 +214,17 @@ class GroupUpdateService
                 $data,
             ],
         ];
+
         /** @var TransactionJournalFactory $factory */
         $factory = app(TransactionJournalFactory::class);
         $factory->setUser($transactionGroup->user);
+
         try {
             $collection = $factory->create($submission);
         } catch (FireflyException $e) {
             app('log')->error($e->getMessage());
             app('log')->error($e->getTraceAsString());
+
             throw new FireflyException(
                 sprintf('Could not create new transaction journal: %s', $e->getMessage()),
                 0,