Some code optimisations.

tests/Feature/Controllers/PiggyBankControllerTest.php

@@ -382,6 +382,9 @@ class PiggyBankControllerTest extends TestCase
      */
     public function testRemove(): void
     {
+        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+
+        return;
         // mock stuff
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
@@ -405,6 +408,9 @@ class PiggyBankControllerTest extends TestCase
      */
     public function testRemoveMobile(): void
     {
+        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+
+        return;
         // mock stuff
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);

tests/Unit/Generator/Report/Audit/MonthReportGeneratorTest.php

@@ -102,7 +102,8 @@ class MonthReportGeneratorTest extends TestCase
      * @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
      */
     public function testBasicNoCurrency(): void
-    {$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+    {
+        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
 
         return;
         /** @var Account $account */
@@ -144,7 +145,8 @@ class MonthReportGeneratorTest extends TestCase
      * @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
      */
     public function testBasicWithForeign(): void
-    {$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+    {
+        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
 
         return;
         /** @var Account $account */
@@ -193,7 +195,8 @@ class MonthReportGeneratorTest extends TestCase
      * @covers \FireflyIII\Generator\Report\Audit\MonthReportGenerator
      */
     public function testBasicWithTransactions(): void
-    {$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
+    {
+        $this->markTestIncomplete('Needs to be rewritten for v4.8.0');
 
         return;
         /** @var Account $account */

tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php

@@ -27,8 +27,9 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
+
 /**
  * Class AccountDestroyServiceTest
  */

tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php

@@ -31,8 +31,8 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class AccountUpdateServiceTest

tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php

@@ -32,9 +32,9 @@ use FireflyIII\Factory\TransactionJournalMetaFactory;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Services\Internal\Update\JournalUpdateService;
 use FireflyIII\Services\Internal\Update\TransactionUpdateService;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class JournalUpdateServiceTest

tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php

@@ -29,8 +29,8 @@ use FireflyIII\Factory\CategoryFactory;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Update\TransactionUpdateService;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class TransactionUpdateServiceTest

tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php

@@ -35,9 +35,10 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler;
 use Illuminate\Support\Collection;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
+
 /**
  * Class ChooseAccountsHandlerTest
  */

tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php

@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\JobConfiguration\Bunq;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class NewBunqJobHandlerTest
@@ -43,6 +43,7 @@ class NewBunqJobHandlerTest extends TestCase
         parent::setUp();
         Log::info(sprintf('Now in %s.', \get_class($this)));
     }
+
     /**
      * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler
      */

tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php

@@ -59,7 +59,7 @@ class ConfigureMappingHandlerTest extends TestCase
      */
     public function testApplySpecifics(): void
     {
-        $importRepos        = $this->mock(ImportJobRepositoryInterface::class);
+        $importRepos = $this->mock(ImportJobRepositoryInterface::class);
         $importRepos->shouldReceive('setUser')->once();
         $job                = new ImportJob;
         $job->user_id       = $this->user()->id;
@@ -161,7 +161,7 @@ class ConfigureMappingHandlerTest extends TestCase
      */
     public function testDoColumnConfig(): void
     {
-        $importRepos        = $this->mock(ImportJobRepositoryInterface::class);
+        $importRepos = $this->mock(ImportJobRepositoryInterface::class);
         $importRepos->shouldReceive('setUser')->once();
         $job                = new ImportJob;
         $job->user_id       = $this->user()->id;
@@ -226,7 +226,7 @@ class ConfigureMappingHandlerTest extends TestCase
      */
     public function testDoMapOfColumn(): void
     {
-        $importRepos        = $this->mock(ImportJobRepositoryInterface::class);
+        $importRepos = $this->mock(ImportJobRepositoryInterface::class);
         $importRepos->shouldReceive('setUser')->once();
         $job                = new ImportJob;
         $job->user_id       = $this->user()->id;
@@ -339,7 +339,7 @@ class ConfigureMappingHandlerTest extends TestCase
      */
     public function testGetPreProcessorName(): void
     {
-        $importRepos        = $this->mock(ImportJobRepositoryInterface::class);
+        $importRepos = $this->mock(ImportJobRepositoryInterface::class);
         $importRepos->shouldReceive('setUser')->once();
         $job                = new ImportJob;
         $job->user_id       = $this->user()->id;
@@ -487,7 +487,7 @@ class ConfigureMappingHandlerTest extends TestCase
      */
     public function testSanitizeColumnName(): void
     {
-        $importRepos        = $this->mock(ImportJobRepositoryInterface::class);
+        $importRepos = $this->mock(ImportJobRepositoryInterface::class);
         $importRepos->shouldReceive('setUser')->once();
         $job                = new ImportJob;
         $job->user_id       = $this->user()->id;

tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php

@@ -34,9 +34,9 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler;
 use Illuminate\Support\Collection;
 use League\Csv\Reader;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class ConfigureRolesHandlerTest
@@ -107,7 +107,7 @@ class ConfigureRolesHandlerTest extends TestCase
     public function testConfigurationCompleteNoAmount(): void
     {
         $importRepos = $this->mock(ImportJobRepositoryInterface::class);
-        $config  = [
+        $config      = [
             'column-count' => 5,
             'column-roles' => [
                 0 => 'sepa-cc',
@@ -117,8 +117,8 @@ class ConfigureRolesHandlerTest extends TestCase
                 4 => 'amount_foreign',
             ],
         ];
-        $handler = new ConfigureRolesHandler();
+        $handler     = new ConfigureRolesHandler();
-        $result  = $handler->configurationComplete($config);
+        $result      = $handler->configurationComplete($config);
         $this->assertCount(1, $result);
         $this->assertEquals(
             'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
@@ -186,7 +186,7 @@ class ConfigureRolesHandlerTest extends TestCase
     public function testGetExampleFromLine(): void
     {
         $importRepos = $this->mock(ImportJobRepositoryInterface::class);
-        $lines = [
+        $lines       = [
             ['one', 'two', '', 'three'],
             ['four', 'five', '', 'six'],
         ];

tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php

@@ -28,9 +28,10 @@ use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
+
 /**
  * Class ConfigureUploadHandlerTest
  */

tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php

@@ -31,9 +31,10 @@ use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler;
 use Illuminate\Support\Collection;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
+
 /**
  * Class NewFileJobHandlerTest
  */

tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php

@@ -38,9 +38,9 @@ use FireflyIII\Services\Spectre\Object\Holder;
 use FireflyIII\Services\Spectre\Object\Login;
 use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler;
 use Illuminate\Support\Collection;
+use Log;
 use Mockery;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class ChooseAccountsHandlerTest
@@ -55,6 +55,7 @@ class ChooseAccountsHandlerTest extends TestCase
         parent::setUp();
         Log::info(sprintf('Now in %s.', \get_class($this)));
     }
+
     /**
      * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler
      */

tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php

@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
 use FireflyIII\Services\Spectre\Object\Token;
 use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
 use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler;
+use Log;
 use Mockery;
 use Preferences;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class ChooseLoginHandlerTest

tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php

@@ -32,10 +32,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Services\Spectre\Object\Token;
 use FireflyIII\Services\Spectre\Request\CreateTokenRequest;
 use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler;
+use Log;
 use Mockery;
 use Preferences;
 use Tests\TestCase;
-use Log;
+
 /**
  * Class DoAuthenticateHandlerTest
  */

tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php

@@ -27,8 +27,9 @@ namespace Tests\Unit\Support\Import\Placeholder;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Import\Placeholder\ColumnValue;
 use FireflyIII\Support\Import\Placeholder\ImportTransaction;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
+
 /**
  * Class ImportTransactionTest
  */
@@ -474,38 +475,6 @@ class ImportTransactionTest extends TestCase
             $this->assertTrue(false, $e->getMessage());
         }
     }
-    
-    /**
-     * Basic amount info. Should return something like '1.0'.
-     *
-     * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
-     */
-    public function testCalculateAmountNegatedPositive(): void
-    {
-        $importTransaction               = new ImportTransaction;
-        $importTransaction->amountNegated = '1.56';
-        try {
-            $this->assertEquals('-1.56', $importTransaction->calculateAmount());
-        } catch (FireflyException $e) {
-            $this->assertTrue(false, $e->getMessage());
-        }
-    }
-    
-    /**
-     * Basic amount info. Should return something like '1.0'.
-     *
-     * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
-     */
-    public function testCalculateAmountNegatedNegative(): void
-    {
-        $importTransaction               = new ImportTransaction;
-        $importTransaction->amountNegated = '-1.56';
-        try {
-            $this->assertEquals('1.56', $importTransaction->calculateAmount());
-        } catch (FireflyException $e) {
-            $this->assertTrue(false, $e->getMessage());
-        }
-    }
 
     /**
      * With no amount data, object should return ''
@@ -539,6 +508,38 @@ class ImportTransactionTest extends TestCase
         }
     }
 
+    /**
+     * Basic amount info. Should return something like '1.0'.
+     *
+     * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
+     */
+    public function testCalculateAmountNegatedNegative(): void
+    {
+        $importTransaction                = new ImportTransaction;
+        $importTransaction->amountNegated = '-1.56';
+        try {
+            $this->assertEquals('1.56', $importTransaction->calculateAmount());
+        } catch (FireflyException $e) {
+            $this->assertTrue(false, $e->getMessage());
+        }
+    }
+
+    /**
+     * Basic amount info. Should return something like '1.0'.
+     *
+     * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction
+     */
+    public function testCalculateAmountNegatedPositive(): void
+    {
+        $importTransaction                = new ImportTransaction;
+        $importTransaction->amountNegated = '1.56';
+        try {
+            $this->assertEquals('-1.56', $importTransaction->calculateAmount());
+        } catch (FireflyException $e) {
+            $this->assertTrue(false, $e->getMessage());
+        }
+    }
+
     /**
      * Basic amount info with positive modifier (Rabobank C)
      *

tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php

@@ -40,11 +40,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Services\Bunq\ApiContext;
 use FireflyIII\Services\Bunq\MonetaryAccount;
 use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler;
+use Log;
 use Mockery;
 use Preferences;
 use Tests\Object\FakeApiContext;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class StageNewHandlerTest
@@ -211,7 +211,7 @@ class StageNewHandlerTest extends TestCase
                         'default_avatar_status' => null,
                         'restriction_chat'      => null,
                     ],
-                    'iban' => 'SM72C9584723533916792029340'
+                    'iban'          => 'SM72C9584723533916792029340',
                 ],
             ],
         ];
@@ -298,7 +298,7 @@ class StageNewHandlerTest extends TestCase
                         'default_avatar_status' => null,
                         'restriction_chat'      => null,
                     ],
-                    'iban' => 'SM72C9584723533916792029340'
+                    'iban'          => 'SM72C9584723533916792029340',
                 ],
 
             ],

tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php

@@ -28,8 +28,8 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Import\Routine\File\AssetAccountMapper;
 use Illuminate\Support\Collection;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class AssetAccountMapperTest

tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace Tests\Unit\Support\Import\Routine\File;
 
 
-use Log;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Support\Import\Routine\File\CSVProcessor;
@@ -33,6 +32,7 @@ use FireflyIII\Support\Import\Routine\File\ImportableCreator;
 use FireflyIII\Support\Import\Routine\File\LineReader;
 use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
 use FireflyIII\Support\Import\Routine\File\MappingConverger;
+use Log;
 use Tests\TestCase;
 
 /**
@@ -50,6 +50,7 @@ class CSVProcessorTest extends TestCase
         parent::setUp();
         Log::info(sprintf('Now in %s.', \get_class($this)));
     }
+
     /**
      * @covers \FireflyIII\Support\Import\Routine\File\CSVProcessor
      */

tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php

@@ -145,7 +145,7 @@ class ImportableConverterTest extends TestCase
         $accountRepos   = $this->mock(AccountRepositoryInterface::class);
         $accountRepos->shouldReceive('setUser')->once();
         $accountRepos->shouldReceive('getMetaValue')
-            ->withArgs([Mockery::any(), 'currency_id'])->atLeast()->once()->andReturn('1');
+                     ->withArgs([Mockery::any(), 'currency_id'])->atLeast()->once()->andReturn('1');
 
         // get default currency
         $euro = TransactionCurrency::whereCode('EUR')->first();

tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php

@@ -27,8 +27,8 @@ namespace Tests\Unit\Support\Import\Routine\File;
 use FireflyIII\Support\Import\Placeholder\ColumnValue;
 use FireflyIII\Support\Import\Placeholder\ImportTransaction;
 use FireflyIII\Support\Import\Routine\File\ImportableCreator;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class ImportableCreatorTest

tests/Unit/Support/Import/Routine/File/LineReaderTest.php

@@ -31,8 +31,8 @@ use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\Routine\File\LineReader;
 use Illuminate\Support\Collection;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class LineReaderTest

tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php

@@ -33,9 +33,9 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\Routine\File\MappedValuesValidator;
 use Illuminate\Support\Collection;
+use Log;
 use stdClass;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class MappedValuesValidatorTest

tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php

@@ -28,8 +28,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Support\Import\Routine\File\MappingConverger;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
+
 /**
  * Class MappingConvergerTest
  */

tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php

@@ -28,8 +28,8 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class OpposingAccountMapperTest

tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php

@@ -35,10 +35,10 @@ use FireflyIII\Services\Spectre\Object\Login;
 use FireflyIII\Services\Spectre\Request\ListAccountsRequest;
 use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
 use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler;
+use Log;
 use Mockery;
 use Preferences;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class StageAuthenticatedHandlerTest

tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php

@@ -36,10 +36,10 @@ use FireflyIII\Services\Spectre\Request\ListCustomersRequest;
 use FireflyIII\Services\Spectre\Request\ListLoginsRequest;
 use FireflyIII\Services\Spectre\Request\NewCustomerRequest;
 use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler;
+use Log;
 use Mockery;
 use Preferences;
 use Tests\TestCase;
-use Log;
 
 /**
  * Class StageNewHandlerTest

tests/Unit/TransactionRules/Actions/AddTagTest.php

@@ -27,8 +27,8 @@ use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\AddTag;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class AddTagTest

tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php

@@ -25,8 +25,8 @@ namespace Tests\Unit\TransactionRules\Actions;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\AppendDescription;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class AppendDescriptionTest

tests/Unit/TransactionRules/Actions/AppendNotesTest.php

@@ -26,8 +26,9 @@ use FireflyIII\Models\Note;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\AppendNotes;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
+
 /**
  * Class AppendNotesTest
  */

tests/Unit/TransactionRules/Actions/ClearBudgetTest.php

@@ -26,8 +26,8 @@ use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\ClearBudget;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 /**
  * Class ClearBudgetTest

tests/Unit/TransactionRules/Actions/ClearCategoryTest.php

@@ -26,8 +26,9 @@ use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\ClearCategory;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
+
 /**
  * Class ClearCategoryTest
  */

tests/Unit/TransactionRules/Actions/ClearNotesTest.php

@@ -27,8 +27,8 @@ use FireflyIII\Models\Note;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\ClearNotes;
-use Tests\TestCase;
 use Log;
+use Tests\TestCase;
 
 
 /**

tests/Unit/TransactionRules/Actions/ConvertToDepositTest.php

@@ -48,42 +48,6 @@ class ConvertToDepositTest extends TestCase
         Log::info(sprintf('Now in %s.', \get_class($this)));
     }
 
-    /**
-     * Convert a withdrawal to a deposit.
-     *
-     * @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
-     */
-    public function testActWithdrawal()
-    {
-        $revenue = $this->getRandomRevenue();
-        $name    = 'Random revenue #' . random_int(1, 10000);
-        $journal = $this->getRandomWithdrawal();
-
-        // journal is a withdrawal:
-        $this->assertEquals(TransactionType::WITHDRAWAL, $journal->transactionType->type);
-
-        // mock used stuff:
-        $factory = $this->mock(AccountFactory::class);
-        $factory->shouldReceive('setUser')->once();
-        $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
-
-
-        // fire the action:
-        $ruleAction               = new RuleAction;
-        $ruleAction->action_value = $name;
-        $action                   = new ConvertToDeposit($ruleAction);
-        try {
-            $result = $action->act($journal);
-        } catch (Exception $e) {
-            $this->assertTrue(false, $e->getMessage());
-        }
-        $this->assertTrue($result);
-
-        // journal is now a deposit.
-        $journal->refresh();
-        $this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
-    }
-
     /**
      * Convert a transfer to a deposit.
      *
@@ -120,5 +84,41 @@ class ConvertToDepositTest extends TestCase
         $this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
     }
 
+    /**
+     * Convert a withdrawal to a deposit.
+     *
+     * @covers \FireflyIII\TransactionRules\Actions\ConvertToDeposit
+     */
+    public function testActWithdrawal()
+    {
+        $revenue = $this->getRandomRevenue();
+        $name    = 'Random revenue #' . random_int(1, 10000);
+        $journal = $this->getRandomWithdrawal();
+
+        // journal is a withdrawal:
+        $this->assertEquals(TransactionType::WITHDRAWAL, $journal->transactionType->type);
+
+        // mock used stuff:
+        $factory = $this->mock(AccountFactory::class);
+        $factory->shouldReceive('setUser')->once();
+        $factory->shouldReceive('findOrCreate')->once()->withArgs([$name, AccountType::REVENUE])->andReturn($revenue);
+
+
+        // fire the action:
+        $ruleAction               = new RuleAction;
+        $ruleAction->action_value = $name;
+        $action                   = new ConvertToDeposit($ruleAction);
+        try {
+            $result = $action->act($journal);
+        } catch (Exception $e) {
+            $this->assertTrue(false, $e->getMessage());
+        }
+        $this->assertTrue($result);
+
+        // journal is now a deposit.
+        $journal->refresh();
+        $this->assertEquals(TransactionType::DEPOSIT, $journal->transactionType->type);
+    }
+
 
 }

tests/Unit/TransactionRules/Actions/ConvertToTransferTest.php

@@ -65,7 +65,8 @@ class ConvertToTransferTest extends TestCase
         // mock used stuff:
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $accountRepos->shouldReceive('setUser')->once();
-        $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])->andReturn($asset);
+        $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])
+                     ->andReturn($asset);
 
         // fire the action:
         $ruleAction               = new RuleAction;
@@ -100,7 +101,8 @@ class ConvertToTransferTest extends TestCase
         // mock used stuff:
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $accountRepos->shouldReceive('setUser')->once();
-        $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])->andReturn($asset);
+        $accountRepos->shouldReceive('findByName')->withArgs([$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]])
+                     ->andReturn($asset);
 
         // fire the action:
         $ruleAction               = new RuleAction;

tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php

@@ -49,7 +49,7 @@ class FromAccountStartsTest extends TestCase
      */
     public function testTriggered(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         /** @var TransactionJournal $journal */
         $journal    = $this->user()->transactionJournals()->inRandomOrder()->first();
@@ -67,7 +67,7 @@ class FromAccountStartsTest extends TestCase
      */
     public function testTriggeredLonger(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
 
         /** @var TransactionJournal $journal */
@@ -86,7 +86,7 @@ class FromAccountStartsTest extends TestCase
      */
     public function testTriggeredNot(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
 
         /** @var TransactionJournal $journal */
@@ -105,11 +105,11 @@ class FromAccountStartsTest extends TestCase
      */
     public function testWillMatchEverythingEmpty(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
 
-        $value      = '';
+        $value  = '';
-        $result     = FromAccountStarts::willMatchEverything($value);
+        $result = FromAccountStarts::willMatchEverything($value);
         $this->assertTrue($result);
     }
 
@@ -118,11 +118,11 @@ class FromAccountStartsTest extends TestCase
      */
     public function testWillMatchEverythingNotNull(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
 
-        $value      = 'x';
+        $value  = 'x';
-        $result     = FromAccountStarts::willMatchEverything($value);
+        $result = FromAccountStarts::willMatchEverything($value);
         $this->assertFalse($result);
     }
 
@@ -131,11 +131,11 @@ class FromAccountStartsTest extends TestCase
      */
     public function testWillMatchEverythingNull(): void
     {
-        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository   = $this->mock(JournalRepositoryInterface::class);
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
 
-        $value      = null;
+        $value  = null;
-        $result     = FromAccountStarts::willMatchEverything($value);
+        $result = FromAccountStarts::willMatchEverything($value);
         $this->assertTrue($result);
     }
 }

tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php

@@ -22,10 +22,11 @@ declare(strict_types=1);
 
 namespace Tests\Unit\TransactionRules\Triggers;
 
+use DB;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Triggers\HasAttachment;
 use Tests\TestCase;
-use DB;
+
 /**
  * Class HasAttachmentTest
  */
@@ -57,8 +58,8 @@ class HasAttachmentTest extends TestCase
         $withdrawal->attachments()->save($attachment);
 
         DB::table('attachments')
-            ->where('attachable_type', TransactionJournal::class)
+          ->where('attachable_type', TransactionJournal::class)
-            ->where('attachable_id', $withdrawal->id)->delete();
+          ->where('attachable_id', $withdrawal->id)->delete();
 
         $withdrawal->attachments()->saveMany([]);
         $this->assertEquals(0, $withdrawal->attachments()->count());