Code clean up.

app/Http/Controllers/Transaction/ConvertController.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
@@ -37,13 +36,11 @@ use Session;
 use View;
 
 /**
- * Class ConvertController
- *
- * @package FireflyIII\Http\Controllers\Transaction
+ * Class ConvertController.
  */
 class ConvertController extends Controller
 {
-    /** @var  AccountRepositoryInterface */
+    /** @var AccountRepositoryInterface */
     private $accounts;
 
     /**
@@ -117,11 +114,9 @@ class ConvertController extends Controller
                 'sourceType',
                 'subTitle',
                 'subTitleIcon'
-
             )
         );
 
-
         // convert withdrawal to deposit requires a new source account ()
         //  or to transfer requires
     }
@@ -178,6 +173,7 @@ class ConvertController extends Controller
      * @param array              $data
      *
      * @return Account
+     *
      * @throws FireflyException
      */
     private function getDestinationAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account
@@ -202,7 +198,7 @@ class ConvertController extends Controller
             case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL:
             case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL:
                 // three and five
-                if ($data['destination_account_expense'] === '' || is_null($data['destination_account_expense'])) {
+                if ('' === $data['destination_account_expense'] || null === $data['destination_account_expense']) {
                     // destination is a cash account.
                     $destination = $accountRepository->getCashAccount();
 
@@ -233,6 +229,7 @@ class ConvertController extends Controller
      * @param array              $data
      *
      * @return Account
+     *
      * @throws FireflyException
      */
     private function getSourceAccount(TransactionJournal $journal, TransactionType $destinationType, array $data): Account
@@ -249,7 +246,7 @@ class ConvertController extends Controller
             case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT:
             case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT:
 
-                if ($data['source_account_revenue'] === '' || is_null($data['source_account_revenue'])) {
+                if ('' === $data['source_account_revenue'] || null === $data['source_account_revenue']) {
                     // destination is a cash account.
                     $destination = $accountRepository->getCashAccount();
 

app/Http/Controllers/Transaction/LinkController.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
@@ -36,14 +35,10 @@ use URL;
 use View;
 
 /**
- * Class LinkController
- *
- * @package FireflyIII\Http\Controllers\Transaction
+ * Class LinkController.
  */
 class LinkController extends Controller
 {
-
-
     /**
      *
      */
@@ -61,7 +56,6 @@ class LinkController extends Controller
         );
     }
 
-
     /**
      * @param TransactionJournalLink $link
      *
@@ -107,7 +101,7 @@ class LinkController extends Controller
         TransactionJournal $journal
     ) {
         $linkInfo = $request->getLinkInfo();
-        if ($linkInfo['transaction_journal_id'] === 0) {
+        if (0 === $linkInfo['transaction_journal_id']) {
             Session::flash('error', trans('firefly.invalid_link_selection'));
 
             return redirect(route('transactions.show', [$journal->id]));
@@ -124,13 +118,13 @@ class LinkController extends Controller
 
         $journalLink = new TransactionJournalLink;
         $journalLink->linkType()->associate($linkType);
-        if ($linkInfo['direction'] === 'inward') {
+        if ('inward' === $linkInfo['direction']) {
             Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $other->id, $journal->id));
             $journalLink->source()->associate($other);
             $journalLink->destination()->associate($journal);
         }
 
-        if ($linkInfo['direction'] === 'outward') {
+        if ('outward' === $linkInfo['direction']) {
             Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $other->id));
             $journalLink->source()->associate($journal);
             $journalLink->destination()->associate($other);

app/Http/Controllers/Transaction/MassController.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
@@ -39,9 +38,7 @@ use Session;
 use View;
 
 /**
- * Class MassController
- *
- * @package FireflyIII\Http\Controllers\Transaction
+ * Class MassController.
  */
 class MassController extends Controller
 {
@@ -52,7 +49,6 @@ class MassController extends Controller
     {
         parent::__construct();
 
-
         $this->middleware(
             function ($request, $next) {
                 View::share('title', trans('firefly.transactions'));
@@ -95,7 +91,7 @@ class MassController extends Controller
             foreach ($ids as $journalId) {
                 /** @var TransactionJournal $journal */
                 $journal = $repository->find(intval($journalId));
-                if (!is_null($journal->id) && intval($journalId) === $journal->id) {
+                if (null !== $journal->id && intval($journalId) === $journal->id) {
                     $set->push($journal);
                 }
             }
@@ -106,7 +102,7 @@ class MassController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($set as $journal) {
             $repository->delete($journal);
-            $count++;
+            ++$count;
         }
 
         Preferences::mark();
@@ -116,7 +112,6 @@ class MassController extends Controller
         return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
     }
 
-
     /**
      * @param Collection $journals
      *
@@ -139,7 +134,7 @@ class MassController extends Controller
         $filtered = new Collection;
         $messages = [];
         /**
-         * @var TransactionJournal $journal
+         * @var TransactionJournal
          */
         foreach ($journals as $journal) {
             $sources      = $journal->sourceAccountList();
@@ -153,7 +148,7 @@ class MassController extends Controller
                 $messages[] = trans('firefly.cannot_edit_multiple_dest', ['description' => $journal->description, 'id' => $journal->id]);
                 continue;
             }
-            if ($journal->transactionType->type === TransactionType::OPENING_BALANCE) {
+            if (TransactionType::OPENING_BALANCE === $journal->transactionType->type) {
                 $messages[] = trans('firefly.cannot_edit_opening_balance');
                 continue;
             }
@@ -191,18 +186,18 @@ class MassController extends Controller
                 $journal->foreign_amount   = floatval($transaction->foreign_amount);
                 $journal->foreign_currency = $transaction->foreignCurrency;
 
-                if (!is_null($sources->first())) {
+                if (null !== $sources->first()) {
                     $journal->source_account_id   = $sources->first()->id;
                     $journal->source_account_name = $sources->first()->editname;
                 }
-                if (!is_null($destinations->first())) {
+                if (null !== $destinations->first()) {
                     $journal->destination_account_id   = $destinations->first()->id;
                     $journal->destination_account_name = $destinations->first()->editname;
                 }
             }
         );
 
-        if ($filtered->count() === 0) {
+        if (0 === $filtered->count()) {
             Session::flash('error', trans('firefly.no_edit_multiple_left'));
         }
 
@@ -265,7 +260,7 @@ class MassController extends Controller
                     // call repository update function.
                     $repository->update($journal, $data);
 
-                    $count++;
+                    ++$count;
                 }
             }
         }

app/Http/Controllers/Transaction/SingleController.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
@@ -48,26 +47,24 @@ use Steam;
 use View;
 
 /**
- * Class SingleController
- *
- * @package FireflyIII\Http\Controllers\Transaction
+ * Class SingleController.
  */
 class SingleController extends Controller
 {
-    /** @var  AccountRepositoryInterface */
+    /** @var AccountRepositoryInterface */
     private $accounts;
 
     /** @var AttachmentHelperInterface */
     private $attachments;
 
-    /** @var  BudgetRepositoryInterface */
+    /** @var BudgetRepositoryInterface */
     private $budgets;
-    /** @var  CurrencyRepositoryInterface */
+    /** @var CurrencyRepositoryInterface */
     private $currency;
-    /** @var  PiggyBankRepositoryInterface */
+    /** @var PiggyBankRepositoryInterface */
     private $piggyBanks;
 
-    /** @var  JournalRepositoryInterface */
+    /** @var JournalRepositoryInterface */
     private $repository;
 
     /**
@@ -105,14 +102,14 @@ class SingleController extends Controller
         $source       = $journal->sourceAccountList()->first();
         $destination  = $journal->destinationAccountList()->first();
         $budget       = $journal->budgets()->first();
-        $budgetId     = is_null($budget) ? 0 : $budget->id;
+        $budgetId     = null === $budget ? 0 : $budget->id;
         $category     = $journal->categories()->first();
-        $categoryName = is_null($category) ? '' : $category->name;
+        $categoryName = null === $category ? '' : $category->name;
         $tags         = join(',', $journal->tags()->get()->pluck('tag')->toArray());
         /** @var Transaction $transaction */
         $transaction   = $journal->transactions()->first();
         $amount        = Steam::positive($transaction->amount);
-        $foreignAmount = is_null($transaction->foreign_amount) ? null : Steam::positive($transaction->foreign_amount);
+        $foreignAmount = null === $transaction->foreign_amount ? null : Steam::positive($transaction->foreign_amount);
 
         $preFilled = [
             'description'               => $journal->description,
@@ -142,7 +139,7 @@ class SingleController extends Controller
 
         /** @var Note $note */
         $note = $journal->notes()->first();
-        if (!is_null($note)) {
+        if (null !== $note) {
             $preFilled['notes'] = $note->text;
         }
 
@@ -172,7 +169,7 @@ class SingleController extends Controller
         Session::put('preFilled', $preFilled);
 
         // put previous url in session if not redirect from store (not "create another").
-        if (session('transactions.create.fromStore') !== true) {
+        if (true !== session('transactions.create.fromStore')) {
             $this->rememberPreviousUri('transactions.create.uri');
         }
         Session::forget('transactions.create.fromStore');
@@ -218,6 +215,7 @@ class SingleController extends Controller
      * @param TransactionJournal $transactionJournal
      *
      * @return \Illuminate\Http\RedirectResponse
+     *
      * @internal param JournalRepositoryInterface $repository
      */
     public function destroy(TransactionJournal $transactionJournal)
@@ -265,7 +263,7 @@ class SingleController extends Controller
         $destinationAccounts = $journal->destinationAccountList();
         $optionalFields      = Preferences::get('transaction_journal_optional_fields', [])->data;
         $pTransaction        = $journal->positiveTransaction();
-        $foreignCurrency     = !is_null($pTransaction->foreignCurrency) ? $pTransaction->foreignCurrency : $pTransaction->transactionCurrency;
+        $foreignCurrency     = null !== $pTransaction->foreignCurrency ? $pTransaction->foreignCurrency : $pTransaction->transactionCurrency;
         $preFilled           = [
             'date'                     => $journal->dateAsString(),
             'interest_date'            => $journal->dateAsString('interest_date'),
@@ -299,13 +297,13 @@ class SingleController extends Controller
         ];
         /** @var Note $note */
         $note = $journal->notes()->first();
-        if (!is_null($note)) {
+        if (null !== $note) {
             $preFilled['notes'] = $note->text;
         }
 
         // amounts for withdrawals and deposits:
         // amount, native_amount, source_amount, destination_amount
-        if (($journal->isWithdrawal() || $journal->isDeposit()) && !is_null($pTransaction->foreign_amount)) {
+        if (($journal->isWithdrawal() || $journal->isDeposit()) && null !== $pTransaction->foreign_amount) {
             $preFilled['amount']   = $pTransaction->foreign_amount;
             $preFilled['currency'] = $pTransaction->foreignCurrency;
         }
@@ -315,7 +313,7 @@ class SingleController extends Controller
         Session::flash('gaEventAction', 'edit-' . $what);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
-        if (session('transactions.edit.fromUpdate') !== true) {
+        if (true !== session('transactions.edit.fromUpdate')) {
             $this->rememberPreviousUri('transactions.edit.uri');
         }
         Session::forget('transactions.edit.fromUpdate');
@@ -334,11 +332,11 @@ class SingleController extends Controller
      */
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
-        $doSplit       = intval($request->get('split_journal')) === 1;
-        $createAnother = intval($request->get('create_another')) === 1;
+        $doSplit       = 1 === intval($request->get('split_journal'));
+        $createAnother = 1 === intval($request->get('create_another'));
         $data          = $request->getJournalData();
         $journal       = $repository->store($data);
-        if (is_null($journal->id)) {
+        if (null === $journal->id) {
             // error!
             Log::error('Could not store transaction journal: ', $journal->getErrors()->toArray());
             Session::flash('error', $journal->getErrors()->first());
@@ -366,13 +364,13 @@ class SingleController extends Controller
         Preferences::mark();
 
         // @codeCoverageIgnoreStart
-        if ($createAnother === true) {
+        if (true === $createAnother) {
             Session::put('transactions.create.fromStore', true);
 
             return redirect(route('transactions.create', [$request->input('what')]))->withInput();
         }
 
-        if ($doSplit === true) {
+        if (true === $doSplit) {
             return redirect(route('transactions.split.edit', [$journal->id]));
         }
 
@@ -419,7 +417,7 @@ class SingleController extends Controller
         Preferences::mark();
 
         // @codeCoverageIgnoreStart
-        if (intval($request->get('return_to_edit')) === 1) {
+        if (1 === intval($request->get('return_to_edit'))) {
             Session::put('transactions.edit.fromUpdate', true);
 
             return redirect(route('transactions.edit', [$journal->id]))->withInput(['return_to_edit' => 1]);
@@ -440,7 +438,7 @@ class SingleController extends Controller
         /** @var Account $account */
         foreach ($accounts as $account) {
             $type = $account->getMeta('accountRole');
-            if (strlen($type) === 0) {
+            if (0 === strlen($type)) {
                 $type = 'no_account_type';
             }
             $key                        = strval(trans('firefly.opt_group_' . $type));
@@ -460,7 +458,7 @@ class SingleController extends Controller
         /** @var Account $account */
         foreach ($accounts as $account) {
             $type = $account->getMeta('accountRole');
-            if (strlen($type) === 0) {
+            if (0 === strlen($type)) {
                 $type = 'no_account_type';
             }
             $key                        = strval(trans('firefly.opt_group_' . $type));

app/Http/Controllers/Transaction/SplitController.php

@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Transaction;
@@ -45,21 +44,17 @@ use Steam;
 use View;
 
 /**
- * Class SplitController
- *
- * @package FireflyIII\Http\Controllers\Transaction
- *
+ * Class SplitController.
  */
 class SplitController extends Controller
 {
-
-    /** @var  AccountRepositoryInterface */
+    /** @var AccountRepositoryInterface */
     private $accounts;
 
     /** @var AttachmentHelperInterface */
     private $attachments;
 
-    /** @var  BudgetRepositoryInterface */
+    /** @var BudgetRepositoryInterface */
     private $budgets;
 
     /** @var CurrencyRepositoryInterface */
@@ -75,7 +70,6 @@ class SplitController extends Controller
     {
         parent::__construct();
 
-
         // some useful repositories:
         $this->middleware(
             function ($request, $next) {
@@ -122,12 +116,11 @@ class SplitController extends Controller
             $accountArray[$account->id]['currency_id'] = intval($account->getMeta('currency_id'));
         }
 
-
         Session::flash('gaEventCategory', 'transactions');
         Session::flash('gaEventAction', 'edit-split-' . $preFilled['what']);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
-        if (session('transactions.edit-split.fromUpdate') !== true) {
+        if (true !== session('transactions.edit-split.fromUpdate')) {
             $this->rememberPreviousUri('transactions.edit-split.uri');
         }
         Session::forget('transactions.edit-split.fromUpdate');
@@ -150,7 +143,6 @@ class SplitController extends Controller
         );
     }
 
-
     /**
      * @param SplitJournalFormRequest    $request
      * @param JournalRepositoryInterface $repository
@@ -183,7 +175,7 @@ class SplitController extends Controller
         Preferences::mark();
 
         // @codeCoverageIgnoreStart
-        if (intval($request->get('return_to_edit')) === 1) {
+        if (1 === intval($request->get('return_to_edit'))) {
             // set value so edit routine will not overwrite URL:
             Session::put('transactions.edit-split.fromUpdate', true);
 
@@ -202,7 +194,7 @@ class SplitController extends Controller
      */
     private function arrayFromInput(SplitJournalFormRequest $request): array
     {
-        $tags  = is_null($request->get('tags')) ? '' : $request->get('tags');
+        $tags  = null === $request->get('tags') ? '' : $request->get('tags');
         $array = [
             'journal_description'            => $request->get('journal_description'),
             'journal_source_account_id'      => $request->get('journal_source_account_id'),
@@ -225,7 +217,6 @@ class SplitController extends Controller
             'transactions'                   => $this->getTransactionDataFromRequest($request),
         ];
 
-
         return $array;
     }
 
@@ -242,7 +233,7 @@ class SplitController extends Controller
         $notes               = '';
         /** @var Note $note */
         $note = $journal->notes()->first();
-        if (!is_null($note)) {
+        if (null !== $note) {
             $notes = $note->text;
         }
         $array = [
@@ -303,11 +294,10 @@ class SplitController extends Controller
                 'foreign_currency_id'         => $transaction['foreign_currency_id'],
                 'foreign_currency_code'       => $transaction['foreign_currency_code'],
                 'foreign_currency_symbol'     => $transaction['foreign_currency_symbol'],
-
             ];
 
             // set initial category and/or budget:
-            if (count($transactions) === 1 && $index === 0) {
+            if (1 === count($transactions) && 0 === $index) {
                 $set['budget_id'] = $journal->budgetId();
                 $set['category']  = $journal->categoryAsString();
             }
@@ -340,7 +330,6 @@ class SplitController extends Controller
                 'category'                 => $transaction['category'] ?? '',
                 'transaction_currency_id'  => intval($transaction['transaction_currency_id']),
                 'foreign_currency_id'      => $transaction['foreign_currency_id'] ?? null,
-
             ];
         }
         Log::debug(sprintf('Found %d splits in request data.', count($return)));
@@ -356,7 +345,7 @@ class SplitController extends Controller
      */
     private function updateWithPrevious($array, $old): array
     {
-        if (count($old) === 0 || !isset($old['transactions'])) {
+        if (0 === count($old) || !isset($old['transactions'])) {
             return $array;
         }
         $old = $old['transactions'];