diff --git a/app/Bootstrap/ConfigureLogging.php b/app/Bootstrap/ConfigureLogging.php
index d06e820990..e020c864d9 100644
--- a/app/Bootstrap/ConfigureLogging.php
+++ b/app/Bootstrap/ConfigureLogging.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * ConfigureLogging.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -20,15 +22,6 @@ use Illuminate\Log\Writer;
  */
 class ConfigureLogging extends IlluminateConfigureLogging
 {
-    /**
-     * @param Application $app
-     * @param Writer      $log
-     */
-    protected function configureSingleHandler(Application $app, Writer $log)
-    {
-        $log->useFiles($app->storagePath() . '/logs/firefly-iii.log');
-    }
-
     /**
      * @param Application $app
      * @param Writer      $log
@@ -40,4 +33,13 @@ class ConfigureLogging extends IlluminateConfigureLogging
             $app->make('config')->get('app.log_max_files', 5)
         );
     }
+
+    /**
+     * @param Application $app
+     * @param Writer      $log
+     */
+    protected function configureSingleHandler(Application $app, Writer $log)
+    {
+        $log->useFiles($app->storagePath() . '/logs/firefly-iii.log');
+    }
 }
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index c67ddb2787..1c540c4b57 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 namespace FireflyIII\Console\Commands;
 
diff --git a/app/Crud/Split/Journal.php b/app/Crud/Split/Journal.php
index c81c65edf1..8fdb895218 100644
--- a/app/Crud/Split/Journal.php
+++ b/app/Crud/Split/Journal.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * Journal.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Crud/Split/JournalInterface.php b/app/Crud/Split/JournalInterface.php
index f7542b4434..be88a6394f 100644
--- a/app/Crud/Split/JournalInterface.php
+++ b/app/Crud/Split/JournalInterface.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * JournalInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Events/BudgetLimitStored.php b/app/Events/BudgetLimitStored.php
index bcfa5f4083..4e6e9ef77f 100644
--- a/app/Events/BudgetLimitStored.php
+++ b/app/Events/BudgetLimitStored.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * BudgetLimitStored.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,8 +9,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-
 namespace FireflyIII\Events;
 
 use Carbon\Carbon;
diff --git a/app/Events/BudgetLimitUpdated.php b/app/Events/BudgetLimitUpdated.php
index f953b84285..bdf7f9272a 100644
--- a/app/Events/BudgetLimitUpdated.php
+++ b/app/Events/BudgetLimitUpdated.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * BudgetLimitUpdated.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,8 +9,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-
 namespace FireflyIII\Events;
 
 use Carbon\Carbon;
diff --git a/app/Events/TransactionStored.php b/app/Events/TransactionStored.php
index 4da42ee0c8..ed70b4a51e 100644
--- a/app/Events/TransactionStored.php
+++ b/app/Events/TransactionStored.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * TransactionStored.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,14 +9,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-/**
- * TransactionStored.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
 
 namespace FireflyIII\Events;
 
diff --git a/app/Export/Entry/EntryAccount.php b/app/Export/Entry/EntryAccount.php
index 337a7b7a5c..d84804e347 100644
--- a/app/Export/Entry/EntryAccount.php
+++ b/app/Export/Entry/EntryAccount.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * EntryAccount.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Export/Entry/EntryBill.php b/app/Export/Entry/EntryBill.php
index c72be96b64..33903f4abe 100644
--- a/app/Export/Entry/EntryBill.php
+++ b/app/Export/Entry/EntryBill.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * EntryBill.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Export/Entry/EntryBudget.php b/app/Export/Entry/EntryBudget.php
index 00c396db9e..e5996ecfe1 100644
--- a/app/Export/Entry/EntryBudget.php
+++ b/app/Export/Entry/EntryBudget.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * EntryBudget.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Export/Entry/EntryCategory.php b/app/Export/Entry/EntryCategory.php
index d3896ed954..0b1d2d8958 100644
--- a/app/Export/Entry/EntryCategory.php
+++ b/app/Export/Entry/EntryCategory.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * EntryCategory.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Export/Processor.php b/app/Export/Processor.php
index 80b742f605..63e2196482 100644
--- a/app/Export/Processor.php
+++ b/app/Export/Processor.php
@@ -157,7 +157,7 @@ class Processor
         foreach ($this->getFiles() as $entry) {
             // is part of this job?
             $zipFileName = str_replace($this->job->key . '-', '', $entry);
-            $result      = $zip->addFromString($zipFileName, $disk->get($entry));
+            $zip->addFromString($zipFileName, $disk->get($entry));
         }
 
         $zip->close();
diff --git a/app/Handlers/Events/BudgetLimitEventHandler.php b/app/Handlers/Events/BudgetLimitEventHandler.php
index 7c5278e1ba..82dfdbc3b7 100644
--- a/app/Handlers/Events/BudgetLimitEventHandler.php
+++ b/app/Handlers/Events/BudgetLimitEventHandler.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * BudgetLimitEventHandler.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Handlers/Events/ConnectTransactionToPiggyBank.php b/app/Handlers/Events/ConnectTransactionToPiggyBank.php
index 55f362d67b..cbb6176b91 100644
--- a/app/Handlers/Events/ConnectTransactionToPiggyBank.php
+++ b/app/Handlers/Events/ConnectTransactionToPiggyBank.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * ConnectTransactionToPiggyBank.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,8 +10,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\TransactionJournalStored;
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 614ce2851f..03665021f2 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 47dc4eee08..0f2e7775c7 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * HomeController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 7fe3bf1b70..78cd15a42c 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * UserController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index a64af3fba5..5f89da45f2 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Http\Requests\BillFormRequest;
 use FireflyIII\Models\Bill;
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 5174256fa1..61fcfa1057 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Amount;
 use Auth;
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index c2d6f29a72..7de7bf4e80 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php
index 40a98c2d0d..ed06cf6c1d 100644
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use Cache;
diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php
index d1d47e5c74..caf238740c 100644
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Helpers\Help\HelpInterface;
 use Log;
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 035aadcbae..6962540179 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+namespace FireflyIII\Http\Controllers;
 
 use Artisan;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index d2003290fb..35b3d571d6 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+namespace FireflyIII\Http\Controllers;
 
 use Amount;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 4977d37265..26115ab5a3 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 359cc2f505..7389b3cb57 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+namespace FireflyIII\Http\Controllers;
 
 use Amount;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 8c27ae274c..333c0c7953 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -1,4 +1,6 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use FireflyIII\Http\Requests\TokenFormRequest;
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index f26023f3ec..da9286b4d8 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Auth;
 use FireflyIII\Http\Requests\DeleteAccountFormRequest;
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 33488585ef..c5063ec10c 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index b634a85379..ab24e771d5 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Http\Controllers;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Support\Search\SearchInterface;
 use Input;
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 27d6b259fd..56042f13e2 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * SplitController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 31b6bf183d..e041e23bed 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * TransactionController.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php
index ae00107e85..0631b55965 100644
--- a/app/Http/Middleware/IsAdmin.php
+++ b/app/Http/Middleware/IsAdmin.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * IsAdmin.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,14 +10,7 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-/**
- * IsConfirmed.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
+
 
 declare(strict_types = 1);
 
diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php
index 8426a96ab8..faa56ee83b 100644
--- a/app/Http/Requests/MassDeleteJournalRequest.php
+++ b/app/Http/Requests/MassDeleteJournalRequest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * MassDeleteJournalRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,15 +9,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-/**
- * MassJournalRequest.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php
index 360cd71437..5f3a60706e 100644
--- a/app/Http/Requests/MassEditJournalRequest.php
+++ b/app/Http/Requests/MassEditJournalRequest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * MassEditJournalRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,15 +9,6 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-/**
- * MassJournalRequest.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace FireflyIII\Http\Requests;
 
 use Auth;
diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php
index 4438c43ff0..c14cd5d121 100644
--- a/app/Http/Requests/SplitJournalFormRequest.php
+++ b/app/Http/Requests/SplitJournalFormRequest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * SplitJournalFormRequest.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
index 8affcf84a9..1f6397ce8a 100644
--- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
+++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 namespace FireflyIII\Jobs;
 
diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php
index e373a13be6..5fbb1eb549 100644
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 namespace FireflyIII\Jobs;
 
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 2c2b46f911..55bcca6340 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 794c3c2128..3fdd851b99 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index d5780ce246..3c509047bf 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 4ceb09a93e..04dce7cff6 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index 4e80d197f1..fb5ad54a2d 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 884c439e4a..16120e6a44 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/Category.php b/app/Models/Category.php
index a69cfa9f73..08b850180c 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
diff --git a/app/Models/Component.php b/app/Models/Component.php
index f4794eb3f2..3660452659 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 5bac90d6f9..347ecaf0c0 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Carbon\Carbon;
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index 7d9b753900..c3dd596d69 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 28beaa6df1..4d0bde7ba1 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 6778171229..3797040a6e 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index b3520e0a0c..a3a17b61b5 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Crypt;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index f5251e0056..c738cdbc31 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 736f7fdb09..c216d95670 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
index dbaf18e7a2..a1013a83c5 100644
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 54e99bd814..949d028148 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Auth;
 use Carbon\Carbon;
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index 0ee5638c96..9b74f76a14 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -1,4 +1,7 @@
-<?php namespace FireflyIII\Models;
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php
index 40e60542a2..a09968cc5d 100644
--- a/app/Providers/AccountServiceProvider.php
+++ b/app/Providers/AccountServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php
index a9b543030d..71c7149894 100644
--- a/app/Providers/AttachmentServiceProvider.php
+++ b/app/Providers/AttachmentServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php
index e0301b5e6a..b2cce88879 100644
--- a/app/Providers/BillServiceProvider.php
+++ b/app/Providers/BillServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php
index b5eac92ff6..1cb8a68951 100644
--- a/app/Providers/BudgetServiceProvider.php
+++ b/app/Providers/BudgetServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php
index 0278b3f472..68a78a9a8b 100644
--- a/app/Providers/CategoryServiceProvider.php
+++ b/app/Providers/CategoryServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/CrudServiceProvider.php b/app/Providers/CrudServiceProvider.php
index 26c2d59869..249ce49100 100644
--- a/app/Providers/CrudServiceProvider.php
+++ b/app/Providers/CrudServiceProvider.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * CrudServiceProvider.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php
index 598af88f54..f0e75345d4 100644
--- a/app/Providers/ExportJobServiceProvider.php
+++ b/app/Providers/ExportJobServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php
index f1d6586082..9ce095e881 100644
--- a/app/Providers/JournalServiceProvider.php
+++ b/app/Providers/JournalServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php
index 83129510e3..3a70c738c8 100644
--- a/app/Providers/PiggyBankServiceProvider.php
+++ b/app/Providers/PiggyBankServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php
index e797814a5d..dd0a9013ed 100644
--- a/app/Providers/RuleGroupServiceProvider.php
+++ b/app/Providers/RuleGroupServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php
index be4e906cbe..98e1932030 100644
--- a/app/Providers/RuleServiceProvider.php
+++ b/app/Providers/RuleServiceProvider.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php
index 50e97b313f..296e9f50c0 100644
--- a/app/Providers/TagServiceProvider.php
+++ b/app/Providers/TagServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 namespace FireflyIII\Providers;
 
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 96ceb39d3b..94d44de835 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 namespace FireflyIII\Repositories\Account;
 
diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php
index 8c312f535f..4ad7dee7ec 100644
--- a/app/Support/Binder/JournalList.php
+++ b/app/Support/Binder/JournalList.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * JournalList.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/app/Support/Binder/UnfinishedJournal.php b/app/Support/Binder/UnfinishedJournal.php
index 9e54cd4906..b253ebb9ba 100644
--- a/app/Support/Binder/UnfinishedJournal.php
+++ b/app/Support/Binder/UnfinishedJournal.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * UnfinishedJournal.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 500021fb9a..c9bc5691c7 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 /*
 |--------------------------------------------------------------------------
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 383013796f..0cb42a4bbe 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 define('LARAVEL_START', microtime(true));
 
diff --git a/composer.json b/composer.json
index 387d512da0..f1965bb2d6 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,6 @@
     "symfony/dom-crawler": "2.8.*|3.0.*",
     "barryvdh/laravel-debugbar": "@stable",
     "barryvdh/laravel-ide-helper": "~2.0",
-    "johnkary/phpunit-speedtrap": "^1.0",
     "hamcrest/hamcrest-php": "^2.0@dev"
   },
   "autoload": {
diff --git a/config/app.php b/config/app.php
index 0f9602b381..79a9e67ed6 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 return [
 
diff --git a/config/auth.php b/config/auth.php
index 6144aafde0..7d48693a30 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/broadcasting.php b/config/broadcasting.php
index abaaac32a7..25ace51efa 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/cache.php b/config/cache.php
index 2a9a8d9613..f45c4fb25c 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/compile.php b/config/compile.php
index 04807eac45..d5ab594860 100644
--- a/config/compile.php
+++ b/config/compile.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 return [
 
diff --git a/config/csv.php b/config/csv.php
index 39bd78ff6b..0419338367 100644
--- a/config/csv.php
+++ b/config/csv.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 return [
     'specifix'        => [
         'RabobankDescription',
diff --git a/config/database.php b/config/database.php
index 9467c969e6..40a8db36e2 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/entrust.php b/config/entrust.php
index b833633587..629fc169ff 100644
--- a/config/entrust.php
+++ b/config/entrust.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 /**
  * This file is part of Entrust,
diff --git a/config/filesystems.php b/config/filesystems.php
index e41406cf51..94ec2811e5 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/firefly.php b/config/firefly.php
index ea8c4c226d..c6a2c05c5b 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
     'chart'               => 'chartjs',
diff --git a/config/mail.php b/config/mail.php
index 0fc18bc022..1027fe9952 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/queue.php b/config/queue.php
index 6c2b7d2e17..c390f1f272 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 return [
 
diff --git a/config/services.php b/config/services.php
index 9fbb81549e..5bc465e884 100644
--- a/config/services.php
+++ b/config/services.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 return [
 
diff --git a/config/session.php b/config/session.php
index f03e290cd0..cbe38ed46d 100644
--- a/config/session.php
+++ b/config/session.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/config/twigbridge.php b/config/twigbridge.php
index 0aac166b97..2064bbf643 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
     'twig'       => [
diff --git a/config/upgrade.php b/config/upgrade.php
index 819b830b98..27059b92db 100644
--- a/config/upgrade.php
+++ b/config/upgrade.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 /**
  * upgrade.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/config/view.php b/config/view.php
index e193ab61d9..5956e661ef 100644
--- a/config/view.php
+++ b/config/view.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 return [
 
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 5141a751d0..be7265bba4 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 $factory->define(
     FireflyIII\User::class, function (Faker\Generator $faker) {
diff --git a/database/migrations/2014_06_27_163032_create_users_table.php b/database/migrations/2014_06_27_163032_create_users_table.php
index 1bd8824f42..57f44c51cd 100644
--- a/database/migrations/2014_06_27_163032_create_users_table.php
+++ b/database/migrations/2014_06_27_163032_create_users_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_163145_create_account_types_table.php b/database/migrations/2014_06_27_163145_create_account_types_table.php
index f55c0f09b6..85b0742038 100644
--- a/database/migrations/2014_06_27_163145_create_account_types_table.php
+++ b/database/migrations/2014_06_27_163145_create_account_types_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_163259_create_accounts_table.php b/database/migrations/2014_06_27_163259_create_accounts_table.php
index 59c3cd4682..972bf66fcb 100644
--- a/database/migrations/2014_06_27_163259_create_accounts_table.php
+++ b/database/migrations/2014_06_27_163259_create_accounts_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_163817_create_components_table.php b/database/migrations/2014_06_27_163817_create_components_table.php
index a96ab4d388..795f14685f 100644
--- a/database/migrations/2014_06_27_163817_create_components_table.php
+++ b/database/migrations/2014_06_27_163817_create_components_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_163818_create_piggybanks_table.php b/database/migrations/2014_06_27_163818_create_piggybanks_table.php
index 827c5f4c48..cffda131c9 100644
--- a/database/migrations/2014_06_27_163818_create_piggybanks_table.php
+++ b/database/migrations/2014_06_27_163818_create_piggybanks_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php b/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php
index d32e52f07b..4c0f9b7ef0 100644
--- a/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php
+++ b/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_164512_create_transaction_types_table.php b/database/migrations/2014_06_27_164512_create_transaction_types_table.php
index 4aa42eb9bd..46d82089c0 100644
--- a/database/migrations/2014_06_27_164512_create_transaction_types_table.php
+++ b/database/migrations/2014_06_27_164512_create_transaction_types_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php b/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php
index 6c9ae0f668..1b6e637279 100644
--- a/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php
+++ b/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_164620_create_transaction_journals_table.php b/database/migrations/2014_06_27_164620_create_transaction_journals_table.php
index b41b1ff493..fdb56228b1 100644
--- a/database/migrations/2014_06_27_164620_create_transaction_journals_table.php
+++ b/database/migrations/2014_06_27_164620_create_transaction_journals_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_164836_create_transactions_table.php b/database/migrations/2014_06_27_164836_create_transactions_table.php
index 8e1c847db5..0ce8e2adab 100644
--- a/database/migrations/2014_06_27_164836_create_transactions_table.php
+++ b/database/migrations/2014_06_27_164836_create_transactions_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_06_27_165344_create_component_transaction_table.php b/database/migrations/2014_06_27_165344_create_component_transaction_table.php
index 03020da537..8d76199427 100644
--- a/database/migrations/2014_06_27_165344_create_component_transaction_table.php
+++ b/database/migrations/2014_06_27_165344_create_component_transaction_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php b/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php
index e6de376c42..06b2a89b4a 100644
--- a/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php
+++ b/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_07_06_123842_create_preferences_table.php b/database/migrations/2014_07_06_123842_create_preferences_table.php
index ef510274c9..a71f0205a4 100644
--- a/database/migrations/2014_07_06_123842_create_preferences_table.php
+++ b/database/migrations/2014_07_06_123842_create_preferences_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_07_09_204843_create_session_table.php b/database/migrations/2014_07_09_204843_create_session_table.php
index fa39883634..08a9a98f75 100644
--- a/database/migrations/2014_07_09_204843_create_session_table.php
+++ b/database/migrations/2014_07_09_204843_create_session_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_07_17_183717_create_limits_table.php b/database/migrations/2014_07_17_183717_create_limits_table.php
index f6c507216a..d94065e832 100644
--- a/database/migrations/2014_07_17_183717_create_limits_table.php
+++ b/database/migrations/2014_07_17_183717_create_limits_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_07_19_055011_create_limit_repeat_table.php b/database/migrations/2014_07_19_055011_create_limit_repeat_table.php
index 5174585c72..83a655c5a0 100644
--- a/database/migrations/2014_07_19_055011_create_limit_repeat_table.php
+++ b/database/migrations/2014_07_19_055011_create_limit_repeat_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php b/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php
index 6105817f64..21d0b8b6c3 100644
--- a/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php
+++ b/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php b/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php
index 223c4262ed..e8dfda76b6 100644
--- a/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php
+++ b/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_08_18_100330_create_piggybank_events_table.php b/database/migrations/2014_08_18_100330_create_piggybank_events_table.php
index 5c68410837..54f57e90aa 100644
--- a/database/migrations/2014_08_18_100330_create_piggybank_events_table.php
+++ b/database/migrations/2014_08_18_100330_create_piggybank_events_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_08_23_113221_create_reminders_table.php b/database/migrations/2014_08_23_113221_create_reminders_table.php
index aaecf27eb6..a7d769a2fc 100644
--- a/database/migrations/2014_08_23_113221_create_reminders_table.php
+++ b/database/migrations/2014_08_23_113221_create_reminders_table.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index dc7f142530..c9da2ac1cc 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_11_10_172053_create_account_meta_table.php b/database/migrations/2014_11_10_172053_create_account_meta_table.php
index 698850465d..044d1e28e6 100644
--- a/database/migrations/2014_11_10_172053_create_account_meta_table.php
+++ b/database/migrations/2014_11_10_172053_create_account_meta_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_11_29_135749_create_transaction_groups_table.php b/database/migrations/2014_11_29_135749_create_transaction_groups_table.php
index 019c0879e6..a312a3d7d9 100644
--- a/database/migrations/2014_11_29_135749_create_transaction_groups_table.php
+++ b/database/migrations/2014_11_29_135749_create_transaction_groups_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_11_29_140217_create_transaction_group_transaction_journal_table.php b/database/migrations/2014_11_29_140217_create_transaction_group_transaction_journal_table.php
index 444e64b7c1..b615d7b102 100644
--- a/database/migrations/2014_11_29_140217_create_transaction_group_transaction_journal_table.php
+++ b/database/migrations/2014_11_29_140217_create_transaction_group_transaction_journal_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2014_12_13_190730_changes_for_v321.php b/database/migrations/2014_12_13_190730_changes_for_v321.php
index 3a497d4bc7..13b4715fcc 100644
--- a/database/migrations/2014_12_13_190730_changes_for_v321.php
+++ b/database/migrations/2014_12_13_190730_changes_for_v321.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
diff --git a/database/migrations/2014_12_24_191544_changes_for_v322.php b/database/migrations/2014_12_24_191544_changes_for_v322.php
index 11a6ce7416..ce79a649e8 100644
--- a/database/migrations/2014_12_24_191544_changes_for_v322.php
+++ b/database/migrations/2014_12_24_191544_changes_for_v322.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_01_18_082406_changes_for_v325.php b/database/migrations/2015_01_18_082406_changes_for_v325.php
index 83e16c0bc6..79f8c00249 100644
--- a/database/migrations/2015_01_18_082406_changes_for_v325.php
+++ b/database/migrations/2015_01_18_082406_changes_for_v325.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_02_27_210653_changes_for_v332.php b/database/migrations/2015_02_27_210653_changes_for_v332.php
index 97a4f38641..982bd02d42 100644
--- a/database/migrations/2015_02_27_210653_changes_for_v332.php
+++ b/database/migrations/2015_02_27_210653_changes_for_v332.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_03_27_061038_changes_for_v333.php b/database/migrations/2015_03_27_061038_changes_for_v333.php
index 78027e5e45..3f67a72a27 100644
--- a/database/migrations/2015_03_27_061038_changes_for_v333.php
+++ b/database/migrations/2015_03_27_061038_changes_for_v333.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_03_29_174140_changes_for_v336.php b/database/migrations/2015_03_29_174140_changes_for_v336.php
index acaf6a384e..411caddc9d 100644
--- a/database/migrations/2015_03_29_174140_changes_for_v336.php
+++ b/database/migrations/2015_03_29_174140_changes_for_v336.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_04_26_054507_changes_for_v3310.php b/database/migrations/2015_04_26_054507_changes_for_v3310.php
index 7073e1b6b1..2bd1c4f0ec 100644
--- a/database/migrations/2015_04_26_054507_changes_for_v3310.php
+++ b/database/migrations/2015_04_26_054507_changes_for_v3310.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_04_28_075215_changes_for_v3310a.php b/database/migrations/2015_04_28_075215_changes_for_v3310a.php
index 5d31326a58..81bdff7117 100644
--- a/database/migrations/2015_04_28_075215_changes_for_v3310a.php
+++ b/database/migrations/2015_04_28_075215_changes_for_v3310a.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_04_28_075317_changes_for_v3310b.php b/database/migrations/2015_04_28_075317_changes_for_v3310b.php
index 06d3522d3d..f950b19c21 100644
--- a/database/migrations/2015_04_28_075317_changes_for_v3310b.php
+++ b/database/migrations/2015_04_28_075317_changes_for_v3310b.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 
diff --git a/database/migrations/2015_05_22_172026_changes_for_v3409.php b/database/migrations/2015_05_22_172026_changes_for_v3409.php
index 5c401d8cdd..6fdbd1e607 100644
--- a/database/migrations/2015_05_22_172026_changes_for_v3409.php
+++ b/database/migrations/2015_05_22_172026_changes_for_v3409.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_05_28_041652_entrust_setup_tables.php b/database/migrations/2015_05_28_041652_entrust_setup_tables.php
index f18279e3a5..ab63daedab 100644
--- a/database/migrations/2015_05_28_041652_entrust_setup_tables.php
+++ b/database/migrations/2015_05_28_041652_entrust_setup_tables.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
diff --git a/database/migrations/2015_06_14_093841_changes_for_v345.php b/database/migrations/2015_06_14_093841_changes_for_v345.php
index 752a0a54f9..bbcb205de1 100644
--- a/database/migrations/2015_06_14_093841_changes_for_v345.php
+++ b/database/migrations/2015_06_14_093841_changes_for_v345.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_07_03_102450_changes_for_v3462.php b/database/migrations/2015_07_03_102450_changes_for_v3462.php
index d18d7c232c..3abeefe40e 100644
--- a/database/migrations/2015_07_03_102450_changes_for_v3462.php
+++ b/database/migrations/2015_07_03_102450_changes_for_v3462.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_07_14_204645_changes_for_v349.php b/database/migrations/2015_07_14_204645_changes_for_v349.php
index b2433f455f..2f5c419438 100644
--- a/database/migrations/2015_07_14_204645_changes_for_v349.php
+++ b/database/migrations/2015_07_14_204645_changes_for_v349.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2015_07_17_190438_changes_for_v3410.php b/database/migrations/2015_07_17_190438_changes_for_v3410.php
index feebb8396b..dcaafee5cd 100644
--- a/database/migrations/2015_07_17_190438_changes_for_v3410.php
+++ b/database/migrations/2015_07_17_190438_changes_for_v3410.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2016_01_11_193428_changes_for_v370.php b/database/migrations/2016_01_11_193428_changes_for_v370.php
index 6f6460e30e..e35dc60c15 100644
--- a/database/migrations/2016_01_11_193428_changes_for_v370.php
+++ b/database/migrations/2016_01_11_193428_changes_for_v370.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 /**
  * 2016_01_11_193428_changes_for_v370.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/database/migrations/2016_02_04_144117_changes_for_v380.php b/database/migrations/2016_02_04_144117_changes_for_v380.php
index 1e8039cb78..f1aed9e55f 100644
--- a/database/migrations/2016_02_04_144117_changes_for_v380.php
+++ b/database/migrations/2016_02_04_144117_changes_for_v380.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2016_02_24_172426_create_jobs_table.php b/database/migrations/2016_02_24_172426_create_jobs_table.php
index 9005b7dae7..34be24287c 100644
--- a/database/migrations/2016_02_24_172426_create_jobs_table.php
+++ b/database/migrations/2016_02_24_172426_create_jobs_table.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_04_08_181054_changes_for_v383.php b/database/migrations/2016_04_08_181054_changes_for_v383.php
index d39dcf77fd..f550d2d18d 100644
--- a/database/migrations/2016_04_08_181054_changes_for_v383.php
+++ b/database/migrations/2016_04_08_181054_changes_for_v383.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/database/migrations/2016_04_25_093451_changes_for_v390.php b/database/migrations/2016_04_25_093451_changes_for_v390.php
index 0afc024bf1..016573a4af 100644
--- a/database/migrations/2016_04_25_093451_changes_for_v390.php
+++ b/database/migrations/2016_04_25_093451_changes_for_v390.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Database\Migrations\Migration;
diff --git a/database/seeds/AccountTypeSeeder.php b/database/seeds/AccountTypeSeeder.php
index 7b2b56e021..76e22d8c37 100644
--- a/database/seeds/AccountTypeSeeder.php
+++ b/database/seeds/AccountTypeSeeder.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 use FireflyIII\Models\AccountType;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 9892663a49..bdbfc34b55 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php
index c6ef9688f3..7ef4e1db75 100644
--- a/database/seeds/PermissionSeeder.php
+++ b/database/seeds/PermissionSeeder.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 
 use FireflyIII\Models\Role;
 use Illuminate\Database\Seeder;
diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php
index deb01e6226..d4faa0e4f3 100644
--- a/database/seeds/TestDataSeeder.php
+++ b/database/seeds/TestDataSeeder.php
@@ -1,5 +1,6 @@
 <?php
 declare(strict_types = 1);
+
 /**
  * TestDataSeeder.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php
index 9260312c18..9a0292200f 100644
--- a/database/seeds/TransactionCurrencySeeder.php
+++ b/database/seeds/TransactionCurrencySeeder.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Database\Seeder;
diff --git a/database/seeds/TransactionTypeSeeder.php b/database/seeds/TransactionTypeSeeder.php
index 4f7a6e13d6..6b6c1f0c22 100644
--- a/database/seeds/TransactionTypeSeeder.php
+++ b/database/seeds/TransactionTypeSeeder.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 use FireflyIII\Models\TransactionType;
 use Illuminate\Database\Seeder;
 
diff --git a/public/index.php b/public/index.php
index c5820533bc..49e92f724a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 /**
  * Laravel - A PHP Framework For Web Artisans
diff --git a/server.php b/server.php
index f65c7c444f..cca73424ad 100644
--- a/server.php
+++ b/server.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 /**
  * Laravel - A PHP Framework For Web Artisans
diff --git a/tests/BasicTest.php b/tests/BasicTest.php
index d32c69e252..c1383a8e7a 100644
--- a/tests/BasicTest.php
+++ b/tests/BasicTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 /**
  * Class BasicTest
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 87ab664e16..1adf1eecb2 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types = 1);
+
+
 use Carbon\Carbon;
 use FireflyIII\Models\Preference;
 use FireflyIII\User;