Learned that I should not refer to env vars directly so I removed all references.

app/Exceptions/Handler.php

@@ -38,6 +38,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class Handler
+ *
  * @codeCoverageIgnore
  */
 class Handler extends ExceptionHandler
@@ -92,7 +93,7 @@ class Handler extends ExceptionHandler
         }
 
         if ($exception instanceof FireflyException || $exception instanceof ErrorException || $exception instanceof OAuthServerException) {
-            $isDebug = env('APP_DEBUG', false);
+            $isDebug = config('app.debug');
 
             return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
         }
@@ -116,7 +117,7 @@ class Handler extends ExceptionHandler
     public function report(Exception $exception)
     {
 
-        $doMailError = env('SEND_ERROR_MESSAGE', true);
+        $doMailError = config('firefly.send_error_message');
         // if the user wants us to mail:
         if (true === $doMailError
             // and if is one of these error instances
@@ -145,7 +146,7 @@ class Handler extends ExceptionHandler
 
             // create job that will mail.
             $ipAddress = Request::ip() ?? '0.0.0.0';
-            $job       = new MailError($userData, env('SITE_OWNER', ''), $ipAddress, $data);
+            $job       = new MailError($userData, (string)config('firefly.site_owner'), $ipAddress, $data);
             dispatch($job);
         }
 

app/Factory/AccountFactory.php

@@ -51,7 +51,7 @@ class AccountFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/AccountMetaFactory.php

@@ -39,7 +39,7 @@ class AccountMetaFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/AttachmentFactory.php

@@ -38,7 +38,7 @@ class AttachmentFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/BillFactory.php

@@ -41,7 +41,7 @@ class BillFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/BudgetFactory.php

@@ -39,7 +39,7 @@ class BudgetFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/CategoryFactory.php

@@ -39,7 +39,7 @@ class CategoryFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/PiggyBankEventFactory.php

@@ -42,7 +42,7 @@ class PiggyBankEventFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/PiggyBankFactory.php

@@ -38,7 +38,7 @@ class PiggyBankFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/RecurrenceFactory.php

@@ -44,7 +44,7 @@ class RecurrenceFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TagFactory.php

@@ -44,7 +44,7 @@ class TagFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TransactionCurrencyFactory.php

@@ -41,7 +41,7 @@ class TransactionCurrencyFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TransactionFactory.php

@@ -50,7 +50,7 @@ class TransactionFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TransactionJournalFactory.php

@@ -46,7 +46,7 @@ class TransactionJournalFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TransactionJournalMetaFactory.php

@@ -39,7 +39,7 @@ class TransactionJournalMetaFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Factory/TransactionTypeFactory.php

@@ -37,7 +37,7 @@ class TransactionTypeFactory
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -34,7 +34,7 @@ class ChartJsGenerator implements GeneratorInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Handlers/Events/AutomationHandler.php

@@ -45,7 +45,7 @@ class AutomationHandler
      */
     public function reportJournals(RequestedReportOnJournals $event): bool
     {
-        $sendReport = envNonEmpty('SEND_REPORT_JOURNALS', true);
+        $sendReport = config('firefly.send_report_journals');
 
         if (false === $sendReport) {
             return true; // @codeCoverageIgnore

app/Handlers/Events/UserEventHandler.php

@@ -214,7 +214,7 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event): bool
     {
-        $sendMail = env('SEND_REGISTRATION_MAIL', true);
+        $sendMail = config('firefly.send_registration_mail');
         if ($sendMail) {
             // get the email address
             $email     = $event->user->email;

app/Helpers/Attachments/AttachmentHelper.php

@@ -65,7 +65,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $this->attachments   = new Collection;
         $this->uploadDisk    = Storage::disk('upload');
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/Chart/MetaPieChart.php

@@ -90,7 +90,7 @@ class MetaPieChart implements MetaPieChartInterface
         $this->categories = new Collection;
         $this->tags       = new Collection;
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
 

app/Helpers/Collector/TransactionCollector.php

@@ -134,7 +134,7 @@ class TransactionCollector implements TransactionCollectorInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/FiscalHelper.php

@@ -40,7 +40,7 @@ class FiscalHelper implements FiscalHelperInterface
     {
         $this->useCustomFiscalYear = app('preferences')->get('customFiscalYear', false)->data;
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/Help/Help.php

@@ -45,7 +45,7 @@ class Help implements HelpInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/Report/BalanceReportHelper.php

@@ -52,7 +52,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     {
         $this->budgetRepository = $budgetRepository;
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
 

app/Helpers/Report/BudgetReportHelper.php

@@ -48,7 +48,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
     {
         $this->repository = $repository;
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
 

app/Helpers/Report/NetWorth.php

@@ -53,7 +53,7 @@ class NetWorth implements NetWorthInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/Report/PopupReport.php

@@ -43,7 +43,7 @@ class PopupReport implements PopupReportInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Helpers/Report/ReportHelper.php

@@ -53,7 +53,7 @@ class ReportHelper implements ReportHelperInterface
     {
         $this->budgetRepository = $budgetRepository;
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
 

app/Http/Controllers/Admin/ConfigurationController.php

@@ -68,7 +68,7 @@ class ConfigurationController extends Controller
         // they don't exist yet.
         $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $isDemoSite     = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
-        $siteOwner      = env('SITE_OWNER');
+        $siteOwner      = config('firefly.site_owner');
 
         return view(
             'admin.configuration.index',

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -59,7 +59,8 @@ class ForgotPasswordController extends Controller
      */
     public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
     {
-        $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
+        Log::info('Start of sendResetLinkEmail()');
+        $loginProvider = config('firefly.login_provider');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
             Log::error($message);
@@ -98,7 +99,7 @@ class ForgotPasswordController extends Controller
      */
     public function showLinkRequestForm()
     {
-        $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
+        $loginProvider = config('firefly.login_provider');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 

app/Http/Controllers/Auth/LoginController.php

@@ -130,7 +130,7 @@ class LoginController extends Controller
     public function showLoginForm(Request $request)
     {
         $count         = DB::table('users')->count();
-        $loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
+        $loginProvider = config('firefly.login_provider');
         $pageTitle     = (string)trans('firefly.login_page_title');
         if (0 === $count && 'eloquent' === $loginProvider) {
             return redirect(route('register')); // @codeCoverageIgnore

app/Http/Controllers/Auth/RegisterController.php

@@ -72,7 +72,7 @@ class RegisterController extends Controller
     {
         // is allowed to?
         $allowRegistration = true;
-        $loginProvider     = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
+        $loginProvider     = config('firefly.login_provider');
         $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@@ -113,7 +113,7 @@ class RegisterController extends Controller
     public function showRegistrationForm(Request $request)
     {
         $allowRegistration = true;
-        $loginProvider     = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
+        $loginProvider     = config('firefly.login_provider');
         $isDemoSite        = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -71,7 +71,7 @@ class ResetPasswordController extends Controller
      */
     public function showResetForm(Request $request, $token = null)
     {
-        $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
+        $loginProvider = config('firefly.login_provider');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
@@ -103,7 +103,7 @@ class ResetPasswordController extends Controller
      */
     public function reset(Request $request)
     {
-        $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
+        $loginProvider = config('firefly.login_provider');
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 

app/Http/Controllers/Auth/TwoFactorController.php

@@ -77,7 +77,7 @@ class TwoFactorController extends Controller
     {
         /** @var User $user */
         $user      = auth()->user();
-        $siteOwner = env('SITE_OWNER', '');
+        $siteOwner = config('firefly.site_owner');
         $title     = (string)trans('firefly.two_factor_forgot_title');
 
         Log::info(

app/Http/Controllers/Controller.php

@@ -63,8 +63,8 @@ class Controller extends BaseController
         // is site a demo site?
         $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         app('view')->share('IS_DEMO_SITE', $isDemoSite);
-        app('view')->share('DEMO_USERNAME', env('DEMO_USERNAME', ''));
+        app('view')->share('DEMO_USERNAME', config('firefly.demo_username'));
-        app('view')->share('DEMO_PASSWORD', env('DEMO_PASSWORD', ''));
+        app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
         app('view')->share('FF_VERSION', config('firefly.version'));
 
         $this->middleware(

app/Http/Controllers/CurrencyController.php

@@ -77,7 +77,7 @@ class CurrencyController extends Controller
         /** @var User $user */
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
         }
@@ -127,7 +127,7 @@ class CurrencyController extends Controller
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
             // @codeCoverageIgnoreStart
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
             // @codeCoverageIgnoreEnd
@@ -160,7 +160,7 @@ class CurrencyController extends Controller
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
             // @codeCoverageIgnoreStart
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
             // @codeCoverageIgnoreEnd
@@ -192,7 +192,7 @@ class CurrencyController extends Controller
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
             // @codeCoverageIgnoreStart
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
             // @codeCoverageIgnoreEnd
@@ -236,7 +236,7 @@ class CurrencyController extends Controller
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
             // @codeCoverageIgnoreStart
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
             // @codeCoverageIgnoreEnd
@@ -308,7 +308,7 @@ class CurrencyController extends Controller
         $defaultCurrency = $this->repository->getCurrencyByPreference(app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR')));
         $isOwner         = true;
         if (!$this->userRepository->hasRole($user, 'owner')) {
-            $request->session()->flash('info', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('info', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
             $isOwner = false;
         }
 
@@ -374,7 +374,7 @@ class CurrencyController extends Controller
         $user = auth()->user();
         if (!$this->userRepository->hasRole($user, 'owner')) {
             // @codeCoverageIgnoreStart
-            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
 
             return redirect(route('currencies.index'));
             // @codeCoverageIgnoreEnd

app/Http/Controllers/DebugController.php

@@ -128,19 +128,19 @@ class DebugController extends Controller
         $drivers        = implode(', ', DB::availableDrivers());
         $currentDriver  = DB::getDriverName();
         $userAgent      = $request->header('user-agent');
-        $isSandstorm    = var_export(env('IS_SANDSTORM', 'unknown'), true);
+        $isSandstorm    = var_export(config('firefly.is_sandstorm'), true);
-        $isDocker       = var_export(env('IS_DOCKER', 'unknown'), true);
+        $isDocker       = var_export(config('firefly.is_docker'), true);
-        $toSandbox      = var_export(env('BUNQ_USE_SANDBOX', 'unknown'), true);
+        $toSandbox      = var_export(config('firefly.bunq_use_sandbox'), true);
-        $trustedProxies = env('TRUSTED_PROXIES', '(none)');
+        $trustedProxies = config('firefly.trusted_proxies');
         $displayErrors  = ini_get('display_errors');
         $storageDisks   = implode(', ', config('filesystems.disks.upload.disks'));
         $errorReporting = $this->errorReporting((int)ini_get('error_reporting'));
-        $appEnv         = env('APP_ENV', '');
+        $appEnv         = config('app.env');
-        $appDebug       = var_export(env('APP_DEBUG', false), true);
+        $appDebug       = var_export(config('app.debug'), true);
-        $logChannel     = env('LOG_CHANNEL', '');
+        $logChannel     = config('logging.default');
-        $appLogLevel    = env('APP_LOG_LEVEL', 'info');
+        $appLogLevel    = config('logging.level');
-        $cacheDriver    = env('CACHE_DRIVER', 'unknown');
+        $cacheDriver    = config('cache.default');
-        $loginProvider  = env('LOGIN_PROVIDER', 'unknown');
+        $loginProvider  = config('auth.driver');
 
         // set languages, see what happens:
         $original       = setlocale(LC_ALL, 0);

app/Http/Controllers/SearchController.php

@@ -96,7 +96,7 @@ class SearchController extends Controller
         if (!$cache->has()) {
             // parse search terms:
             $searcher->parseQuery($fullQuery);
-            $searcher->setLimit((int)env('SEARCH_RESULT_LIMIT', 50));
+            $searcher->setLimit((int)config('firefly.search_result_limit'));
             $transactions = $searcher->searchTransactions();
             $cache->store($transactions);
         }

app/Http/Middleware/Installer.php

@@ -54,7 +54,7 @@ class Installer
      */
     public function handle($request, Closure $next)
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             return $next($request);
         }
         $url    = $request->url();

app/Http/Middleware/Range.php

@@ -107,7 +107,7 @@ class Range
      */
     private function loseItAll(Request $request): void
     {
-        if ('sqlite' === getenv('DB_CONNECTION') && true === getenv('IS_DOCKER')) {
+        if ('sqlite' === config('database.default') && true === config('firefly.is_docker')) {
             // @codeCoverageIgnoreStart
             $request->session()->flash(
                 'error', 'You seem to be using SQLite in a Docker container. Don\'t do this. If the container restarts all your data will be gone.'

app/Http/Middleware/SecureHeaders.php

@@ -44,7 +44,7 @@ class SecureHeaders
     {
         $response    = $next($request);
         $google      = '';
-        $analyticsId = env('ANALYTICS_ID', '');
+        $analyticsId = config('firefly.analytics_id');
         if ('' !== $analyticsId) {
             $google = 'www.googletagmanager.com/gtag/js'; // @codeCoverageIgnore
         }
@@ -76,7 +76,7 @@ class SecureHeaders
             "payment 'none'",
         ];
 
-        $disableFrameHeader = env('DISABLE_FRAME_HEADER');
+        $disableFrameHeader = config('firefly.disable_frame_header');
         if (false === $disableFrameHeader || null === $disableFrameHeader) {
             $response->header('X-Frame-Options', 'deny');
         }

app/Http/Middleware/TrustProxies.php

@@ -43,7 +43,7 @@ class TrustProxies extends Middleware
      */
     public function __construct(Repository $config)
     {
-        $trustedProxies = (string)env('TRUSTED_PROXIES', null);
+        $trustedProxies = (string)config('firefly.trusted_proxies');
         $this->proxies  = explode(',', $trustedProxies);
         if ('**' === $trustedProxies) {
             $this->proxies = '**';

app/Http/Requests/TagFormRequest.php

@@ -63,7 +63,7 @@ class TagFormRequest extends Request
             'description' => $this->string('description'),
             'latitude'    => $latitude,
             'longitude'   => $longitude,
-            'zoomLevel'   => $zoomLevel,
+            'zoom_level'   => $zoomLevel,
         ];
 
         return $data;
@@ -93,7 +93,7 @@ class TagFormRequest extends Request
             'date'        => 'date|nullable',
             'latitude'    => 'numeric|min:-90|max:90|nullable',
             'longitude'   => 'numeric|min:-90|max:90|nullable',
-            'zoomLevel'   => 'numeric|min:0|max:80|nullable',
+            'zoom_level'   => 'numeric|min:0|max:80|nullable',
         ];
     }
 }

app/Import/Prerequisites/BunqPrerequisites.php

@@ -156,7 +156,7 @@ class BunqPrerequisites implements PrerequisitesInterface
      */
     private function getBunqEnvironment(): BunqEnumApiEnvironmentType
     {
-        $env = env('BUNQ_USE_SANDBOX');
+        $env = config('firefly.bunq_use_sandbox');
         if (null === $env) {
             return BunqEnumApiEnvironmentType::PRODUCTION();
         }

app/Import/Storage/ImportArrayStorage.php

@@ -337,7 +337,7 @@ class ImportArrayStorage
             'description' => null,
             'latitude'    => null,
             'longitude'   => null,
-            'zoomLevel'   => null,
+            'zoom_level'   => null,
             'tagMode'     => 'nothing',
         ];
         $tag  = $repository->store($data);

app/Jobs/MailError.php

@@ -70,7 +70,7 @@ class MailError extends Job implements ShouldQueue
      */
     public function handle()
     {
-        $email            = env('SITE_OWNER');
+        $email            = config('firefly.site_owner');
         $args             = $this->exception;
         $args['loggedIn'] = $this->userData['id'] > 0;
         $args['user']     = $this->userData;

app/Models/Account.php

@@ -58,6 +58,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @property string      $interest
  * @property string      $interestPeriod
  * @property string      accountTypeString
+ * @property Carbon      created_at
+ * @property Carbon      updated_at
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

app/Providers/AppServiceProvider.php

@@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
-        if ('heroku' === env('APP_ENV')) {
+        if ('heroku' === config('app.env')) {
             URL::forceScheme('https');
         }
     }

app/Repositories/Account/AccountTasker.php

@@ -45,7 +45,7 @@ class AccountTasker implements AccountTaskerInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Attachment/AttachmentRepository.php

@@ -50,7 +50,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Bill/BillRepository.php

@@ -53,7 +53,7 @@ class BillRepository implements BillRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Budget/BudgetRepository.php

@@ -61,7 +61,7 @@ class BudgetRepository implements BudgetRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Category/CategoryRepository.php

@@ -52,7 +52,7 @@ class CategoryRepository implements CategoryRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Currency/CurrencyRepository.php

@@ -50,7 +50,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/ExportJob/ExportJobRepository.php

@@ -44,7 +44,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/ImportJob/ImportJobRepository.php

@@ -54,7 +54,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface
         $this->maxUploadSize = (int)config('firefly.maxUploadSize');
         $this->uploadDisk    = Storage::disk('upload');
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Journal/JournalRepository.php

@@ -61,7 +61,7 @@ class JournalRepository implements JournalRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/LinkType/LinkTypeRepository.php

@@ -45,7 +45,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -49,7 +49,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Recurring/RecurringRepository.php

@@ -61,7 +61,7 @@ class RecurringRepository implements RecurringRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Rule/RuleRepository.php

@@ -46,7 +46,7 @@ class RuleRepository implements RuleRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -42,7 +42,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Repositories/Tag/TagRepository.php

@@ -49,7 +49,7 @@ class TagRepository implements TagRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }
@@ -373,7 +373,7 @@ class TagRepository implements TagRepositoryInterface
         $tag->description = $data['description'];
         $tag->latitude    = $data['latitude'];
         $tag->longitude   = $data['longitude'];
-        $tag->zoomLevel   = $data['zoomLevel'];
+        $tag->zoomLevel   = $data['zoom_level'];
         $tag->save();
 
         return $tag;

app/Repositories/User/UserRepository.php

@@ -41,7 +41,7 @@ class UserRepository implements UserRepositoryInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Currency/FixerIOv2.php

@@ -44,7 +44,7 @@ class FixerIOv2 implements ExchangeRateInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }
@@ -70,7 +70,7 @@ class FixerIOv2 implements ExchangeRateInterface
         $exchangeRate->created_at = new Carbon;
 
         // get API key
-        $apiKey = env('FIXER_API_KEY', '');
+        $apiKey = config('firefly.fixer_api_key');
 
         // if no API key, return unsaved exchange rate.
         if ('' === $apiKey) {

app/Services/IP/IpifyOrg.php

@@ -39,7 +39,7 @@ class IpifyOrg implements IPRetrievalInterface
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Destroy/AccountDestroyService.php

@@ -43,7 +43,7 @@ class AccountDestroyService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Destroy/CategoryDestroyService.php

@@ -37,7 +37,7 @@ class CategoryDestroyService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Destroy/CurrencyDestroyService.php

@@ -37,7 +37,7 @@ class CurrencyDestroyService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Destroy/JournalDestroyService.php

@@ -40,7 +40,7 @@ class JournalDestroyService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Destroy/RecurrenceDestroyService.php

@@ -39,7 +39,7 @@ class RecurrenceDestroyService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/File/EncryptService.php

@@ -39,7 +39,7 @@ class EncryptService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/AccountUpdateService.php

@@ -38,7 +38,7 @@ class AccountUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/BillUpdateService.php

@@ -39,7 +39,7 @@ class BillUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/CategoryUpdateService.php

@@ -36,7 +36,7 @@ class CategoryUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/CurrencyUpdateService.php

@@ -36,7 +36,7 @@ class CurrencyUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/JournalUpdateService.php

@@ -43,7 +43,7 @@ class JournalUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Internal/Update/TransactionUpdateService.php

@@ -39,7 +39,7 @@ class TransactionUpdateService
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Services/Password/PwndVerifierV2.php

@@ -38,7 +38,7 @@ class PwndVerifierV2 implements Verifier
      */
     public function __construct()
     {
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
     }

app/Support/CacheProperties.php

@@ -76,7 +76,7 @@ class CacheProperties
      */
     public function has(): bool
     {
-        if ('testing' === getenv('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             return false;
         }
         $this->hash();

app/Support/Search/Search.php

@@ -56,7 +56,7 @@ class Search implements SearchInterface
         $this->modifiers      = new Collection;
         $this->validModifiers = (array)config('firefly.search_modifiers');
 
-        if ('testing' === env('APP_ENV')) {
+        if ('testing' === config('app.env')) {
             Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
         }
 

app/Support/Twig/General.php

@@ -59,7 +59,6 @@ class General extends Twig_Extension
             $this->getCurrencyCode(),
             $this->getCurrencySymbol(),
             $this->phpdate(),
-            $this->env(),
             $this->activeRouteStrict(),
             $this->activeRoutePartial(),
             $this->activeRoutePartialWhat(),
@@ -158,19 +157,6 @@ class General extends Twig_Extension
         );
     }
 
-    /**
-     * @return Twig_SimpleFunction
-     */
-    protected function env(): Twig_SimpleFunction
-    {
-        return new Twig_SimpleFunction(
-            'env',
-            function (string $name, string $default): string {
-                return env($name, $default);
-            }
-        );
-    }
-
     /**
      * @return Twig_SimpleFunction
      */

app/Transformers/AttachmentTransformer.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Transformers;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -51,6 +52,9 @@ class AttachmentTransformer extends TransformerAbstract
     {
         $this->parameters = $parameters;
         $this->repository = app(AttachmentRepositoryInterface::class);
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/AvailableBudgetTransformer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\AvailableBudget;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -46,6 +47,9 @@ class AvailableBudgetTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/BillTransformer.php

@@ -56,6 +56,9 @@ class BillTransformer extends TransformerAbstract
     {
         $this->parameters = $parameters;
         $this->repository = app(BillRepositoryInterface::class);
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/BudgetLimitTransformer.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\BudgetLimit;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -45,6 +46,9 @@ class BudgetLimitTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/BudgetTransformer.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Support\Collection;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -48,6 +49,9 @@ class BudgetTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/CategoryTransformer.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Support\Collection;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -51,6 +52,9 @@ class CategoryTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/CurrencyExchangeRateTransformer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\CurrencyExchangeRate;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -46,6 +47,9 @@ class CurrencyExchangeRateTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/CurrencyTransformer.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\TransactionCurrency;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -45,6 +46,9 @@ class CurrencyTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/ImportJobTransformer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\ImportJob;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -46,6 +47,9 @@ class ImportJobTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
 

app/Transformers/JournalLinkTransformer.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Transformers;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalLink;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -48,6 +49,9 @@ class JournalLinkTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/JournalMetaTransformer.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Support\Collection;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -49,6 +50,9 @@ class JournalMetaTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/LinkTypeTransformer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\LinkType;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -61,6 +62,9 @@ class LinkTypeTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/NoteTransformer.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Transformers;
 use FireflyIII\Models\Note;
 use League\CommonMark\CommonMarkConverter;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -60,6 +61,9 @@ class NoteTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/PiggyBankEventTransformer.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -48,6 +49,9 @@ class PiggyBankEventTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/PiggyBankTransformer.php

@@ -30,29 +30,23 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
-use League\Fractal\Resource\Collection as FractalCollection;
+use Log;
-use League\Fractal\Resource\Item;
-use League\Fractal\TransformerAbstract;
-use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
  * Class PiggyBankTransformer
  */
-class PiggyBankTransformer extends TransformerAbstract
+class PiggyBankTransformer extends AbstractTransformer
 {
-    /** @var ParameterBag */
-    protected $parameters;
-
     /**
      * PiggyBankTransformer constructor.
      *
      * @codeCoverageIgnore
-     *
-     * @param ParameterBag $parameters
      */
-    public function __construct(ParameterBag $parameters)
+    public function __construct()
     {
-        $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
 

app/Transformers/PreferenceTransformer.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\Preference;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -44,6 +45,9 @@ class PreferenceTransformer extends TransformerAbstract
     public function __construct(ParameterBag $parameters)
     {
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**

app/Transformers/RecurrenceTransformer.php

@@ -37,6 +37,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use League\Fractal\TransformerAbstract;
+use Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -60,6 +61,9 @@ class RecurrenceTransformer extends TransformerAbstract
     {
         $this->repository = app(RecurringRepositoryInterface::class);
         $this->parameters = $parameters;
+        if ('testing' === config('app.env')) {
+            Log::warning(sprintf('%s should not be instantiated in the TEST environment!', \get_class($this)));
+        }
     }
 
     /**