Merge branch 'release/4.7.6.2'

4.7.6.1

.deploy/docker/cronjob.conf

@@ -0,0 +1,11 @@
+[program:cron]
+command=/usr/sbin/cron -f -L 15
+user=root
+autostart=true
+autorestart=true
+stdout_events_enabled=true
+stderr_events_enabled=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+startsecs=10
+startretries=3

.deploy/docker/entrypoint.sh

@@ -22,8 +22,8 @@ chmod -R 775 $FIREFLY_PATH/storage
 # remove any lingering files that may break upgrades:
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
-cat .env.docker | envsubst > .env && cat .env
+cat .env.docker | envsubst > .env
 composer dump-autoload
 php artisan package:discover
 php artisan firefly:instructions install
-exec apache2-foreground
+exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon

.deploy/docker/firefly-iii.conf

@@ -0,0 +1,6 @@
+[program:apache2]
+command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
+stdout_events_enabled=true
+stderr_events_enabled=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0

.deploy/docker/supervisord.conf

@@ -0,0 +1,30 @@
+# supervisor config file
+# Adapted from the config file distributed with the supervisor package on Debian
+# Jessie
+
+# Enable supervisord in non-daemon mode. Disable the logfile as we receive
+# log messages via stdout/err. Set up the child process log directory in case
+# the user doesn't set logging to stdout/err.
+[supervisord]
+nodaemon = true
+logfile = NONE
+pidfile = /var/run/supervisord.pid
+childlogdir = /var/log/supervisor
+loglevel=debug
+
+# Enable supervisorctl via RPC interface over Unix socket
+[unix_http_server]
+file = /var/run/supervisor.sock
+chmod = 0700
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run/supervisor.sock
+
+
+# Include conf files for child processes
+# Debian/Ubuntu packages use /etc/supervisor/conf.d
+[include]
+files = /etc/supervisor/conf.d/*.conf

.deploy/docker/vhost.conf

@@ -0,0 +1,26 @@
+server {
+    listen 80 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+}
+
+##############
+# SSL
+##############
+
+server {
+    listen 443 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+    include /opt/docker/etc/nginx/vhost.ssl.conf;
+}

.env.docker

@@ -13,15 +13,31 @@ SITE_OWNER=${SITE_OWNER}
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=${FF_APP_KEY}
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=${TZ}
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=${APP_URL}
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=${TRUSTED_PROXIES}
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=${LOG_CHANNEL}
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=${APP_LOG_LEVEL}
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
 DB_CONNECTION=${FF_DB_CONNECTION}
 DB_HOST=${FF_DB_HOST}
 DB_PORT=${FF_DB_PORT}
@@ -29,17 +45,6 @@ DB_DATABASE=${FF_DB_NAME}
 DB_USERNAME=${FF_DB_USER}
 DB_PASSWORD=${FF_DB_PASSWORD}
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=syslog
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=info
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -103,4 +108,5 @@ IS_DOCKER=true
 IS_SANDSTORM=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-TZ=${TZ}
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.env.example

@@ -15,15 +15,27 @@ APP_KEY=SomeRandomStringOf32CharsExactly
 
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
-TZ=UTC
+TZ=Europe/Amsterdam
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
 LOG_CHANNEL=daily
 
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=notice
+
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
 DB_CONNECTION=mysql
@@ -33,17 +45,6 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=daily
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=notice
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -105,7 +106,7 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=false
+BUNQ_USE_SANDBOX=false
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=

.env.heroku

@@ -17,12 +17,24 @@ APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
 # Example: Europe/Amsterdam
 TZ=UTC
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
-TRUSTED_PROXIES=
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=**
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=syslog
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
@@ -33,17 +45,6 @@ DB_CONNECTION=pgsql
 
 
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=errorlog
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=debug
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -105,7 +106,7 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=true
+BUNQ_USE_SANDBOX=false
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=

.env.sandstorm

@@ -17,12 +17,24 @@ APP_KEY=SomeRandomStringOf32CharsExactly
 # Example: Europe/Amsterdam
 TZ=UTC
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=syslog
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
@@ -33,17 +45,6 @@ DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=firefly
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=syslog
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=info
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -105,7 +106,7 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=true
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=false
+BUNQ_USE_SANDBOX=false
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=

.env.testing

@@ -17,27 +17,33 @@ APP_KEY=TestTestTestTestTestTestTestTest
 # Example: Europe/Amsterdam
 TZ=Europe/Amsterdam
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=dailytest
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=sqlite
-
 # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=daily
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=dailytest
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
 # nothing will get logged, ever.
-APP_LOG_LEVEL=debug
+APP_LOG_LEVEL=info
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
+DB_CONNECTION=sqlite
+
+
+
+
+
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
@@ -64,6 +70,9 @@ MAILGUN_SECRET=
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
+# Firefly III can send you the following messages
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=false
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
@@ -97,7 +106,7 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=true
 IS_HEROKU=false
+BUNQ_USE_SANDBOX=true
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=

.sandstorm/Vagrantfile

@@ -9,9 +9,16 @@ VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Ti
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442
+# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3,
+# remove entirely when confident nobody uses vagrant 1.x for anything.
+unless Vagrant::DEFAULT_SERVER_URL.frozen?
+  Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
-  config.vm.box = "sandstorm/debian-jessie64"
+  config.vm.box = "debian/contrib-jessie64"
 
   if Vagrant.has_plugin?("vagrant-vbguest") then
     # vagrant-vbguest is a Vagrant plugin that upgrades

.sandstorm/changelog.md

@@ -1,3 +1,69 @@
+# 4.7.6.2
+- Docker file builds again.
+- Fix CSS of OAuth2 authorization view.
+
+# 4.7.6.1
+- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both.
+- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers
+- Docker build gave a cURL error whenever it runs PHP commands.
+
+# 4.7.6
+- [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB.
+- [Issue 306](https://github.com/firefly-iii/firefly-iii/issues/306) You can now add liabilities to Firefly III.
+- [Issue 740](https://github.com/firefly-iii/firefly-iii/issues/740) Various charts are now currency aware.
+- [Issue 833](https://github.com/firefly-iii/firefly-iii/issues/833) Bills can use non-default currencies.
+- [Issue 1578](https://github.com/firefly-iii/firefly-iii/issues/1578) Firefly III will notify you if the cron job hasn't fired.
+- [Issue 1623](https://github.com/firefly-iii/firefly-iii/issues/1623) New transactions will link back from the success message.
+- [Issue 1624](https://github.com/firefly-iii/firefly-iii/issues/1624) transactions will link to the object.
+- You can call the cron job over the web now (see docs).
+- You don't need to call the cron job every minute any more.
+- Various charts are now red/green to signify income and expenses.
+- Option to add or remove accounts from the net worth calculations.
+- This will be the last release on PHP 7.1. Future versions will require PHP 7.2.
+- [Issue 1460](https://github.com/firefly-iii/firefly-iii/issues/1460) Downloading transactions from bunq should go more smoothly.
+- [Issue 1464](https://github.com/firefly-iii/firefly-iii/issues/1464) Fixed the docker file to work on Raspberry Pi's.
+- [Issue 1540](https://github.com/firefly-iii/firefly-iii/issues/1540) The Docker file now has a working cron job for recurring transactions.
+- [Issue 1564](https://github.com/firefly-iii/firefly-iii/issues/1564) Fix double transfers when importing from bunq.
+- [Issue 1575](https://github.com/firefly-iii/firefly-iii/issues/1575) Some views would give a XSRF token warning
+- [Issue 1576](https://github.com/firefly-iii/firefly-iii/issues/1576) Fix assigning budgets
+- [Issue 1580](https://github.com/firefly-iii/firefly-iii/issues/1580) Missing string for translation
+- [Issue 1581](https://github.com/firefly-iii/firefly-iii/issues/1581) Expand help text
+- [Issue 1584](https://github.com/firefly-iii/firefly-iii/issues/1584) Link to administration is back.
+- [Issue 1586](https://github.com/firefly-iii/firefly-iii/issues/1586) Date fields in import were mislabeled.
+- [Issue 1593](https://github.com/firefly-iii/firefly-iii/issues/1593) Link types are translatable.
+- [Issue 1594](https://github.com/firefly-iii/firefly-iii/issues/1594) Very long breadcrumbs are weird.
+- [Issue 1598](https://github.com/firefly-iii/firefly-iii/issues/1598) Fix budget calculations.
+- [Issue 1597](https://github.com/firefly-iii/firefly-iii/issues/1597) Piggy banks are always inactive.
+- [Issue 1605](https://github.com/firefly-iii/firefly-iii/issues/1605) System will ignore foreign currency setting if user doesn't indicate the amount.
+- [Issue 1608](https://github.com/firefly-iii/firefly-iii/issues/1608) Spelling error in command line import.
+- [Issue 1609](https://github.com/firefly-iii/firefly-iii/issues/1609) Link to budgets page was absolute.
+- [Issue 1615](https://github.com/firefly-iii/firefly-iii/issues/1615) Fix currency bug in transactions.
+- [Issue 1616](https://github.com/firefly-iii/firefly-iii/issues/1616) Fix null pointer exception in pie charts.
+- [Issue 1617](https://github.com/firefly-iii/firefly-iii/issues/1617) Fix for complex tag names in URL's.
+- [Issue 1620](https://github.com/firefly-iii/firefly-iii/issues/1620) Fixed index reference in API.
+- [Issue 1639](https://github.com/firefly-iii/firefly-iii/issues/1639) Firefly III trusts the Heroku load balancer, fixing deployment on Heroku.
+- [Issue 1642](https://github.com/firefly-iii/firefly-iii/issues/1642) Fix issue with split journals.
+- [Issue 1643](https://github.com/firefly-iii/firefly-iii/issues/1643) Fix reconciliation issue.
+- Users can no longer give expenses a budget.
+- Fix bug in Spectre import.
+- Heroku would not make you owner.
+- Add `.htaccess` files to all public directories.
+- New secure headers will make Firefly III slightly more secure.
+
+# 4.7.5.3
+- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget.
+- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system.
+- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget.
+- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart.
+- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount
+- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm
+- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code.
+- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie)
+- Fixed a bug where transfers would be stored inversely when using the CSV import.
+- Retired the "Rabobank description"-fix, because it is no longer necessary.
+- Fixed a bug where users could not delete budget limits in the API.
+- Piggy bank notes are visible again.
+
 # 4.7.5.1
 - [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories.
 - [Issue 1532](https://github.com/firefly-iii/firefly-iii/issues/1532), broken dropdown for autosuggest things.

.sandstorm/global-setup.sh

@@ -9,6 +9,10 @@ CURL_OPTS="--silent --show-error"
 echo localhost > /etc/hostname
 hostname localhost
 
+# Install curl that is needed below.
+apt-get update
+apt-get install -y curl
+
 # The following line copies stderr through stderr to cat without accidentally leaving it in the
 # output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159
 curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat

.sandstorm/sandstorm-files.list

@@ -209,13 +209,6 @@ opt/app/.env.sandstorm
 opt/app/.gitattributes
 opt/app/.htaccess
 opt/app/.sandstorm/.gitattributes
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/action_provision
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/action_set_name
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/creator_uid
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/id
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/index_uuid
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/private_key
-opt/app/.sandstorm/.vagrant/machines/default/virtualbox/synced_folders
 opt/app/.sandstorm/.vagrant/machines/default/virtualbox/vagrant_cwd
 opt/app/.sandstorm/Vagrantfile
 opt/app/.sandstorm/app-graphics/firefly-iii-128.png
@@ -242,15 +235,41 @@ opt/app/LICENSE
 opt/app/app.json
 opt/app/app/Api/V1/Controllers/AboutController.php
 opt/app/app/Api/V1/Controllers/AccountController.php
+opt/app/app/Api/V1/Controllers/AttachmentController.php
+opt/app/app/Api/V1/Controllers/AvailableBudgetController.php
 opt/app/app/Api/V1/Controllers/BillController.php
+opt/app/app/Api/V1/Controllers/BudgetController.php
+opt/app/app/Api/V1/Controllers/BudgetLimitController.php
+opt/app/app/Api/V1/Controllers/CategoryController.php
+opt/app/app/Api/V1/Controllers/ConfigurationController.php
 opt/app/app/Api/V1/Controllers/Controller.php
 opt/app/app/Api/V1/Controllers/CurrencyController.php
+opt/app/app/Api/V1/Controllers/CurrencyExchangeRateController.php
+opt/app/app/Api/V1/Controllers/JournalLinkController.php
+opt/app/app/Api/V1/Controllers/LinkTypeController.php
+opt/app/app/Api/V1/Controllers/PiggyBankController.php
+opt/app/app/Api/V1/Controllers/PreferenceController.php
+opt/app/app/Api/V1/Controllers/RecurrenceController.php
+opt/app/app/Api/V1/Controllers/RuleController.php
+opt/app/app/Api/V1/Controllers/RuleGroupController.php
 opt/app/app/Api/V1/Controllers/TransactionController.php
 opt/app/app/Api/V1/Controllers/UserController.php
 opt/app/app/Api/V1/Requests/AccountRequest.php
+opt/app/app/Api/V1/Requests/AttachmentRequest.php
+opt/app/app/Api/V1/Requests/AvailableBudgetRequest.php
 opt/app/app/Api/V1/Requests/BillRequest.php
+opt/app/app/Api/V1/Requests/BudgetLimitRequest.php
+opt/app/app/Api/V1/Requests/BudgetRequest.php
+opt/app/app/Api/V1/Requests/CategoryRequest.php
 opt/app/app/Api/V1/Requests/CurrencyRequest.php
+opt/app/app/Api/V1/Requests/JournalLinkRequest.php
+opt/app/app/Api/V1/Requests/LinkTypeRequest.php
+opt/app/app/Api/V1/Requests/PiggyBankRequest.php
+opt/app/app/Api/V1/Requests/PreferenceRequest.php
+opt/app/app/Api/V1/Requests/RecurrenceRequest.php
 opt/app/app/Api/V1/Requests/Request.php
+opt/app/app/Api/V1/Requests/RuleGroupRequest.php
+opt/app/app/Api/V1/Requests/RuleRequest.php
 opt/app/app/Api/V1/Requests/TransactionRequest.php
 opt/app/app/Api/V1/Requests/UserRequest.php
 opt/app/app/Console/Commands/CreateExport.php
@@ -269,6 +288,7 @@ opt/app/app/Events/AdminRequestedTestMessage.php
 opt/app/app/Events/Event.php
 opt/app/app/Events/RegisteredUser.php
 opt/app/app/Events/RequestedNewPassword.php
+opt/app/app/Events/RequestedReportOnJournals.php
 opt/app/app/Events/RequestedVersionCheckStatus.php
 opt/app/app/Events/StoredTransactionJournal.php
 opt/app/app/Events/UpdatedTransactionJournal.php
@@ -289,11 +309,13 @@ opt/app/app/Export/Exporter/ExporterInterface.php
 opt/app/app/Export/ProcessorInterface.php
 opt/app/app/Factory/AccountFactory.php
 opt/app/app/Factory/AccountMetaFactory.php
+opt/app/app/Factory/AttachmentFactory.php
 opt/app/app/Factory/BillFactory.php
 opt/app/app/Factory/BudgetFactory.php
 opt/app/app/Factory/CategoryFactory.php
 opt/app/app/Factory/PiggyBankEventFactory.php
 opt/app/app/Factory/PiggyBankFactory.php
+opt/app/app/Factory/RecurrenceFactory.php
 opt/app/app/Factory/TagFactory.php
 opt/app/app/Factory/TransactionCurrencyFactory.php
 opt/app/app/Factory/TransactionFactory.php
@@ -325,6 +347,7 @@ opt/app/app/Generator/Report/Tag/MultiYearReportGenerator.php
 opt/app/app/Generator/Report/Tag/YearReportGenerator.php
 opt/app/app/Handlers/Events/APIEventHandler.php
 opt/app/app/Handlers/Events/AdminEventHandler.php
+opt/app/app/Handlers/Events/AutomationHandler.php
 opt/app/app/Handlers/Events/StoredJournalEventHandler.php
 opt/app/app/Handlers/Events/UpdatedJournalEventHandler.php
 opt/app/app/Handlers/Events/UserEventHandler.php
@@ -365,8 +388,13 @@ opt/app/app/Helpers/Report/PopupReport.php
 opt/app/app/Helpers/Report/PopupReportInterface.php
 opt/app/app/Helpers/Report/ReportHelper.php
 opt/app/app/Helpers/Report/ReportHelperInterface.php
+opt/app/app/Helpers/Update/UpdateTrait.php
+opt/app/app/Http/Controllers/Account/CreateController.php
+opt/app/app/Http/Controllers/Account/DeleteController.php
+opt/app/app/Http/Controllers/Account/EditController.php
+opt/app/app/Http/Controllers/Account/IndexController.php
 opt/app/app/Http/Controllers/Account/ReconcileController.php
-opt/app/app/Http/Controllers/AccountController.php
+opt/app/app/Http/Controllers/Account/ShowController.php
 opt/app/app/Http/Controllers/Admin/ConfigurationController.php
 opt/app/app/Http/Controllers/Admin/HomeController.php
 opt/app/app/Http/Controllers/Admin/LinkController.php
@@ -379,7 +407,14 @@ opt/app/app/Http/Controllers/Auth/RegisterController.php
 opt/app/app/Http/Controllers/Auth/ResetPasswordController.php
 opt/app/app/Http/Controllers/Auth/TwoFactorController.php
 opt/app/app/Http/Controllers/BillController.php
-opt/app/app/Http/Controllers/BudgetController.php
+opt/app/app/Http/Controllers/Budget/AmountController.php
+opt/app/app/Http/Controllers/Budget/CreateController.php
+opt/app/app/Http/Controllers/Budget/DeleteController.php
+opt/app/app/Http/Controllers/Budget/EditController.php
+opt/app/app/Http/Controllers/Budget/IndexController.php
+opt/app/app/Http/Controllers/Budget/ShowController.php
+opt/app/app/Http/Controllers/Category/NoCategoryController.php
+opt/app/app/Http/Controllers/Category/ShowController.php
 opt/app/app/Http/Controllers/CategoryController.php
 opt/app/app/Http/Controllers/Chart/AccountController.php
 opt/app/app/Http/Controllers/Chart/BillController.php
@@ -407,12 +442,18 @@ opt/app/app/Http/Controllers/Json/BoxController.php
 opt/app/app/Http/Controllers/Json/ExchangeController.php
 opt/app/app/Http/Controllers/Json/FrontpageController.php
 opt/app/app/Http/Controllers/Json/IntroController.php
+opt/app/app/Http/Controllers/Json/ReconcileController.php
+opt/app/app/Http/Controllers/Json/RecurrenceController.php
 opt/app/app/Http/Controllers/JsonController.php
 opt/app/app/Http/Controllers/NewUserController.php
 opt/app/app/Http/Controllers/PiggyBankController.php
 opt/app/app/Http/Controllers/Popup/ReportController.php
 opt/app/app/Http/Controllers/PreferencesController.php
 opt/app/app/Http/Controllers/ProfileController.php
+opt/app/app/Http/Controllers/Recurring/CreateController.php
+opt/app/app/Http/Controllers/Recurring/DeleteController.php
+opt/app/app/Http/Controllers/Recurring/EditController.php
+opt/app/app/Http/Controllers/Recurring/IndexController.php
 opt/app/app/Http/Controllers/Report/AccountController.php
 opt/app/app/Http/Controllers/Report/BalanceController.php
 opt/app/app/Http/Controllers/Report/BudgetController.php
@@ -420,7 +461,11 @@ opt/app/app/Http/Controllers/Report/CategoryController.php
 opt/app/app/Http/Controllers/Report/ExpenseController.php
 opt/app/app/Http/Controllers/Report/OperationsController.php
 opt/app/app/Http/Controllers/ReportController.php
-opt/app/app/Http/Controllers/RuleController.php
+opt/app/app/Http/Controllers/Rule/CreateController.php
+opt/app/app/Http/Controllers/Rule/DeleteController.php
+opt/app/app/Http/Controllers/Rule/EditController.php
+opt/app/app/Http/Controllers/Rule/IndexController.php
+opt/app/app/Http/Controllers/Rule/SelectController.php
 opt/app/app/Http/Controllers/RuleGroupController.php
 opt/app/app/Http/Controllers/SearchController.php
 opt/app/app/Http/Controllers/System/InstallController.php
@@ -471,6 +516,7 @@ opt/app/app/Http/Requests/PiggyBankFormRequest.php
 opt/app/app/Http/Requests/ProfileFormRequest.php
 opt/app/app/Http/Requests/ReconciliationStoreRequest.php
 opt/app/app/Http/Requests/ReconciliationUpdateRequest.php
+opt/app/app/Http/Requests/RecurrenceFormRequest.php
 opt/app/app/Http/Requests/ReportFormRequest.php
 opt/app/app/Http/Requests/Request.php
 opt/app/app/Http/Requests/RuleFormRequest.php
@@ -482,8 +528,6 @@ opt/app/app/Http/Requests/TestRuleFormRequest.php
 opt/app/app/Http/Requests/TokenFormRequest.php
 opt/app/app/Http/Requests/UserFormRequest.php
 opt/app/app/Http/Requests/UserRegistrationRequest.php
-opt/app/app/Import/Configuration/BunqConfigurator.php
-opt/app/app/Import/Configuration/ConfiguratorInterface.php
 opt/app/app/Import/Converter/Amount.php
 opt/app/app/Import/Converter/AmountCredit.php
 opt/app/app/Import/Converter/AmountDebit.php
@@ -508,12 +552,6 @@ opt/app/app/Import/Mapper/TransactionCurrencies.php
 opt/app/app/Import/MapperPreProcess/PreProcessorInterface.php
 opt/app/app/Import/MapperPreProcess/TagsComma.php
 opt/app/app/Import/MapperPreProcess/TagsSpace.php
-opt/app/app/Import/Object/ImportAccount.php
-opt/app/app/Import/Object/ImportBill.php
-opt/app/app/Import/Object/ImportBudget.php
-opt/app/app/Import/Object/ImportCategory.php
-opt/app/app/Import/Object/ImportCurrency.php
-opt/app/app/Import/Object/ImportJournal.php
 opt/app/app/Import/Prerequisites/BunqPrerequisites.php
 opt/app/app/Import/Prerequisites/FakePrerequisites.php
 opt/app/app/Import/Prerequisites/FilePrerequisites.php
@@ -531,6 +569,7 @@ opt/app/app/Import/Specifics/RabobankDescription.php
 opt/app/app/Import/Specifics/SnsDescription.php
 opt/app/app/Import/Specifics/SpecificInterface.php
 opt/app/app/Import/Storage/ImportArrayStorage.php
+opt/app/app/Jobs/CreateRecurringTransactions.php
 opt/app/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
 opt/app/app/Jobs/ExecuteRuleOnExistingTransactions.php
 opt/app/app/Jobs/Job.php
@@ -540,6 +579,7 @@ opt/app/app/Mail/AdminTestMail.php
 opt/app/app/Mail/ConfirmEmailChangeMail.php
 opt/app/app/Mail/OAuthTokenCreatedMail.php
 opt/app/app/Mail/RegisteredUser.php
+opt/app/app/Mail/ReportNewJournalsMail.php
 opt/app/app/Mail/RequestedNewPassword.php
 opt/app/app/Mail/UndoEmailChangeMail.php
 opt/app/app/Models/Account.php
@@ -561,6 +601,11 @@ opt/app/app/Models/PiggyBank.php
 opt/app/app/Models/PiggyBankEvent.php
 opt/app/app/Models/PiggyBankRepetition.php
 opt/app/app/Models/Preference.php
+opt/app/app/Models/Recurrence.php
+opt/app/app/Models/RecurrenceMeta.php
+opt/app/app/Models/RecurrenceRepetition.php
+opt/app/app/Models/RecurrenceTransaction.php
+opt/app/app/Models/RecurrenceTransactionMeta.php
 opt/app/app/Models/Role.php
 opt/app/app/Models/Rule.php
 opt/app/app/Models/RuleAction.php
@@ -588,8 +633,8 @@ opt/app/app/Providers/ExportJobServiceProvider.php
 opt/app/app/Providers/FireflyServiceProvider.php
 opt/app/app/Providers/FireflySessionProvider.php
 opt/app/app/Providers/JournalServiceProvider.php
-opt/app/app/Providers/LogServiceProvider.php
 opt/app/app/Providers/PiggyBankServiceProvider.php
+opt/app/app/Providers/RecurringServiceProvider.php
 opt/app/app/Providers/RouteServiceProvider.php
 opt/app/app/Providers/RuleGroupServiceProvider.php
 opt/app/app/Providers/RuleServiceProvider.php
@@ -600,7 +645,6 @@ opt/app/app/Repositories/Account/AccountRepository.php
 opt/app/app/Repositories/Account/AccountRepositoryInterface.php
 opt/app/app/Repositories/Account/AccountTasker.php
 opt/app/app/Repositories/Account/AccountTaskerInterface.php
-opt/app/app/Repositories/Account/FindAccountsTrait.php
 opt/app/app/Repositories/Attachment/AttachmentRepository.php
 opt/app/app/Repositories/Attachment/AttachmentRepositoryInterface.php
 opt/app/app/Repositories/Bill/BillRepository.php
@@ -621,18 +665,22 @@ opt/app/app/Repositories/LinkType/LinkTypeRepository.php
 opt/app/app/Repositories/LinkType/LinkTypeRepositoryInterface.php
 opt/app/app/Repositories/PiggyBank/PiggyBankRepository.php
 opt/app/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+opt/app/app/Repositories/Recurring/RecurringRepository.php
+opt/app/app/Repositories/Recurring/RecurringRepositoryInterface.php
 opt/app/app/Repositories/Rule/RuleRepository.php
 opt/app/app/Repositories/Rule/RuleRepositoryInterface.php
 opt/app/app/Repositories/RuleGroup/RuleGroupRepository.php
 opt/app/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
 opt/app/app/Repositories/Tag/TagRepository.php
 opt/app/app/Repositories/Tag/TagRepositoryInterface.php
-opt/app/app/Repositories/TransactionType/TransactionTypeRepository.php
-opt/app/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php
 opt/app/app/Repositories/User/UserRepository.php
 opt/app/app/Repositories/User/UserRepositoryInterface.php
 opt/app/app/Rules/BelongsUser.php
+opt/app/app/Rules/IsAssetAccountId.php
+opt/app/app/Rules/IsValidAttachmentModel.php
 opt/app/app/Rules/UniqueIban.php
+opt/app/app/Rules/ValidRecurrenceRepetitionType.php
+opt/app/app/Rules/ValidRecurrenceRepetitionValue.php
 opt/app/app/Rules/ValidTransactions.php
 opt/app/app/Services/Bunq/ApiContext.php
 opt/app/app/Services/Bunq/MonetaryAccount.php
@@ -650,16 +698,20 @@ opt/app/app/Services/Internal/Destroy/BillDestroyService.php
 opt/app/app/Services/Internal/Destroy/CategoryDestroyService.php
 opt/app/app/Services/Internal/Destroy/CurrencyDestroyService.php
 opt/app/app/Services/Internal/Destroy/JournalDestroyService.php
+opt/app/app/Services/Internal/Destroy/RecurrenceDestroyService.php
 opt/app/app/Services/Internal/File/EncryptService.php
 opt/app/app/Services/Internal/Support/AccountServiceTrait.php
 opt/app/app/Services/Internal/Support/BillServiceTrait.php
 opt/app/app/Services/Internal/Support/JournalServiceTrait.php
+opt/app/app/Services/Internal/Support/RecurringTransactionTrait.php
 opt/app/app/Services/Internal/Support/TransactionServiceTrait.php
+opt/app/app/Services/Internal/Support/TransactionTypeTrait.php
 opt/app/app/Services/Internal/Update/AccountUpdateService.php
 opt/app/app/Services/Internal/Update/BillUpdateService.php
 opt/app/app/Services/Internal/Update/CategoryUpdateService.php
 opt/app/app/Services/Internal/Update/CurrencyUpdateService.php
 opt/app/app/Services/Internal/Update/JournalUpdateService.php
+opt/app/app/Services/Internal/Update/RecurrenceUpdateService.php
 opt/app/app/Services/Internal/Update/TransactionUpdateService.php
 opt/app/app/Services/Password/PwndVerifierV2.php
 opt/app/app/Services/Password/Verifier.php
@@ -705,10 +757,10 @@ opt/app/app/Support/Facades/Navigation.php
 opt/app/app/Support/Facades/Preferences.php
 opt/app/app/Support/Facades/Steam.php
 opt/app/app/Support/FireflyConfig.php
-opt/app/app/Support/Import/Information/BunqInformation.php
+opt/app/app/Support/Http/Controllers/DateCalculation.php
+opt/app/app/Support/Http/Controllers/RuleManagement.php
 opt/app/app/Support/Import/Information/GetSpectreCustomerTrait.php
 opt/app/app/Support/Import/Information/GetSpectreTokenTrait.php
-opt/app/app/Support/Import/Information/InformationInterface.php
 opt/app/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php
 opt/app/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php
 opt/app/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php
@@ -743,7 +795,6 @@ opt/app/app/Support/Import/Routine/File/OpposingAccountMapper.php
 opt/app/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php
 opt/app/app/Support/Import/Routine/Spectre/StageImportDataHandler.php
 opt/app/app/Support/Import/Routine/Spectre/StageNewHandler.php
-opt/app/app/Support/Models/TransactionJournalTrait.php
 opt/app/app/Support/Navigation.php
 opt/app/app/Support/Preferences.php
 opt/app/app/Support/Search/Modifier.php
@@ -759,7 +810,6 @@ opt/app/app/Support/Twig/Journal.php
 opt/app/app/Support/Twig/Loader/AccountLoader.php
 opt/app/app/Support/Twig/Loader/TransactionJournalLoader.php
 opt/app/app/Support/Twig/Loader/TransactionLoader.php
-opt/app/app/Support/Twig/PiggyBank.php
 opt/app/app/Support/Twig/Rule.php
 opt/app/app/Support/Twig/Transaction.php
 opt/app/app/Support/Twig/Translation.php
@@ -823,18 +873,32 @@ opt/app/app/TransactionRules/Triggers/TriggerInterface.php
 opt/app/app/TransactionRules/Triggers/UserAction.php
 opt/app/app/Transformers/AccountTransformer.php
 opt/app/app/Transformers/AttachmentTransformer.php
+opt/app/app/Transformers/AvailableBudgetTransformer.php
 opt/app/app/Transformers/BillTransformer.php
+opt/app/app/Transformers/BudgetLimitTransformer.php
 opt/app/app/Transformers/BudgetTransformer.php
 opt/app/app/Transformers/CategoryTransformer.php
+opt/app/app/Transformers/CurrencyExchangeRateTransformer.php
 opt/app/app/Transformers/CurrencyTransformer.php
+opt/app/app/Transformers/JournalLinkTransformer.php
 opt/app/app/Transformers/JournalMetaTransformer.php
+opt/app/app/Transformers/LinkTypeTransformer.php
+opt/app/app/Transformers/NoteTransformer.php
 opt/app/app/Transformers/PiggyBankEventTransformer.php
 opt/app/app/Transformers/PiggyBankTransformer.php
+opt/app/app/Transformers/PreferenceTransformer.php
+opt/app/app/Transformers/RecurrenceTransformer.php
+opt/app/app/Transformers/RuleActionTransformer.php
+opt/app/app/Transformers/RuleGroupTransformer.php
+opt/app/app/Transformers/RuleTransformer.php
+opt/app/app/Transformers/RuleTriggerTransformer.php
 opt/app/app/Transformers/TagTransformer.php
 opt/app/app/Transformers/TransactionTransformer.php
 opt/app/app/Transformers/UserTransformer.php
 opt/app/app/User.php
 opt/app/app/Validation/FireflyValidator.php
+opt/app/app/Validation/RecurrenceValidation.php
+opt/app/app/Validation/TransactionValidation.php
 opt/app/artisan
 opt/app/bootstrap/app.php
 opt/app/bootstrap/cache/packages.php
@@ -842,7 +906,6 @@ opt/app/bootstrap/cache/services.php
 opt/app/changelog.md
 opt/app/composer.json
 opt/app/composer.lock
-opt/app/composer.phar
 opt/app/config/app.php
 opt/app/config/auth.php
 opt/app/config/breadcrumbs.php
@@ -887,6 +950,7 @@ opt/app/database/migrations/2018_01_01_000005_create_oauth_personal_access_clien
 opt/app/database/migrations/2018_03_19_141348_changes_for_v472.php
 opt/app/database/migrations/2018_04_07_210913_changes_for_v473.php
 opt/app/database/migrations/2018_04_29_174524_changes_for_v474.php
+opt/app/database/migrations/2018_06_08_200526_changes_for_v475.php
 opt/app/database/seeds/AccountTypeSeeder.php
 opt/app/database/seeds/ConfigSeeder.php
 opt/app/database/seeds/DatabaseSeeder.php
@@ -1105,6 +1169,8 @@ opt/app/public/js/ff/piggy-banks/edit.js
 opt/app/public/js/ff/piggy-banks/index.js
 opt/app/public/js/ff/piggy-banks/show.js
 opt/app/public/js/ff/preferences/index.js
+opt/app/public/js/ff/recurring/create.js
+opt/app/public/js/ff/recurring/edit.js
 opt/app/public/js/ff/reports/account/month.js
 opt/app/public/js/ff/reports/all.js
 opt/app/public/js/ff/reports/audit/all.js
@@ -1153,6 +1219,12 @@ opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css
 opt/app/public/lib/adminlte/img/icons.png
 opt/app/public/lib/adminlte/js/app.js
 opt/app/public/lib/adminlte/js/app.min.js
+opt/app/public/lib/fc/fullcalendar.css
+opt/app/public/lib/fc/fullcalendar.js
+opt/app/public/lib/fc/fullcalendar.min.css
+opt/app/public/lib/fc/fullcalendar.min.js
+opt/app/public/lib/fc/fullcalendar.print.css
+opt/app/public/lib/fc/fullcalendar.print.min.css
 opt/app/public/lib/intro/intro.min.js
 opt/app/public/lib/intro/introjs-rtl.min.css
 opt/app/public/lib/intro/introjs.min.css
@@ -1419,6 +1491,8 @@ opt/app/resources/views/demo/import/index.twig
 opt/app/resources/views/demo/index.twig
 opt/app/resources/views/demo/no-demo-text.twig
 opt/app/resources/views/demo/piggy-banks/index.twig
+opt/app/resources/views/demo/recurring/index.twig
+opt/app/resources/views/demo/recurring/recurring-create.twig
 opt/app/resources/views/demo/reports/index.twig
 opt/app/resources/views/demo/transactions/index.twig
 opt/app/resources/views/emails/access-token-created-html.twig
@@ -1441,6 +1515,8 @@ opt/app/resources/views/emails/password-html.twig
 opt/app/resources/views/emails/password-text.twig
 opt/app/resources/views/emails/registered-html.twig
 opt/app/resources/views/emails/registered-text.twig
+opt/app/resources/views/emails/report-new-journals-html.twig
+opt/app/resources/views/emails/report-new-journals-text.twig
 opt/app/resources/views/emails/undo-email-change-html.twig
 opt/app/resources/views/emails/undo-email-change-text.twig
 opt/app/resources/views/error.twig
@@ -1461,7 +1537,6 @@ opt/app/resources/views/form/file.twig
 opt/app/resources/views/form/help.twig
 opt/app/resources/views/form/integer.twig
 opt/app/resources/views/form/location.twig
-opt/app/resources/views/form/multiRadio.twig
 opt/app/resources/views/form/non-selectable-amount.twig
 opt/app/resources/views/form/number.twig
 opt/app/resources/views/form/options.twig
@@ -1538,6 +1613,11 @@ opt/app/resources/views/profile/change-password.twig
 opt/app/resources/views/profile/code.twig
 opt/app/resources/views/profile/delete-account.twig
 opt/app/resources/views/profile/index.twig
+opt/app/resources/views/recurring/create.twig
+opt/app/resources/views/recurring/delete.twig
+opt/app/resources/views/recurring/edit.twig
+opt/app/resources/views/recurring/index.twig
+opt/app/resources/views/recurring/show.twig
 opt/app/resources/views/reports/account/report.twig
 opt/app/resources/views/reports/audit/report.twig
 opt/app/resources/views/reports/budget/month.twig
@@ -2060,30 +2140,6 @@ opt/app/vendor/defuse/php-encryption/src/Key.php
 opt/app/vendor/defuse/php-encryption/src/KeyOrPassword.php
 opt/app/vendor/defuse/php-encryption/src/KeyProtectedByPassword.php
 opt/app/vendor/defuse/php-encryption/src/RuntimeTests.php
-opt/app/vendor/doctrine/annotations/CHANGELOG.md
-opt/app/vendor/doctrine/annotations/LICENSE
-opt/app/vendor/doctrine/annotations/README.md
-opt/app/vendor/doctrine/annotations/composer.json
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
-opt/app/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
-opt/app/vendor/doctrine/annotations/phpstan.neon
 opt/app/vendor/doctrine/cache/LICENSE
 opt/app/vendor/doctrine/cache/README.md
 opt/app/vendor/doctrine/cache/UPGRADE.md
@@ -2118,89 +2174,11 @@ opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
 opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
 opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
 opt/app/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
-opt/app/vendor/doctrine/collections/CONTRIBUTING.md
-opt/app/vendor/doctrine/collections/LICENSE
-opt/app/vendor/doctrine/collections/README.md
-opt/app/vendor/doctrine/collections/composer.json
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
-opt/app/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php
-opt/app/vendor/doctrine/common/LICENSE
-opt/app/vendor/doctrine/common/README.md
-opt/app/vendor/doctrine/common/UPGRADE_TO_2_1
-opt/app/vendor/doctrine/common/UPGRADE_TO_2_2
-opt/app/vendor/doctrine/common/composer.json
-opt/app/vendor/doctrine/common/humbug.json.dist
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/CommonException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Comparable.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Lexer.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Util/Inflector.php
-opt/app/vendor/doctrine/common/lib/Doctrine/Common/Version.php
-opt/app/vendor/doctrine/common/phpstan.neon
+opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/BC_Break.md
+opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Bug.md
+opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Feature_Request.md
+opt/app/vendor/doctrine/dbal/.github/ISSUE_TEMPLATE/Support_Question.md
+opt/app/vendor/doctrine/dbal/.github/PULL_REQUEST_TEMPLATE.md
 opt/app/vendor/doctrine/dbal/LICENSE
 opt/app/vendor/doctrine/dbal/README.md
 opt/app/vendor/doctrine/dbal/SECURITY.md
@@ -2324,6 +2302,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.ph
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MariaDb102Keywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MsSQLKeywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL57Keywords.php
+opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL80Keywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL100Keywords.php
@@ -2343,6 +2322,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLServerKeywo
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php
+opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL80Platform.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSQL100Platform.php
@@ -2367,7 +2347,6 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/CompositeExpress
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryException.php
-opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/README.markdown
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtilsException.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractAsset.php
@@ -2421,6 +2400,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWor
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php
+opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Tools/Dumper.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/TransactionIsolationLevel.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/ArrayType.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BigIntType.php
@@ -2455,6 +2435,16 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeImmutableType.ph
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeType.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php
+opt/app/vendor/doctrine/dbal/phpstan.neon.dist
+opt/app/vendor/doctrine/event-manager/LICENSE
+opt/app/vendor/doctrine/event-manager/README.md
+opt/app/vendor/doctrine/event-manager/composer.json
+opt/app/vendor/doctrine/event-manager/docs/en/index.rst
+opt/app/vendor/doctrine/event-manager/docs/en/reference/index.rst
+opt/app/vendor/doctrine/event-manager/docs/en/sidebar.rst
+opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventArgs.php
+opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventManager.php
+opt/app/vendor/doctrine/event-manager/lib/Doctrine/Common/EventSubscriber.php
 opt/app/vendor/doctrine/inflector/LICENSE
 opt/app/vendor/doctrine/inflector/README.md
 opt/app/vendor/doctrine/inflector/composer.json
@@ -2904,6 +2894,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/Refr
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
+opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/stubs/seeder.stub
@@ -3176,6 +3167,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddle
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/stubs/facade.stub
+opt/app/vendor/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashManager.php
@@ -3383,6 +3375,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Redis/composer.json
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.api.stub
+opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.invokable.stub
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.api.stub
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.stub
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub
@@ -4432,9 +4425,6 @@ opt/app/vendor/ramsey/uuid/CONTRIBUTING.md
 opt/app/vendor/ramsey/uuid/LICENSE
 opt/app/vendor/ramsey/uuid/README.md
 opt/app/vendor/ramsey/uuid/composer.json
-opt/app/vendor/ramsey/uuid/docs/Makefile
-opt/app/vendor/ramsey/uuid/docs/conf.py
-opt/app/vendor/ramsey/uuid/docs/index.rst
 opt/app/vendor/ramsey/uuid/src/BinaryUtils.php
 opt/app/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php
 opt/app/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php
@@ -4532,6 +4522,10 @@ opt/app/vendor/swiftmailer/swiftmailer/doc/messages.rst
 opt/app/vendor/swiftmailer/swiftmailer/doc/plugins.rst
 opt/app/vendor/swiftmailer/swiftmailer/doc/sending.rst
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -4594,6 +4588,7 @@ opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.ph
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -4670,6 +4665,8 @@ opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/Pl
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
+opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -6327,6 +6324,7 @@ opt/app/vendor/symfony/var-dumper/Resources/bin/var-dump-server
 opt/app/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css
 opt/app/vendor/symfony/var-dumper/Resources/functions/dump.php
 opt/app/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js
+opt/app/vendor/symfony/var-dumper/Server/Connection.php
 opt/app/vendor/symfony/var-dumper/Server/DumpServer.php
 opt/app/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php
 opt/app/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -6351,6 +6349,7 @@ opt/app/vendor/symfony/var-dumper/Tests/Fixtures/Twig.php
 opt/app/vendor/symfony/var-dumper/Tests/Fixtures/dumb-var.php
 opt/app/vendor/symfony/var-dumper/Tests/Fixtures/dump_server.php
 opt/app/vendor/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
+opt/app/vendor/symfony/var-dumper/Tests/Server/ConnectionTest.php
 opt/app/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
 opt/app/vendor/symfony/var-dumper/VarDumper.php
 opt/app/vendor/symfony/var-dumper/composer.json
@@ -7259,6 +7258,14 @@ opt/app/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
 opt/app/vendor/zendframework/zend-diactoros/src/Stream.php
 opt/app/vendor/zendframework/zend-diactoros/src/UploadedFile.php
 opt/app/vendor/zendframework/zend-diactoros/src/Uri.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/create_uploaded_file.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/normalize_server.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php
+opt/app/vendor/zendframework/zend-diactoros/src/functions/parse_cookie_header.php
 proc/cpuinfo
 sandstorm-http-bridge
 sandstorm-http-bridge-config
@@ -7433,14 +7440,17 @@ usr/share/zoneinfo/Africa/Libreville
 usr/share/zoneinfo/Africa/Lome
 usr/share/zoneinfo/Africa/Luanda
 usr/share/zoneinfo/Africa/Lubumbashi
+usr/share/zoneinfo/Africa/Lusaka
 usr/share/zoneinfo/Africa/Malabo
 usr/share/zoneinfo/Africa/Maputo
 usr/share/zoneinfo/Africa/Maseru
+usr/share/zoneinfo/Africa/Mbabane
 usr/share/zoneinfo/Africa/Mogadishu
 usr/share/zoneinfo/Africa/Nairobi
 usr/share/zoneinfo/Africa/Niamey
 usr/share/zoneinfo/Africa/Nouakchott
 usr/share/zoneinfo/Africa/Ouagadougou
+usr/share/zoneinfo/Africa/Porto-Novo
 usr/share/zoneinfo/Africa/Sao_Tome
 usr/share/zoneinfo/Africa/Timbuktu
 usr/share/zoneinfo/Africa/Tripoli
@@ -7459,7 +7469,9 @@ usr/share/zoneinfo/America/Argentina/Mendoza
 usr/share/zoneinfo/America/Aruba
 usr/share/zoneinfo/America/Atikokan
 usr/share/zoneinfo/America/Atka
+usr/share/zoneinfo/America/Cayman
 usr/share/zoneinfo/America/Chicago
+usr/share/zoneinfo/America/Coral_Harbour
 usr/share/zoneinfo/America/Cordoba
 usr/share/zoneinfo/America/Curacao
 usr/share/zoneinfo/America/Denver
@@ -7480,6 +7492,7 @@ usr/share/zoneinfo/America/Jamaica
 usr/share/zoneinfo/America/Kentucky
 usr/share/zoneinfo/America/Kentucky/Louisville
 usr/share/zoneinfo/America/Knox_IN
+usr/share/zoneinfo/America/Kralendijk
 usr/share/zoneinfo/America/Los_Angeles
 usr/share/zoneinfo/America/Lower_Princes
 usr/share/zoneinfo/America/Manaus
@@ -7498,6 +7511,7 @@ usr/share/zoneinfo/America/Porto_Acre
 usr/share/zoneinfo/America/Puerto_Rico
 usr/share/zoneinfo/America/Regina
 usr/share/zoneinfo/America/Rio_Branco
+usr/share/zoneinfo/America/Santa_Isabel
 usr/share/zoneinfo/America/Santiago
 usr/share/zoneinfo/America/Sao_Paulo
 usr/share/zoneinfo/America/Shiprock
@@ -7511,6 +7525,7 @@ usr/share/zoneinfo/America/Tijuana
 usr/share/zoneinfo/America/Toronto
 usr/share/zoneinfo/America/Tortola
 usr/share/zoneinfo/America/Vancouver
+usr/share/zoneinfo/America/Virgin
 usr/share/zoneinfo/America/Whitehorse
 usr/share/zoneinfo/America/Winnipeg
 usr/share/zoneinfo/Antarctica
@@ -7521,8 +7536,10 @@ usr/share/zoneinfo/Asia
 usr/share/zoneinfo/Asia/Aden
 usr/share/zoneinfo/Asia/Ashgabat
 usr/share/zoneinfo/Asia/Bangkok
+usr/share/zoneinfo/Asia/Calcutta
 usr/share/zoneinfo/Asia/Chongqing
 usr/share/zoneinfo/Asia/Chungking
+usr/share/zoneinfo/Asia/Dacca
 usr/share/zoneinfo/Asia/Dhaka
 usr/share/zoneinfo/Asia/Dubai
 usr/share/zoneinfo/Asia/Harbin
@@ -7530,24 +7547,31 @@ usr/share/zoneinfo/Asia/Ho_Chi_Minh
 usr/share/zoneinfo/Asia/Hong_Kong
 usr/share/zoneinfo/Asia/Istanbul
 usr/share/zoneinfo/Asia/Jerusalem
+usr/share/zoneinfo/Asia/Kashgar
 usr/share/zoneinfo/Asia/Kathmandu
+usr/share/zoneinfo/Asia/Katmandu
 usr/share/zoneinfo/Asia/Kolkata
+usr/share/zoneinfo/Asia/Macao
 usr/share/zoneinfo/Asia/Macau
 usr/share/zoneinfo/Asia/Makassar
 usr/share/zoneinfo/Asia/Nicosia
 usr/share/zoneinfo/Asia/Phnom_Penh
 usr/share/zoneinfo/Asia/Qatar
 usr/share/zoneinfo/Asia/Riyadh
+usr/share/zoneinfo/Asia/Saigon
 usr/share/zoneinfo/Asia/Seoul
 usr/share/zoneinfo/Asia/Shanghai
 usr/share/zoneinfo/Asia/Singapore
 usr/share/zoneinfo/Asia/Taipei
 usr/share/zoneinfo/Asia/Tehran
 usr/share/zoneinfo/Asia/Tel_Aviv
+usr/share/zoneinfo/Asia/Thimbu
 usr/share/zoneinfo/Asia/Thimphu
 usr/share/zoneinfo/Asia/Tokyo
 usr/share/zoneinfo/Asia/Ulaanbaatar
+usr/share/zoneinfo/Asia/Ulan_Bator
 usr/share/zoneinfo/Asia/Urumqi
+usr/share/zoneinfo/Asia/Yangon
 usr/share/zoneinfo/Atlantic
 usr/share/zoneinfo/Atlantic/Faroe
 usr/share/zoneinfo/Atlantic/Jan_Mayen
@@ -7560,16 +7584,21 @@ usr/share/zoneinfo/Australia/Broken_Hill
 usr/share/zoneinfo/Australia/Canberra
 usr/share/zoneinfo/Australia/Darwin
 usr/share/zoneinfo/Australia/Hobart
+usr/share/zoneinfo/Australia/LHI
 usr/share/zoneinfo/Australia/Lord_Howe
 usr/share/zoneinfo/Australia/Melbourne
+usr/share/zoneinfo/Australia/NSW
+usr/share/zoneinfo/Australia/North
 usr/share/zoneinfo/Australia/Perth
+usr/share/zoneinfo/Australia/Queensland
 usr/share/zoneinfo/Australia/Sydney
+usr/share/zoneinfo/Australia/West
 usr/share/zoneinfo/Brazil
 usr/share/zoneinfo/Canada
 usr/share/zoneinfo/Canada/Atlantic
-usr/share/zoneinfo/Canada/East-Saskatchewan
 usr/share/zoneinfo/Canada/Saskatchewan
 usr/share/zoneinfo/Chile
+usr/share/zoneinfo/Chile/EasterIsland
 usr/share/zoneinfo/Etc
 usr/share/zoneinfo/Etc/GMT
 usr/share/zoneinfo/Etc/GMT+0
@@ -7583,6 +7612,7 @@ usr/share/zoneinfo/Etc/Zulu
 usr/share/zoneinfo/Europe
 usr/share/zoneinfo/Europe/Belfast
 usr/share/zoneinfo/Europe/Belgrade
+usr/share/zoneinfo/Europe/Bratislava
 usr/share/zoneinfo/Europe/Busingen
 usr/share/zoneinfo/Europe/Chisinau
 usr/share/zoneinfo/Europe/Dublin
@@ -7594,25 +7624,37 @@ usr/share/zoneinfo/Europe/Jersey
 usr/share/zoneinfo/Europe/Lisbon
 usr/share/zoneinfo/Europe/Ljubljana
 usr/share/zoneinfo/Europe/London
+usr/share/zoneinfo/Europe/Mariehamn
 usr/share/zoneinfo/Europe/Moscow
+usr/share/zoneinfo/Europe/Nicosia
 usr/share/zoneinfo/Europe/Oslo
 usr/share/zoneinfo/Europe/Podgorica
 usr/share/zoneinfo/Europe/Prague
 usr/share/zoneinfo/Europe/Rome
+usr/share/zoneinfo/Europe/San_Marino
 usr/share/zoneinfo/Europe/Sarajevo
 usr/share/zoneinfo/Europe/Skopje
+usr/share/zoneinfo/Europe/Tiraspol
+usr/share/zoneinfo/Europe/Vaduz
 usr/share/zoneinfo/Europe/Vatican
 usr/share/zoneinfo/Europe/Warsaw
+usr/share/zoneinfo/Europe/Zagreb
 usr/share/zoneinfo/Europe/Zurich
 usr/share/zoneinfo/GB
+usr/share/zoneinfo/GB-Eire
 usr/share/zoneinfo/GMT
 usr/share/zoneinfo/GMT+0
 usr/share/zoneinfo/GMT-0
 usr/share/zoneinfo/GMT0
+usr/share/zoneinfo/Greenwich
 usr/share/zoneinfo/Indian
 usr/share/zoneinfo/Indian/Antananarivo
 usr/share/zoneinfo/Indian/Comoro
+usr/share/zoneinfo/Indian/Mayotte
 usr/share/zoneinfo/Mexico
+usr/share/zoneinfo/Mexico/BajaNorte
+usr/share/zoneinfo/Mexico/BajaSur
+usr/share/zoneinfo/Mexico/General
 usr/share/zoneinfo/Pacific
 usr/share/zoneinfo/Pacific/Auckland
 usr/share/zoneinfo/Pacific/Chatham
@@ -7629,18 +7671,35 @@ usr/share/zoneinfo/Pacific/Pitcairn
 usr/share/zoneinfo/Pacific/Pohnpei
 usr/share/zoneinfo/Pacific/Samoa
 usr/share/zoneinfo/Pacific/Truk
+usr/share/zoneinfo/Pacific/Yap
 usr/share/zoneinfo/SystemV
+usr/share/zoneinfo/SystemV/AST4
+usr/share/zoneinfo/SystemV/AST4ADT
+usr/share/zoneinfo/SystemV/CST6
+usr/share/zoneinfo/SystemV/CST6CDT
+usr/share/zoneinfo/SystemV/EST5
 usr/share/zoneinfo/SystemV/EST5EDT
+usr/share/zoneinfo/SystemV/HST10
+usr/share/zoneinfo/SystemV/MST7
 usr/share/zoneinfo/SystemV/MST7MDT
+usr/share/zoneinfo/SystemV/PST8
+usr/share/zoneinfo/SystemV/PST8PDT
+usr/share/zoneinfo/SystemV/YST9
+usr/share/zoneinfo/SystemV/YST9YDT
 usr/share/zoneinfo/US
 usr/share/zoneinfo/US/Alaska
+usr/share/zoneinfo/US/Aleutian
 usr/share/zoneinfo/US/Arizona
 usr/share/zoneinfo/US/Central
+usr/share/zoneinfo/US/East-Indiana
 usr/share/zoneinfo/US/Eastern
 usr/share/zoneinfo/US/Hawaii
+usr/share/zoneinfo/US/Indiana-Starke
+usr/share/zoneinfo/US/Michigan
 usr/share/zoneinfo/US/Mountain
 usr/share/zoneinfo/US/Pacific
 usr/share/zoneinfo/US/Pacific-New
+usr/share/zoneinfo/US/Samoa
 usr/share/zoneinfo/UTC
 usr/share/zoneinfo/Universal
 usr/share/zoneinfo/Zulu

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 14,
-    appMarketingVersion = (defaultText = "4.7.5.1"),
+    appVersion = 16,
+    appMarketingVersion = (defaultText = "4.7.6.2"),
 
     actions = [
       # Define your "new document" handlers here.

.sandstorm/setup.sh

@@ -14,10 +14,7 @@ apt-get install -y python-software-properties software-properties-common
 
 # install all languages
 sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
-
-sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
@@ -35,7 +32,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
 add-apt-repository "deb http://packages.dotdeb.org jessie all"
 
 # add another repos
-apt-get install apt-transport-https lsb-release ca-certificates
+apt-get install -y apt-transport-https lsb-release ca-certificates
 wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
 echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
 

Dockerfile

@@ -1,12 +1,16 @@
-# use PHP 7.1 and Apache as a base.
 FROM php:7.1-apache
 
-# set working dir
-ENV FIREFLY_PATH /var/www/firefly-iii
+# If building on a RPi, use --build-arg cores=3 to use all cores when compiling
+# to speed up the image build
+ARG CORES
+ENV CORES ${CORES:-1}
+
+ENV FIREFLY_PATH /var/www/firefly-iii/
 ENV CURL_VERSION 7.60.0
 ENV OPENSSL_VERSION 1.1.1-pre6
-WORKDIR $FIREFLY_PATH
-ADD . $FIREFLY_PATH
+
+LABEL version="1.0" maintainer="thegrumpydictator@gmail.com"
+
 
 # install packages
 RUN apt-get update -y && \
@@ -19,47 +23,60 @@ RUN apt-get update -y && \
                                                libedit-dev \
                                                libtidy-dev \
                                                libxml2-dev \
+                                               unzip \
                                                libsqlite3-dev \
+                                               nano \
                                                libpq-dev \
                                                libbz2-dev \
                                                gettext-base \
                                                cron \
+                                               rsyslog \
+                                               supervisor \
                                                locales && \
                                                apt-get clean && \
                                                rm -rf /var/lib/apt/lists/*
 
-# Setup the Composer installer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
 # Install latest curl
 RUN cd /tmp && \
     wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
     tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
     cd openssl-${OPENSSL_VERSION} && \
     ./config && \
-    make && \
+    make -j${CORES} && \
     make install
 
 RUN cd /tmp && \
     wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
     tar -xvf curl-${CURL_VERSION}.tar.gz && \
     cd curl-${CURL_VERSION} && \
-    ./configure --with-ssl && \
-    make && \
+    ./configure --with-ssl --host=$(gcc -dumpmachine) && \
+    make -j${CORES} && \
     make install
 
+# Make sure that libcurl is using the newer curl libaries
+RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/00-curl.conf && ldconfig
 
-# Create the log file to be able to run tail
-RUN touch /var/log/cron.log
+# Mimic the Debian/Ubuntu config file structure for supervisor
+COPY .deploy/docker/supervisord.conf /etc/supervisor/supervisord.conf
+RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor
 
-# Setup cron job
-RUN (crontab -l ; echo "* * * * * root $FIREFLY_PATH/artisan schedule:run >> /var/log/cron.log") | crontab
+# copy Firefly III supervisor conf file.
+COPY ./.deploy/docker/firefly-iii.conf /etc/supervisor/conf.d/firefly-iii.conf
 
+# copy cron job supervisor conf file.
+COPY ./.deploy/docker/cronjob.conf /etc/supervisor/conf.d/cronjob.conf
+
+# test crons added via crontab
+RUN echo "0 3 * * * /usr/local/bin/php /var/www/firefly-iii/artisan firefly:cron" | crontab -
+#RUN (crontab -l ; echo "*/1 * * * * free >> /var/www/firefly-iii/public/cron.html") 2>&1 | crontab -
 # Install PHP exentions.
-RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
+RUN docker-php-ext-install -j$(nproc) gd intl tidy zip bcmath pdo_mysql bz2 pdo_pgsql
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # Generate locales supported by Firefly III
-RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8pt_BR.UTF-8 UTF-8ru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
+RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
 
 # copy Apache config to correct spot.
 COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
@@ -70,7 +87,7 @@ RUN a2enmod rewrite
 # Enable apache mod ssl..
 RUN a2enmod ssl
 
-# Create volumes for several directories:
+# Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
 # Enable default site (Firefly III)
@@ -79,15 +96,19 @@ COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-defau
 # Make sure we own Firefly III directory
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
+# Copy in Firefly Source
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# Fix the link to curl:
+RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4
+
 # Run composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
 RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
 # Expose port 80
 EXPOSE 80
 
-# Run the command on container startup
-CMD cron
-
 # Run entrypoint thing
 ENTRYPOINT [".deploy/docker/entrypoint.sh"]
-

app/Api/V1/Controllers/AccountController.php

@@ -221,6 +221,11 @@ class AccountController extends Controller
             'special'                    => [AccountType::CASH, AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION,
                                              AccountType::LOAN,],
             'hidden'                     => [AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION, AccountType::LOAN,],
+            'liability'                  => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
+            'liabilities'                => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
+            'cc'                         => [AccountType::CREDITCARD],
+            'creditcard'                 => [AccountType::CREDITCARD],
+            'credit_card'                => [AccountType::CREDITCARD],
             AccountType::DEFAULT         => [AccountType::DEFAULT],
             AccountType::CASH            => [AccountType::CASH],
             AccountType::ASSET           => [AccountType::ASSET],
@@ -231,6 +236,10 @@ class AccountController extends Controller
             AccountType::IMPORT          => [AccountType::IMPORT],
             AccountType::RECONCILIATION  => [AccountType::RECONCILIATION],
             AccountType::LOAN            => [AccountType::LOAN],
+            AccountType::MORTGAGE        => [AccountType::MORTGAGE],
+            AccountType::DEBT            => [AccountType::DEBT],
+            AccountType::CREDITCARD      => [AccountType::CREDITCARD],
+
         ];
         $return = $types['all'];
         if (isset($types[$type])) {

app/Api/V1/Controllers/AttachmentController.php

@@ -232,4 +232,4 @@ class AttachmentController extends Controller
         return response()->json([], 204);
     }
 
-}
+}

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -152,7 +152,10 @@ class AvailableBudgetController extends Controller
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
         $data     = $request->getAll();
-        $currency = $this->currencyRepository->findNull($data['transaction_currency_id']);
+        $currency = $this->currencyRepository->findNull($data['currency_id']);
+        if (null === $currency) {
+            $currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
+        }
         if (null === $currency) {
             throw new FireflyException('Could not find the indicated currency.');
         }
@@ -166,6 +169,8 @@ class AvailableBudgetController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+
+
     /**
      * Update the specified resource in storage.
      *
@@ -187,4 +192,4 @@ class AvailableBudgetController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/BudgetController.php

@@ -185,4 +185,4 @@ class BudgetController extends Controller
 
     }
 
-}
+}

app/Api/V1/Controllers/BudgetLimitController.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use Carbon\Carbon;
+
 use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\BudgetLimit;
@@ -34,13 +34,12 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use InvalidArgumentException;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Log;
+
 
 /**
  * Class BudgetLimitController.
@@ -95,34 +94,17 @@ class BudgetLimitController extends Controller
     {
         $manager  = new Manager;
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $start    = null;
-        $end      = null;
         $budgetId = (int)($request->get('budget_id') ?? 0);
         $budget   = $this->repository->findNull($budgetId);
-        $this->parameters->set('budget_id', $budgetId);
-
-        try {
-            $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
-            $this->parameters->set('start', $start->format('Y-m-d'));
-        } catch (InvalidArgumentException $e) {
-            Log::debug(sprintf('Invalid date: %s', $e->getMessage()));
-        }
-
-        try {
-            $end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
-            $this->parameters->set('end', $end->format('Y-m-d'));
-        } catch (InvalidArgumentException $e) {
-            Log::debug(sprintf('Invalid date: %s', $e->getMessage()));
-        }
-
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $this->parameters->set('budget_id', $budgetId);
 
         $collection = new Collection;
         if (null === $budget) {
-            $collection = $this->repository->getAllBudgetLimits($start, $end);
+            $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         }
         if (null !== $budget) {
-            $collection = $this->repository->getBudgetLimits($budget, $start, $end);
+            $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
         $count        = $collection->count();
@@ -212,4 +194,4 @@ class BudgetLimitController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/CategoryController.php

@@ -185,4 +185,4 @@ class CategoryController extends Controller
 
     }
 
-}
+}

app/Api/V1/Controllers/ConfigurationController.php

@@ -54,6 +54,7 @@ class ConfigurationController extends Controller
                 $admin = auth()->user();
 
                 if (!$this->repository->hasRole($admin, 'owner')) {
+                    /** @noinspection ExceptionsAnnotatingAndHandlingInspection */
                     throw new FireflyException('No access to method.'); // @codeCoverageIgnore
                 }
 
@@ -132,4 +133,4 @@ class ConfigurationController extends Controller
 
         return $data;
     }
-}
+}

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -108,4 +108,4 @@ class CurrencyExchangeRateController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
-}
+}

app/Api/V1/Controllers/JournalLinkController.php

@@ -175,8 +175,7 @@ class JournalLinkController extends Controller
         $data['direction'] = 'inward';
 
         $journalLink = $this->repository->storeLink($data, $inward, $outward);
-
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+        $resource    = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -214,4 +213,4 @@ class JournalLinkController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/LinkTypeController.php

@@ -207,4 +207,4 @@ class LinkTypeController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/PiggyBankController.php

@@ -161,7 +161,7 @@ class PiggyBankController extends Controller
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
-        throw new FireflyException('Could not store new piggy bank.'); // @codeCoverageIgnore
+        throw new FireflyException('Could not store new piggy bank.');
 
     }
 
@@ -185,4 +185,4 @@ class PiggyBankController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/PreferenceController.php

@@ -34,7 +34,6 @@ use League\Fractal\Manager;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Preferences;
 
 /**
  *
@@ -60,7 +59,7 @@ class PreferenceController extends Controller
         ];
         $preferences = new Collection;
         foreach ($available as $name) {
-            $pref = Preferences::getForUser($user, $name);
+            $pref = app('preferences')->getForUser($user, $name);
             if (null !== $pref) {
                 $preferences->push($pref);
             }
@@ -130,7 +129,7 @@ class PreferenceController extends Controller
                 $newValue = 1 === (int)$data['data'];
                 break;
         }
-        $result = Preferences::set($preference->name, $newValue);
+        $result = app('preferences')->set($preference->name, $newValue);
 
         // create some objects:
         $manager = new Manager;
@@ -143,4 +142,4 @@ class PreferenceController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RecurrenceController.php

@@ -177,4 +177,4 @@ class RecurrenceController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RuleController.php

@@ -101,7 +101,7 @@ class RuleController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
@@ -175,4 +175,4 @@ class RuleController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RuleGroupController.php

@@ -95,7 +95,7 @@ class RuleGroupController extends Controller
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
-        // get list of budgets. Count it and split it.
+        // get list of rule groups. Count it and split it.
         $collection = $this->ruleGroupRepository->get();
         $count      = $collection->count();
         $ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -176,4 +176,4 @@ class RuleGroupController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/TransactionController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\TransactionRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Helpers\Filter\NegativeAmountFilter;
 use FireflyIII\Helpers\Filter\PositiveAmountFilter;
@@ -108,8 +108,8 @@ class TransactionController extends Controller
 
         /** @var User $admin */
         $admin = auth()->user();
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser($admin);
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         $collector->setAllAssetAccounts();
@@ -123,7 +123,7 @@ class TransactionController extends Controller
         }
         $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
         $collector->setTypes($types);
-        $paginator = $collector->getPaginatedJournals();
+        $paginator = $collector->getPaginatedTransactions();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
         $transactions = $paginator->getCollection();
 
@@ -155,7 +155,7 @@ class TransactionController extends Controller
         $manager->parseIncludes($include);
 
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -170,7 +170,7 @@ class TransactionController extends Controller
             $collector->addFilter(NegativeAmountFilter::class);
         }
 
-        $transactions = $collector->getJournals();
+        $transactions = $collector->getTransactions();
         $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -201,7 +201,7 @@ class TransactionController extends Controller
         $manager->parseIncludes($include);
 
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -216,7 +216,7 @@ class TransactionController extends Controller
             $collector->addFilter(NegativeAmountFilter::class);
         }
 
-        $transactions = $collector->getJournals();
+        $transactions = $collector->getTransactions();
         $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -247,7 +247,7 @@ class TransactionController extends Controller
 
         // needs a lot of extra data to match the journal collector. Or just expand that one.
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -262,7 +262,7 @@ class TransactionController extends Controller
             $collector->addFilter(NegativeAmountFilter::class);
         }
 
-        $transactions = $collector->getJournals();
+        $transactions = $collector->getTransactions();
         $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');

app/Api/V1/Requests/AccountRequest.php

@@ -50,6 +50,7 @@ class AccountRequest extends Request
         $data = [
             'name'                 => $this->string('name'),
             'active'               => $this->boolean('active'),
+            'include_net_worth'    => $this->boolean('include_net_worth'),
             'accountType'          => $this->string('type'),
             'account_type_id'      => null,
             'currency_id'          => $this->integer('currency_id'),
@@ -64,7 +65,21 @@ class AccountRequest extends Request
             'ccType'               => $this->string('cc_type'),
             'ccMonthlyPaymentDate' => $this->string('cc_monthly_payment_date'),
             'notes'                => $this->string('notes'),
+            'interest'             => $this->string('interest'),
+            'interest_period'      => $this->string('interest_period'),
         ];
+        // new fields for liabilities
+        //            'liability_type'       => $this->string('liability_type'),
+        //            'liability_start_date' => $this->date('liability_start_date'),
+
+
+        //];
+        if ('liability' === $data['accountType']) {
+            $data['openingBalance']     = bcmul($this->string('liability_amount'), '-1');
+            $data['openingBalanceDate'] = $this->date('liability_start_date');
+            $data['accountType']        = $this->string('liability_type');
+            $data['account_type_id']    = null;
+        }
 
         return $data;
     }
@@ -91,10 +106,18 @@ class AccountRequest extends Request
             'account_number'          => 'between:1,255|nullable|uniqueAccountNumberForUser',
             'account_role'            => 'in:' . $accountRoles . '|required_if:type,asset',
             'active'                  => 'required|boolean',
+            'include_net_worth'       => 'required|boolean',
             'cc_type'                 => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
             'cc_monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:cc_type,monthlyFull',
             'type'                    => 'required|in:' . $types,
             'notes'                   => 'min:0|max:65536',
+            // required fields for liabilities:
+            'liability_type'          => 'required_if:type,liability|in:loan,debt,mortgage,credit card',
+            'liability_amount'        => 'required_if:type,liability|min:0|numeric',
+            'liability_start_date'    => 'required_if:type,liability|date',
+            'interest'                => 'required_if:type,liability|between:0,100|numeric',
+            'interest_period'         => 'required_if:type,liability|in:daily,monthly,yearly',
+
         ];
         switch ($this->method()) {
             default:

app/Api/V1/Requests/AttachmentRequest.php

@@ -94,4 +94,4 @@ class AttachmentRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -47,15 +47,15 @@ class AvailableBudgetRequest extends Request
     public function getAll(): array
     {
         return [
-            'transaction_currency_id' => $this->integer('transaction_currency_id'),
-            'amount'                  => $this->string('amount'),
-            'start_date'              => $this->date('start_date'),
-            'end_date'                => $this->date('end_date'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+            'amount'        => $this->string('amount'),
+            'start_date'    => $this->date('start_date'),
+            'end_date'      => $this->date('end_date'),
         ];
     }
 
     /**
-     * TODO must also accept currency code.
      * The rules that the incoming request must be matched against.
      *
      * @return array
@@ -63,14 +63,15 @@ class AvailableBudgetRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'transaction_currency_id' => 'required|numeric|exists:transaction_currencies,id',
-            'amount'                  => 'required|numeric|more:0',
-            'start_date'              => 'required|date|before:end_date',
-            'end_date'                => 'required|date|after:start_date',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
+            'amount'        => 'required|numeric|more:0',
+            'start_date'    => 'required|date|before:end_date',
+            'end_date'      => 'required|date|after:start_date',
         ];
 
         return $rules;
     }
 
 
-}
+}

app/Api/V1/Requests/BillRequest.php

@@ -115,7 +115,7 @@ class BillRequest extends Request
                 $min  = (float)($data['amount_min'] ?? 0);
                 $max  = (float)($data['amount_max'] ?? 0);
                 if ($min > $max) {
-                    $validator->errors()->add('amount_min', trans('validation.amount_min_over_max'));
+                    $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max'));
                 }
             }
         );

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -80,4 +80,4 @@ class BudgetLimitRequest extends Request
         return $rules;
     }
 
-}
+}

app/Api/V1/Requests/BudgetRequest.php

@@ -79,4 +79,4 @@ class BudgetRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/CategoryRequest.php

@@ -78,4 +78,4 @@ class CategoryRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/JournalLinkRequest.php

@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Validation\Validator;
 
 /**
  *
@@ -49,16 +52,15 @@ class JournalLinkRequest extends Request
     public function getAll(): array
     {
         return [
-            'link_type_id' => $this->integer('link_type_id'),
-            'inward_id'    => $this->integer('inward_id'),
-            'outward_id'   => $this->integer('outward_id'),
-            'notes'        => $this->string('notes'),
+            'link_type_id'   => $this->integer('link_type_id'),
+            'link_type_name' => $this->string('link_type_name'),
+            'inward_id'      => $this->integer('inward_id'),
+            'outward_id'     => $this->integer('outward_id'),
+            'notes'          => $this->string('notes'),
         ];
     }
 
     /**
-     * TODO include link-type name as optional parameter.
-     * TODO be consistent and remove notes from this object.
      *
      * The rules that the incoming request must be matched against.
      *
@@ -67,11 +69,63 @@ class JournalLinkRequest extends Request
     public function rules(): array
     {
         return [
-            'link_type_id' => 'required|exists:link_types,id',
-            'inward_id'    => 'required|belongsToUser:transaction_journals,id',
-            'outward_id'   => 'required|belongsToUser:transaction_journals,id',
-            'notes'        => 'between:0,65000',
+            'link_type_id'   => 'exists:link_types,id|required_without:link_type_name',
+            'link_type_name' => 'exists:link_types,name|required_without:link_type_id',
+            'inward_id'      => 'required|belongsToUser:transaction_journals,id',
+            'outward_id'     => 'required|belongsToUser:transaction_journals,id',
+            'notes'          => 'between:0,65000',
         ];
     }
 
-}
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->validateExistingLink($validator);
+            }
+        );
+    }
+
+    /**
+     * @param Validator $validator
+     */
+    private function validateExistingLink(Validator $validator): void
+    {
+        /** @var LinkTypeRepositoryInterface $repository */
+        $repository = app(LinkTypeRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+
+        /** @var JournalRepositoryInterface $journalRepos */
+        $journalRepos = app(JournalRepositoryInterface::class);
+        $journalRepos->setUser(auth()->user());
+
+        $data      = $validator->getData();
+        $inwardId  = (int)($data['inward_id'] ?? 0);
+        $outwardId = (int)($data['outward_id'] ?? 0);
+        $inward    = $journalRepos->findNull($inwardId);
+        $outward   = $journalRepos->findNull($outwardId);
+
+        if (null === $inward) {
+            $validator->errors()->add('inward_id', 'Invalid inward ID.');
+
+            return;
+        }
+        if (null === $outward) {
+            $validator->errors()->add('outward_id', 'Invalid outward ID.');
+
+            return;
+        }
+
+        if ($repository->findLink($inward, $outward)) {
+            $validator->errors()->add('outward_id', 'Already have a link between inward and outward.');
+            $validator->errors()->add('inward_id', 'Already have a link between inward and outward.');
+        }
+    }
+}

app/Api/V1/Requests/LinkTypeRequest.php

@@ -71,7 +71,6 @@ class LinkTypeRequest extends Request
             'outward' => 'required|unique:link_types,outward|min:1|different:inward',
             'inward'  => 'required|unique:link_types,inward|min:1|different:outward',
         ];
-        //        Rule::unique('users')->ignore($user->id),
 
 
         switch ($this->method()) {
@@ -89,4 +88,4 @@ class LinkTypeRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/PiggyBankRequest.php

@@ -57,7 +57,7 @@ class PiggyBankRequest extends Request
             'current_amount' => $this->string('current_amount'),
             'start_date'     => $this->date('start_date'),
             'target_date'    => $this->date('target_date'),
-            'note'           => $this->string('notes'),
+            'notes'           => $this->string('notes'),
         ];
     }
 
@@ -93,4 +93,4 @@ class PiggyBankRequest extends Request
         return $rules;
     }
 
-}
+}

app/Api/V1/Requests/PreferenceRequest.php

@@ -66,4 +66,4 @@ class PreferenceRequest extends Request
         ];
     }
 
-}
+}

app/Api/V1/Requests/RecurrenceRequest.php

@@ -84,8 +84,7 @@ class RecurrenceRequest extends Request
      */
     public function rules(): array
     {
-        $today = new Carbon;
-        $today->addDay();
+        $today = Carbon::now()->addDay();
 
         return [
             'type'                                 => 'required|in:withdrawal,transfer,deposit',
@@ -201,4 +200,4 @@ class RecurrenceRequest extends Request
 
         return $return;
     }
-}
+}

app/Api/V1/Requests/RuleGroupRequest.php

@@ -82,4 +82,4 @@ class RuleGroupRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/RuleRequest.php

@@ -56,27 +56,12 @@ class RuleRequest extends Request
             'rule_group_title' => $this->string('rule_group_title'),
             'trigger'          => $this->string('trigger'),
             'strict'           => $this->boolean('strict'),
-            'stop-processing'  => $this->boolean('stop_processing'),
+            'stop_processing'  => $this->boolean('stop_processing'),
             'active'           => $this->boolean('active'),
-            'rule-triggers'    => [],
-            'rule-actions'     => [],
+            'rule_triggers'    => $this->getRuleTriggers(),
+            'rule_actions'     => $this->getRuleActions(),
         ];
 
-        foreach ($this->get('rule-triggers') as $trigger) {
-            $data['rule-triggers'][] = [
-                'name'            => $trigger['name'],
-                'value'           => $trigger['value'],
-                'stop-processing' => 1 === (int)($trigger['stop-processing'] ?? 0),
-            ];
-        }
-        foreach ($this->get('rule-actions') as $action) {
-            $data['rule-actions'][] = [
-                'name'            => $action['name'],
-                'value'           => $action['value'],
-                'stop-processing' => 1 === (int)($action['stop-processing'] ?? 0),
-            ];
-        }
-
         return $data;
     }
 
@@ -99,12 +84,12 @@ class RuleRequest extends Request
             'rule_group_id'                   => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
             'rule_group_title'                => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
             'trigger'                         => 'required|in:store-journal,update-journal',
-            'rule-triggers.*.name'            => 'required|in:' . implode(',', $validTriggers),
-            'rule-triggers.*.stop-processing' => 'boolean',
-            'rule-triggers.*.value'           => 'required|min:1|ruleTriggerValue', //
-            'rule-actions.*.name'             => 'required|in:' . implode(',', $validActions),
-            'rule-actions.*.value'            => 'required_if:rule-action.*.type,' . $contextActions . '|ruleActionValue',
-            'rule-actions.*.stop-processing'  => 'boolean',
+            'rule_triggers.*.name'            => 'required|in:' . implode(',', $validTriggers),
+            'rule_triggers.*.stop_processing' => 'boolean',
+            'rule_triggers.*.value'           => 'required|min:1|ruleTriggerValue',
+            'rule_actions.*.name'             => 'required|in:' . implode(',', $validActions),
+            'rule_actions.*.value'            => 'required_if:rule_actions.*.type,' . $contextActions . '|ruleActionValue',
+            'rule_actions.*.stop_processing'  => 'boolean',
             'strict'                          => 'required|boolean',
             'stop_processing'                 => 'required|boolean',
             'active'                          => 'required|boolean',
@@ -138,10 +123,10 @@ class RuleRequest extends Request
     protected function atLeastOneAction(Validator $validator): void
     {
         $data        = $validator->getData();
-        $repetitions = $data['rule-actions'] ?? [];
+        $repetitions = $data['rule_actions'] ?? [];
         // need at least one transaction
         if (0 === \count($repetitions)) {
-            $validator->errors()->add('title', trans('validation.at_least_one_action'));
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
         }
     }
 
@@ -153,10 +138,50 @@ class RuleRequest extends Request
     protected function atLeastOneTrigger(Validator $validator): void
     {
         $data        = $validator->getData();
-        $repetitions = $data['rule-triggers'] ?? [];
+        $repetitions = $data['rule_triggers'] ?? [];
         // need at least one transaction
         if (0 === \count($repetitions)) {
-            $validator->errors()->add('title', trans('validation.at_least_one_trigger'));
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
         }
     }
-}
+
+    /**
+     * @return array
+     */
+    private function getRuleActions(): array
+    {
+        $actions = $this->get('rule_actions');
+        $return  = [];
+        if (\is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'name'            => $action['name'],
+                    'value'           => $action['value'],
+                    'stop_processing' => 1 === (int)($action['stop-processing'] ?? '0'),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('rule_triggers');
+        $return   = [];
+        if (\is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'name'            => $trigger['name'],
+                    'value'           => $trigger['value'],
+                    'stop_processing' => 1 === (int)($trigger['stop-processing'] ?? '0'),
+                ];
+            }
+        }
+
+        return $return;
+    }
+}

app/Console/Commands/CreateExport.php

@@ -39,6 +39,8 @@ use Storage;
  * Class CreateExport.
  *
  * Generates export from the command line.
+ *
+ * @codeCoverageIgnore
  */
 class CreateExport extends Command
 {

app/Console/Commands/CreateImport.php

@@ -34,10 +34,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Log;
-use Preferences;
 
 /**
  * Class CreateImport.
+ *
+ * @codeCoverageIgnore
  */
 class CreateImport extends Command
 {
@@ -151,7 +152,7 @@ class CreateImport extends Command
 
 
         if (true === $this->option('start')) {
-            $this->infoLine('The has started. The process is not visible. Please wait.');
+            $this->infoLine('The import routine has started. The process is not visible. Please wait.');
             Log::debug('Go for import!');
 
             // run it!
@@ -232,7 +233,7 @@ class CreateImport extends Command
             }
         }
         // clear cache for user:
-        Preferences::setForUser($user, 'lastActivity', microtime());
+        app('preferences')->setForUser($user, 'lastActivity', microtime());
 
         return 0;
     }
@@ -266,8 +267,8 @@ class CreateImport extends Command
      */
     private function validArguments(): bool
     {
-        $file          = $this->argument('file');
-        $configuration = $this->argument('configuration');
+        $file          = (string)$this->argument('file');
+        $configuration = (string)$this->argument('configuration');
         $cwd           = getcwd();
         $validTypes    = config('import.options.file.import_formats');
         $type          = strtolower($this->option('type'));

app/Console/Commands/Cron.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\Cronjobs\RecurringCronjob;
+use Illuminate\Console\Command;
+
+/**
+ * Class Cron
+ *
+ * @codeCoverageIgnore
+ */
+class Cron extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Runs all Firefly III cron-job related commands. Configure a cron job according to the official Firefly III documentation.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:cron';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle(): int
+    {
+        $recurring = new RecurringCronjob;
+        try {
+            $result = $recurring->fire();
+        } catch (FireflyException $e) {
+            $this->error($e->getMessage());
+
+            return 0;
+        }
+        if (false === $result) {
+            $this->line('The recurring transaction cron job did not fire.');
+        }
+        if (true === $result) {
+            $this->line('The recurring transaction cron job fired successfully.');
+        }
+
+        $this->info('More feedback on the cron jobs can be found in the log files.');
+
+        return 0;
+    }
+
+
+}

app/Console/Commands/DecryptAttachment.php

@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class DecryptAttachment.
+ *
+ * @codeCoverageIgnore
  */
 class DecryptAttachment extends Command
 {
@@ -63,9 +65,9 @@ class DecryptAttachment extends Command
         $repository     = app(AttachmentRepositoryInterface::class);
         $attachmentId   = (int)$this->argument('id');
         $attachment     = $repository->findWithoutUser($attachmentId);
-        $attachmentName = trim($this->argument('name'));
-        $storagePath    = realpath(trim($this->argument('directory')));
-        if (null === $attachment->id) {
+        $attachmentName = trim((string)$this->argument('name'));
+        $storagePath    = realpath(trim((string)$this->argument('directory')));
+        if (null === $attachment) {
             $this->error(sprintf('No attachment with id #%d', $attachmentId));
             Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
 

app/Console/Commands/EncryptFile.php

@@ -29,6 +29,8 @@ use Illuminate\Console\Command;
 
 /**
  * Class EncryptFile.
+ *
+ * @codeCoverageIgnore
  */
 class EncryptFile extends Command
 {

app/Console/Commands/Import.php

@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class Import.
+ *
+ * @codeCoverageIgnore
  */
 class Import extends Command
 {
@@ -59,20 +61,21 @@ class Import extends Command
      *
      * @throws FireflyException
      */
-    public function handle(): void
+    public function handle(): int
     {
         Log::debug('Start start-import command');
-        $jobKey = $this->argument('key');
-        $job    = ImportJob::where('key', $jobKey)->first();
+        $jobKey = (string)$this->argument('key');
+        /** @var ImportJob $job */
+        $job = ImportJob::where('key', $jobKey)->first();
         if (null === $job) {
             $this->errorLine(sprintf('No job found with key "%s"', $jobKey));
 
-            return;
+            return 1;
         }
         if (!$this->isValid($job)) {
             $this->errorLine('Job is not valid for some reason. Exit.');
 
-            return;
+            return 1;
         }
 
         $this->infoLine(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
@@ -106,6 +109,8 @@ class Import extends Command
         }
 
         $this->infoLine(sprintf('The import has finished. %d transactions have been imported.', $count));
+
+        return 0;
     }
 
     /**

app/Console/Commands/ScanAttachments.php

@@ -34,6 +34,8 @@ use Storage;
 
 /**
  * Class ScanAttachments.
+ *
+ * @codeCoverageIgnore
  */
 class ScanAttachments extends Command
 {
@@ -54,7 +56,7 @@ class ScanAttachments extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         $attachments = Attachment::get();
         $disk        = Storage::disk('upload');
@@ -82,5 +84,7 @@ class ScanAttachments extends Command
             $attachment->save();
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
         }
+
+        return 0;
     }
 }

app/Console/Commands/UpgradeDatabase.php

@@ -54,7 +54,6 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Log;
-use Preferences;
 use Schema;
 use UnexpectedValueException;
 
@@ -64,6 +63,7 @@ use UnexpectedValueException;
  * Upgrade user database.
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @codeCoverageIgnore
  */
 class UpgradeDatabase extends Command
 {
@@ -83,7 +83,7 @@ class UpgradeDatabase extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         $this->setTransactionIdentifier();
         $this->updateAccountCurrencies();
@@ -97,6 +97,8 @@ class UpgradeDatabase extends Command
         $this->migrateBillsToRules();
 
         $this->info('Firefly III database is up to date.');
+
+        return 0;
     }
 
     /**
@@ -110,10 +112,10 @@ class UpgradeDatabase extends Command
     {
         foreach (User::get() as $user) {
             /** @var Preference $lang */
-            $lang               = Preferences::getForUser($user, 'language', 'en_US');
+            $lang               = app('preferences')->getForUser($user, 'language', 'en_US');
             $groupName          = (string)trans('firefly.rulegroup_for_bills_title', [], $lang->data);
             $ruleGroup          = $user->ruleGroups()->where('title', $groupName)->first();
-            $currencyPreference = Preferences::getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
+            $currencyPreference = app('preferences')->getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
 
             if (null === $currencyPreference) {
                 $this->error('User has no currency preference. Impossible.');
@@ -198,7 +200,7 @@ class UpgradeDatabase extends Command
                             [
                                 'rule_id'         => $rule->id,
                                 'trigger_type'    => 'amount_more',
-                                'trigger_value'   => round($bill->amount_min, $currency->decimal_places),
+                                'trigger_value'   => round((float)$bill->amount_min, $currency->decimal_places),
                                 'active'          => 1,
                                 'stop_processing' => 0,
                                 'order'           => 4,
@@ -210,7 +212,7 @@ class UpgradeDatabase extends Command
                             [
                                 'rule_id'         => $rule->id,
                                 'trigger_type'    => 'amount_exactly',
-                                'trigger_value'   => round($bill->amount_min, $currency->decimal_places),
+                                'trigger_value'   => round((float)$bill->amount_min, $currency->decimal_places),
                                 'active'          => 1,
                                 'stop_processing' => 0,
                                 'order'           => 3,
@@ -294,7 +296,7 @@ class UpgradeDatabase extends Command
             function (Account $account) use ($repository) {
                 $repository->setUser($account->user);
                 // get users preference, fall back to system pref.
-                $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+                $defaultCurrencyCode = app('preferences')->getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
                 $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
                 $accountCurrency     = (int)$repository->getMetaValue($account, 'currency_id');
                 $openingBalance      = $account->getOpeningBalance();

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -27,6 +27,8 @@ use Illuminate\Console\Command;
 
 /**
  * Class UpgradeFireflyInstructions.
+ *
+ * @codeCoverageIgnore
  */
 class UpgradeFireflyInstructions extends Command
 {
@@ -46,14 +48,16 @@ class UpgradeFireflyInstructions extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
-        if ('update' === $this->argument('task')) {
+        if ('update' === (string)$this->argument('task')) {
             $this->updateInstructions();
         }
-        if ('install' === $this->argument('task')) {
+        if ('install' === (string)$this->argument('task')) {
             $this->installInstructions();
         }
+
+        return 0;
     }
 
     /**

app/Console/Commands/UseEncryption.php

@@ -28,6 +28,7 @@ use Illuminate\Support\Str;
 
 /**
  * Class UseEncryption.
+ * @codeCoverageIgnore
  */
 class UseEncryption extends Command
 {
@@ -47,7 +48,7 @@ class UseEncryption extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         if (true === config('firefly.encryption')) {
             $this->info('Firefly III configuration calls for encrypted data.');
@@ -62,6 +63,8 @@ class UseEncryption extends Command
         $this->handleObjects('Category', 'name', 'encrypted');
         $this->handleObjects('PiggyBank', 'name', 'encrypted');
         $this->handleObjects('TransactionJournal', 'description', 'encrypted');
+
+        return 0;
     }
 
     /**

app/Console/Commands/VerifiesAccessToken.php

@@ -25,12 +25,12 @@ namespace FireflyIII\Console\Commands;
 
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Log;
-use Preferences;
 
 /**
  * Trait VerifiesAccessToken.
  *
  * Verifies user access token for sensitive commands.
+ * @codeCoverageIgnore
  */
 trait VerifiesAccessToken
 {
@@ -61,7 +61,7 @@ trait VerifiesAccessToken
 
             return false;
         }
-        $accessToken = Preferences::getForUser($user, 'access_token', null);
+        $accessToken = app('preferences')->getForUser($user, 'access_token', null);
         if (null === $accessToken) {
             Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
 

app/Console/Commands/VerifyDatabase.php

@@ -42,7 +42,6 @@ use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
 use Log;
-use Preferences;
 use Schema;
 use stdClass;
 
@@ -51,6 +50,7 @@ use stdClass;
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @codeCoverageIgnore
  */
 class VerifyDatabase extends Command
 {
@@ -70,11 +70,11 @@ class VerifyDatabase extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         // if table does not exist, return false
         if (!Schema::hasTable('users')) {
-            return;
+            return 1;
         }
 
         $this->reportEmptyBudgets();
@@ -95,6 +95,8 @@ class VerifyDatabase extends Command
         $this->fixDoubleAmounts();
         $this->fixBadMeta();
         $this->removeBills();
+
+        return 0;
     }
 
     /**
@@ -106,10 +108,10 @@ class VerifyDatabase extends Command
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
-            $pref = Preferences::getForUser($user, 'access_token', null);
+            $pref = app('preferences')->getForUser($user, 'access_token', null);
             if (null === $pref) {
                 $token = $user->generateAccessToken();
-                Preferences::setForUser($user, 'access_token', $token);
+                app('preferences')->setForUser($user, 'access_token', $token);
                 $this->line(sprintf('Generated access token for user %s', $user->email));
                 ++$count;
             }

app/Console/Kernel.php

@@ -24,13 +24,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console;
 
-use Carbon\Carbon;
-use FireflyIII\Jobs\CreateRecurringTransactions;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Log;
 
 /**
  * File to make sure commands work.
+ * @codeCoverageIgnore
  */
 class Kernel extends ConsoleKernel
 {
@@ -52,6 +52,21 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        $schedule->job(new CreateRecurringTransactions(new Carbon))->daily();
+        $schedule->call(
+            function () {
+                Log::error('Firefly III no longer users the Laravel scheduler to do cron jobs! Please read the instructions at https://firefly-iii.readthedocs.io/en/latest/');
+                echo "\n";
+                echo '------------';
+                echo "\n";
+                echo wordwrap('Firefly III no longer users the Laravel scheduler to do cron jobs! Please read the instructions here:');
+                echo "\n";
+                echo 'https://firefly-iii.readthedocs.io/en/latest/';
+                echo "\n\n";
+                echo 'Disable this cron job!';
+                echo "\n";
+                echo '------------';
+                echo "\n";
+            }
+        )->everyMinute();
     }
 }

app/Events/AdminRequestedTestMessage.php

@@ -30,6 +30,7 @@ use Log;
 
 /**
  * Class AdminRequestedTestMessage.
+ * @codeCoverageIgnore
  */
 class AdminRequestedTestMessage extends Event
 {

app/Events/Event.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Events;
 
 /**
  * Class Event.
+ * @codeCoverageIgnore
  */
 abstract class Event
 {

app/Events/RegisteredUser.php

@@ -29,6 +29,7 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class RegisteredUser.
+ * @codeCoverageIgnore
  */
 class RegisteredUser extends Event
 {

app/Events/RequestedNewPassword.php

@@ -29,6 +29,7 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class RequestedNewPassword.
+ * @codeCoverageIgnore
  */
 class RequestedNewPassword extends Event
 {
@@ -36,10 +37,10 @@ class RequestedNewPassword extends Event
 
     /** @var string The users IP address */
     public $ipAddress;
-    /** @var User The user */
-    public $user;
     /** @var string The token */
     public $token;
+    /** @var User The user */
+    public $user;
 
     /**
      * Create a new event instance. This event is triggered when a users tries to reset his or her password.

app/Events/RequestedReportOnJournals.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * RequestedReportOnJournals.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -30,6 +31,8 @@ use Log;
 
 /**
  * Class RequestedReportOnJournals
+ *
+ * @codeCoverageIgnore
  */
 class RequestedReportOnJournals
 {

app/Events/RequestedVersionCheckStatus.php

@@ -30,6 +30,8 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class RequestedVersionCheckStatus
+ *
+ * @codeCoverageIgnore
  */
 class RequestedVersionCheckStatus extends Event
 {

app/Events/UserChangedEmail.php

@@ -29,6 +29,8 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class UserChangedEmail.
+ *
+ * @codeCoverageIgnore
  */
 class UserChangedEmail extends Event
 {

app/Exceptions/Handler.php

@@ -31,13 +31,14 @@ use Exception;
 use FireflyIII\Jobs\MailError;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Validation\ValidationException;
+use Illuminate\Validation\ValidationException as LaravelValidationException;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class Handler
+ * @codeCoverageIgnore
  */
 class Handler extends ExceptionHandler
 {
@@ -54,7 +55,7 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $exception)
     {
-        if ($exception instanceof ValidationException && $request->expectsJson()) {
+        if ($exception instanceof LaravelValidationException && $request->expectsJson()) {
             // ignore it: controller will handle it.
             return parent::render($request, $exception);
         }

app/Export/Collector/AttachmentCollector.php

@@ -28,13 +28,15 @@ use Crypt;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Collection;
 use Log;
 use Storage;
 
 /**
  * Class AttachmentCollector.
+ *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AttachmentCollector extends BasicCollector implements CollectorInterface
 {
@@ -108,7 +110,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
         if ($this->uploadDisk->exists($file)) {
             try {
                 $decrypted = Crypt::decrypt($this->uploadDisk->get($file));
-            } catch (FileNotFoundException|DecryptException $e) {
+            } catch (DecryptException $e) {
                 Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage());
 
                 return false;

app/Export/Collector/BasicCollector.php

@@ -30,6 +30,9 @@ use Illuminate\Support\Collection;
 
 /**
  * Class BasicCollector.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class BasicCollector
 {

app/Export/Collector/CollectorInterface.php

@@ -29,6 +29,9 @@ use Illuminate\Support\Collection;
 
 /**
  * Interface CollectorInterface.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface CollectorInterface
 {

app/Export/Collector/UploadCollector.php

@@ -31,6 +31,9 @@ use Storage;
 
 /**
  * Class UploadCollector.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class UploadCollector extends BasicCollector implements CollectorInterface
 {

app/Export/Entry/Entry.php

@@ -43,6 +43,9 @@ use FireflyIII\Models\Transaction;
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 final class Entry
 {

app/Export/ExpandedProcessor.php

@@ -31,7 +31,8 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Export\Collector\AttachmentCollector;
 use FireflyIII\Export\Collector\UploadCollector;
 use FireflyIII\Export\Entry\Entry;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Export\Exporter\ExporterInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\ExportJob;
@@ -48,12 +49,15 @@ use ZipArchive;
  * Class ExpandedProcessor.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // its doing a lot.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class ExpandedProcessor implements ProcessorInterface
 {
     /** @var Collection All accounts */
     public $accounts;
-    /** @var string The export format*/
+    /** @var string The export format */
     public $exportFormat;
     /** @var bool Should include attachments */
     public $includeAttachments;
@@ -61,7 +65,7 @@ class ExpandedProcessor implements ProcessorInterface
     public $includeOldUploads;
     /** @var ExportJob The export job itself */
     public $job;
-    /** @var array The settings*/
+    /** @var array The settings */
     public $settings;
     /** @var Collection The entries to export. */
     private $exportEntries;
@@ -106,13 +110,13 @@ class ExpandedProcessor implements ProcessorInterface
     public function collectJournals(): bool
     {
         // use journal collector thing.
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser($this->job->user);
         $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate'])
                   ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
                   ->removeFilter(InternalTransferFilter::class);
-        $transactions = $collector->getJournals();
+        $transactions = $collector->getTransactions();
         // get some more meta data for each entry:
         $ids         = $transactions->pluck('journal_id')->toArray();
         $assetIds    = $transactions->pluck('account_id')->toArray();
@@ -220,7 +224,8 @@ class ExpandedProcessor implements ProcessorInterface
     public function exportJournals(): bool
     {
         $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
-        $exporter      = app($exporterClass);
+        /** @var ExporterInterface $exporter */
+        $exporter = app($exporterClass);
         $exporter->setJob($this->job);
         $exporter->setEntries($this->exportEntries);
         $exporter->run();
@@ -258,7 +263,7 @@ class ExpandedProcessor implements ProcessorInterface
     /**
      * Delete files.
      */
-    private function deleteFiles():void
+    private function deleteFiles(): void
     {
         $disk = Storage::disk('export');
         foreach ($this->getFiles() as $file) {

app/Export/Exporter/BasicExporter.php

@@ -29,6 +29,9 @@ use Illuminate\Support\Collection;
 
 /**
  * Class BasicExporter.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class BasicExporter
 {

app/Export/Exporter/CsvExporter.php

@@ -30,6 +30,9 @@ use Storage;
 
 /**
  * Class CsvExporter.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class CsvExporter extends BasicExporter implements ExporterInterface
 {

app/Export/Exporter/ExporterInterface.php

@@ -29,6 +29,9 @@ use Illuminate\Support\Collection;
 
 /**
  * Interface ExporterInterface.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface ExporterInterface
 {

app/Export/ProcessorInterface.php

@@ -28,6 +28,9 @@ use Illuminate\Support\Collection;
 
 /**
  * Interface ProcessorInterface.
+ *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface ProcessorInterface
 {

app/Factory/AccountFactory.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Services\Internal\Support\AccountServiceTrait;
 use FireflyIII\User;
+use Log;
 
 /**
  * Factory to create or return accounts.
@@ -80,8 +81,9 @@ class AccountFactory
                 'iban'            => $data['iban'],
             ];
 
-            // remove virtual balance when not an asset account:
-            if ($type->type !== AccountType::ASSET) {
+            // remove virtual balance when not an asset account or a liability
+            $canHaveVirtual = [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
+            if (!\in_array($type->type, $canHaveVirtual, true)) {
                 $databaseData['virtual_balance'] = '0';
             }
 
@@ -93,7 +95,7 @@ class AccountFactory
             $return = Account::create($databaseData);
             $this->updateMetaData($return, $data);
 
-            if ($type->type === AccountType::ASSET) {
+            if (\in_array($type->type, $canHaveVirtual, true)) {
                 if ($this->validIBData($data)) {
                     $this->updateIB($return, $data);
                 }
@@ -130,6 +132,7 @@ class AccountFactory
     }
 
     /**
+     *
      * @param string $accountName
      * @param string $accountType
      *
@@ -188,9 +191,13 @@ class AccountFactory
             $result = AccountType::find($accountTypeId);
         }
         if (null === $result) {
-            /** @var string $type */
-            $type   = (string)config('firefly.accountTypeByIdentifier.' . (string)$accountType);
-            $result = AccountType::whereType($type)->first();
+            Log::debug(sprintf('No account type found by ID, continue search for "%s".', $accountType));
+            /** @var array $types */
+            $types = config('firefly.accountTypeByIdentifier.' . $accountType) ?? [];
+            if (\count($types) > 0) {
+                Log::debug(sprintf('%d accounts in list from config', \count($types)), $types);
+                $result = AccountType::whereIn('type', $types)->first();
+            }
             if (null === $result && null !== $accountType) {
                 // try as full name:
                 $result = AccountType::whereType($accountType)->first();

app/Factory/AccountMetaFactory.php

@@ -24,13 +24,17 @@ declare(strict_types=1);
 
 namespace FireflyIII\Factory;
 
+use Exception;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
+use Log;
 
 /**
  * Class AccountMetaFactory
  */
 class AccountMetaFactory
 {
+
     /**
      * @param array $data
      *
@@ -41,4 +45,46 @@ class AccountMetaFactory
         return AccountMeta::create($data);
     }
 
+    /**
+     * Create update or delete meta data.
+     *
+     * @param Account $account
+     * @param string  $field
+     * @param string  $value
+     *
+     * @return AccountMeta|null
+     */
+    public function crud(Account $account, string $field, string $value): ?AccountMeta
+    {
+        /** @var AccountMeta $entry */
+        $entry = $account->accountMeta()->where('name', $field)->first();
+
+        // must not be an empty string:
+        if ('' !== $value) {
+
+            // if $data has field and $entry is null, create new one:
+            if (null === $entry) {
+                Log::debug(sprintf('Created meta-field "%s":"%s" for account #%d ("%s") ', $field, $value, $account->id, $account->name));
+                return $this->create(['account_id' => $account->id, 'name' => $field, 'data' => $value]);
+            }
+
+            // if $data has field and $entry is not null, update $entry:
+            if (null !== $entry) {
+                $entry->data = $value;
+                $entry->save();
+                Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $value, $account->id, $account->name));
+            }
+        }
+        if ('' === $value && null !== $entry) {
+            try {
+                $entry->delete();
+            } catch (Exception $e) { // @codeCoverageIgnore
+                Log::debug(sprintf('Could not delete entry: %s', $e->getMessage())); // @codeCoverageIgnore
+            }
+            return null;
+        }
+
+        return $entry;
+    }
+
 }

app/Factory/AttachmentFactory.php

@@ -76,4 +76,4 @@ class AttachmentFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/BillFactory.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Factory;
 
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Support\BillServiceTrait;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
@@ -46,6 +47,10 @@ class BillFactory
      */
     public function create(array $data): ?Bill
     {
+        /** @var TransactionCurrencyFactory $factory */
+        $factory = app(TransactionCurrencyFactory::class);
+        /** @var TransactionCurrency $currency */
+        $currency = $factory->find((int)$data['currency_id'], (string)$data['currency_code']);
         /** @var Bill $bill */
         $bill = Bill::create(
             [
@@ -53,7 +58,7 @@ class BillFactory
                 'match'                   => 'MIGRATED_TO_RULES',
                 'amount_min'              => $data['amount_min'],
                 'user_id'                 => $this->user->id,
-                'transaction_currency_id' => $data['transaction_currency_id'],
+                'transaction_currency_id' => $currency->id,
                 'amount_max'              => $data['amount_max'],
                 'date'                    => $data['date'],
                 'repeat_freq'             => $data['repeat_freq'],

app/Factory/RecurrenceFactory.php

@@ -93,4 +93,4 @@ class RecurrenceFactory
         $this->user = $user;
     }
 
-}
+}

app/Factory/TransactionCurrencyFactory.php

@@ -43,7 +43,6 @@ class TransactionCurrencyFactory
      */
     public function create(array $data): ?TransactionCurrency
     {
-        $result = null;
         try {
             /** @var TransactionCurrency $currency */
             $result = TransactionCurrency::create(
@@ -55,6 +54,7 @@ class TransactionCurrencyFactory
                 ]
             );
         } catch (QueryException $e) {
+            $result = null;
             Log::error(sprintf('Could not create new currency: %s', $e->getMessage()));
         }
 

app/Factory/TransactionFactory.php

@@ -59,10 +59,10 @@ class TransactionFactory
         $currencyId = isset($data['currency']) ? $data['currency']->id : $currencyId;
         if ('' === $data['amount']) {
             Log::error('Empty string in data.', $data);
-            throw new FireflyException('Amount is an empty string, which Firefly III cannot handle. Apologies.'); // @codeCoverageIgnore
+            throw new FireflyException('Amount is an empty string, which Firefly III cannot handle. Apologies.');
         }
         if (null === $currencyId) {
-            throw new FireflyException('Cannot store transaction without currency information.'); // @codeCoverageIgnore
+            throw new FireflyException('Cannot store transaction without currency information.');
         }
         $data['foreign_amount'] = '' === (string)$data['foreign_amount'] ? null : $data['foreign_amount'];
         Log::debug(sprintf('Create transaction for account #%d ("%s") with amount %s', $data['account']->id, $data['account']->name, $data['amount']));
@@ -113,17 +113,17 @@ class TransactionFactory
         $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']);
 
         if (null === $sourceAccount || null === $destinationAccount) {
+            $debugData                = $data;
+            $debugData['source_type'] = $sourceType;
+            $debugData['dest_type']   = $destinationType;
+            Log::error('Info about source/dest:', $debugData);
             throw new FireflyException('Could not determine source or destination account.');
         }
 
         Log::debug(sprintf('Source type is "%s", destination type is "%s"', $sourceAccount->accountType->type, $destinationAccount->accountType->type));
-        // throw big fat error when source type === dest type and it's not a transfer or reconciliation.
-        if ($sourceAccount->accountType->type === $destinationAccount->accountType->type && $journal->transactionType->type !== TransactionType::TRANSFER) {
-            throw new FireflyException(sprintf('Source and destination account cannot be both of the type "%s"', $destinationAccount->accountType->type));
-        }
-        if ($sourceAccount->accountType->type !== AccountType::ASSET && $destinationAccount->accountType->type !== AccountType::ASSET) {
-            throw new FireflyException('At least one of the accounts must be an asset account.');
-        }
+
+        // based on the source type, destination type and transaction type, the system can start throwing FireflyExceptions.
+        $this->validateTransaction($sourceAccount->accountType->type, $destinationAccount->accountType->type, $journal->transactionType->type);
 
         $source = $this->create(
             [
@@ -150,7 +150,7 @@ class TransactionFactory
             ]
         );
         if (null === $source || null === $dest) {
-            throw new FireflyException('Could not create transactions.');
+            throw new FireflyException('Could not create transactions.'); // @codeCoverageIgnore
         }
 
         // set foreign currency
@@ -190,5 +190,30 @@ class TransactionFactory
         $this->user = $user;
     }
 
+    /**
+     * @param string $sourceType
+     * @param string $destinationType
+     * @param string $transactionType
+     *
+     * @throws FireflyException
+     */
+    private function validateTransaction(string $sourceType, string $destinationType, string $transactionType): void
+    {
+        // throw big fat error when source type === dest type and it's not a transfer or reconciliation.
+        if ($sourceType === $destinationType && $transactionType !== TransactionType::TRANSFER) {
+            throw new FireflyException(sprintf('Source and destination account cannot be both of the type "%s"', $destinationType));
+        }
+        // source must be in this list AND dest must be in this list:
+        $list = [AccountType::DEFAULT, AccountType::ASSET, AccountType::CREDITCARD, AccountType::CASH, AccountType::DEBT, AccountType::MORTGAGE,
+                 AccountType::LOAN, AccountType::MORTGAGE];
+        if (
+            !\in_array($sourceType, $list, true)
+            && !\in_array($destinationType, $list, true)) {
+            throw new FireflyException(sprintf('At least one of the accounts must be an asset account (%s, %s).', $sourceType, $destinationType));
+        }
+        // either of these must be asset or default account.
+
+    }
+
 
 }

app/Factory/TransactionJournalFactory.php

@@ -104,7 +104,7 @@ class TransactionJournalFactory
         // store date meta fields (if present):
         $fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date',
                    'due_date', 'recurrence_id', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id', 'importHash', 'importHashV2',
-                   'external_id'];
+                   'external_id', 'sepa-batch-id'];
 
         foreach ($fields as $field) {
             $this->storeMeta($journal, $data, $field);

app/Factory/TransactionTypeFactory.php

@@ -28,7 +28,6 @@ namespace FireflyIII\Factory;
 use FireflyIII\Models\TransactionType;
 
 /**
- * @codeCoverageIgnore
  * Class TransactionTypeFactory
  */
 class TransactionTypeFactory

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -39,6 +39,8 @@ class ChartJsGenerator implements GeneratorInterface
      *    'type' => bar or line, optional
      *    'yAxisID' => ID of yAxis, optional, will not be included when unused.
      *    'fill' => if to fill a line? optional, will not be included when unused.
+     *    'currency_symbol' => 'x',
+     *    'backgroundColor' => 'x',
      *    'entries' =>
      *        [
      *         'label-of-entry' => 'value'
@@ -120,7 +122,7 @@ class ChartJsGenerator implements GeneratorInterface
         // different sort when values are positive and when they're negative.
         asort($data);
         $next = next($data);
-        if (!\is_bool($next) && 1 === bccomp($next, '0')) {
+        if (!\is_bool($next) && 1 === bccomp((string)$next, '0')) {
             // next is positive, sort other way around.
             arsort($data);
         }
@@ -129,7 +131,7 @@ class ChartJsGenerator implements GeneratorInterface
         $index = 0;
         foreach ($data as $key => $value) {
             // make larger than 0
-            $chartData['datasets'][0]['data'][]            = (float)app('steam')->positive($value);
+            $chartData['datasets'][0]['data'][]            = (float)app('steam')->positive((string)$value);
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
             $chartData['labels'][]                         = $key;
             ++$index;
@@ -138,6 +140,46 @@ class ChartJsGenerator implements GeneratorInterface
         return $chartData;
     }
 
+    /**
+     * Expects data as:.
+     *
+     * key => [value => x, 'currency_symbol' => 'x']
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiCurrencyPieChart(array $data): array
+    {
+        $chartData = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+
+        $amounts = array_column($data, 'amount');
+        $next = next($amounts);
+        $sortFlag = SORT_ASC;
+        if (!\is_bool($next) && 1 === bccomp((string)$next, '0')) {
+            $sortFlag = SORT_DESC;
+        }
+        array_multisort($amounts, $sortFlag, $data);
+        unset($next, $sortFlag, $amounts);
+
+        $index = 0;
+        foreach ($data as $key => $valueArray) {
+            // make larger than 0
+            $chartData['datasets'][0]['data'][]            = (float)app('steam')->positive((string)$valueArray['amount']);
+            $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $chartData['datasets'][0]['currency_symbol'][] = $valueArray['currency_symbol'];
+            $chartData['labels'][]                         = $key;
+            ++$index;
+        }
+
+        return $chartData;
+    }
+
     /**
      * Will generate a (ChartJS) compatible array from the given input. Expects this format:.
      *

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -27,6 +27,13 @@ namespace FireflyIII\Generator\Chart\Basic;
  */
 interface GeneratorInterface
 {
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiCurrencyPieChart(array $data): array;
+
     /**
      * Will generate a Chart JS compatible array from the given input. Expects this format.
      *

app/Generator/Report/Account/MonthReportGenerator.php

@@ -25,9 +25,13 @@ namespace FireflyIII\Generator\Report\Account;
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use Illuminate\Support\Collection;
+use Log;
+use Throwable;
 
 /**
  * Class MonthReportGenerator.
+ *
+ * @codeCoverageIgnore
  */
 class MonthReportGenerator implements ReportGeneratorInterface
 {
@@ -44,7 +48,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * Generate the report.
      *
      * @return string
-     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -52,11 +55,17 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $expenseIds      = implode(',', $this->expense->pluck('id')->toArray());
         $reportType      = 'account';
         $preferredPeriod = $this->preferredPeriod();
+        try {
+            $result = view(
+                'reports.account.report',
+                compact('accountIds', 'reportType', 'expenseIds', 'preferredPeriod')
+            )->with('start', $this->start)->with('end', $this->end)->render();
+        } catch (Throwable $e) {
+            Log::error(sprintf('Cannot render reports.account.report: %s', $e->getMessage()));
+            $result = 'Could not render report view.';
+        }
 
-        return view(
-            'reports.account.report',
-            compact('accountIds', 'reportType', 'expenseIds', 'preferredPeriod')
-        )->with('start', $this->start)->with('end', $this->end)->render();
+        return $result;
     }
 
     /**

app/Generator/Report/Account/MultiYearReportGenerator.php

@@ -24,6 +24,8 @@ namespace FireflyIII\Generator\Report\Account;
 
 /**
  * Class MultiYearReportGenerator.
+ *
+ * @codeCoverageIgnore
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Account/YearReportGenerator.php

@@ -24,6 +24,8 @@ namespace FireflyIII\Generator\Report\Account;
 
 /**
  * Class YearReportGenerator.
+ *
+ * @codeCoverageIgnore
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -28,12 +28,14 @@ namespace FireflyIII\Generator\Report\Audit;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
+use Log;
+use Throwable;
 
 /**
  * Class MonthReportGenerator.
@@ -51,7 +53,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * Generates the report.
      *
      * @return string
-     * @throws \Throwable
+     * @throws FireflyException
+     * @codeCoverageIgnore
      */
     public function generate(): string
     {
@@ -77,100 +80,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'internal_reference', 'notes',
                         'create_date', 'update_date',
         ];
+        try {
+            $result = view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
+                ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
+                ->render();
+        } catch (Throwable $e) {
+            Log::error(sprintf('Cannot render reports.audit.report: %s', $e->getMessage()));
+            $result = 'Could not render report view.';
+        }
 
-        return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
-            ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
-            ->render();
-    }
-
-    /**
-     * Account collection setter.
-     *
-     * @param Collection $accounts
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setAccounts(Collection $accounts): ReportGeneratorInterface
-    {
-        $this->accounts = $accounts;
-
-        return $this;
-    }
-
-    /**
-     * Budget collection setter.
-     *
-     * @param Collection $budgets
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setBudgets(Collection $budgets): ReportGeneratorInterface
-    {
-        return $this;
-    }
-
-    /**
-     * Category collection setter.
-     *
-     * @param Collection $categories
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setCategories(Collection $categories): ReportGeneratorInterface
-    {
-        return $this;
-    }
-
-    /**
-     * End date setter.
-     *
-     * @param Carbon $date
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setEndDate(Carbon $date): ReportGeneratorInterface
-    {
-        $this->end = $date;
-
-        return $this;
-    }
-
-    /**
-     * Expenses collection setter.
-     *
-     * @param Collection $expense
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setExpense(Collection $expense): ReportGeneratorInterface
-    {
-        return $this;
-    }
-
-    /**
-     * Start date collection setter.
-     *
-     * @param Carbon $date
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setStartDate(Carbon $date): ReportGeneratorInterface
-    {
-        $this->start = $date;
-
-        return $this;
-    }
-
-    /**
-     * Tags collection setter.
-     *
-     * @param Collection $tags
-     *
-     * @return ReportGeneratorInterface
-     */
-    public function setTags(Collection $tags): ReportGeneratorInterface
-    {
-        return $this;
+        return $result;
     }
 
     /**
@@ -184,7 +103,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // not that long
      * @throws FireflyException
      */
-    private function getAuditReport(Account $account, Carbon $date): array
+    public function getAuditReport(Account $account, Carbon $date): array
     {
         /** @var CurrencyRepositoryInterface $currencyRepos */
         $currencyRepos = app(CurrencyRepositoryInterface::class);
@@ -193,10 +112,10 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $accountRepository = app(AccountRepositoryInterface::class);
         $accountRepository->setUser($account->user);
 
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
-        $journals         = $collector->getJournals();
+        $journals         = $collector->getTransactions();
         $journals         = $journals->reverse();
         $dayBeforeBalance = app('steam')->balance($account, $date);
         $startBalance     = $dayBeforeBalance;
@@ -231,4 +150,101 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         return $return;
     }
+
+    /**
+     * Account collection setter.
+     *
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * Budget collection setter.
+     *
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * Category collection setter.
+     *
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * End date setter.
+     *
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * Expenses collection setter.
+     *
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * Start date collection setter.
+     *
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * Tags collection setter.
+     *
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     * @codeCoverageIgnore
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
 }

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Generator\Report\Audit;
 
 /**
  * Class MultiYearReportGenerator.
+ * @codeCoverageIgnore
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Audit/YearReportGenerator.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Generator\Report\Audit;
 
 /**
  * Class YearReportGenerator.
+ * @codeCoverageIgnore
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Generator\Report\Budget;
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Helpers\Filter\OpposingAccountFilter;
 use FireflyIII\Helpers\Filter\PositiveAmountFilter;
 use FireflyIII\Helpers\Filter\TransferFilter;
@@ -35,9 +35,12 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
 use Log;
+use Throwable;
 
 /**
  * Class MonthReportGenerator.
+ *
+ * @codeCoverageIgnore
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
@@ -64,7 +67,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
      * Generates the report.
      *
      * @return string
-     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -77,11 +79,18 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $topExpenses     = $this->getTopExpenses();
 
         // render!
-        return view('reports.budget.month', compact('accountIds', 'budgetIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
-            ->with('start', $this->start)->with('end', $this->end)
-            ->with('budgets', $this->budgets)
-            ->with('accounts', $this->accounts)
-            ->render();
+        try {
+            $result = view('reports.budget.month', compact('accountIds', 'budgetIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
+                ->with('start', $this->start)->with('end', $this->end)
+                ->with('budgets', $this->budgets)
+                ->with('accounts', $this->accounts)
+                ->render();
+        } catch (Throwable $e) {
+            Log::error(sprintf('Cannot render reports.account.report: %s', $e->getMessage()));
+            $result = 'Could not render report view.';
+        }
+
+        return $result;
     }
 
     /**
@@ -189,8 +198,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             return $this->expenses;
         }
 
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL])
                   ->setBudgets($this->budgets)->withOpposingAccount();
@@ -199,7 +208,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector->addFilter(OpposingAccountFilter::class);
         $collector->addFilter(PositiveAmountFilter::class);
 
-        $transactions   = $collector->getJournals();
+        $transactions   = $collector->getTransactions();
         $this->expenses = $transactions;
 
         return $transactions;

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Generator\Report\Budget;
 
 /**
  * Class MultiYearReportGenerator.
+ * @codeCoverageIgnore
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Budget/YearReportGenerator.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Generator\Report\Budget;
 
 /**
  * Class YearReportGenerator.
+ * @codeCoverageIgnore
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Category/MonthReportGenerator.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Generator\Report\Category;
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Helpers\Filter\NegativeAmountFilter;
 use FireflyIII\Helpers\Filter\OpposingAccountFilter;
 use FireflyIII\Helpers\Filter\PositiveAmountFilter;
@@ -36,9 +36,11 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
 use Log;
+use Throwable;
 
 /**
  * Class MonthReportGenerator.
+ * @codeCoverageIgnore
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
@@ -68,7 +70,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
      * Generates the report.
      *
      * @return string
-     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -85,24 +86,23 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $topIncome       = $this->getTopIncome();
 
         // render!
-        return view(
-            'reports.category.month',
-            compact(
-                'accountIds',
-                'categoryIds',
-                'topIncome',
-                'reportType',
-                'accountSummary',
-                'categorySummary',
-                'averageExpenses',
-                'averageIncome',
-                'topExpenses'
+        try {
+            return view(
+                'reports.category.month', compact(
+                                            'accountIds', 'categoryIds', 'topIncome', 'reportType', 'accountSummary', 'categorySummary', 'averageExpenses',
+                                            'averageIncome', 'topExpenses'
+                                        )
             )
-        )
-            ->with('start', $this->start)->with('end', $this->end)
-            ->with('categories', $this->categories)
-            ->with('accounts', $this->accounts)
-            ->render();
+                ->with('start', $this->start)->with('end', $this->end)
+                ->with('categories', $this->categories)
+                ->with('accounts', $this->accounts)
+                ->render();
+        } catch (Throwable $e) {
+            Log::error(sprintf('Cannot render reports.category.month: %s', $e->getMessage()));
+            $result = 'Could not render report view.';
+        }
+
+        return $result;
     }
 
     /**
@@ -210,8 +210,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             return $this->expenses;
         }
 
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount();
@@ -220,7 +220,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector->addFilter(OpposingAccountFilter::class);
         $collector->addFilter(PositiveAmountFilter::class);
 
-        $transactions   = $collector->getJournals();
+        $transactions   = $collector->getTransactions();
         $this->expenses = $transactions;
 
         return $transactions;
@@ -237,8 +237,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             return $this->income;
         }
 
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount();
@@ -246,7 +246,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector->addFilter(OpposingAccountFilter::class);
         $collector->addFilter(NegativeAmountFilter::class);
 
-        $transactions = $collector->getJournals();
+        $transactions = $collector->getTransactions();
         $this->income = $transactions;
 
         return $transactions;

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -24,6 +24,7 @@ namespace FireflyIII\Generator\Report\Category;
 
 /**
  * Class MultiYearReportGenerator.
+ * @codeCoverageIgnore
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {