Merge branch 'release/4.7.2.1'

Allow user to specify port

.codeclimate.yml

@@ -0,0 +1,12 @@
+--- 
+exclude_patterns: 
+  - public/lib/
+  - public/js/lib/
+  - public/fonts/
+  - public/css/jquery-ui/
+  - public/css/bootstrap-multiselect.css
+  - public/css/bootstrap-sortable.css
+  - public/css/bootstrap-tagsinput.css
+  - public/css/daterangepicker.css
+  - public/css/google-fonts.css
+  - .sandstorm/

.deploy/docker/docker.env

@@ -0,0 +1,6 @@
+FF_APP_ENV=local
+FF_APP_KEY=S0m3R@nd0mString0f32Ch@rsEx@ct1y
+FF_DB_HOST=
+FF_DB_NAME=
+FF_DB_USER=
+FF_DB_PASSWORD=

.deploy/docker/entrypoint.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# make sure we own the volumes:
+chown -R www-data:www-data $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+chmod -R 775 $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
 cat .env.docker | envsubst > .env && cat .env
 composer dump-autoload

.deploy/kubernetes/firefly.yaml

@@ -0,0 +1,82 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mysql-pv-export-claim
+  labels:
+    app: firefly-local
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mysql-pv-upload-claim
+  labels:
+    app: firefly-local
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
+--- 
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: firefly-local
+  namespace: firefly
+  labels:
+    app: firefly-local
+spec:
+  selector:
+    matchLabels:
+      app: firefly-local
+  template:
+    metadata:
+      labels:
+        app: firefly-local
+    spec:
+      containers:
+      - image: firefly-local
+        name: firefly-local
+        env:
+        - name: FF_APP_ENV
+          value: "local"
+        - name: FF_APP_KEY
+          value: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
+        - name: FF_DB_HOST
+          value: "172.17.0.9" 
+        - name: FF_DB_NAME
+          value: "firefly_db"
+        - name: FF_DB_USER
+          value: "firefly_db"
+        - name: FF_DB_PASSWORD
+          value: "password" 
+        volumeMounts:
+        - mountPath: "/var/www/firefly-iii/storage/export"
+          name: mysql-persistent-export
+        - mountPath: "/var/www/firefly-iii/storage/upload"
+          name: mysql-persistent-upload 
+        imagePullPolicy: IfNotPresent
+      volumes:
+        - name: mysql-persistent-export
+          persistentVolumeClaim:
+            claimName: mysql-pv-export-claim
+        - name: mysql-persistent-upload
+          persistentVolumeClaim:
+            claimName: mysql-pv-upload-claim
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: firefly-local
+spec:
+  ports:
+    - port: 80
+  type: NodePort
+  selector:
+    app: firefly-local

.deploy/kubernetes/sql.yaml

@@ -0,0 +1,49 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: sql-pass
+type: Opaque
+data:
+  password: cGFzc3dvcmQ=
+---
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: mysql
+  namespace: firefly
+  labels:
+    app: mysql
+spec:
+  selector:
+    matchLabels:
+      app: mysql
+  template:
+    metadata:
+      labels:
+        app: mysql
+    spec:
+      containers:
+      - image: mysql
+        imagePullPolicy: IfNotPresent
+        name: mysql
+        env:
+          - name: MYSQL_ROOT_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: sql-pass
+                key: password
+        ports:
+        - containerPort: 3306
+          name: mysql
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mysql
+spec:
+  ports:
+    - port: 3306
+  type: NodePort
+  selector:
+    app: mysql
+

.env.docker

@@ -1,57 +1,98 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
 APP_ENV=${FF_APP_ENV}
-APP_DEBUG=false
-APP_NAME=FireflyIII
-APP_KEY=${FF_APP_KEY}
-APP_LOG=daily
-APP_LOG_LEVEL=warning
-APP_URL=http://localhost
 
+# Set to true if you want to see debug information in error screens.
+APP_DEBUG=${APP_DEBUG}
+
+# This should be your email address
+SITE_OWNER=${SITE_OWNER}
+
+# The encryption key for your database and sessions. Keep this very secure.
+# If you generate a new one all existing data must be considered LOST.
+# 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.
+APP_URL=${APP_URL}
+TRUSTED_PROXIES=${TRUSTED_PROXIES}
+
+# The log channel defines where your log entries go to.
+LOG_CHANNEL=${LOG_CHANNEL}
+
+# 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.
 DB_CONNECTION=mysql
 DB_HOST=${FF_DB_HOST}
-DB_PORT=3306
+DB_PORT=${FF_DB_PORT}
 DB_DATABASE=${FF_DB_NAME}
 DB_USERNAME=${FF_DB_USER}
 DB_PASSWORD=${FF_DB_PASSWORD}
 
-BROADCAST_DRIVER=log
+# '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
-QUEUE_DRIVER=sync
 
+# Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
+# If you want Firefly III to mail you, update these settings
+MAIL_DRIVER=${MAIL_DRIVER}
+MAIL_HOST=${MAIL_HOST}
+MAIL_PORT=${MAIL_PORT}
+MAIL_FROM=${MAIL_FROM}
+MAIL_USERNAME=${MAIL_USERNAME}
+MAIL_PASSWORD=${MAIL_PASSWORD}
+MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
+
+# 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=${MAPBOX_API_KEY}
+
+# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this will only work for paid fixer.io accounts because they severly limited
+# the free API up to the point where you might as well offer nothing.
+FIXER_API_KEY=${FIXER_API_KEY}
+
+# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
+ANALYTICS_ID=${ANALYTICS_ID}
+
+# Most parts of the database are encrypted by default, but you can turn this off if you want to.
+# This makes it easier to migrate your database. Not that some fields will never be decrypted.
+USE_ENCRYPTION=true
+
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
-
 CACHE_PREFIX=firefly
-
 SEARCH_RESULT_LIMIT=50
-EXCHANGE_RATE_SERVICE=fixerio
-
-MAPBOX_API_KEY=
-ANALYTICS_ID=
-SITE_OWNER=mail@example.com
-USE_ENCRYPTION=true
-
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_ID=
-
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=true
+IS_SANDSTORM=false
+IS_HEROKU=false
+TZ=${TZ}

.env.example

@@ -1,12 +1,31 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
 APP_ENV=local
+
+# Set to true if you want to see debug information in error screens.
 APP_DEBUG=false
-APP_NAME=FireflyIII
+
+# This should be your email address
+SITE_OWNER=mail@example.com
+
+# The encryption key for your database and sessions. Keep this very secure.
+# If you generate a new one all existing data must be considered LOST.
+# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=SomeRandomStringOf32CharsExactly
-APP_LOG=daily
-APP_LOG_LEVEL=warning
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
+# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=
 
+# The log channel defines where your log entries go to.
+LOG_CHANNEL=daily
+
+# 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
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -14,19 +33,27 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-BROADCAST_DRIVER=log
+# '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
-QUEUE_DRIVER=sync
 
+# Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
+# If you want Firefly III to mail you, update these settings
 MAIL_DRIVER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
@@ -35,24 +62,40 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
-
-CACHE_PREFIX=firefly
-
-SEARCH_RESULT_LIMIT=50
-EXCHANGE_RATE_SERVICE=fixerio
 
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
+
+# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this will only work for paid fixer.io accounts because they severly limited
+# the free API up to the point where you might as well offer nothing.
+FIXER_API_KEY=
+
+# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
 ANALYTICS_ID=
-SITE_OWNER=mail@example.com
+
+# Most parts of the database are encrypted by default, but you can turn this off if you want to.
+# This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+CACHE_PREFIX=firefly
+SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_ID=
-
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false

.env.heroku

@@ -0,0 +1,101 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
+APP_ENV=heroku
+
+# Set to true if you want to see debug information in error screens.
+APP_DEBUG=false
+
+# This should be your email address
+SITE_OWNER=heroku@example.com
+
+# The encryption key for your database and sessions. Keep this very secure.
+# If you generate a new one all existing data must be considered LOST.
+# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
+APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
+# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+APP_URL=http://localhost
+TRUSTED_PROXIES=
+
+# The log channel defines where your log entries go to.
+LOG_CHANNEL=syslog
+
+# 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.
+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
+
+# Cookie settings. Should not be necessary to change these.
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+# If you want Firefly III to mail you, update these settings
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+# Firefly III can send you the following messages
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+MAPBOX_API_KEY=
+
+# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this will only work for paid fixer.io accounts because they severly limited
+# the free API up to the point where you might as well offer nothing.
+FIXER_API_KEY=
+
+# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
+ANALYTICS_ID=
+
+# Most parts of the database are encrypted by default, but you can turn this off if you want to.
+# This makes it easier to migrate your database. Not that some fields will never be decrypted.
+USE_ENCRYPTION=true
+
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+CACHE_PREFIX=firefly
+SEARCH_RESULT_LIMIT=50
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_ID=
+DEMO_USERNAME=
+DEMO_PASSWORD=
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=true

.env.sandstorm

@@ -1,11 +1,31 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
 APP_ENV=local
-APP_DEBUG=false
-APP_NAME=FireflyIII
-APP_KEY=SomeRandomStringOf32CharsExactly
-APP_LOG=syslog
-APP_LOG_LEVEL=info
-APP_URL=http://localhost
 
+# Set to true if you want to see debug information in error screens.
+APP_DEBUG=false
+
+# This should be your email address
+SITE_OWNER=sandstorm@example.com
+
+# The encryption key for your database and sessions. Keep this very secure.
+# If you generate a new one all existing data must be considered LOST.
+# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
+APP_KEY=SomeRandomStringOf32CharsExactly
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
+# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+APP_URL=http://localhost
+TRUSTED_PROXIES=
+
+# The log channel defines where your log entries go to.
+LOG_CHANNEL=syslog
+
+# 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.
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -13,19 +33,27 @@ DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=firefly
 
-BROADCAST_DRIVER=log
+# '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
-QUEUE_DRIVER=sync
 
+# Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
+# If you want Firefly III to mail you, update these settings
 MAIL_DRIVER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
@@ -34,23 +62,40 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
-
-CACHE_PREFIX=firefly
-
-SEARCH_RESULT_LIMIT=50
-EXCHANGE_RATE_SERVICE=fixerio
 
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
+
+# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this will only work for paid fixer.io accounts because they severly limited
+# the free API up to the point where you might as well offer nothing.
+FIXER_API_KEY=
+
+# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
 ANALYTICS_ID=
-SITE_OWNER=mail@example.com
+
+# Most parts of the database are encrypted by default, but you can turn this off if you want to.
+# This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+CACHE_PREFIX=firefly
+SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_ID=
-
 DEMO_USERNAME=
 DEMO_PASSWORD=
+IS_DOCKER=false
+IS_SANDSTORM=true
+IS_HEROKU=false

.env.testing

@@ -1,31 +1,55 @@
+# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
+# Never set it to "testing".
 APP_ENV=testing
+
+# Set to true if you want to see debug information in error screens.
 APP_DEBUG=true
-APP_NAME=FireflyIII
+
+# This should be your email address
+SITE_OWNER=thegrumpydictator+testing@gmail.com
+
+# The encryption key for your database and sessions. Keep this very secure.
+# If you generate a new one all existing data must be considered LOST.
+# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=TestTestTestTestTestTestTestTest
-APP_LOG=daily
-APP_LOG_LEVEL=debug
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=Europe/Amsterdam
+
+# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
+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
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USERNAME=homestead
-DB_PASSWORD=
 
-BROADCAST_DRIVER=log
+# '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=debug
+
+# If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
 
+# Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
+# If you want Firefly III to mail you, update these settings
+MAIL_DRIVER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
@@ -33,23 +57,41 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
+SEND_ERROR_MESSAGE=false
 
-CACHE_PREFIX=firefly
 
-EXCHANGE_RATE_SERVICE=fixerio
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+MAPBOX_API_KEY=
 
-GOOGLE_MAPS_API_KEY=
+# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this will only work for paid fixer.io accounts because they severly limited
+# the free API up to the point where you might as well offer nothing.
+FIXER_API_KEY=
+
+# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
 ANALYTICS_ID=
-SITE_OWNER=mail@example.com
-USE_ENCRYPTION=true
 
+# Most parts of the database are encrypted by default, but you can turn this off if you want to.
+# This makes it easier to migrate your database. Not that some fields will never be decrypted.
+USE_ENCRYPTION=false
+
+# Leave the following configuration vars as is.
+# Unless you like to tinker and know what you're doing.
+APP_NAME=FireflyIII
+BROADCAST_DRIVER=log
+QUEUE_DRIVER=sync
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+CACHE_PREFIX=firefly_tst
+SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_ID=
-
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false

.github/SUPPORT.md

@@ -1,11 +0,0 @@
-# Welcome to Firefly III on Github!
-
-:+1::tada: Thank you for taking the time to contribute something to Firefly III!
-
-## Bugs
-
-First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! 
-
-## Installation problems
-
-Please take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.

.github/contributing.md

@@ -4,7 +4,7 @@
 
 ## Feature requests
 
-I am always interested in expanding Firefly III's many features. If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).
+I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:thegrumpydictator@gmail.com).
 
 ## Pull requests
 

.github/issue_template.md

@@ -7,3 +7,5 @@ I am running Firefly III version x.x.x
 (please include if this problem also exists on the demo site)
 
 #### Other important details (log files, system info):
+
+Please click the version number in the right corner of any Firefly III page to get debug information. 

.github/support.md

@@ -0,0 +1,11 @@
+# Welcome to Firefly III on Github!
+
+:+1::tada: Thank you for taking the time to contribute something to Firefly III!
+
+## Bugs
+
+First of all: thank you for reporting a bug instead of ditching the tool altogether. If you find a bug, please take the time and see if the [demo site](https://demo.firefly-iii.org/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! 
+
+## Installation problems
+
+Please take the time to read the [installation guide FAQ](https://firefly-iii.org/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.

.htaccess

@@ -0,0 +1,14 @@
+# Optional: force HTTPS:
+# <IfModule mod_rewrite.c>
+#	RewriteEngine On
+#	RewriteCond %{HTTPS} off
+#	RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
+# </IfModule>
+
+# To hide directory listing
+Options All -Indexes
+
+# To prevent access to .env and other files
+<Files .*>
+    Deny from all
+</Files>

.sandstorm/build.sh

@@ -3,10 +3,9 @@
 # This script only runs once, when the app connects to sandstorm.
 set -euo pipefail
 
-
+echo "In build.sh"
 
 cd /opt/app
-
 cp .env.sandstorm .env
 
 if [ -f /opt/app/composer.json ] ; then

.sandstorm/changelog.md

@@ -1,3 +1,170 @@
+# 4.7.2
+- [Issue 1123](https://github.com/firefly-iii/firefly-iii/issues/1123) First browser based update routine.
+- Add support for Italian.
+- [Issue 1232](https://github.com/firefly-iii/firefly-iii/issues/1232) Allow user to specify Docker database port.
+- [Issue 1197](https://github.com/firefly-iii/firefly-iii/issues/1197) Beter account list overview 
+- [Issue 1202](https://github.com/firefly-iii/firefly-iii/issues/1202) Some budgetary warnings 
+- [Issue 1284](https://github.com/firefly-iii/firefly-iii/issues/1284) Experimental support for bunq import
+- [Issue 1248](https://github.com/firefly-iii/firefly-iii/issues/1248) Ability to import BIC, ability to import SEPA fields. 
+- [Issue 1102](https://github.com/firefly-iii/firefly-iii/issues/1102) Summary line for bills 
+- More info to debug page.
+- [Issue 1186](https://github.com/firefly-iii/firefly-iii/issues/1186) You can see the latest account balance in CRUD forms 
+- Add Kubernetes YAML files, kindly created by a FF3 user.
+- [Issue 1244](https://github.com/firefly-iii/firefly-iii/issues/1244) Better line for "today" marker and add it to other chart as well ([issue 1214](https://github.com/firefly-iii/firefly-iii/issues/1214))
+- [Issue 1219](https://github.com/firefly-iii/firefly-iii/issues/1219) Languages in dropdown 
+- [Issue 1189](https://github.com/firefly-iii/firefly-iii/issues/1189) Inactive accounts get removed from net worth 
+- [Issue 1220](https://github.com/firefly-iii/firefly-iii/issues/1220) Attachment description and notes migrated to just "notes". 
+- [Issue 1236](https://github.com/firefly-iii/firefly-iii/issues/1236) Multi currency balance box 
+- [Issue 1240](https://github.com/firefly-iii/firefly-iii/issues/1240) Better overview for accounts. 
+- [Issue 1292](https://github.com/firefly-iii/firefly-iii/issues/1292) Removed some charts from the "all"-overview of budgets and categories 
+- [Issue 1245](https://github.com/firefly-iii/firefly-iii/issues/1245) Improved recognition of IBANs 
+- Improved import routine.
+- Update notifier will wait three days before notifying users.
+- [Issue 1300](https://github.com/firefly-iii/firefly-iii/issues/1300) Virtual balance of credit cards does not count for net worth 
+- [Issue 1247](https://github.com/firefly-iii/firefly-iii/issues/1247) Can now see overspent amount 
+- [Issue 1221](https://github.com/firefly-iii/firefly-iii/issues/1221) Upgrade to Laravel 5.6 
+- [Issue 1187](https://github.com/firefly-iii/firefly-iii/issues/1187) Updated the password verifier to use Troy Hunt's new API 
+- Revenue chart is now on frontpage permanently
+- [Issue 1153](https://github.com/firefly-iii/firefly-iii/issues/1153) 2FA settings are in your profile now 
+- [Issue 1227](https://github.com/firefly-iii/firefly-iii/issues/1227) Can set the timezone in config or in Docker 
+- [Issue 1294](https://github.com/firefly-iii/firefly-iii/issues/1294) Ability to link a transaction to itself 
+- Correct reference to journal description in split form.
+- [Issue 1234](https://github.com/firefly-iii/firefly-iii/issues/1234) Fix budget page issues in SQLite 
+- [Issue 1262](https://github.com/firefly-iii/firefly-iii/issues/1262) Can now use double and epty headers in CSV files 
+- [Issue 1258](https://github.com/firefly-iii/firefly-iii/issues/1258) Fixed a possible date mismatch in piggy banks
+- [Issue 1283](https://github.com/firefly-iii/firefly-iii/issues/1283) Bulk delete was broken 
+- [Issue 1293](https://github.com/firefly-iii/firefly-iii/issues/1293) Layout problem with notes 
+- [Issue 1257](https://github.com/firefly-iii/firefly-iii/issues/1257) Improve transaction lists query count 
+- [Issue 1291](https://github.com/firefly-iii/firefly-iii/issues/1291) Fixer IO problems 
+- [Issue 1239](https://github.com/firefly-iii/firefly-iii/issues/1239) Could not edit expense or revenue accounts ([issue 1298](https://github.com/firefly-iii/firefly-iii/issues/1298)) 
+- [Issue 1297](https://github.com/firefly-iii/firefly-iii/issues/1297) Could not convert to withdrawal 
+- [Issue 1226](https://github.com/firefly-iii/firefly-iii/issues/1226) Category overview in default report shows no income. 
+- Various other bugs and problems ([issue 1198](https://github.com/firefly-iii/firefly-iii/issues/1198), [issue 1213](https://github.com/firefly-iii/firefly-iii/issues/1213), [issue 1237](https://github.com/firefly-iii/firefly-iii/issues/1237), [issue 1238](https://github.com/firefly-iii/firefly-iii/issues/1238), [issue 1199](https://github.com/firefly-iii/firefly-iii/issues/1199), [issue 1200](https://github.com/firefly-iii/firefly-iii/issues/1200))
+
+### Security
+- Fixed an issue with token validation on the command line.
+
+# 4.7.1
+- A brand new API. Read about it in the [documentation](http://firefly-iii.readthedocs.io/en/latest/).
+- Add support for Spanish. [issue 1194](https://github.com/firefly-iii/firefly-iii/issues/1194)
+- Some custom preferences are selected by default for a better user experience.
+- Some new currencies [issue 1211](https://github.com/firefly-iii/firefly-iii/issues/1211)
+- Fixed [issue 1155](https://github.com/firefly-iii/firefly-iii/issues/1155) (reported by [ndandanov](https://github.com/ndandanov))
+- [Issue 1156](https://github.com/firefly-iii/firefly-iii/issues/1156) [issue 1182](https://github.com/firefly-iii/firefly-iii/issues/1182) and other issues related to SQLite databases.
+- Multi-page budget overview was broken (reported by [jinformatique](https://github.com/jinformatique))
+- Importing CSV files with semi-colons in them did not work [issue 1172](https://github.com/firefly-iii/firefly-iii/issues/1172) [issue 1183](https://github.com/firefly-iii/firefly-iii/issues/1183) [issue 1210](https://github.com/firefly-iii/firefly-iii/issues/1210)
+- Could not use account number that was in use by a deleted account [issue 1174](https://github.com/firefly-iii/firefly-iii/issues/1174) 
+- Fixed spelling error that lead to 404's [issue 1175](https://github.com/firefly-iii/firefly-iii/issues/1175) [issue 1190](https://github.com/firefly-iii/firefly-iii/issues/1190)
+- Fixed tag autocomplete [issue 1178](https://github.com/firefly-iii/firefly-iii/issues/1178)
+- Better links for "new transaction" buttons [issue 1185](https://github.com/firefly-iii/firefly-iii/issues/1185)
+- Cache errors in budget charts [issue 1192](https://github.com/firefly-iii/firefly-iii/issues/1192)
+- Deleting transactions that are linked to other other transactions would lead to errors [issue 1209](https://github.com/firefly-iii/firefly-iii/issues/1209)
+
+# 4.7.0
+- Support for Russian and Portuguese (Brazil)
+- Support for the Spectre API (Salt Edge)
+- Many strings now translatable thanks to [Nik-vr](https://github.com/Nik-vr) ([issue 1118](https://github.com/firefly-iii/firefly-iii/issues/1118), [issue 1116](https://github.com/firefly-iii/firefly-iii/issues/1116), [issue 1109](https://github.com/firefly-iii/firefly-iii/issues/1109), )
+- Many buttons to quickly create stuff
+- Sum of tables in reports, requested by [MacPaille](https://github.com/MacPaille) ([issue 1106](https://github.com/firefly-iii/firefly-iii/issues/1106))
+- Future versions of Firefly III will notify you there is a new version, as suggested by [8bitgentleman](https://github.com/8bitgentleman) in [issue 1050](https://github.com/firefly-iii/firefly-iii/issues/1050)
+- Improved net worth box [issue 1101](https://github.com/firefly-iii/firefly-iii/issues/1101) ([Nik-vr](https://github.com/Nik-vr))
+- Nice dropdown in transaction list [issue 1082](https://github.com/firefly-iii/firefly-iii/issues/1082)
+- Better support for local fonts thanks to [devlearner](https://github.com/devlearner) ([issue 1145](https://github.com/firefly-iii/firefly-iii/issues/1145))
+- Improve attachment support and view capabilities (suggested by [trinhit](https://github.com/trinhit) in [issue 1146](https://github.com/firefly-iii/firefly-iii/issues/1146))
+- Whole new [read me file](https://github.com/firefly-iii/firefly-iii/blob/master/readme.md), [new end user documentation](https://firefly-iii.readthedocs.io/en/latest/) and an [updated website](https://www.firefly-iii.org/)!
+- Many charts and info-blocks now scale property ([issue 989](https://github.com/firefly-iii/firefly-iii/issues/989) and [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040))
+- Charts work in IE thanks to [devlearner](https://github.com/devlearner) ([issue 1107](https://github.com/firefly-iii/firefly-iii/issues/1107))
+- Various fixes in import routine
+- Bug that left charts empty ([issue 1088](https://github.com/firefly-iii/firefly-iii/issues/1088)), reported by various users amongst which [jinformatique](https://github.com/jinformatique)
+- [Issue 1124](https://github.com/firefly-iii/firefly-iii/issues/1124), as reported by [gavu](https://github.com/gavu)
+- [Issue 1125](https://github.com/firefly-iii/firefly-iii/issues/1125), as reported by [gavu](https://github.com/gavu)
+- [Issue 1126](https://github.com/firefly-iii/firefly-iii/issues/1126), as reported by [gavu](https://github.com/gavu)
+- [Issue 1131](https://github.com/firefly-iii/firefly-iii/issues/1131), as reported by [dp87](https://github.com/dp87)
+- [Issue 1129](https://github.com/firefly-iii/firefly-iii/issues/1129), as reported by [gavu](https://github.com/gavu)
+- [Issue 1132](https://github.com/firefly-iii/firefly-iii/issues/1132), as reported by [gavu](https://github.com/gavu)
+- Issue with cache in Sandstorm ([issue 1130](https://github.com/firefly-iii/firefly-iii/issues/1130))
+- [Issue 1134](https://github.com/firefly-iii/firefly-iii/issues/1134)
+- [Issue 1140](https://github.com/firefly-iii/firefly-iii/issues/1140)
+- [Issue 1141](https://github.com/firefly-iii/firefly-iii/issues/1141), reported by [ErikFontanel](https://github.com/ErikFontanel)
+- [Issue 1142](https://github.com/firefly-iii/firefly-iii/issues/1142)
+- Removed many access rights from the demo user
+
+# 4.6.13
+- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
+- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
+- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
+- Support for Turkish.
+- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
+- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
+- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
+- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
+- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
+- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
+- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
+- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
+- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
+- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
+
+# 4.6.12
+- Support for Indonesian.
+- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
+- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
+- Greatly improved Docker support and documentation.
+- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
+- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner) 
+- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reporterd by a user on Tweakers.net
+- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion) 
+- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
+- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
+- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
+- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
+- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
+
+# 4.6.1.1
+- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
+- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu) 
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
+- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
+- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
+- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
+- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
+- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
+- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
+- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
+
+# 4.6.11
+- A debug page at `/debug` for easier debug.
+- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)
+- Even more strings are translatable (and translated), thanks to [pkoziol](https://github.com/pkoziol) (see [issue 979](https://github.com/firefly-iii/firefly-iii/issues/979))
+- Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
+- Extended currency list, as suggested by @emuhendis in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
+- [Issue 996](https://github.com/firefly-iii/firefly-iii/issues/996) as suggested by [dp87](https://github.com/dp87)
+- Disabled Heroku support until I get it working again.
+- [Issue 980](https://github.com/firefly-iii/firefly-iii/issues/980), reported by [Tim-Frensch](https://github.com/Tim-Frensch)
+- [Issue 987](https://github.com/firefly-iii/firefly-iii/issues/987), reported by [gavu](https://github.com/gavu)
+- [Issue 988](https://github.com/firefly-iii/firefly-iii/issues/988), reported by [gavu](https://github.com/gavu)
+- [Issue 992](https://github.com/firefly-iii/firefly-iii/issues/992), reported by [ncicovic](https://github.com/ncicovic)
+- [Issue 993](https://github.com/firefly-iii/firefly-iii/issues/993), reported by [gavu](https://github.com/gavu)
+- [Issue 997](https://github.com/firefly-iii/firefly-iii/issues/997), reported by [gavu](https://github.com/gavu)
+- [Issue 1000](https://github.com/firefly-iii/firefly-iii/issues/1000), reported by [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 1001](https://github.com/firefly-iii/firefly-iii/issues/1001), reported by [gavu](https://github.com/gavu)
+- [Issue 1002](https://github.com/firefly-iii/firefly-iii/issues/1002), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1003](https://github.com/firefly-iii/firefly-iii/issues/1003), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1004](https://github.com/firefly-iii/firefly-iii/issues/1004), reported by [Aquariu](https://github.com/Aquariu)
+- [Issue 1010](https://github.com/firefly-iii/firefly-iii/issues/1010)
+- [Issue 1014](https://github.com/firefly-iii/firefly-iii/issues/1014), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1016](https://github.com/firefly-iii/firefly-iii/issues/1016)
+- [Issue 1024](https://github.com/firefly-iii/firefly-iii/issues/1024), reported by [gavu](https://github.com/gavu)
+- [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
+
 # 4.6.10
 - Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619)
 - [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu)

.sandstorm/launcher.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Runs every time we create a new grain!
+echo "Now in launcher.sh"
 
 # Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist
 mkdir -p /var/lib/mysql
@@ -30,7 +31,6 @@ mkdir -p /var/storage/framework/views
 mkdir -p /var/storage/logs
 mkdir -p /var/storage/upload
 
-
 # Ensure mysql tables created
 HOME=/etc/mysql /usr/bin/mysql_install_db --force
 
@@ -58,5 +58,9 @@ echo "Migrating..."
 php /opt/app/artisan migrate --seed --force
 echo "Done!"
 
+echo "Clear cache.."
+php /opt/app/artisan cache:clear
+echo "Done"
+
 # Start nginx.
 /usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 2,
-    appMarketingVersion = (defaultText = "4.6.10"),
+    appVersion = 10,
+    appMarketingVersion = (defaultText = "4.7.2"),
 
     actions = [
       # Define your "new document" handlers here.
@@ -41,7 +41,7 @@ const pkgdef :Spk.PackageDefinition = (
         market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png"))
       ),
 
-      website = "https://firefly-iii.github.io/",
+      website = "https://firefly-iii.org/",
       codeUrl = "https://github.com/firefly-iii/firefly-iii",
       license = (openSource = gpl3),
       # The license this package is distributed under.  See

.sandstorm/service-config/nginx.conf

@@ -57,6 +57,7 @@ http {
             fastcgi_index index.php;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
 			fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+			fastcgi_read_timeout 900;
 
 
 			fastcgi_param  QUERY_STRING       $query_string;

.sandstorm/setup.sh

@@ -2,6 +2,7 @@
 
 # When you change this file, you must take manual action. Read this doc:
 # - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh
+echo "Now in setup.sh"
 
 set -euo pipefail
 
@@ -12,10 +13,18 @@ apt-get update
 apt-get install -y python-software-properties software-properties-common
 
 # install all languages
-sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.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
+sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# tr_TR.UTF-8 UTF-8/tr_TR.UTF-8 UTF-8/g' /etc/locale.gen
+
 dpkg-reconfigure --frontend=noninteractive locales
 
 

.scrutinizer.yml

@@ -1,51 +1,58 @@
-# .scrutinizer.yml
-tools:
-  external_code_coverage: false
-filter:
-  paths:
+--- 
+build: 
+  nodes: 
+    analysis: 
+      project_setup: 
+        override: true
+      tests: 
+        override: 
+          - php-scrutinizer-run
+checks: 
+  javascript: true
+  php: 
+    align_assignments: true
+    avoid_fixme_comments: true
+    avoid_multiple_statements_on_same_line: true
+    avoid_perl_style_comments: true
+    avoid_todo_comments: true
+    duplication: false
+    encourage_single_quotes: true
+    newline_at_end_of_file: true
+    no_goto: true
+    no_long_variable_names: 
+      maximum: "20"
+    no_short_method_names: 
+      minimum: "3"
+    no_short_variable_names: 
+      minimum: "3"
+    optional_parameters_at_the_end: true
+    parameter_doc_comments: true
+    remove_extra_empty_lines: true
+    return_doc_comment_if_not_inferrable: true
+    return_doc_comments: true
+    uppercase_constants: true
+    use_self_instead_of_fqcn: true
+coding_style: 
+  php: 
+    spaces: 
+      around_operators: 
+        concatenation: true
+      other: 
+        after_type_cast: false
+filter: 
+  excluded_paths: 
+    - database/migrations/*
+    - bootstrap/*
+    - config/*
+    - docker/*
+    - public/js/lib/*
+    - public/lib/adminlte/js/*
+    - public/lib/bootstrap/js/*
+    - resources/*
+    - routes/*
+    - storage/*
+  paths: 
     - app/*
     - public/js/ff/*
-  excluded_paths:
-    - "database/migrations/*"
-    - "bootstrap/*"
-    - "config/*"
-    - "docker/*"
-    - "public/js/lib/*"
-    - "public/lib/adminlte/js/*"
-    - "public/lib/bootstrap/js/*"
-    - "resources/*"
-    - "routes/*"
-    - "storage/*"
-checks:
-    php:
-        use_self_instead_of_fqcn: true
-        uppercase_constants: true
-        return_doc_comments: true
-        return_doc_comment_if_not_inferrable: true
-        remove_extra_empty_lines: true
-        parameter_doc_comments: true
-        optional_parameters_at_the_end: true
-        no_short_variable_names:
-            minimum: '3'
-        no_short_method_names:
-            minimum: '3'
-        no_long_variable_names:
-            maximum: '20'
-        no_goto: true
-        newline_at_end_of_file: true
-        encourage_single_quotes: true
-        avoid_todo_comments: true
-        avoid_perl_style_comments: true
-        avoid_fixme_comments: true
-        avoid_multiple_statements_on_same_line: true
-        align_assignments: true
-        duplication: false
-    javascript: true
-
-coding_style:
-    php:
-        spaces:
-            around_operators:
-                concatenation: true
-            other:
-                after_type_cast: false
+tools: 
+  external_code_coverage: false

.travis.yml

@@ -12,20 +12,19 @@ install:
   - composer update --no-scripts
   - cp .env.testing .env
   - php artisan clear-compiled
-  - php artisan optimize
   - php artisan env
   - cp .env.testing .env
   - wget -q https://github.com/firefly-iii/test-data/raw/master/storage/database.sqlite -O storage/database/database.sqlite
   - mkdir -p build/logs
 
 script:
-  - phpunit -c phpunit.coverage.xml
+  - ./vendor/bin/phpunit -c phpunit.coverage.xml
 
 after_success:
-  - travis_retry php vendor/bin/coveralls -x storage/build/clover-all.xml
+  - travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
 
 # safelist
 branches:
   only:
   - develop
-  - master
+  - master

Dockerfile

@@ -1,12 +1,18 @@
-FROM php:7-apache
+# use PHP 7.1 and Apache as a base.
+FROM php:7.1-apache
 
+# set working dir
+ENV FIREFLY_PATH /var/www/firefly-iii
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# install packages
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends libcurl4-openssl-dev \
                                                zlib1g-dev \
                                                libjpeg62-turbo-dev \
                                                libpng12-dev \
                                                libicu-dev \
-                                               libmcrypt-dev \
                                                libedit-dev \
                                                libtidy-dev \
                                                libxml2-dev \
@@ -15,15 +21,17 @@ RUN apt-get update -y && \
                                                libbz2-dev \
                                                gettext-base \
                                                locales && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+                                               apt-get clean && \
+                                               rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
+# 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
 
-# Generate locales supported by firefly
-RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
+# Generate locales supported by Firefly III
+RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
 
-COPY ./docker/apache2.conf /etc/apache2/apache2.conf
+# copy Apache config to correct spot.
+COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
 
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
@@ -31,23 +39,23 @@ RUN a2enmod rewrite
 # Enable apache mod ssl..
 RUN a2enmod ssl
 
+# Create volumes for several directories:
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
 # Setup the Composer installer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Copy Apache Configs
-COPY ./docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-
-ENV FIREFLY_PATH /var/www/firefly-iii
-
-WORKDIR $FIREFLY_PATH
-
-# The working directory
-COPY . $FIREFLY_PATH
+# Enable default site (Firefly III)
+COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
 
+# Make sure we own Firefly III directory
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
-RUN composer install --prefer-dist --no-dev --no-scripts
+# Run composer
+RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
+# Expose port 80
 EXPOSE 80
 
-ENTRYPOINT ["docker/entrypoint.sh"]
+# Run entrypoint thing
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]

README.md

@@ -1,79 +0,0 @@
-# Firefly III: A personal finances manager 
-
-[![Requires PHP7.1](https://img.shields.io/badge/php-7.1-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-GPL-lightgrey.svg)](https://www.gnu.org/licenses/gpl.html) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
-
-[![The index of Firefly III](https://i.nder.be/ccynyxy0/400)](https://i.nder.be/h327vx3y) [![The account overview of Firefly III](https://i.nder.be/g8v86y2g/400)](https://i.nder.be/hkpynqr9)
-
-[![The useful financial reports of Firefly III](https://i.nder.be/cs3qx4f3/400)](https://i.nder.be/cwznmryd) [![Saving money is easy!](https://i.nder.be/gpq6ykym/400)](https://i.nder.be/gum2qf8z)
-
-"Firefly III" is a financial manager for your personal finances. It can help you keep track of your expenses and income.
-Firefly III supports the use of budgets. You can categorize and tag your transactions.
-It also supports credit cards, shared  household accounts and savings accounts.
-There are many financial reports available.
-
-## Want to try Firefly III?
-
-There is a **[demo site](https://firefly-iii.nder.be)** with an example financial administration already present. You can use Docker, Heroku or Sandstorm.io (see below) to quickly setup your own instance.
-
-## Install Firefly III
-
-### Using docker
-
-You can use docker-compose to [set up your personal secure](https://firefly-iii.github.io/using-docker.html) Firefly III environment. Advanced users can use the Dockerfile directly. 
-
-### Using vagrant (or other VMs)
-
-You can install Firefly III on any Linux or Windows machine. You'll need a web server (preferrably on Linux) and access to the command line. Please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
-
-### Using Heroku
-
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/firefly-iii/firefly-iii/tree/master)
-
-Register for a free Heroku account and instantly run Firefly III on your very own cloud instance.
-
-### Using Sandstorm.io
-
-You can find Firefly III in [the Sandstorm.io marketplace](https://apps.sandstorm.io/app/uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70). You can run it on your own installation or on Oasis.
-
-## More about Firefly III
-
-Personal financial management is pretty difficult, and everybody has their own approach to it.
-Some people make budgets, other people limit their cashflow by throwing away their credit cards, 
-others try to increase their current cashflow. There are tons of ways to save and earn money.
-
-Firefly works on the principle that if you know where you're money is going, you can stop it from going there.
-
-### Some advantages of using Firefly
-
-- Firefly can import any CSV file, so migrating from other systems is easy.
-- Firefly runs on your own server, so you are fully in control of your data. Remember, there is no such thing as "the cloud", it’s just somebody else’s computer!
-- Firefly has lots of features without being fancy or bloated.
-- If you feel you're missing something you can just ask me and I'll add it!
-
-Firefly III has become pretty awesome over the years! (but please excuse me for bragging, it's just that I'm proud of it).
-[You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
-
-### Contributing
-
-Please read [CONTRIBUTING.md](https://github.com/firefly-iii/firefly-iii/blob/master/.github/CONTRIBUTING.md) for details on contributing, and the process for submitting pull requests. Please check out the [code of conduct](https://github.com/firefly-iii/firefly-iii/blob/master/CODE_OF_CONDUCT.md) as well.
-
-### Versioning
-
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see [the tags](https://github.com/firefly-iii/firefly-iii/tags) on this repository.
-
-### Authors
-
-* James Cole
-* Over time, [many people have contributed to Firefly III](https://github.com/firefly-iii/firefly-iii/graphs/contributors).
-
-### License
-
-This work [is licensed](https://github.com/firefly-iii/firefly-iii/blob/master/LICENSE) under the [GPL v3](https://www.gnu.org/licenses/gpl.html).
-
-### Other stuff
-
-If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
-
-If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).
-
-[![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/firefly-iii/firefly-iii/badge.svg?branch=master)](https://coveralls.io/github/firefly-iii/firefly-iii?branch=master)

app.json

@@ -2,6 +2,7 @@
   "name": "Firefly III",
   "description": "A free and open source personal finances manager",
   "repository": "https://github.com/firefly-iii/firefly-iii",
+  "website": "https://firefly-iii.org/",
   "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
   "keywords": [
     "finance",
@@ -36,14 +37,16 @@
     "transfers",
     "management"
   ],
-  "website": "https://firefly-iii.github.io/",
   "addons": [
     {
-      "plan": "heroku-postgresql"
+      "plan": "heroku-postgresql",
+      "options": {
+        "version": "9.5"
+      }
     }
   ],
   "scripts": {
-    "postdeploy": "export APP_KEY=$(php artisan --no-ansi key:generate --show)"
+    "postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
   },
   "buildpacks": [
     {

app/Api/V1/Controllers/AboutController.php

@@ -0,0 +1,74 @@
+<?php
+declare(strict_types=1);
+/**
+ * AboutController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use DB;
+use FireflyIII\Transformers\UserTransformer;
+use Illuminate\Http\Request;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ * Class AboutController
+ */
+class AboutController extends Controller
+{
+    /**
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function about()
+    {
+        $search        = ['~', '#'];
+        $replace       = ['\~', '# '];
+        $phpVersion    = str_replace($search, $replace, PHP_VERSION);
+        $phpOs         = str_replace($search, $replace, PHP_OS);
+        $currentDriver = DB::getDriverName();
+        $data
+                       = [
+            'version'     => config('firefly.version'),
+            'api_version' => config('firefly.api_version'),
+            'php_version' => $phpVersion,
+            'os'          => $phpOs,
+            'driver'      => $currentDriver,
+        ];
+
+        return response()->json(['data' => $data], 200)->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function user(Request $request)
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item(auth()->user(), new UserTransformer($this->parameters), 'users');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+}

app/Api/V1/Controllers/AccountController.php

@@ -0,0 +1,261 @@
+<?php
+declare(strict_types=1);
+/**
+ * AccountController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\AccountRequest;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Transformers\AccountTransformer;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+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 Preferences;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepository;
+    /** @var AccountRepositoryInterface */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                // @var AccountRepositoryInterface repository
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param \FireflyIII\Models\Account $account
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function delete(Account $account)
+    {
+        $this->repository->destroy($account, null);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(Request $request)
+    {
+        // create some objects:
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // read type from URI
+        $type = $request->get('type') ?? 'all';
+        $this->parameters->set('type', $type);
+
+        // types to get, page size:
+        $types    = $this->mapTypes($this->parameters->get('type'));
+        $pageSize = (int)Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $collection = $this->repository->getAccountsByType($types);
+        $count      = $collection->count();
+        $accounts   = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($accounts, new AccountTransformer($this->parameters), 'accounts');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param Request $request
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, Account $account)
+    {
+        $manager = new Manager();
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param AccountRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(AccountRequest $request)
+    {
+        $data = $request->getAll();
+        // if currency ID is 0, find the currency by the code:
+        if (0 === $data['currency_id']) {
+            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
+            $data['currency_id'] = null === $currency ? 0 : $currency->id;
+        }
+        $account = $this->repository->store($data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update account.
+     *
+     * @param AccountRequest $request
+     * @param Account        $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update(AccountRequest $request, Account $account)
+    {
+        $data = $request->getAll();
+        // if currency ID is 0, find the currency by the code:
+        if (0 === $data['currency_id']) {
+            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
+            $data['currency_id'] = null === $currency ? 0 : $currency->id;
+        }
+        // set correct type:
+        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $this->repository->update($account, $data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return array
+     */
+    private function mapTypes(string $type): array
+    {
+        $types = [
+            'all'                        => [
+                AccountType::DEFAULT,
+                AccountType::CASH,
+                AccountType::ASSET,
+                AccountType::EXPENSE,
+                AccountType::REVENUE,
+                AccountType::INITIAL_BALANCE,
+                AccountType::BENEFICIARY,
+                AccountType::IMPORT,
+                AccountType::RECONCILIATION,
+                AccountType::LOAN,
+            ],
+            'asset'                      => [
+                AccountType::DEFAULT,
+                AccountType::ASSET,
+            ],
+            'cash'                       => [
+                AccountType::CASH,
+            ],
+            'expense'                    => [
+                AccountType::EXPENSE,
+                AccountType::BENEFICIARY,
+            ],
+            'revenue'                    => [
+                AccountType::REVENUE,
+            ],
+            'special'                    => [
+                AccountType::CASH,
+                AccountType::INITIAL_BALANCE,
+                AccountType::IMPORT,
+                AccountType::RECONCILIATION,
+                AccountType::LOAN,
+            ],
+            'hidden'                     => [
+                AccountType::INITIAL_BALANCE,
+                AccountType::IMPORT,
+                AccountType::RECONCILIATION,
+                AccountType::LOAN,
+            ],
+            AccountType::DEFAULT         => [AccountType::DEFAULT],
+            AccountType::CASH            => [AccountType::CASH],
+            AccountType::ASSET           => [AccountType::ASSET],
+            AccountType::EXPENSE         => [AccountType::EXPENSE],
+            AccountType::REVENUE         => [AccountType::REVENUE],
+            AccountType::INITIAL_BALANCE => [AccountType::INITIAL_BALANCE],
+            AccountType::BENEFICIARY     => [AccountType::BENEFICIARY],
+            AccountType::IMPORT          => [AccountType::IMPORT],
+            AccountType::RECONCILIATION  => [AccountType::RECONCILIATION],
+            AccountType::LOAN            => [AccountType::LOAN],
+        ];
+        if (isset($types[$type])) {
+            return $types[$type];
+        }
+
+        return $types['all']; // @codeCoverageIgnore
+    }
+}

app/Api/V1/Controllers/BillController.php

@@ -0,0 +1,163 @@
+<?php
+declare(strict_types=1);
+/**
+ * BillController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\BillRequest;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Transformers\BillTransformer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+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 Preferences;
+
+/**
+ * Class BillController
+ */
+class BillController extends Controller
+{
+    /** @var BillRepositoryInterface */
+    private $repository;
+
+    /**
+     * BillController constructor.
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var BillRepositoryInterface repository */
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \FireflyIII\Models\Bill $bill
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function delete(Bill $bill)
+    {
+        $this->repository->destroy($bill);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $pageSize  = (int)Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $paginator = $this->repository->getPaginator($pageSize);
+        /** @var Collection $bills */
+        $bills = $paginator->getCollection();
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new FractalCollection($bills, new BillTransformer($this->parameters), 'bills');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * @param Request $request
+     * @param Bill    $bill
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, Bill $bill)
+    {
+        $manager = new Manager();
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param BillRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(BillRequest $request)
+    {
+        $bill    = $this->repository->store($request->getAll());
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+
+    /**
+     * @param BillRequest $request
+     * @param Bill        $bill
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update(BillRequest $request, Bill $bill)
+    {
+        $data    = $request->getAll();
+        $bill    = $this->repository->update($bill, $data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/Controller.php

@@ -0,0 +1,124 @@
+<?php
+declare(strict_types=1);
+/**
+ * Controller.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use Carbon\Carbon;
+use Carbon\Exceptions\InvalidDateException;
+use FireflyConfig;
+use FireflyIII\Exceptions\FireflyException;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+use Log;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+/**
+ * Class Controller.
+ *
+ * @codeCoverageIgnore
+ */
+class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    /** @var ParameterBag */
+    protected $parameters;
+
+    /**
+     * Controller constructor.
+     *
+     * @throws FireflyException
+     */
+    public function __construct()
+    {
+        // is site a demo site?
+        $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+
+        // do not expose API on demo site:
+        if (true === $isDemoSite) {
+            throw new FireflyException('The API is not available on the demo site.');
+        }
+
+        // get global parameters
+        $this->parameters = $this->getParameters();
+    }
+
+    /**
+     * @return string
+     */
+    protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ($key === 'page') {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+            }
+            if (!$value instanceof Carbon) {
+                $params[$key] = $value;
+            }
+        }
+        $return .= http_build_query($params);
+        if (strlen($return) === 1) {
+            return '';
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return ParameterBag
+     */
+    private function getParameters(): ParameterBag
+    {
+        $bag  = new ParameterBag;
+        $page = (int)request()->get('page');
+        if ($page === 0) {
+            $page = 1;
+        }
+        $bag->set('page', $page);
+
+        // some date fields:
+        $dates = ['start', 'end', 'date'];
+        foreach ($dates as $field) {
+            $date = request()->get($field);
+            $obj  = null;
+            if (null !== $date) {
+                try {
+                    $obj = new Carbon($date);
+                } catch (InvalidDateException $e) {
+                    // don't care
+                    Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
+                }
+            }
+            $bag->set($field, $obj);
+        }
+
+        return $bag;
+
+    }
+}

app/Api/V1/Controllers/TransactionController.php

@@ -0,0 +1,334 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\TransactionRequest;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Transformers\TransactionTransformer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
+use Preferences;
+
+/**
+ * Class TransactionController
+ */
+class TransactionController extends Controller
+{
+
+    /** @var JournalRepositoryInterface */
+    private $repository;
+
+    /**
+     * TransactionController constructor.
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var JournalRepositoryInterface repository */
+                $this->repository = app(JournalRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \FireflyIII\Models\Transaction $transaction
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function delete(Transaction $transaction)
+    {
+        $journal = $transaction->transactionJournal;
+        $this->repository->destroy($journal);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $pageSize = (int)Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // read type from URI
+        $type = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        // types to get, page size:
+        $types = $this->mapTypes($this->parameters->get('type'));
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // collect transactions using the journal collector
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setUser(auth()->user());
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+
+        // remove internal transfer filter:
+        if (in_array(TransactionType::TRANSFER, $types)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedJournals();
+        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+
+        $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * @param Request     $request
+     * @param Transaction $transaction
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, Transaction $transaction)
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // collect transactions using the journal collector
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setUser(auth()->user());
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        // filter on specific journals.
+        $collector->setJournals(new Collection([$transaction->transactionJournal]));
+
+        // add filter to remove transactions:
+        $transactionType = $transaction->transactionJournal->transactionType->type;
+        if ($transactionType === TransactionType::WITHDRAWAL) {
+            $collector->addFilter(PositiveAmountFilter::class);
+        }
+        if (!($transactionType === TransactionType::WITHDRAWAL)) {
+            $collector->addFilter(NegativeAmountFilter::class);
+        }
+
+        $transactions = $collector->getJournals();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param TransactionRequest         $request
+     *
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(TransactionRequest $request, JournalRepositoryInterface $repository)
+    {
+        $data         = $request->getAll();
+        $data['user'] = auth()->user()->id;
+        $journal      = $repository->store($data);
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // collect transactions using the journal collector
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setUser(auth()->user());
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        // filter on specific journals.
+        $collector->setJournals(new Collection([$journal]));
+
+        // add filter to remove transactions:
+        $transactionType = $journal->transactionType->type;
+        if ($transactionType === TransactionType::WITHDRAWAL) {
+            $collector->addFilter(PositiveAmountFilter::class);
+        }
+        if (!($transactionType === TransactionType::WITHDRAWAL)) {
+            $collector->addFilter(NegativeAmountFilter::class);
+        }
+
+        $transactions = $collector->getJournals();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * @param TransactionRequest         $request
+     * @param JournalRepositoryInterface $repository
+     * @param Transaction                $transaction
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update(TransactionRequest $request, JournalRepositoryInterface $repository, Transaction $transaction)
+    {
+        $data         = $request->getAll();
+        $data['user'] = auth()->user()->id;
+
+        Log::debug('Inside transaction update');
+
+        $journal = $repository->update($transaction->transactionJournal, $data);
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // 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->setUser(auth()->user());
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        // filter on specific journals.
+        $collector->setJournals(new Collection([$journal]));
+
+        // add filter to remove transactions:
+        $transactionType = $journal->transactionType->type;
+        if ($transactionType === TransactionType::WITHDRAWAL) {
+            $collector->addFilter(PositiveAmountFilter::class);
+        }
+        if (!($transactionType === TransactionType::WITHDRAWAL)) {
+            $collector->addFilter(NegativeAmountFilter::class);
+        }
+
+        $transactions = $collector->getJournals();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return array
+     */
+    private function mapTypes(string $type): array
+    {
+        $types = [
+            'all'             => [
+                TransactionType::WITHDRAWAL,
+                TransactionType::DEPOSIT,
+                TransactionType::TRANSFER,
+                TransactionType::OPENING_BALANCE,
+                TransactionType::RECONCILIATION,
+            ],
+            'withdrawal'      => [
+                TransactionType::WITHDRAWAL,
+            ],
+            'withdrawals'     => [
+                TransactionType::WITHDRAWAL,
+            ],
+            'expense'         => [
+                TransactionType::WITHDRAWAL,
+            ],
+            'income'          => [
+                TransactionType::DEPOSIT,
+            ],
+            'deposit'         => [
+                TransactionType::DEPOSIT,
+            ],
+            'deposits'        => [
+                TransactionType::DEPOSIT,
+            ],
+            'transfer'        => [
+                TransactionType::TRANSFER,
+            ],
+            'transfers'       => [
+                TransactionType::TRANSFER,
+            ],
+            'opening_balance' => [
+                TransactionType::OPENING_BALANCE,
+            ],
+            'reconciliation'  => [
+                TransactionType::RECONCILIATION,
+            ],
+            'reconciliations' => [
+                TransactionType::RECONCILIATION,
+            ],
+            'special'         => [
+                TransactionType::OPENING_BALANCE,
+                TransactionType::RECONCILIATION,
+            ],
+            'specials'        => [
+                TransactionType::OPENING_BALANCE,
+                TransactionType::RECONCILIATION,
+            ],
+            'default'         => [
+                TransactionType::WITHDRAWAL,
+                TransactionType::DEPOSIT,
+                TransactionType::TRANSFER,
+            ],
+        ];
+        if (isset($types[$type])) {
+            return $types[$type];
+        }
+
+        return $types['default']; // @codeCoverageIgnore
+
+    }
+}

app/Api/V1/Controllers/UserController.php

@@ -0,0 +1,193 @@
+<?php
+declare(strict_types=1);
+/**
+ * UserController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\UserRequest;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Transformers\UserTransformer;
+use FireflyIII\User;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+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 Preferences;
+use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+
+/**
+ * Class UserController
+ */
+class UserController extends Controller
+{
+
+    /** @var UserRepositoryInterface */
+    private $repository;
+
+    /**
+     * UserController constructor.
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var UserRepositoryInterface repository */
+                $this->repository = app(UserRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \FireflyIII\User $user
+     *
+     * @return \Illuminate\Http\Response
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException
+     */
+    public function delete(User $user)
+    {
+        if (auth()->user()->hasRole('owner')) {
+            $this->repository->destroy($user);
+
+            return response()->json([], 204);
+        }
+        throw new AccessDeniedException(''); // @codeCoverageIgnore
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(Request $request)
+    {
+        // user preferences
+        $pageSize = (int)Preferences::getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // make manager
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // build collection
+        $collection = $this->repository->all();
+        $count      = $collection->count();
+        $users      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($users, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.users.index') . $this->buildParams());
+
+        // make resource
+        $resource = new FractalCollection($users, new UserTransformer($this->parameters), 'users');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param Request $request
+     * @param User    $user
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, User $user)
+    {
+        // make manager
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // make resource
+        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param UserRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(UserRequest $request)
+    {
+        $data = $request->getAll();
+        $user = $this->repository->store($data);
+
+        // make manager
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // make resource
+        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param UserRequest $request
+     * @param User        $user
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update(UserRequest $request, User $user)
+    {
+        $data = $request->getAll();
+        $user = $this->repository->update($user, $data);
+
+        // make manager
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        // make resource
+        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+}

app/Api/V1/Requests/AccountRequest.php

@@ -0,0 +1,107 @@
+<?php
+declare(strict_types=1);
+/**
+ * AccountRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Requests;
+
+/**
+ * Class AccountRequest
+ */
+class AccountRequest extends Request
+{
+
+    /**
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'name'                 => $this->string('name'),
+            'active'               => $this->boolean('active'),
+            'accountType'          => $this->string('type'),
+            'account_type_id'      => null,
+            'currency_id'          => $this->integer('currency_id'),
+            'currency_code'        => $this->string('currency_code'),
+            'virtualBalance'       => $this->string('virtual_balance'),
+            'iban'                 => $this->string('iban'),
+            'BIC'                  => $this->string('bic'),
+            'accountNumber'        => $this->string('account_number'),
+            'accountRole'          => $this->string('account_role'),
+            'openingBalance'       => $this->string('opening_balance'),
+            'openingBalanceDate'   => $this->date('opening_balance_date'),
+            'ccType'               => $this->string('cc_type'),
+            'ccMonthlyPaymentDate' => $this->string('cc_monthly_payment_date'),
+            'notes'                => $this->string('notes'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+        $rules          = [
+            'name'                    => 'required|min:1|uniqueAccountForUser',
+            'opening_balance'         => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date'    => 'date|required_with:opening_balance|nullable',
+            'iban'                    => 'iban|nullable',
+            'bic'                     => 'bic|nullable',
+            'virtual_balance'         => 'numeric|nullable',
+            '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',
+            'account_number'          => 'between:1,255|nullable|uniqueAccountNumberForUser',
+            'account_role'            => 'in:' . $accountRoles . '|required_if:type,asset',
+            'active'                  => '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',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                $account                 = $this->route()->parameter('account');
+                $rules['name']           .= ':' . $account->id;
+                $rules['account_number'] .= ':' . $account->id;
+                $rules['type']           = 'in:' . $types;
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/BillRequest.php

@@ -0,0 +1,119 @@
+<?php
+declare(strict_types=1);
+/**
+ * BillRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Requests;
+
+use Illuminate\Validation\Validator;
+
+/**
+ * Class BillRequest
+ */
+class BillRequest extends Request
+{
+
+    /**
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'name'        => $this->string('name'),
+            'match'       => $this->string('match'),
+            'amount_min'  => $this->string('amount_min'),
+            'amount_max'  => $this->string('amount_max'),
+            //'currency_id'   => $this->integer('currency_id'),
+            //'currency_code' => $this->string('currency_code'),
+            'date'        => $this->date('date'),
+            'repeat_freq' => $this->string('repeat_freq'),
+            'skip'        => $this->integer('skip'),
+            'automatch'   => $this->boolean('automatch'),
+            'active'      => $this->boolean('active'),
+            'notes'       => $this->string('notes'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'        => 'required|between:1,255|uniqueObjectForUser:bills,name',
+            'match'       => 'required|between:1,255|uniqueObjectForUser:bills,match',
+            'amount_min'  => 'required|numeric|more:0',
+            'amount_max'  => 'required|numeric|more:0',
+            //'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',
+            'date'        => 'required|date',
+            'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
+            'skip'        => 'required|between:0,31',
+            'automatch'   => 'required|boolean',
+            'active'      => 'required|boolean',
+            'notes'       => 'between:1,65536',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                $bill           = $this->route()->parameter('bill');
+                $rules['name']  .= ',' . $bill->id;
+                $rules['match'] .= ',' . $bill->id;
+                break;
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $data = $validator->getData();
+                $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'));
+                }
+            }
+        );
+    }
+}

app/Api/V1/Requests/Request.php

@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+/**
+ * Request.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
+
+/**
+ * Class Request.
+ */
+class Request extends FireflyIIIRequest
+{
+
+}

app/Api/V1/Requests/TransactionRequest.php

@@ -0,0 +1,514 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Rules\BelongsUser;
+use Illuminate\Validation\Validator;
+
+
+/**
+ * Class TransactionRequest
+ */
+class TransactionRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            // basic fields for journal:
+            'type'               => $this->string('type'),
+            'date'               => $this->date('date'),
+            'description'        => $this->string('description'),
+            'piggy_bank_id'      => $this->integer('piggy_bank_id'),
+            'piggy_bank_name'    => $this->string('piggy_bank_name'),
+            'bill_id'            => $this->integer('bill_id'),
+            'bill_name'          => $this->string('bill_name'),
+            'tags'               => explode(',', $this->string('tags')),
+
+            // then, custom fields for journal
+            'interest_date'      => $this->date('interest_date'),
+            'book_date'          => $this->date('book_date'),
+            'process_date'       => $this->date('process_date'),
+            'due_date'           => $this->date('due_date'),
+            'payment_date'       => $this->date('payment_date'),
+            'invoice_date'       => $this->date('invoice_date'),
+            'internal_reference' => $this->string('internal_reference'),
+            'notes'              => $this->string('notes'),
+
+            // then, transactions (see below).
+            'transactions'       => [],
+
+        ];
+        foreach ($this->get('transactions') as $index => $transaction) {
+            $array                  = [
+                'description'           => $transaction['description'] ?? null,
+                'amount'                => $transaction['amount'],
+                'currency_id'           => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
+                'currency_code'         => $transaction['currency_code'] ?? null,
+                'foreign_amount'        => $transaction['foreign_amount'] ?? null,
+                'foreign_currency_id'   => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
+                'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
+                'budget_id'             => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
+                'budget_name'           => $transaction['budget_name'] ?? null,
+                'category_id'           => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
+                'category_name'         => $transaction['category_name'] ?? null,
+                'source_id'             => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
+                'source_name'           => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
+                'destination_id'        => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
+                'destination_name'      => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
+                'reconciled'            => $transaction['reconciled'] ?? false,
+                'identifier'            => $index,
+            ];
+            $data['transactions'][] = $array;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            // basic fields for journal:
+            'type'                                 => 'required|in:withdrawal,deposit,transfer',
+            'date'                                 => 'required|date',
+            'description'                          => 'between:1,255',
+            'piggy_bank_id'                        => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser],
+            'piggy_bank_name'                      => ['between:1,255', 'nullable', new BelongsUser],
+            'bill_id'                              => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
+            'bill_name'                            => ['between:1,255', 'nullable', new BelongsUser],
+            'tags'                                 => 'between:1,255',
+
+            // then, custom fields for journal
+            'interest_date'                        => 'date|nullable',
+            'book_date'                            => 'date|nullable',
+            'process_date'                         => 'date|nullable',
+            'due_date'                             => 'date|nullable',
+            'payment_date'                         => 'date|nullable',
+            'invoice_date'                         => 'date|nullable',
+            'internal_reference'                   => 'min:1,max:255|nullable',
+            'notes'                                => 'min:1,max:50000|nullable',
+
+            // transaction rules (in array for splits):
+            'transactions.*.description'           => 'nullable|between:1,255',
+            'transactions.*.amount'                => 'required|numeric|more:0',
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id|required_without:transactions.*.currency_code',
+            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code|required_without:transactions.*.currency_id',
+            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.reconciled'            => 'boolean|nullable',
+            // basic rules will be expanded later.
+            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.destination_name'      => 'between:1,255|nullable',
+        ];
+
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                unset($rules['type'], $rules['piggy_bank_id'], $rules['piggy_bank_name']);
+                break;
+        }
+
+        return $rules;
+
+
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->atLeastOneTransaction($validator);
+                $this->checkValidDescriptions($validator);
+                $this->equalToJournalDescription($validator);
+                $this->emptySplitDescriptions($validator);
+                $this->foreignCurrencyInformation($validator);
+                $this->validateAccountInformation($validator);
+                $this->validateSplitAccounts($validator);
+            }
+        );
+    }
+
+    /**
+     * Throws an error when this asset account is invalid.
+     *
+     * @param Validator   $validator
+     * @param int|null    $accountId
+     * @param null|string $accountName
+     * @param string      $idField
+     * @param string      $nameField
+     *
+     * @return null|Account
+     */
+    protected function assetAccountExists(Validator $validator, ?int $accountId, ?string $accountName, string $idField, string $nameField): ?Account
+    {
+
+        $accountId   = (int)$accountId;
+        $accountName = (string)$accountName;
+        // both empty? hard exit.
+        if ($accountId < 1 && strlen($accountName) === 0) {
+            $validator->errors()->add($idField, trans('validation.filled', ['attribute' => $idField]));
+
+            return null;
+        }
+        // ID belongs to user and is asset account:
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+        $set = $repository->getAccountsById([$accountId]);
+        if ($set->count() === 1) {
+            /** @var Account $first */
+            $first = $set->first();
+            if ($first->accountType->type !== AccountType::ASSET) {
+                $validator->errors()->add($idField, trans('validation.belongs_user'));
+
+                return null;
+            }
+
+            // we ignore the account name at this point.
+            return $first;
+        }
+
+        $account = $repository->findByNameNull($accountName, [AccountType::ASSET]);
+        if (null === $account) {
+            $validator->errors()->add($nameField, trans('validation.belongs_user'));
+
+            return null;
+        }
+
+        return $account;
+    }
+
+    /**
+     * Adds an error to the validator when there are no transactions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneTransaction(Validator $validator): void
+    {
+        $data         = $validator->getData();
+        $transactions = $data['transactions'] ?? [];
+        // need at least one transaction
+        if (count($transactions) === 0) {
+            $validator->errors()->add('description', trans('validation.at_least_one_transaction'));
+        }
+    }
+
+    /**
+     * Adds an error to the "description" field when the user has submitted no descriptions and no
+     * journal description.
+     *
+     * @param Validator $validator
+     */
+    protected function checkValidDescriptions(Validator $validator)
+    {
+        $data               = $validator->getData();
+        $transactions       = $data['transactions'] ?? [];
+        $journalDescription = (string)($data['description'] ?? '');
+        $validDescriptions  = 0;
+        foreach ($transactions as $index => $transaction) {
+            if (strlen((string)($transaction['description'] ?? '')) > 0) {
+                $validDescriptions++;
+            }
+        }
+
+        // no valid descriptions and empty journal description? error.
+        if ($validDescriptions === 0 && strlen($journalDescription) === 0) {
+            $validator->errors()->add('description', trans('validation.filled', ['attribute' => trans('validation.attributes.description')]));
+        }
+
+    }
+
+    /**
+     * Adds an error to the validator when the user submits a split transaction (more than 1 transactions)
+     * but does not give them a description.
+     *
+     * @param Validator $validator
+     */
+    protected function emptySplitDescriptions(Validator $validator): void
+    {
+        $data         = $validator->getData();
+        $transactions = $data['transactions'] ?? [];
+        foreach ($transactions as $index => $transaction) {
+            $description = (string)($transaction['description'] ?? '');
+            // filled description is mandatory for split transactions.
+            if (count($transactions) > 1 && strlen($description) === 0) {
+                $validator->errors()->add(
+                    'transactions.' . $index . '.description',
+                    trans('validation.filled', ['attribute' => trans('validation.attributes.transaction_description')])
+                );
+            }
+        }
+    }
+
+    /**
+     * Adds an error to the validator when any transaction descriptions are equal to the journal description.
+     *
+     * @param Validator $validator
+     */
+    protected function equalToJournalDescription(Validator $validator): void
+    {
+        $data               = $validator->getData();
+        $transactions       = $data['transactions'] ?? [];
+        $journalDescription = (string)($data['description'] ?? '');
+        foreach ($transactions as $index => $transaction) {
+            $description = (string)($transaction['description'] ?? '');
+            // description cannot be equal to journal description.
+            if ($description === $journalDescription) {
+                $validator->errors()->add('transactions.' . $index . '.description', trans('validation.equal_description'));
+            }
+        }
+    }
+
+    /**
+     * If the transactions contain foreign amounts, there must also be foreign currency information.
+     *
+     * @param Validator $validator
+     */
+    protected function foreignCurrencyInformation(Validator $validator): void
+    {
+        $data         = $validator->getData();
+        $transactions = $data['transactions'] ?? [];
+        foreach ($transactions as $index => $transaction) {
+            // must have currency info.
+            if (isset($transaction['foreign_amount'])
+                && !(isset($transaction['foreign_currency_id'])
+                     || isset($transaction['foreign_currency_code']))) {
+                $validator->errors()->add(
+                    'transactions.' . $index . '.foreign_amount',
+                    trans('validation.require_currency_info')
+                );
+            }
+        }
+    }
+
+    /**
+     * Throws an error when the given opposing account (of type $type) is invalid.
+     * Empty data is allowed, system will default to cash.
+     *
+     * @param Validator   $validator
+     * @param string      $type
+     * @param int|null    $accountId
+     * @param null|string $accountName
+     * @param string      $idField
+     *
+     * @return null|Account
+     */
+    protected function opposingAccountExists(Validator $validator, string $type, ?int $accountId, ?string $accountName, string $idField): ?Account
+    {
+        $accountId   = (int)$accountId;
+        $accountName = (string)$accountName;
+        // both empty? done!
+        if ($accountId < 1 && strlen($accountName) === 0) {
+            return null;
+        }
+        if ($accountId !== 0) {
+            // ID belongs to user and is $type account:
+            /** @var AccountRepositoryInterface $repository */
+            $repository = app(AccountRepositoryInterface::class);
+            $repository->setUser(auth()->user());
+            $set = $repository->getAccountsById([$accountId]);
+            if ($set->count() === 1) {
+                /** @var Account $first */
+                $first = $set->first();
+                if ($first->accountType->type !== $type) {
+                    $validator->errors()->add($idField, trans('validation.belongs_user'));
+
+                    return null;
+                }
+
+                // we ignore the account name at this point.
+                return $first;
+            }
+        }
+
+        // not having an opposing account by this name is NOT a problem.
+        return null;
+    }
+
+    /**
+     * Validates the given account information. Switches on given transaction type.
+     *
+     * @param Validator $validator
+     *
+     * @throws FireflyException
+     */
+    protected function validateAccountInformation(Validator $validator): void
+    {
+        $data         = $validator->getData();
+        $transactions = $data['transactions'] ?? [];
+        if (!isset($data['type'])) {
+            // the journal may exist in the request:
+            /** @var Transaction $transaction */
+            $transaction = $this->route()->parameter('transaction');
+            if (null === $transaction) {
+                return; // @codeCoverageIgnore
+            }
+            $data['type'] = strtolower($transaction->transactionJournal->transactionType->type);
+        }
+        foreach ($transactions as $index => $transaction) {
+            $sourceId           = isset($transaction['source_id']) ? (int)$transaction['source_id'] : null;
+            $sourceName         = $transaction['source_name'] ?? null;
+            $destinationId      = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null;
+            $destinationName    = $transaction['destination_name'] ?? null;
+            $sourceAccount      = null;
+            $destinationAccount = null;
+            switch ($data['type']) {
+                case 'withdrawal':
+                    $idField            = 'transactions.' . $index . '.source_id';
+                    $nameField          = 'transactions.' . $index . '.source_name';
+                    $sourceAccount      = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
+                    $idField            = 'transactions.' . $index . '.destination_id';
+                    $destinationAccount = $this->opposingAccountExists($validator, AccountType::EXPENSE, $destinationId, $destinationName, $idField);
+                    break;
+                case 'deposit':
+                    $idField       = 'transactions.' . $index . '.source_id';
+                    $sourceAccount = $this->opposingAccountExists($validator, AccountType::REVENUE, $sourceId, $sourceName, $idField);
+
+                    $idField            = 'transactions.' . $index . '.destination_id';
+                    $nameField          = 'transactions.' . $index . '.destination_name';
+                    $destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
+                    break;
+                case 'transfer':
+                    $idField       = 'transactions.' . $index . '.source_id';
+                    $nameField     = 'transactions.' . $index . '.source_name';
+                    $sourceAccount = $this->assetAccountExists($validator, $sourceId, $sourceName, $idField, $nameField);
+
+                    $idField            = 'transactions.' . $index . '.destination_id';
+                    $nameField          = 'transactions.' . $index . '.destination_name';
+                    $destinationAccount = $this->assetAccountExists($validator, $destinationId, $destinationName, $idField, $nameField);
+                    break;
+                default:
+                    // @codeCoverageIgnoreStart
+                    throw new FireflyException(
+                        sprintf('The validator cannot handle transaction type "%s" in validateAccountInformation().', $data['type'])
+                    );
+                // @codeCoverageIgnoreEnd
+
+            }
+            // add some errors in case of same account submitted:
+            if (null !== $sourceAccount && null !== $destinationAccount && $sourceAccount->id === $destinationAccount->id) {
+                $validator->errors()->add($idField, trans('validation.source_equals_destination'));
+            }
+        }
+    }
+
+    /**
+     * @param Validator $validator
+     *
+     * @throws FireflyException
+     */
+    protected function validateSplitAccounts(Validator $validator)
+    {
+        $data  = $validator->getData();
+        $count = isset($data['transactions']) ? count($data['transactions']) : 0;
+        if ($count < 2) {
+            return;
+        }
+        // this is pretty much impossible:
+        // @codeCoverageIgnoreStart
+        if (!isset($data['type'])) {
+            // the journal may exist in the request:
+            /** @var Transaction $transaction */
+            $transaction = $this->route()->parameter('transaction');
+            if (null === $transaction) {
+                return;
+            }
+            $data['type'] = strtolower($transaction->transactionJournal->transactionType->type);
+        }
+        // @codeCoverageIgnoreEnd
+
+        // collect all source ID's and destination ID's, if present:
+        $sources      = [];
+        $destinations = [];
+
+        foreach ($data['transactions'] as $transaction) {
+            $sources[]      = isset($transaction['source_id']) ? (int)$transaction['source_id'] : 0;
+            $destinations[] = isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : 0;
+        }
+        $destinations = array_unique($destinations);
+        $sources      = array_unique($sources);
+        // switch on type:
+        switch ($data['type']) {
+            case 'withdrawal':
+                if (count($sources) > 1) {
+                    $validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal'));
+                }
+                break;
+            case 'deposit':
+                if (count($destinations) > 1) {
+                    $validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal'));
+                }
+                break;
+            case 'transfer':
+                if (count($sources) > 1 || count($destinations) > 1) {
+                    $validator->errors()->add('transactions.0.source_id', trans('validation.all_accounts_equal'));
+                    $validator->errors()->add('transactions.0.destination_id', trans('validation.all_accounts_equal'));
+                }
+                break;
+            default:
+                // @codeCoverageIgnoreStart
+                throw new FireflyException(
+                    sprintf('The validator cannot handle transaction type "%s" in validateSplitAccounts().', $data['type'])
+                );
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+}

app/Api/V1/Requests/UserRequest.php

@@ -0,0 +1,89 @@
+<?php
+declare(strict_types=1);
+/**
+ * UserRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\User;
+
+
+/**
+ * Class UserRequest
+ */
+class UserRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        if (!auth()->check()) {
+            return false; // @codeCoverageIgnore
+        }
+        /** @var User $user */
+        $user = auth()->user();
+        if (!$user->hasRole('owner')) {
+            return false; // @codeCoverageIgnore
+        }
+
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'email'        => $this->string('email'),
+            'blocked'      => $this->boolean('blocked'),
+            'blocked_code' => $this->string('blocked_code'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'email'        => 'required|email|unique:users,email,',
+            'blocked'      => 'required|boolean',
+            'blocked_code' => 'in:email_changed',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                $user           = $this->route()->parameter('user');
+                $rules['email'] = 'required|email|unique:users,email,' . $user->id;
+                break;
+        }
+
+        return $rules;
+    }
+
+}

app/Console/Commands/CreateExport.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CreateExport.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,12 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
-
 namespace FireflyIII\Console\Commands;
 
 use Carbon\Carbon;
@@ -34,13 +32,10 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Storage;
 
-
 /**
- * Class CreateExport
+ * Class CreateExport.
  *
  * Generates export from the command line.
- *
- * @package FireflyIII\Console\Commands
  */
 class CreateExport extends Command
 {
@@ -65,19 +60,6 @@ class CreateExport extends Command
                             {--with_uploads : Include user\'s uploads?}';
 
     /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     *
      * Execute the console command.
      *
      * @return mixed
@@ -87,7 +69,7 @@ class CreateExport extends Command
         if (!$this->verifyAccessToken()) {
             $this->error('Invalid access token.');
 
-            return;
+            return 1;
         }
         $this->line('Full export is running...');
         // make repositories
@@ -101,7 +83,7 @@ class CreateExport extends Command
         $journalRepository = app(JournalRepositoryInterface::class);
 
         // set user
-        $user = $userRepository->find(intval($this->option('user')));
+        $user = $userRepository->findNull((int)$this->option('user'));
         $jobRepository->setUser($user);
         $journalRepository->setUser($user);
         $accountRepository->setUser($user);
@@ -109,7 +91,7 @@ class CreateExport extends Command
         // first date
         $firstJournal = $journalRepository->first();
         $first        = new Carbon;
-        if (!is_null($firstJournal->id)) {
+        if (null !== $firstJournal->id) {
             $first = $firstJournal->date;
         }
 
@@ -125,7 +107,6 @@ class CreateExport extends Command
             'job'                => $job,
         ];
 
-
         /** @var ProcessorInterface $processor */
         $processor = app(ProcessorInterface::class);
         $processor->setSettings($settings);
@@ -149,6 +130,6 @@ class CreateExport extends Command
         $this->line('The export has finished! You can find the ZIP file in this location:');
         $this->line(storage_path(sprintf('export/%s', $fileName)));
 
-        return;
+        return 0;
     }
 }

app/Console/Commands/CreateImport.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CreateImport.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,28 +17,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
-use Artisan;
-use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Services\Internal\File\EncryptService;
 use Illuminate\Console\Command;
 use Illuminate\Support\MessageBag;
 use Log;
-use Monolog\Formatter\LineFormatter;
 use Preferences;
 
 /**
- * Class CreateImport
- *
- * @package FireflyIII\Console\Commands
+ * Class CreateImport.
  */
 class CreateImport extends Command
 {
@@ -57,146 +53,153 @@ class CreateImport extends Command
     protected $signature
         = 'firefly:create-import
                             {file : The file to import.}
-                            {configuration : The configuration file to use for the import/}
+                            {configuration : The configuration file to use for the import.}
                             {--type=csv : The file type of the import.}
                             {--user= : The user ID that the import should import for.}
                             {--token= : The user\'s access token.}
                             {--start : Starts the job immediately.}';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Run the command.
      *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
+     * @noinspection MultipleReturnStatementsInspection
+     *
+     * @throws FireflyException
      */
-    public function handle()
+    public function handle(): int
     {
         if (!$this->verifyAccessToken()) {
-            $this->error('Invalid access token.');
+            $this->errorLine('Invalid access token.');
 
-            return;
+            return 1;
         }
         /** @var UserRepositoryInterface $userRepository */
         $userRepository = app(UserRepositoryInterface::class);
         $file           = $this->argument('file');
         $configuration  = $this->argument('configuration');
-        $user           = $userRepository->find(intval($this->option('user')));
+        $user           = $userRepository->findNull((int)$this->option('user'));
         $cwd            = getcwd();
         $type           = strtolower($this->option('type'));
 
         if (!$this->validArguments()) {
-            return;
+            $this->errorLine('Invalid arguments.');
+
+            return 1;
         }
 
-        $configurationData = json_decode(file_get_contents($configuration));
-        if (is_null($configurationData)) {
-            $this->error(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
+        $configurationData = json_decode(file_get_contents($configuration), true);
+        if (null === $configurationData) {
+            $this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
 
-            return;
+            return 1;
         }
 
-        $this->line(sprintf('Going to create a job to import file: %s', $file));
-        $this->line(sprintf('Using configuration file: %s', $configuration));
-        $this->line(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
-        $this->line(sprintf('Type of import: %s', $type));
-
+        $this->infoLine(sprintf('Going to create a job to import file: %s', $file));
+        $this->infoLine(sprintf('Using configuration file: %s', $configuration));
+        $this->infoLine(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
+        $this->infoLine(sprintf('Type of import: %s', $type));
 
         /** @var ImportJobRepositoryInterface $jobRepository */
         $jobRepository = app(ImportJobRepositoryInterface::class);
         $jobRepository->setUser($user);
         $job = $jobRepository->create($type);
-        $this->line(sprintf('Created job "%s"', $job->key));
+        $this->infoLine(sprintf('Created job "%s"', $job->key));
 
+        /** @var EncryptService $service */
+        $service = app(EncryptService::class);
+        $service->encrypt($file, $job->key);
 
-        Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
-        $this->line('Stored import data...');
+        $this->infoLine('Stored import data...');
 
+        $jobRepository->setConfiguration($job, $configurationData);
+        $jobRepository->updateStatus($job, 'configured');
+        $this->infoLine('Stored configuration...');
 
-        $job->configuration = $configurationData;
-        $job->status        = 'configured';
-        $job->save();
-        $this->line('Stored configuration...');
-
-
-        if ($this->option('start') === true) {
-            $this->line('The import will start in a moment. This process is not visible...');
+        if (true === $this->option('start')) {
+            $this->infoLine('The import will start in a moment. This process is not visible...');
             Log::debug('Go for import!');
 
             // normally would refer to other firefly:start-import but that doesn't seem to work all to well...
-            $monolog   = Log::getMonolog();
-            $handler   = new CommandHandler($this);
-            $formatter = new LineFormatter(null, null, false, true);
-            $handler->setFormatter($formatter);
-            $monolog->pushHandler($handler);
-
 
             // start the actual routine:
-            /** @var ImportRoutine $routine */
-            $routine = app(ImportRoutine::class);
+            $type      = 'csv' === $job->file_type ? 'file' : $job->file_type;
+            $key       = sprintf('import.routine.%s', $type);
+            $className = config($key);
+            if (null === $className || !class_exists($className)) {
+                throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
+            }
+            /** @var RoutineInterface $routine */
+            $routine = app($className);
             $routine->setJob($job);
             $routine->run();
 
             // give feedback.
             /** @var MessageBag $error */
-            foreach ($routine->errors as $index => $error) {
-                $this->error(sprintf('Error importing line #%d: %s', $index, $error));
+            foreach ($routine->getErrors() as $index => $error) {
+                $this->errorLine(sprintf('Error importing line #%d: %s', $index, $error));
             }
-            $this->line(
-                sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines)
+            $this->infoLine(
+                sprintf(
+                    'The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines()
+                )
             );
         }
 
         // clear cache for user:
         Preferences::setForUser($user, 'lastActivity', microtime());
 
-        return;
+        return 0;
+    }
+
+    /**
+     * @param string     $message
+     * @param array|null $data
+     */
+    private function errorLine(string $message, array $data = null): void
+    {
+        Log::error($message, $data ?? []);
+        $this->error($message);
+
+    }
+
+    /**
+     * @param string $message
+     * @param array  $data
+     */
+    private function infoLine(string $message, array $data = null): void
+    {
+        Log::info($message, $data ?? []);
+        $this->line($message);
     }
 
     /**
      * Verify user inserts correct arguments.
      *
+     * @noinspection MultipleReturnStatementsInspection
      * @return bool
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
     private function validArguments(): bool
     {
-        /** @var UserRepositoryInterface $userRepository */
-        $userRepository = app(UserRepositoryInterface::class);
-        $file           = $this->argument('file');
-        $configuration  = $this->argument('configuration');
-        $user           = $userRepository->find(intval($this->option('user')));
-        $cwd            = getcwd();
-        $validTypes     = array_keys(config('firefly.import_formats'));
-        $type           = strtolower($this->option('type'));
-        if (is_null($user->id)) {
-            $this->error(sprintf('There is no user with ID %d.', $this->option('user')));
+        $file          = $this->argument('file');
+        $configuration = $this->argument('configuration');
+        $cwd           = getcwd();
+        $validTypes    = config('import.options.file.import_formats');
+        $type          = strtolower($this->option('type'));
 
-            return false;
-        }
-
-        if (!in_array($type, $validTypes)) {
-            $this->error(sprintf('Cannot import file of type "%s"', $type));
+        if (!\in_array($type, $validTypes, true)) {
+            $this->errorLine(sprintf('Cannot import file of type "%s"', $type));
 
             return false;
         }
 
         if (!file_exists($file)) {
-            $this->error(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
+            $this->errorLine(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
 
             return false;
         }
 
         if (!file_exists($configuration)) {
-            $this->error(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
+            $this->errorLine(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
 
             return false;
         }

app/Console/Commands/DecryptAttachment.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * DecryptAttachment.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,11 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
@@ -28,9 +27,7 @@ use Illuminate\Console\Command;
 use Log;
 
 /**
- * Class DecryptAttachment
- *
- * @package FireflyIII\Console\Commands
+ * Class DecryptAttachment.
  */
 class DecryptAttachment extends Command
 {
@@ -50,33 +47,21 @@ class DecryptAttachment extends Command
         = 'firefly:decrypt-attachment {id:The ID of the attachment.} {name:The file name of the attachment.} 
     {directory:Where the file must be stored.}';
 
-
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-    }
-
     /**
      * Execute the console command.
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     *
      */
     public function handle()
     {
         /** @var AttachmentRepositoryInterface $repository */
         $repository     = app(AttachmentRepositoryInterface::class);
-        $attachmentId   = intval($this->argument('id'));
+        $attachmentId   = (int)$this->argument('id');
         $attachment     = $repository->findWithoutUser($attachmentId);
         $attachmentName = trim($this->argument('name'));
         $storagePath    = realpath(trim($this->argument('directory')));
-        if (is_null($attachment->id)) {
+        if (null === $attachment->id) {
             $this->error(sprintf('No attachment with id #%d', $attachmentId));
             Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
 
@@ -108,7 +93,7 @@ class DecryptAttachment extends Command
         $content  = $repository->getContent($attachment);
         $this->line(sprintf('Going to write content for attachment #%d into file "%s"', $attachment->id, $fullPath));
         $result = file_put_contents($fullPath, $content);
-        if ($result === false) {
+        if (false === $result) {
             $this->error('Could not write to file.');
 
             return;

app/Console/Commands/EncryptFile.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * EncryptFile.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
-use Crypt;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Services\Internal\File\EncryptService;
 use Illuminate\Console\Command;
 
 /**
- * Class EncryptFile
- *
- * @package FireflyIII\Console\Commands
+ * Class EncryptFile.
  */
 class EncryptFile extends Command
 {
@@ -47,32 +45,26 @@ class EncryptFile extends Command
      */
     protected $signature = 'firefly:encrypt-file {file} {key}';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
+     *
+     * @throws \Illuminate\Contracts\Encryption\EncryptException
      */
-    public function handle()
+    public function handle(): int
     {
-        $file = e(strval($this->argument('file')));
-        if (!file_exists($file)) {
-            $this->error(sprintf('File "%s" does not seem to exist.', $file));
+        $code = 0;
+        $file = (string)$this->argument('file');
+        $key  = (string)$this->argument('key');
+        /** @var EncryptService $service */
+        $service = app(EncryptService::class);
 
-            return;
+        try {
+            $service->encrypt($file, $key);
+        } catch (FireflyException $e) {
+            $this->error($e->getMessage());
+            $code = 1;
         }
-        $content = file_get_contents($file);
-        $content = Crypt::encrypt($content);
-        $newName = e(strval($this->argument('key'))) . '.upload';
 
-        $path = storage_path('upload') . '/' . $newName;
-        file_put_contents($path, $content);
-        $this->line(sprintf('Encrypted "%s" and put it in "%s"', $file, $path));
+        return $code;
     }
 }

app/Console/Commands/Import.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Import.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,24 +17,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
-use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Models\ImportJob;
 use Illuminate\Console\Command;
 use Illuminate\Support\MessageBag;
 use Log;
 
 /**
- * Class Import
- *
- * @package FireflyIII\Console\Commands
+ * Class Import.
  */
 class Import extends Command
 {
@@ -51,55 +48,75 @@ class Import extends Command
      */
     protected $signature = 'firefly:start-import {key}';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Run the import routine.
+     *
+     * @throws FireflyException
      */
     public function handle()
     {
         Log::debug('Start start-import command');
         $jobKey = $this->argument('key');
         $job    = ImportJob::where('key', $jobKey)->first();
-        if (is_null($job)) {
-            $this->error(sprintf('No job found with key "%s"', $jobKey));
+        if (null === $job) {
+            $this->errorLine(sprintf('No job found with key "%s"', $jobKey));
 
             return;
         }
         if (!$this->isValid($job)) {
-            Log::error('Job is not valid for some reason. Exit.');
+            $this->errorLine('Job is not valid for some reason. Exit.');
 
             return;
         }
 
-        $this->line(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
+        $this->infoLine(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
 
-        $monolog = Log::getMonolog();
-        $handler = new CommandHandler($this);
-        $monolog->pushHandler($handler);
+        // actually start job:
+        $type      = 'csv' === $job->file_type ? 'file' : $job->file_type;
+        $key       = sprintf('import.routine.%s', $type);
+        $className = config($key);
+        if (null === $className || !class_exists($className)) {
+            throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
+        }
 
-        /** @var ImportRoutine $routine */
-        $routine = app(ImportRoutine::class);
+        /** @var RoutineInterface $routine */
+        $routine = app($className);
         $routine->setJob($job);
         $routine->run();
 
         /** @var MessageBag $error */
-        foreach ($routine->errors as $index => $error) {
-            $this->error(sprintf('Error importing line #%d: %s', $index, $error));
+        foreach ($routine->getErrors() as $index => $error) {
+            $this->errorLine(sprintf('Error importing line #%d: %s', $index, $error));
         }
 
-        $this->line(sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines));
+        $this->infoLine(
+            sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines())
+        );
 
         return;
     }
 
+    /**
+     * @param string     $message
+     * @param array|null $data
+     */
+    private function errorLine(string $message, array $data = null): void
+    {
+        Log::error($message, $data ?? []);
+        $this->error($message);
+
+    }
+
+    /**
+     * @param string $message
+     * @param array  $data
+     */
+    private function infoLine(string $message, array $data = null): void
+    {
+        Log::info($message, $data ?? []);
+        $this->line($message);
+    }
+
     /**
      * Check if job is valid to be imported.
      *
@@ -109,16 +126,15 @@ class Import extends Command
      */
     private function isValid(ImportJob $job): bool
     {
-        if (is_null($job)) {
-            Log::error('This job does not seem to exist.');
-            $this->error('This job does not seem to exist.');
+        if (null === $job) {
+            $this->errorLine('This job does not seem to exist.');
 
             return false;
         }
 
-        if ($job->status !== 'configured') {
+        if ('configured' !== $job->status) {
             Log::error(sprintf('This job is not ready to be imported (status is %s).', $job->status));
-            $this->error('This job is not ready to be imported.');
+            $this->errorLine('This job is not ready to be imported.');
 
             return false;
         }

app/Console/Commands/ScanAttachments.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ScanAttachments.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,11 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
 use Crypt;
@@ -31,9 +30,7 @@ use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Storage;
 
 /**
- * Class ScanAttachments
- *
- * @package FireflyIII\Console\Commands
+ * Class ScanAttachments.
  */
 class ScanAttachments extends Command
 {
@@ -51,15 +48,6 @@ class ScanAttachments extends Command
      */
     protected $signature = 'firefly:scan-attachments';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */

app/Console/Commands/UpgradeDatabase.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UpgradeDatabase.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
-
 use DB;
+use Exception;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
@@ -45,17 +43,15 @@ use Preferences;
 use Schema;
 
 /**
- * Class UpgradeDatabase
+ * Class UpgradeDatabase.
  *
  * Upgrade user database.
  *
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it just touches a lot of things.
- * @package FireflyIII\Console\Commands
  */
 class UpgradeDatabase extends Command
 {
-
     /**
      * The console command description.
      *
@@ -69,54 +65,23 @@ class UpgradeDatabase extends Command
      */
     protected $signature = 'firefly:upgrade-database';
 
-    /**
-     * Create a new command instance.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */
     public function handle()
     {
         $this->setTransactionIdentifier();
-        $this->migrateRepetitions();
         $this->updateAccountCurrencies();
+        $this->createNewTypes();
         $this->line('Updating currency information..');
         $this->updateTransferCurrencies();
         $this->updateOtherCurrencies();
         $this->line('Done updating currency information..');
         $this->migrateNotes();
+        $this->migrateAttachmentData();
         $this->info('Firefly III database is up to date.');
 
         return;
-
-
-    }
-
-    /**
-     * Migrate budget repetitions to new format where the end date is in the budget limit as well,
-     * making the limit_repetition table obsolete.
-     */
-    public function migrateRepetitions(): void
-    {
-        $set = BudgetLimit::whereNull('end_date')->get();
-        /** @var BudgetLimit $budgetLimit */
-        foreach ($set as $budgetLimit) {
-            /** @var LimitRepetition $repetition */
-            $repetition = $budgetLimit->limitrepetitions()->first();
-            if (!is_null($repetition)) {
-                $budgetLimit->end_date = $repetition->enddate;
-                $budgetLimit->save();
-                $this->line(sprintf('Updated budget limit #%d', $budgetLimit->id));
-                $repetition->delete();
-            }
-        }
-
-        return;
     }
 
     /**
@@ -146,7 +111,7 @@ class UpgradeDatabase extends Command
         $journalIds = array_unique($result->pluck('id')->toArray());
 
         foreach ($journalIds as $journalId) {
-            $this->updateJournalidentifiers(intval($journalId));
+            $this->updateJournalidentifiers((int)$journalId);
         }
 
         return;
@@ -168,12 +133,13 @@ class UpgradeDatabase extends Command
                 // get users preference, fall back to system pref.
                 $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
                 $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
-                $accountCurrency     = intval($account->getMeta('currency_id'));
+                $accountCurrency     = (int)$account->getMeta('currency_id');
                 $openingBalance      = $account->getOpeningBalance();
-                $obCurrency          = intval($openingBalance->transaction_currency_id);
+                $obCurrency          = (int)$openingBalance->transaction_currency_id;
 
                 // both 0? set to default currency:
-                if ($accountCurrency === 0 && $obCurrency === 0) {
+                if (0 === $accountCurrency && 0 === $obCurrency) {
+                    AccountMeta::where('account_id', $account->id)->where('name', 'currency_id')->forceDelete();
                     AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
                     $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
 
@@ -181,7 +147,7 @@ class UpgradeDatabase extends Command
                 }
 
                 // account is set to 0, opening balance is not?
-                if ($accountCurrency === 0 && $obCurrency > 0) {
+                if (0 === $accountCurrency && $obCurrency > 0) {
                     AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
                     $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
 
@@ -231,23 +197,23 @@ class UpgradeDatabase extends Command
                                        ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                                        ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                                        ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->first(['transactions.*']);
-                if (is_null($transaction)) {
+                if (null === $transaction) {
                     return;
                 }
                 /** @var Account $account */
                 $account      = $transaction->account;
-                $currency     = $repository->find(intval($account->getMeta('currency_id')));
+                $currency     = $repository->find((int)$account->getMeta('currency_id'));
                 $transactions = $journal->transactions()->get();
                 $transactions->each(
                     function (Transaction $transaction) use ($currency) {
-                        if (is_null($transaction->transaction_currency_id)) {
+                        if (null === $transaction->transaction_currency_id) {
                             $transaction->transaction_currency_id = $currency->id;
                             $transaction->save();
                         }
 
                         // when mismatch in transaction:
-                        if ($transaction->transaction_currency_id !== $currency->id) {
-                            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
+                        if (!((int)$transaction->transaction_currency_id === (int)$currency->id)) {
+                            $transaction->foreign_currency_id     = (int)$transaction->transaction_currency_id;
                             $transaction->foreign_amount          = $transaction->amount;
                             $transaction->transaction_currency_id = $currency->id;
                             $transaction->save();
@@ -295,6 +261,51 @@ class UpgradeDatabase extends Command
         );
     }
 
+    private function createNewTypes(): void
+    {
+        // create transaction type "Reconciliation".
+        $type = TransactionType::where('type', TransactionType::RECONCILIATION)->first();
+        if (null === $type) {
+            TransactionType::create(['type' => TransactionType::RECONCILIATION]);
+        }
+        $account = AccountType::where('type', AccountType::RECONCILIATION)->first();
+        if (null === $account) {
+            AccountType::create(['type' => AccountType::RECONCILIATION]);
+        }
+    }
+
+    /**
+     * Move the description of each attachment (when not NULL) to the notes or to a new note object
+     * for all attachments.
+     */
+    private function migrateAttachmentData(): void
+    {
+        $attachments = Attachment::get();
+
+        /** @var Attachment $att */
+        foreach ($attachments as $att) {
+
+            // move description:
+            $description = (string)$att->description;
+            if (strlen($description) > 0) {
+                // find or create note:
+                $note = $att->notes()->first();
+                if (null === $note) {
+                    $note = new Note;
+                    $note->noteable()->associate($att);
+                }
+                $note->text = $description;
+                $note->save();
+
+                // clear description:
+                $att->description = '';
+                $att->save();
+
+                Log::debug(sprintf('Migrated attachment #%s description to note #%d', $att->id, $note->id));
+            }
+        }
+    }
+
     /**
      * Move all the journal_meta notes to their note object counter parts.
      */
@@ -305,20 +316,22 @@ class UpgradeDatabase extends Command
         foreach ($set as $meta) {
             $journal = $meta->transactionJournal;
             $note    = $journal->notes()->first();
-            if (is_null($note)) {
-                $note = new Note;
+            if (null === $note) {
+                $note = new Note();
                 $note->noteable()->associate($journal);
             }
 
             $note->text = $meta->data;
             $note->save();
             Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id));
-            $meta->delete();
-
+            try {
+                $meta->delete();
+            } catch (Exception $e) {
+                Log::error(sprintf('Could not delete old meta entry #%d: %s', $meta->id, $e->getMessage()));
+            }
         }
     }
 
-
     /**
      * This method makes sure that the transaction journal uses the currency given in the transaction.
      *
@@ -328,13 +341,16 @@ class UpgradeDatabase extends Command
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository = app(CurrencyRepositoryInterface::class);
-        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+        $currency   = $repository->find((int)$transaction->account->getMeta('currency_id'));
         $journal    = $transaction->transactionJournal;
 
-        if (!(intval($currency->id) === intval($journal->transaction_currency_id))) {
+        if (!((int)$currency->id === (int)$journal->transaction_currency_id)) {
             $this->line(
                 sprintf(
-                    'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
+                    'Transfer #%d ("%s") has been updated to use %s instead of %s.',
+                    $journal->id,
+                    $journal->description,
+                    $currency->code,
                     $journal->transactionCurrency->code
                 )
             );
@@ -359,7 +375,7 @@ class UpgradeDatabase extends Command
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
             // find opposing:
-            $amount = bcmul(strval($transaction->amount), '-1');
+            $amount = bcmul((string)$transaction->amount, '-1');
 
             try {
                 /** @var Transaction $opposing */
@@ -376,7 +392,7 @@ class UpgradeDatabase extends Command
 
                 return;
             }
-            if (!is_null($opposing)) {
+            if (null !== $opposing) {
                 // give both a new identifier:
                 $transaction->identifier = $identifier;
                 $opposing->identifier    = $identifier;
@@ -385,7 +401,7 @@ class UpgradeDatabase extends Command
                 $processed[] = $transaction->id;
                 $processed[] = $opposing->id;
             }
-            $identifier++;
+            ++$identifier;
         }
 
         return;
@@ -409,25 +425,28 @@ class UpgradeDatabase extends Command
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository = app(CurrencyRepositoryInterface::class);
-        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+        $currency   = $repository->find((int)$transaction->account->getMeta('currency_id'));
 
         // has no currency ID? Must have, so fill in using account preference:
-        if (is_null($transaction->transaction_currency_id)) {
-            $transaction->transaction_currency_id = $currency->id;
+        if (null === $transaction->transaction_currency_id) {
+            $transaction->transaction_currency_id = (int)$currency->id;
             Log::debug(sprintf('Transaction #%d has no currency setting, now set to %s', $transaction->id, $currency->code));
             $transaction->save();
         }
 
         // does not match the source account (see above)? Can be fixed
         // when mismatch in transaction and NO foreign amount is set:
-        if ($transaction->transaction_currency_id !== $currency->id && is_null($transaction->foreign_amount)) {
+        if (!((int)$transaction->transaction_currency_id === (int)$currency->id) && null === $transaction->foreign_amount) {
             Log::debug(
                 sprintf(
-                    'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', $transaction->id,
-                    $transaction->transaction_currency_id, $currency->id, $transaction->amount
+                    'Transaction #%d has a currency setting #%d that should be #%d. Amount remains %s, currency is changed.',
+                    $transaction->id,
+                    $transaction->transaction_currency_id,
+                    $currency->id,
+                    $transaction->amount
                 )
             );
-            $transaction->transaction_currency_id = $currency->id;
+            $transaction->transaction_currency_id = (int)$currency->id;
             $transaction->save();
         }
 
@@ -436,16 +455,16 @@ class UpgradeDatabase extends Command
         $journal = $transaction->transactionJournal;
         /** @var Transaction $opposing */
         $opposing         = $journal->transactions()->where('amount', '>', 0)->where('identifier', $transaction->identifier)->first();
-        $opposingCurrency = $repository->find(intval($opposing->account->getMeta('currency_id')));
+        $opposingCurrency = $repository->find((int)$opposing->account->getMeta('currency_id'));
 
-        if (is_null($opposingCurrency->id)) {
+        if (null === $opposingCurrency->id) {
             Log::error(sprintf('Account #%d ("%s") must have currency preference but has none.', $opposing->account->id, $opposing->account->name));
 
             return;
         }
 
         // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
-        if ($opposingCurrency->id === $currency->id) {
+        if ((int)$opposingCurrency->id === (int)$currency->id) {
             // update both transactions to match:
             $transaction->foreign_amount       = null;
             $transaction->foreign_currency_id  = null;
@@ -459,7 +478,7 @@ class UpgradeDatabase extends Command
             return;
         }
         // if destination account currency is different, both transactions must have this currency as foreign currency id.
-        if ($opposingCurrency->id !== $currency->id) {
+        if (!((int)$opposingCurrency->id === (int)$currency->id)) {
             $transaction->foreign_currency_id = $opposingCurrency->id;
             $opposing->foreign_currency_id    = $opposingCurrency->id;
             $transaction->save();
@@ -468,36 +487,37 @@ class UpgradeDatabase extends Command
         }
 
         // if foreign amount of one is null and the other is not, use this to restore:
-        if (is_null($transaction->foreign_amount) && !is_null($opposing->foreign_amount)) {
-            $transaction->foreign_amount = bcmul(strval($opposing->foreign_amount), '-1');
+        if (null === $transaction->foreign_amount && null !== $opposing->foreign_amount) {
+            $transaction->foreign_amount = bcmul((string)$opposing->foreign_amount, '-1');
             $transaction->save();
             Log::debug(sprintf('Restored foreign amount of transaction (1) #%d to %s', $transaction->id, $transaction->foreign_amount));
         }
 
         // if foreign amount of one is null and the other is not, use this to restore (other way around)
-        if (is_null($opposing->foreign_amount) && !is_null($transaction->foreign_amount)) {
-            $opposing->foreign_amount = bcmul(strval($transaction->foreign_amount), '-1');
+        if (null === $opposing->foreign_amount && null !== $transaction->foreign_amount) {
+            $opposing->foreign_amount = bcmul((string)$transaction->foreign_amount, '-1');
             $opposing->save();
             Log::debug(sprintf('Restored foreign amount of transaction (2) #%d to %s', $opposing->id, $opposing->foreign_amount));
         }
 
         // when both are zero, try to grab it from journal:
-        if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) {
-
+        if (null === $opposing->foreign_amount && null === $transaction->foreign_amount) {
             $foreignAmount = $journal->getMeta('foreign_amount');
-            if (is_null($foreignAmount)) {
+            if (null === $foreignAmount) {
                 Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id));
-                $transaction->foreign_amount = bcmul(strval($transaction->amount), '-1');
-                $opposing->foreign_amount    = bcmul(strval($opposing->amount), '-1');
+                $transaction->foreign_amount = bcmul((string)$transaction->amount, '-1');
+                $opposing->foreign_amount    = bcmul((string)$opposing->amount, '-1');
                 $transaction->save();
                 $opposing->save();
 
                 return;
             }
-            $foreignPositive = app('steam')->positive(strval($foreignAmount));
+            $foreignPositive = app('steam')->positive((string)$foreignAmount);
             Log::debug(
                 sprintf(
-                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount
+                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").',
+                    $transaction->transaction_journal_id,
+                    $foreignAmount
                 )
             );
             $transaction->foreign_amount = bcmul($foreignPositive, '-1');
@@ -506,7 +526,7 @@ class UpgradeDatabase extends Command
             $opposing->save();
         }
 
-
         return;
     }
+
 }

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UpgradeFireflyInstructions.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,19 +17,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
 
 /**
- * Class UpgradeFireflyInstructions
- *
- * @package FireflyIII\Console\Commands
+ * Class UpgradeFireflyInstructions.
  */
 class UpgradeFireflyInstructions extends Command
 {
@@ -45,31 +42,21 @@ class UpgradeFireflyInstructions extends Command
      */
     protected $signature = 'firefly:instructions {task}';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */
     public function handle()
     {
-
-        if ($this->argument('task') === 'update') {
+        if ('update' === $this->argument('task')) {
             $this->updateInstructions();
         }
-        if ($this->argument('task') === 'install') {
+        if ('install' === $this->argument('task')) {
             $this->installInstructions();
         }
     }
 
     /**
-     * Show a nice box
+     * Show a nice box.
      *
      * @param string $text
      */
@@ -82,7 +69,7 @@ class UpgradeFireflyInstructions extends Command
     }
 
     /**
-     * Show a nice info box
+     * Show a nice info box.
      *
      * @param string $text
      */
@@ -109,12 +96,10 @@ class UpgradeFireflyInstructions extends Command
             if (substr($version, 0, $len) === $compare) {
                 $text = $config[$compare];
             }
-
         }
         $this->showLine();
         $this->boxed('');
-        if (is_null($text)) {
-
+        if (null === $text) {
             $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');
@@ -131,17 +116,16 @@ class UpgradeFireflyInstructions extends Command
     }
 
     /**
-     * Show a line
+     * Show a line.
      */
     private function showLine()
     {
         $line = '+';
-        for ($i = 0; $i < 78; $i++) {
+        for ($i = 0; $i < 78; ++$i) {
             $line .= '-';
         }
         $line .= '+';
         $this->line($line);
-
     }
 
     /**
@@ -159,12 +143,10 @@ class UpgradeFireflyInstructions extends Command
             if (substr($version, 0, $len) === $compare) {
                 $text = $config[$compare];
             }
-
         }
         $this->showLine();
         $this->boxed('');
-        if (is_null($text)) {
-
+        if (null === $text) {
             $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
             $this->boxedInfo('There are no extra upgrade instructions.');
             $this->boxed('Firefly III should be ready for use.');

app/Console/Commands/UseEncryption.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * UseEncryption.php
@@ -17,17 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-/**
- * UseEncryption.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace FireflyIII\Console\Commands;
@@ -36,9 +27,7 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
 /**
- * Class UseEncryption
- *
- * @package FireflyIII\Console\Commands
+ * Class UseEncryption.
  */
 class UseEncryption extends Command
 {
@@ -55,20 +44,17 @@ class UseEncryption extends Command
      */
     protected $signature = 'firefly:use-encryption';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */
     public function handle()
     {
+        if (config('firefly.encryption') === true) {
+            $this->info('Firefly III configuration calls for encrypted data.');
+        }
+        if (config('firefly.encryption') === false) {
+            $this->info('Firefly III configuration calls for unencrypted data.');
+        }
         $this->handleObjects('Account', 'name', 'encrypted');
         $this->handleObjects('Bill', 'name', 'name_encrypted');
         $this->handleObjects('Bill', 'match', 'match_encrypted');
@@ -88,7 +74,7 @@ class UseEncryption extends Command
     public function handleObjects(string $class, string $field, string $indicator)
     {
         $fqn     = sprintf('FireflyIII\Models\%s', $class);
-        $encrypt = config('firefly.encryption') ? 0 : 1;
+        $encrypt = config('firefly.encryption') === true ? 0 : 1;
         $set     = $fqn::where($indicator, $encrypt)->get();
 
         foreach ($set as $entry) {

app/Console/Commands/VerifiesAccessToken.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * VerifiesAccessToken.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,11 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
 use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -28,18 +27,16 @@ use Log;
 use Preferences;
 
 /**
- * Trait VerifiesAccessToken
+ * Trait VerifiesAccessToken.
  *
  * Verifies user access token for sensitive commands.
- *
- * @package FireflyIII\Console\Commands
  */
 trait VerifiesAccessToken
 {
     /**
      * Abstract method to make sure trait knows about method "option".
      *
-     * @param null $key
+     * @param string|null $key
      *
      * @return mixed
      */
@@ -52,30 +49,30 @@ trait VerifiesAccessToken
      */
     protected function verifyAccessToken(): bool
     {
-        $userId = intval($this->option('user'));
-        $token  = strval($this->option('token'));
+        $userId = (int)$this->option('user');
+        $token  = (string)$this->option('token');
         /** @var UserRepositoryInterface $repository */
         $repository = app(UserRepositoryInterface::class);
-        $user       = $repository->find($userId);
+        $user       = $repository->findNull($userId);
 
-        if (is_null($user->id)) {
+        if (null === $user) {
             Log::error(sprintf('verifyAccessToken(): no such user for input "%d"', $userId));
 
             return false;
         }
         $accessToken = Preferences::getForUser($user, 'access_token', null);
-        if (is_null($accessToken)) {
+        if (null === $accessToken) {
             Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
 
             return false;
         }
         if (!($accessToken->data === $token)) {
             Log::error(sprintf('Invalid access token for user #%d.', $userId));
+            Log::error(sprintf('Token given is "%s", expected something else.', $token));
 
             return false;
         }
 
         return true;
     }
-
-}
+}

app/Console/Commands/VerifyDatabase.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * VerifyDatabase.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,14 +17,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Console\Commands;
 
 use Crypt;
+use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
@@ -42,11 +42,9 @@ use Schema;
 use stdClass;
 
 /**
- * Class VerifyDatabase
+ * Class VerifyDatabase.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- *
- * @package FireflyIII\Console\Commands
  */
 class VerifyDatabase extends Command
 {
@@ -63,14 +61,6 @@ class VerifyDatabase extends Command
      */
     protected $signature = 'firefly:verify';
 
-    /**
-     * Create a new command instance.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */
@@ -96,7 +86,7 @@ class VerifyDatabase extends Command
         $this->repairPiggyBanks();
         $this->createLinkTypes();
         $this->createAccessTokens();
-
+        $this->fixDoubleAmounts();
     }
 
     /**
@@ -104,16 +94,21 @@ class VerifyDatabase extends Command
      */
     private function createAccessTokens()
     {
+        $count = 0;
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
             $pref = Preferences::getForUser($user, 'access_token', null);
-            if (is_null($pref)) {
+            if (null === $pref) {
                 $token = $user->generateAccessToken();
                 Preferences::setForUser($user, 'access_token', $token);
                 $this->line(sprintf('Generated access token for user %s', $user->email));
+                ++$count;
             }
         }
+        if (0 === $count) {
+            $this->info('All access tokens OK!');
+        }
     }
 
     /**
@@ -121,7 +116,8 @@ class VerifyDatabase extends Command
      */
     private function createLinkTypes()
     {
-        $set = [
+        $count = 0;
+        $set   = [
             'Related'       => ['relates to', 'relates to'],
             'Refund'        => ['(partially) refunds', 'is (partially) refunded by'],
             'Paid'          => ['(partially) pays for', 'is (partially) paid for by'],
@@ -129,15 +125,69 @@ class VerifyDatabase extends Command
         ];
         foreach ($set as $name => $values) {
             $link = LinkType::where('name', $name)->where('outward', $values[0])->where('inward', $values[1])->first();
-            if (is_null($link)) {
+            if (null === $link) {
                 $link          = new LinkType;
                 $link->name    = $name;
                 $link->outward = $values[0];
                 $link->inward  = $values[1];
+                ++$count;
             }
             $link->editable = false;
             $link->save();
         }
+        if (0 === $count) {
+            $this->info('All link types OK!');
+        }
+    }
+
+    private function fixDoubleAmounts()
+    {
+        $count = 0;
+        // get invalid journals
+        $errored  = [];
+        $journals = DB::table('transactions')
+                      ->groupBy('transaction_journal_id')
+                      ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
+        /** @var stdClass $entry */
+        foreach ($journals as $entry) {
+            if (0 !== bccomp((string)$entry->the_sum, '0')) {
+                $errored[] = $entry->transaction_journal_id;
+            }
+        }
+        foreach ($errored as $journalId) {
+            // select and update:
+            $res = Transaction::whereNull('deleted_at')->where('transaction_journal_id', $journalId)->groupBy('amount')->get([DB::raw('MIN(id) as first_id')]);
+            $ids = $res->pluck('first_id')->toArray();
+            DB::table('transactions')->whereIn('id', $ids)->update(['amount' => DB::raw('amount * -1')]);
+            ++$count;
+            // report about it
+            /** @var TransactionJournal $journal */
+            $journal = TransactionJournal::find($journalId);
+            if (null === $journal) {
+                continue;
+            }
+            if (TransactionType::OPENING_BALANCE === $journal->transactionType->type) {
+                $this->error(
+                    sprintf(
+                        'Transaction #%d was stored incorrectly. One of your asset accounts may show the wrong balance. Please visit /transactions/show/%d to verify the opening balance.',
+                        $journalId, $journalId
+                    )
+                );
+            }
+            if (TransactionType::OPENING_BALANCE !== $journal->transactionType->type) {
+                $this->error(
+                    sprintf(
+                        'Transaction #%d was stored incorrectly. Could be that the transaction shows the wrong amount. Please visit /transactions/show/%d to verify the opening balance.',
+                        $journalId, $journalId
+                    )
+                );
+            }
+        }
+        if (0 === $count) {
+            $this->info('Amount integrity OK!');
+        }
+
+        return;
     }
 
     /**
@@ -148,17 +198,17 @@ class VerifyDatabase extends Command
         $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
         $set->each(
             function (PiggyBankEvent $event) {
-                if (is_null($event->transaction_journal_id)) {
+                if (null === $event->transaction_journal_id) {
                     return true;
                 }
                 /** @var TransactionJournal $journal */
                 $journal = $event->transactionJournal()->first();
-                if (is_null($journal)) {
+                if (null === $journal) {
                     return true;
                 }
 
                 $type = $journal->transactionType->type;
-                if ($type !== TransactionType::TRANSFER) {
+                if (TransactionType::TRANSFER !== $type) {
                     $event->transaction_journal_id = null;
                     $event->save();
                     $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
@@ -208,7 +258,10 @@ class VerifyDatabase extends Command
         foreach ($set as $entry) {
             $line = sprintf(
                 'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
-                $entry->user_id, $entry->email, $entry->id, $entry->name
+                $entry->user_id,
+                $entry->email,
+                $entry->id,
+                $entry->name
             );
             $this->line($line);
         }
@@ -232,11 +285,11 @@ class VerifyDatabase extends Command
                       ->get(
                           ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
                            'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                           'transaction_journals.deleted_at as journal_deleted_at']
+                           'transaction_journals.deleted_at as journal_deleted_at',]
                       );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
-            $date = is_null($entry->transaction_deleted_at) ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
+            $date = $entry->transaction_deleted_at ?? $entry->journal_deleted_at;
             $this->error(
                 'Error: Account #' . $entry->account_id . ' should have been deleted, but has not.' .
                 ' Find it in the table called "accounts" and change the "deleted_at" field to: "' . $date . '"'
@@ -268,7 +321,7 @@ class VerifyDatabase extends Command
                                      ->whereNull('transaction_journals.deleted_at')
                                      ->get(
                                          ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
-                                          'transaction_types.type']
+                                          'transaction_types.type',]
                                      );
             foreach ($set as $entry) {
                 $this->error(
@@ -287,28 +340,33 @@ class VerifyDatabase extends Command
     }
 
     /**
-     * Any deleted transaction journals that have transactions that are NOT deleted:
+     * Any deleted transaction journals that have transactions that are NOT deleted:.
      */
     private function reportJournals()
     {
-        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-                                 ->whereNull('transactions.deleted_at')
-                                 ->whereNotNull('transactions.id')
-                                 ->get(
-                                     [
-                                         'transaction_journals.id as journal_id',
-                                         'transaction_journals.description',
-                                         'transaction_journals.deleted_at as journal_deleted',
-                                         'transactions.id as transaction_id',
-                                         'transactions.deleted_at as transaction_deleted_at']
-                                 );
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                   ->whereNull('transactions.deleted_at')
+                                   ->whereNotNull('transactions.id')
+                                   ->get(
+                                       [
+                                           'transaction_journals.id as journal_id',
+                                           'transaction_journals.description',
+                                           'transaction_journals.deleted_at as journal_deleted',
+                                           'transactions.id as transaction_id',
+                                           'transactions.deleted_at as transaction_deleted_at',]
+                                   );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
                 'Error: Transaction #' . $entry->transaction_id . ' should have been deleted, but has not.' .
                 ' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned transactions!');
         }
     }
 
@@ -317,17 +375,21 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->groupBy('transaction_journals.id')
-                                 ->whereNull('transactions.transaction_journal_id')
-                                 ->get(['transaction_journals.id']);
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->groupBy('transaction_journals.id')
+                                   ->whereNull('transactions.transaction_journal_id')
+                                   ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
                 'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned journals!');
         }
-
     }
 
     /**
@@ -339,7 +401,7 @@ class VerifyDatabase extends Command
     {
         $plural = str_plural($name);
         $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
-        $field  = $name === 'tag' ? 'tag' : 'name';
+        $field  = 'tag' === $name ? 'tag' : 'name';
         $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
                         ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
                         ->distinct()
@@ -349,7 +411,6 @@ class VerifyDatabase extends Command
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
-
             $objName = $entry->name;
             try {
                 $objName = Crypt::decrypt($objName);
@@ -359,7 +420,11 @@ class VerifyDatabase extends Command
 
             $line = sprintf(
                 'User #%d (%s) has %s #%d ("%s") which has no transactions.',
-                $entry->user_id, $entry->email, $name, $entry->id, $objName
+                $entry->user_id,
+                $entry->email,
+                $name,
+                $entry->id,
+                $objName
             );
             $this->line($line);
         }
@@ -375,9 +440,11 @@ class VerifyDatabase extends Command
 
         /** @var User $user */
         foreach ($userRepository->all() as $user) {
-            $sum = strval($user->transactions()->sum('amount'));
-            if (bccomp($sum, '0') !== 0) {
+            $sum = (string)$user->transactions()->sum('amount');
+            if (0 !== bccomp($sum, '0')) {
                 $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
+            } else {
+                $this->info(sprintf('Amount integrity OK for user #%d', $user->id));
             }
         }
     }
@@ -392,7 +459,7 @@ class VerifyDatabase extends Command
                           ->whereNull('transaction_journals.deleted_at')
                           ->get(
                               ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                               'transaction_journals.deleted_at']
+                               'transaction_journals.deleted_at',]
                           );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -419,11 +486,10 @@ class VerifyDatabase extends Command
             $this->error(
                 sprintf(
                     'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.',
-                    $entry->id, $entry->transactionType->type
+                    $entry->id,
+                    $entry->transactionType->type
                 )
             );
         }
-
-
     }
 }

app/Console/Kernel.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Kernel.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,19 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-
-/**
- * Kernel.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace FireflyIII\Console;
@@ -48,13 +37,10 @@ class Kernel extends ConsoleKernel
      */
     protected $commands
         = [
-            //
         ];
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
     protected function commands()
     {
@@ -66,9 +52,8 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
-     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function schedule(Schedule $schedule)

app/Events/AdminRequestedTestMessage.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * AdminRequestedTestMessage.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,34 +17,35 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
-
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 use Log;
 
 /**
- * Class AdminRequestedTestMessage
- *
- * @package FireflyIII\Events
+ * Class AdminRequestedTestMessage.
  */
 class AdminRequestedTestMessage extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var User
+     */
     public $user;
 
     /**
      * Create a new event instance.
      *
-     * @param  User  $user
+     * @param User   $user
      * @param string $ipAddress
      */
     public function __construct(User $user, string $ipAddress)

app/Events/Event.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Event.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,19 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 /**
- * Class Event
- *
- * @package FireflyIII\Events
+ * Class Event.
  */
 abstract class Event
 {
-    //
 }

app/Events/RegisteredUser.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * RegisteredUser.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,32 +17,34 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class RegisteredUser
- *
- * @package FireflyIII\Events
+ * Class RegisteredUser.
  */
 class RegisteredUser extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var User
+     */
     public $user;
 
     /**
      * Create a new event instance. This event is triggered when a new user registers.
      *
-     * @param  User  $user
+     * @param User   $user
      * @param string $ipAddress
      */
     public function __construct(User $user, string $ipAddress)

app/Events/RequestedNewPassword.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * RequestedNewPassword.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,33 +17,38 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class RequestedNewPassword
- *
- * @package FireflyIII\Events
+ * Class RequestedNewPassword.
  */
 class RequestedNewPassword extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var string
+     */
     public $token;
+    /**
+     * @var User
+     */
     public $user;
 
     /**
      * Create a new event instance. This event is triggered when a users tries to reset his or her password.
      *
-     * @param  User  $user
+     * @param User   $user
      * @param string $token
      * @param string $ipAddress
      */
@@ -52,5 +58,4 @@ class RequestedNewPassword extends Event
         $this->token     = $token;
         $this->ipAddress = $ipAddress;
     }
-
 }

app/Events/RequestedVersionCheckStatus.php

@@ -0,0 +1,52 @@
+<?php
+declare(strict_types=1);
+/**
+ * RequestedVersionCheckStatus.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+
+/**
+ * Class RequestedVersionCheckStatus
+ */
+class RequestedVersionCheckStatus extends Event
+{
+    use SerializesModels;
+
+    /**
+     * @var User
+     */
+    public $user;
+
+    /**
+     * Create a new event instance. This event is triggered when Firefly III wants to know
+     * what the deal is with the version checker.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Events/StoredTransactionJournal.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * StoredTransactionJournal.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,24 +17,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class StoredTransactionJournal
- *
- * @package FireflyIII\Events
+ * @codeCoverageIgnore
+ * Class StoredTransactionJournal.
  */
 class StoredTransactionJournal extends Event
 {
-
     use SerializesModels;
 
     /** @var TransactionJournal */
@@ -49,10 +46,7 @@ class StoredTransactionJournal extends Event
      */
     public function __construct(TransactionJournal $journal, int $piggyBankId)
     {
-        //
         $this->journal     = $journal;
         $this->piggyBankId = $piggyBankId;
-
     }
-
 }

app/Events/UpdatedTransactionJournal.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UpdatedTransactionJournal.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,24 +17,22 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UpdatedTransactionJournal
+ * Class UpdatedTransactionJournal.
+ *
+ * @codeCoverageIgnore
  *
- * @package FireflyIII\Events
  */
 class UpdatedTransactionJournal extends Event
 {
-
     use SerializesModels;
 
     /** @var TransactionJournal */
@@ -46,8 +45,6 @@ class UpdatedTransactionJournal extends Event
      */
     public function __construct(TransactionJournal $journal)
     {
-        //
         $this->journal = $journal;
     }
-
 }

app/Events/UserChangedEmail.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UserChangedEmail.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,30 +17,26 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Events;
 
 use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UserChangedEmail
- *
- * @package FireflyIII\Events
+ * Class UserChangedEmail.
  */
 class UserChangedEmail extends Event
 {
     use SerializesModels;
 
-    /** @var  string */
+    /** @var string */
     public $ipAddress;
-    /** @var  string */
+    /** @var string */
     public $newEmail;
-    /** @var  string */
+    /** @var string */
     public $oldEmail;
     /** @var User */
     public $user;
@@ -59,4 +56,4 @@ class UserChangedEmail extends Event
         $this->oldEmail  = $oldEmail;
         $this->newEmail  = $newEmail;
     }
-}
+}

app/Exceptions/FireflyException.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * FireflyException.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Exceptions;
 
+use Exception;
 
 /**
- * Class FireflyException
- *
- * @package FireflyIII\Exceptions
+ * Class FireflyException.
  */
-class FireflyException extends \Exception
+class FireflyException extends Exception
 {
-
-} 
+}

app/Exceptions/Handler.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Handler.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,19 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-
-/**
- * Handler.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
 namespace FireflyIII\Exceptions;
@@ -36,10 +25,15 @@ namespace FireflyIII\Exceptions;
 use ErrorException;
 use Exception;
 use FireflyIII\Jobs\MailError;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Validation\ValidationException;
 use Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-
+/**
+ * Class Handler
+ */
 class Handler extends ExceptionHandler
 {
     /**
@@ -59,21 +53,50 @@ class Handler extends ExceptionHandler
      */
     protected $dontReport
         = [
-            //
         ];
 
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Exception               $exception
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $exception
      *
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $exception)
     {
-        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
+        if ($exception instanceof ValidationException && $request->expectsJson()) {
+            // ignore it: controller will handle it.
+            return parent::render($request, $exception);
+        }
+        if ($exception instanceof NotFoundHttpException && $request->expectsJson()) {
+            // JSON error:
+            return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404);
+        }
 
+        if ($exception instanceof AuthenticationException && $request->expectsJson()) {
+            // somehow Laravel handler does not catch this:
+            return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401);
+        }
+
+        if ($request->expectsJson()) {
+            $isDebug = config('app.debug', false);
+            if ($isDebug) {
+                return response()->json(
+                    [
+                        'message'   => $exception->getMessage(),
+                        'exception' => get_class($exception),
+                        'line'      => $exception->getLine(),
+                        'file'      => $exception->getFile(),
+                        'trace'     => $exception->getTrace(),
+                    ], 500
+                );
+            }
+
+            return response()->json(['message' => 'Internal Firefly III Exception. See log files.', 'exception' => get_class($exception)], 500);
+        }
+
+        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
             $isDebug = env('APP_DEBUG', false);
 
             return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
@@ -88,9 +111,12 @@ class Handler extends ExceptionHandler
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
-     * @param  \Exception $exception
      *
-     * @return void
+     * @param \Exception $exception
+     *
+     * @return mixed|void
+     *
+     * @throws Exception
      */
     public function report(Exception $exception)
     {
@@ -121,7 +147,6 @@ class Handler extends ExceptionHandler
             dispatch($job);
         }
 
-
         parent::report($exception);
     }
 }

app/Exceptions/NotImplementedException.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * NotImplementedException.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Exceptions;
 
-
 /**
- * Class NotImplementedException
- *
- * @package FireflyIII\Exceptions
+ * Class NotImplementedException.
  */
 class NotImplementedException extends \Exception
 {
-
-} 
+}

app/Exceptions/ValidationException.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ValidationException.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,19 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Exceptions;
 
 /**
- * Class ValidationExceptions
- *
- * @package FireflyIII\Exception
+ * Class ValidationExceptions.
  */
 class ValidationException extends \Exception
 {
-
-} 
+}

app/Export/Collector/AttachmentCollector.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * AttachmentCollector.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,11 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Collector;
 
 use Carbon\Carbon;
@@ -33,19 +32,17 @@ use Log;
 use Storage;
 
 /**
- * Class AttachmentCollector
- *
- * @package FireflyIII\Export\Collector
+ * Class AttachmentCollector.
  */
 class AttachmentCollector extends BasicCollector implements CollectorInterface
 {
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $exportDisk;
-    /** @var  AttachmentRepositoryInterface */
+    /** @var AttachmentRepositoryInterface */
     private $repository;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $uploadDisk;
@@ -104,11 +101,9 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
                 $exportFile = $this->exportFileName($attachment);
                 $this->exportDisk->put($exportFile, $decrypted);
                 $this->getEntries()->push($exportFile);
-
             } catch (DecryptException $e) {
                 Log::error('Catchable error: could not decrypt attachment #' . $attachment->id . ' because: ' . $e->getMessage());
             }
-
         }
 
         return true;
@@ -123,8 +118,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
      */
     private function exportFileName($attachment): string
     {
-
-        return sprintf('%s-Attachment nr. %s - %s', $this->job->key, strval($attachment->id), $attachment->filename);
+        return sprintf('%s-Attachment nr. %s - %s', $this->job->key, (string)$attachment->id, $attachment->filename);
     }
 
     /**
@@ -133,8 +127,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
     private function getAttachments(): Collection
     {
         $this->repository->setUser($this->user);
-        $attachments = $this->repository->getBetween($this->start, $this->end);
 
-        return $attachments;
+        return $this->repository->getBetween($this->start, $this->end);
     }
 }

app/Export/Collector/BasicCollector.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * BasicCollector.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,28 +17,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Collector;
 
-
 use FireflyIII\Models\ExportJob;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
- * Class BasicCollector
- *
- * @package FireflyIII\Export\Collector
+ * Class BasicCollector.
  */
 class BasicCollector
 {
     /** @var ExportJob */
     protected $job;
-    /** @var  User */
+    /** @var User */
     protected $user;
     /** @var Collection */
     private $entries;
@@ -82,6 +78,4 @@ class BasicCollector
     {
         $this->user = $user;
     }
-
-
 }

app/Export/Collector/CollectorInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CollectorInterface.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Collector;
 
 use FireflyIII\Models\ExportJob;
 use Illuminate\Support\Collection;
 
 /**
- * Interface CollectorInterface
- *
- * @package FireflyIII\Export\Collector
+ * Interface CollectorInterface.
  */
 interface CollectorInterface
 {
@@ -45,9 +42,6 @@ interface CollectorInterface
 
     /**
      * @param Collection $entries
-     *
-     * @return void
-     *
      */
     public function setEntries(Collection $entries);
 
@@ -57,5 +51,4 @@ interface CollectorInterface
      * @return mixed
      */
     public function setJob(ExportJob $job);
-
 }

app/Export/Collector/UploadCollector.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * UploadCollector.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,23 +17,19 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Collector;
 
 use Crypt;
+use Exception;
 use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Log;
 use Storage;
 
 /**
- * Class UploadCollector
- *
- * @package FireflyIII\Export\Collector
+ * Class UploadCollector.
  */
 class UploadCollector extends BasicCollector implements CollectorInterface
 {
@@ -94,7 +91,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     {
         // find job associated with import file:
         $job = $this->job->user->importJobs()->where('key', $key)->first();
-        if (is_null($job)) {
+        if (null === $job) {
             return false;
         }
 
@@ -102,7 +99,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         $content = '';
         try {
             $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
-        } catch (FileNotFoundException | DecryptException $e) {
+        } catch (Exception | DecryptException $e) {
             Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
         }
 
@@ -116,5 +113,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface
 
         return true;
     }
-
 }

app/Export/Entry/Entry.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Entry.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,18 +17,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Entry;
 
 use FireflyIII\Models\Transaction;
 
 /**
  * To extend the exported object, in case of new features in Firefly III for example,
- * do the following:
+ * do the following:.
  *
  * - Add the field(s) to this class. If you add more than one related field, add a new object.
  * - Make sure the "fromJournal"-routine fills these fields.
@@ -39,52 +38,141 @@ use FireflyIII\Models\Transaction;
  *
  *
  * Class Entry
+ *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
- *
- * @package FireflyIII\Export\Entry
  */
 final class Entry
 {
     // @formatter:off
+    /**
+     * @var int
+     */
     public $journal_id;
+    /**
+     * @var int
+     */
     public $transaction_id = 0;
 
+    /**
+     * @var string
+     */
     public $date;
+    /**
+     * @var string
+     */
     public $description;
 
+    /**
+     * @var string
+     */
     public $currency_code;
+    /**
+     * @var string
+     */
     public $amount;
+    /**
+     * @var string
+     */
     public $foreign_currency_code = '';
-    public $foreign_amount        = '0';
+    /**
+     * @var string
+     */
+    public $foreign_amount = '0';
 
+    /**
+     * @var string
+     */
     public $transaction_type;
 
+    /**
+     * @var string
+     */
     public $asset_account_id;
+    /**
+     * @var string
+     */
     public $asset_account_name;
+    /**
+     * @var string
+     */
     public $asset_account_iban;
+    /**
+     * @var string
+     */
     public $asset_account_bic;
+    /**
+     * @var string
+     */
     public $asset_account_number;
+    /**
+     * @var string
+     */
     public $asset_currency_code;
 
+    /**
+     * @var string
+     */
     public $opposing_account_id;
+    /**
+     * @var string
+     */
     public $opposing_account_name;
+    /**
+     * @var string
+     */
     public $opposing_account_iban;
+    /**
+     * @var string
+     */
     public $opposing_account_bic;
+    /**
+     * @var string
+     */
     public $opposing_account_number;
+    /**
+     * @var string
+     */
     public $opposing_currency_code;
 
+    /**
+     * @var string
+     */
     public $budget_id;
+    /**
+     * @var string
+     */
     public $budget_name;
 
+    /**
+     * @var string
+     */
     public $category_id;
+    /**
+     * @var string
+     */
     public $category_name;
 
+    /**
+     * @var string
+     */
     public $bill_id;
+    /**
+     * @var string
+     */
     public $bill_name;
 
+    /**
+     * @var string
+     */
     public $notes;
+
+    /**
+     * @var string
+     */
     public $tags;
+
+
     // @formatter:on
 
     /**
@@ -106,59 +194,58 @@ final class Entry
      */
     public static function fromTransaction(Transaction $transaction): Entry
     {
-        $entry                 = new self;
+        $entry                 = new self();
         $entry->journal_id     = $transaction->journal_id;
         $entry->transaction_id = $transaction->id;
         $entry->date           = $transaction->date->format('Ymd');
         $entry->description    = $transaction->description;
-        if (strlen(strval($transaction->transaction_description)) > 0) {
+        if (strlen((string)$transaction->transaction_description) > 0) {
             $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
         }
         $entry->currency_code = $transaction->transactionCurrency->code;
-        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+        $entry->amount        = (string)round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
 
-        $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
-        $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
+        $entry->foreign_currency_code = null === $transaction->foreign_currency_id ? null : $transaction->foreignCurrency->code;
+        $entry->foreign_amount        = null === $transaction->foreign_currency_id
             ? null
-            : strval(
-                round(
-                    $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
-                )
+            : (string)round(
+                $transaction->transaction_foreign_amount,
+                $transaction->foreignCurrency->decimal_places
             );
 
         $entry->transaction_type     = $transaction->transaction_type_type;
-        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_id     = (string)$transaction->account_id;
         $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
         $entry->asset_account_iban   = $transaction->account_iban;
         $entry->asset_account_number = $transaction->account_number;
         $entry->asset_account_bic    = $transaction->account_bic;
         $entry->asset_currency_code  = $transaction->account_currency_code;
 
-        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_id     = (string)$transaction->opposing_account_id;
         $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
         $entry->opposing_account_iban   = $transaction->opposing_account_iban;
         $entry->opposing_account_number = $transaction->opposing_account_number;
         $entry->opposing_account_bic    = $transaction->opposing_account_bic;
         $entry->opposing_currency_code  = $transaction->opposing_currency_code;
 
-        /** budget */
-        $entry->budget_id   = $transaction->transaction_budget_id;
+        // budget
+        $entry->budget_id   = (string)$transaction->transaction_budget_id;
         $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
-        if (is_null($transaction->transaction_budget_id)) {
+        if (null === $transaction->transaction_budget_id) {
             $entry->budget_id   = $transaction->transaction_journal_budget_id;
             $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
         }
 
-        /** category */
-        $entry->category_id   = $transaction->transaction_category_id;
+        // category
+        $entry->category_id   = (string)$transaction->transaction_category_id;
         $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
-        if (is_null($transaction->transaction_category_id)) {
+        if (null === $transaction->transaction_category_id) {
             $entry->category_id   = $transaction->transaction_journal_category_id;
             $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
         }
 
-        /** budget */
-        $entry->bill_id   = $transaction->bill_id;
+        // budget
+        $entry->bill_id   = (string)$transaction->bill_id;
         $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
 
         $entry->tags  = $transaction->tags;
@@ -166,6 +253,4 @@ final class Entry
 
         return $entry;
     }
-
-
 }

app/Export/ExpandedProcessor.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ExpandedProcessor.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,14 +17,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export;
 
-
 use Crypt;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
@@ -34,8 +32,8 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
@@ -43,32 +41,29 @@ use Storage;
 use ZipArchive;
 
 /**
- * Class ExpandedProcessor
+ * Class ExpandedProcessor.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // its doing a lot.
- *
- * @package FireflyIII\Export
  */
 class ExpandedProcessor implements ProcessorInterface
 {
-
     /** @var Collection */
     public $accounts;
-    /** @var  string */
+    /** @var string */
     public $exportFormat;
-    /** @var  bool */
+    /** @var bool */
     public $includeAttachments;
-    /** @var  bool */
+    /** @var bool */
     public $includeOldUploads;
-    /** @var  ExportJob */
+    /** @var ExportJob */
     public $job;
     /** @var array */
     public $settings;
-    /** @var  Collection */
+    /** @var Collection */
     private $exportEntries;
-    /** @var  Collection */
+    /** @var Collection */
     private $files;
-    /** @var  Collection */
+    /** @var Collection */
     private $journals;
 
     /**
@@ -119,24 +114,23 @@ class ExpandedProcessor implements ProcessorInterface
         $notes       = $this->getNotes($ids);
         $tags        = $this->getTags($ids);
         /** @var array $ibans */
-        $ibans      = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $ibans      = array_merge($this->getIbans($assetIds), $this->getIbans($opposingIds));
         $currencies = $this->getAccountCurrencies($ibans);
         $transactions->each(
             function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
-                $journalId                            = intval($transaction->journal_id);
-                $accountId                            = intval($transaction->account_id);
-                $opposingId                           = intval($transaction->opposing_account_id);
-                $currencyId                           = $ibans[$accountId]['currency_id'] ?? 0;
-                $opposingCurrencyId                   = $ibans[$opposingId]['currency_id'] ?? 0;
+                $journalId                            = (int)$transaction->journal_id;
+                $accountId                            = (int)$transaction->account_id;
+                $opposingId                           = (int)$transaction->opposing_account_id;
+                $currencyId                           = (int)($ibans[$accountId]['currency_id'] ?? 0.0);
+                $opposingCurrencyId                   = (int)($ibans[$opposingId]['currency_id'] ?? 0.0);
                 $transaction->notes                   = $notes[$journalId] ?? '';
-                $transaction->tags                    = join(',', $tags[$journalId] ?? []);
+                $transaction->tags                    = implode(',', $tags[$journalId] ?? []);
                 $transaction->account_number          = $ibans[$accountId]['accountNumber'] ?? '';
                 $transaction->account_bic             = $ibans[$accountId]['BIC'] ?? '';
                 $transaction->account_currency_code   = $currencies[$currencyId] ?? '';
                 $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
                 $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
                 $transaction->opposing_currency_code  = $currencies[$opposingCurrencyId] ?? '';
-
             }
         );
 
@@ -177,7 +171,9 @@ class ExpandedProcessor implements ProcessorInterface
 
     /**
      * @return bool
+     *
      * @throws FireflyException
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function createZipFile(): bool
     {
@@ -185,7 +181,7 @@ class ExpandedProcessor implements ProcessorInterface
         $file     = $this->job->key . '.zip';
         $fullPath = storage_path('export') . '/' . $file;
 
-        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+        if (true !== $zip->open($fullPath, ZipArchive::CREATE)) {
             throw new FireflyException('Cannot store zip file.');
         }
         // for each file in the collection, add it to the zip file.
@@ -267,7 +263,7 @@ class ExpandedProcessor implements ProcessorInterface
         $ids        = [];
         $repository->setUser($this->job->user);
         foreach ($array as $value) {
-            $ids[] = $value['currency_id'] ?? 0;
+            $ids[] = (int)($value['currency_id'] ?? 0.0);
         }
         $ids    = array_unique($ids);
         $result = $repository->getByIds($ids);
@@ -280,7 +276,7 @@ class ExpandedProcessor implements ProcessorInterface
     }
 
     /**
-     * Get all IBAN / SWIFT / account numbers
+     * Get all IBAN / SWIFT / account numbers.
      *
      * @param array $array
      *
@@ -297,7 +293,7 @@ class ExpandedProcessor implements ProcessorInterface
                              ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
         /** @var AccountMeta $meta */
         foreach ($set as $meta) {
-            $id                       = intval($meta->account_id);
+            $id                       = (int)$meta->account_id;
             $return[$id][$meta->name] = $meta->data;
         }
 
@@ -314,17 +310,16 @@ class ExpandedProcessor implements ProcessorInterface
     private function getNotes(array $array): array
     {
         $array  = array_unique($array);
-        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
-                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
-                                        ->where('transaction_journals.user_id', $this->job->user_id)
-                                        ->where('journal_meta.name', 'notes')->get(
-                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
-            );
+        $notes  = Note::where('notes.noteable_type', 'FireflyIII\\Models\\TransactionJournal')
+                      ->whereIn('notes.noteable_id', $array)
+                      ->get(['notes.*']);
         $return = [];
-        /** @var TransactionJournalMeta $meta */
-        foreach ($set as $meta) {
-            $id          = intval($meta->transaction_journal_id);
-            $return[$id] = $meta->data;
+        /** @var Note $note */
+        foreach ($notes as $note) {
+            if (strlen(trim((string)$note->text)) > 0) {
+                $id          = (int)$note->noteable_id;
+                $return[$id] = $note->text;
+            }
         }
 
         return $return;
@@ -336,6 +331,7 @@ class ExpandedProcessor implements ProcessorInterface
      * @param array $array
      *
      * @return array
+     * @throws \Illuminate\Contracts\Encryption\DecryptException
      */
     private function getTags(array $array): array
     {
@@ -347,8 +343,8 @@ class ExpandedProcessor implements ProcessorInterface
                     ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag']);
         $result = [];
         foreach ($set as $entry) {
-            $id            = intval($entry->transaction_journal_id);
-            $result[$id]   = isset($result[$id]) ? $result[$id] : [];
+            $id            = (int)$entry->transaction_journal_id;
+            $result[$id]   = $result[$id] ?? [];
             $result[$id][] = Crypt::decrypt($entry->tag);
         }
 

app/Export/Exporter/BasicExporter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * BasicExporter.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,25 +17,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Exporter;
 
-
 use FireflyIII\Models\ExportJob;
 use Illuminate\Support\Collection;
 
 /**
- * Class BasicExporter
- *
- * @package FireflyIII\Export\Exporter
+ * Class BasicExporter.
  */
 class BasicExporter
 {
-    /** @var  ExportJob */
+    /** @var ExportJob */
     protected $job;
     /** @var Collection */
     private $entries;
@@ -70,6 +66,4 @@ class BasicExporter
     {
         $this->job = $job;
     }
-
-
 }

app/Export/Exporter/CsvExporter.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * CsvExporter.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,35 +17,23 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Exporter;
 
 use FireflyIII\Export\Entry\Entry;
 use League\Csv\Writer;
-use SplFileObject;
+use Storage;
 
 /**
- * Class CsvExporter
- *
- * @package FireflyIII\Export\Exporter
+ * Class CsvExporter.
  */
 class CsvExporter extends BasicExporter implements ExporterInterface
 {
-    /** @var  string */
+    /** @var string */
     private $fileName;
 
-    /**
-     * CsvExporter constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * @return string
      */
@@ -55,6 +44,7 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
     /**
      * @return bool
+     *
      */
     public function run(): bool
     {
@@ -63,13 +53,16 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
         // necessary for CSV writer:
         $fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->fileName;
-        $writer   = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
-        $rows     = [];
+
+
+        //we create the CSV into memory
+        $writer = Writer::createFromPath($fullPath);
+        $rows   = [];
 
         // get field names for header row:
         $first   = $this->getEntries()->first();
         $headers = [];
-        if (!is_null($first)) {
+        if (null !== $first) {
             $headers = array_keys(get_object_vars($first));
         }
 
@@ -88,9 +81,11 @@ class CsvExporter extends BasicExporter implements ExporterInterface
         return true;
     }
 
-
     private function tempFile()
     {
         $this->fileName = $this->job->key . '-records.csv';
+        // touch file in export directory:
+        $disk = Storage::disk('export');
+        $disk->put($this->fileName, '');
     }
 }

app/Export/Exporter/ExporterInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ExporterInterface.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,20 +17,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export\Exporter;
 
 use FireflyIII\Models\ExportJob;
 use Illuminate\Support\Collection;
 
 /**
- * Interface ExporterInterface
- *
- * @package FireflyIII\Export\Exporter
+ * Interface ExporterInterface.
  */
 interface ExporterInterface
 {
@@ -50,9 +47,6 @@ interface ExporterInterface
 
     /**
      * @param Collection $entries
-     *
-     * @return void
-     *
      */
     public function setEntries(Collection $entries);
 
@@ -60,5 +54,4 @@ interface ExporterInterface
      * @param ExportJob $job
      */
     public function setJob(ExportJob $job);
-
 }

app/Export/ProcessorInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * ProcessorInterface.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -16,23 +17,18 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace FireflyIII\Export;
 
 use Illuminate\Support\Collection;
 
 /**
- * Interface ProcessorInterface
- *
- * @package FireflyIII\Export
+ * Interface ProcessorInterface.
  */
 interface ProcessorInterface
 {
-
     /**
      * Processor constructor.
      */

app/Factory/AccountFactory.php

@@ -0,0 +1,176 @@
+<?php
+declare(strict_types=1);
+/**
+ * AccountFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Services\Internal\Support\AccountServiceTrait;
+use FireflyIII\User;
+
+/**
+ * Factory to create or return accounts.
+ *
+ * Class AccountFactory
+ */
+class AccountFactory
+{
+    use AccountServiceTrait;
+    /** @var User */
+    private $user;
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    public function create(array $data): Account
+    {
+        $type         = $this->getAccountType($data['account_type_id'], $data['accountType']);
+        $data['iban'] = $this->filterIban($data['iban']);
+
+
+        // account may exist already:
+        $existingAccount = $this->find($data['name'], $type->type);
+        if (null !== $existingAccount) {
+            return $existingAccount;
+        }
+
+
+        // create it:
+        $databaseData
+            = [
+            'user_id'         => $this->user->id,
+            'account_type_id' => $type->id,
+            'name'            => $data['name'],
+            'virtual_balance' => $data['virtualBalance'] ?? '0',
+            'active'          => true === $data['active'],
+            'iban'            => $data['iban'],
+        ];
+
+        // remove virtual balance when not an asset account:
+        if ($type->type !== AccountType::ASSET) {
+            $databaseData['virtual_balance'] = '0';
+        }
+
+        $newAccount = Account::create($databaseData);
+        $this->updateMetaData($newAccount, $data);
+
+        if ($this->validIBData($data) && $type->type === AccountType::ASSET) {
+            $this->updateIB($newAccount, $data);
+        }
+        if (!$this->validIBData($data) && $type->type === AccountType::ASSET) {
+            $this->deleteIB($newAccount);
+        }
+        // update note:
+        if (isset($data['notes'])) {
+            $this->updateNote($newAccount, $data['notes']);
+        }
+
+        return $newAccount;
+    }
+
+    /**
+     * @param string $accountName
+     * @param string $accountType
+     *
+     * @return Account|null
+     */
+    public function find(string $accountName, string $accountType): ?Account
+    {
+        $type     = AccountType::whereType($accountType)->first();
+        $accounts = $this->user->accounts()->where('account_type_id', $type->id)->get(['accounts.*']);
+
+        /** @var Account $object */
+        foreach ($accounts as $object) {
+            if ($object->name === $accountName) {
+                return $object;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $accountName
+     * @param string $accountType
+     *
+     * @return Account
+     */
+    public function findOrCreate(string $accountName, string $accountType): Account
+    {
+        $type     = AccountType::whereType($accountType)->first();
+        $accounts = $this->user->accounts()->where('account_type_id', $type->id)->get(['accounts.*']);
+
+        /** @var Account $object */
+        foreach ($accounts as $object) {
+            if ($object->name === $accountName) {
+                return $object;
+            }
+        }
+
+        return $this->create(
+            [
+                'user_id'         => $this->user->id,
+                'name'            => $accountName,
+                'account_type_id' => $type->id,
+                'accountType'     => null,
+                'virtualBalance'  => '0',
+                'iban'            => null,
+                'active'          => true,
+            ]
+        );
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param int|null    $accountTypeId
+     * @param null|string $accountType
+     *
+     * @return AccountType|null
+     */
+    protected function getAccountType(?int $accountTypeId, ?string $accountType): ?AccountType
+    {
+        $accountTypeId = (int)$accountTypeId;
+        if ($accountTypeId > 0) {
+            return AccountType::find($accountTypeId);
+        }
+        $type   = config('firefly.accountTypeByIdentifier.' . (string)$accountType);
+        $result = AccountType::whereType($type)->first();
+        if (null === $result && null !== $accountType) {
+            // try as full name:
+            $result = AccountType::whereType($accountType)->first();
+        }
+
+        return $result;
+
+    }
+
+}

app/Factory/AccountMetaFactory.php

@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+/**
+ * AccountMetaFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\AccountMeta;
+
+/**
+ * Class AccountMetaFactory
+ */
+class AccountMetaFactory
+{
+    /**
+     * @param array $data
+     *
+     * @return AccountMeta|null
+     */
+    public function create(array $data): ?AccountMeta
+    {
+        return AccountMeta::create($data);
+    }
+
+}

app/Factory/BillFactory.php

@@ -0,0 +1,137 @@
+<?php
+declare(strict_types=1);
+/**
+ * BillFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Services\Internal\Support\BillServiceTrait;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class BillFactory
+ */
+class BillFactory
+{
+    use BillServiceTrait;
+    /** @var User */
+    private $user;
+
+    /**
+     * @param array $data
+     *
+     * @return Bill|null
+     */
+    public function create(array $data): ?Bill
+    {
+        $matchArray = explode(',', $data['match']);
+        $matchArray = array_unique($matchArray);
+        $match      = implode(',', $matchArray);
+
+        /** @var Bill $bill */
+        $bill = Bill::create(
+            [
+                'name'        => $data['name'],
+                'match'       => $match,
+                'amount_min'  => $data['amount_min'],
+                'user_id'     => $this->user->id,
+                'amount_max'  => $data['amount_max'],
+                'date'        => $data['date'],
+                'repeat_freq' => $data['repeat_freq'],
+                'skip'        => $data['skip'],
+                'automatch'   => $data['automatch'],
+                'active'      => $data['active'],
+            ]
+        );
+
+        // update note:
+        if (isset($data['notes'])) {
+            $this->updateNote($bill, $data['notes']);
+        }
+
+        return $bill;
+    }
+
+    /**
+     * @param int|null    $billId
+     * @param null|string $billName
+     *
+     * @return Bill|null
+     */
+    public function find(?int $billId, ?string $billName): ?Bill
+    {
+        $billId   = (int)$billId;
+        $billName = (string)$billName;
+
+        // first find by ID:
+        if ($billId > 0) {
+            /** @var Bill $bill */
+            $bill = $this->user->bills()->find($billId);
+            if (null !== $bill) {
+                return $bill;
+            }
+        }
+
+        // then find by name:
+        if (strlen($billName) > 0) {
+            $bill = $this->findByName($billName);
+            if (null !== $bill) {
+                return $bill;
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return Bill|null
+     */
+    public function findByName(string $name): ?Bill
+    {
+        /** @var Collection $collection */
+        $collection = $this->user->bills()->get();
+        /** @var Bill $bill */
+        foreach ($collection as $bill) {
+            Log::debug(sprintf('"%s" vs. "%s"', $bill->name, $name));
+            if ($bill->name === $name) {
+                return $bill;
+            }
+        }
+        Log::debug(sprintf('Bill::Find by name returns NULL based on "%s"', $name));
+
+        return null;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
+}

app/Factory/BudgetFactory.php

@@ -0,0 +1,100 @@
+<?php
+declare(strict_types=1);
+/**
+ * BudgetFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\Budget;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class BudgetFactory
+ */
+class BudgetFactory
+{
+    /** @var User */
+    private $user;
+
+
+    /**
+     * @param int|null    $budgetId
+     * @param null|string $budgetName
+     *
+     * @return Budget|null
+     */
+    public function find(?int $budgetId, ?string $budgetName): ?Budget
+    {
+        $budgetId   = (int)$budgetId;
+        $budgetName = (string)$budgetName;
+
+        if (strlen($budgetName) === 0 && $budgetId === 0) {
+            return null;
+        }
+
+        // first by ID:
+        if ($budgetId > 0) {
+            /** @var Budget $budget */
+            $budget = $this->user->budgets()->find($budgetId);
+            if (null !== $budget) {
+                return $budget;
+            }
+        }
+
+        if (strlen($budgetName) > 0) {
+            $budget = $this->findByName($budgetName);
+            if (null !== $budget) {
+                return $budget;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return Budget|null
+     */
+    public function findByName(string $name): ?Budget
+    {
+        /** @var Collection $collection */
+        $collection = $this->user->budgets()->get();
+        /** @var Budget $budget */
+        foreach ($collection as $budget) {
+            if ($budget->name === $name) {
+                return $budget;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
+}

app/Factory/CategoryFactory.php

@@ -0,0 +1,111 @@
+<?php
+declare(strict_types=1);
+/**
+ * CategoryFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+
+use FireflyIII\Models\Category;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class CategoryFactory
+ */
+class CategoryFactory
+{
+    /** @var User */
+    private $user;
+
+    /**
+     * @param string $name
+     *
+     * @return Category|null
+     */
+    public function findByName(string $name): ?Category
+    {
+        $result = null;
+        /** @var Collection $collection */
+        $collection = $this->user->categories()->get();
+        /** @var Category $category */
+        foreach ($collection as $category) {
+            if ($category->name === $name) {
+                $result = $category;
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int|null    $categoryId
+     * @param null|string $categoryName
+     *
+     * @return Category|null
+     */
+    public function findOrCreate(?int $categoryId, ?string $categoryName): ?Category
+    {
+        $categoryId   = (int)$categoryId;
+        $categoryName = (string)$categoryName;
+
+        Log::debug(sprintf('Going to find category with ID %d and name "%s"', $categoryId, $categoryName));
+
+        if (strlen($categoryName) === 0 && $categoryId === 0) {
+            return null;
+        }
+        // first by ID:
+        if ($categoryId > 0) {
+            /** @var Category $category */
+            $category = $this->user->categories()->find($categoryId);
+            if (null !== $category) {
+                return $category;
+            }
+        }
+
+        if (strlen($categoryName) > 0) {
+            $category = $this->findByName($categoryName);
+            if (null !== $category) {
+                return $category;
+            }
+
+            return Category::create(
+                [
+                    'user_id' => $this->user->id,
+                    'name'    => $categoryName,
+                ]
+            );
+        }
+
+        return null;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
+}

app/Factory/PiggyBankEventFactory.php

@@ -0,0 +1,88 @@
+<?php
+declare(strict_types=1);
+/**
+ * PiggyBankEventFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use Log;
+
+/**
+ * Create piggy bank events.
+ *
+ * Class PiggyBankEventFactory
+ */
+class PiggyBankEventFactory
+{
+    /**
+     * @param TransactionJournal $journal
+     * @param PiggyBank|null     $piggyBank
+     *
+     * @return PiggyBankEvent|null
+     */
+    public function create(TransactionJournal $journal, ?PiggyBank $piggyBank): ?PiggyBankEvent
+    {
+        Log::debug(sprintf('Now in PiggyBankEventCreate for a %s', $journal->transactionType->type));
+        if (null === $piggyBank) {
+            return null;
+        }
+
+        // is a transfer?
+        if (!(TransactionType::TRANSFER === $journal->transactionType->type)) {
+            Log::info(sprintf('Will not connect %s #%d to a piggy bank.', $journal->transactionType->type, $journal->id));
+
+            return null;
+        }
+
+        /** @var PiggyBankRepositoryInterface $piggyRepos */
+        $piggyRepos = app(PiggyBankRepositoryInterface::class);
+        $piggyRepos->setUser($journal->user);
+
+        // repetition exists?
+        $repetition = $piggyRepos->getRepetition($piggyBank, $journal->date);
+        if (null === $repetition->id) {
+            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
+
+            return null;
+        }
+
+        // get the amount
+        $amount = $piggyRepos->getExactAmount($piggyBank, $repetition, $journal);
+        if (0 === bccomp($amount, '0')) {
+            Log::debug('Amount is zero, will not create event.');
+
+            return null;
+        }
+
+        // update amount
+        $piggyRepos->addAmountToRepetition($repetition, $amount);
+        $event = $piggyRepos->createEventWithJournal($piggyBank, $amount, $journal);
+
+        Log::debug(sprintf('Created piggy bank event #%d', $event->id));
+
+        return $event;
+    }
+}

app/Factory/PiggyBankFactory.php

@@ -0,0 +1,100 @@
+<?php
+declare(strict_types=1);
+/**
+ * PiggyBankFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\User;
+
+/**
+ * Class PiggyBankFactory
+ */
+class PiggyBankFactory
+{
+    /** @var User */
+    private $user;
+
+    /**
+     * @param int|null    $piggyBankId
+     * @param null|string $piggyBankName
+     *
+     * @return PiggyBank|null
+     */
+    public function find(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank
+    {
+        $piggyBankId   = (int)$piggyBankId;
+        $piggyBankName = (string)$piggyBankName;
+        if (strlen($piggyBankName) === 0 && $piggyBankId === 0) {
+            return null;
+        }
+        // first find by ID:
+        if ($piggyBankId > 0) {
+            /** @var PiggyBank $piggyBank */
+            $piggyBank = $this->user->piggyBanks()->find($piggyBankId);
+            if (null !== $piggyBank) {
+                return $piggyBank;
+            }
+        }
+
+        // then find by name:
+        if (strlen($piggyBankName) > 0) {
+            /** @var PiggyBank $piggyBank */
+            $piggyBank = $this->findByName($piggyBankName);
+            if (null !== $piggyBank) {
+                return $piggyBank;
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return PiggyBank|null
+     */
+    public function findByName(string $name): ?PiggyBank
+    {
+        $set = $this->user->piggyBanks()->get();
+        /** @var PiggyBank $piggy */
+        foreach ($set as $piggy) {
+            if ($piggy->name === $name) {
+                return $piggy;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+
+    }
+
+}

app/Factory/TagFactory.php

@@ -0,0 +1,102 @@
+<?php
+declare(strict_types=1);
+/**
+ * TagFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\Tag;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class TagFactory
+ */
+class TagFactory
+{
+    /** @var Collection */
+    private $tags;
+    /** @var User */
+    private $user;
+
+    /**
+     * @param array $data
+     *
+     * @return Tag|null
+     */
+    public function create(array $data): ?Tag
+    {
+        return Tag::create(
+            [
+                'user_id'     => $this->user->id,
+                'tag'         => $data['tag'],
+                'tagMode'     => 'nothing',
+                'date'        => $data['date'],
+                'description' => $data['description'],
+                'latitude'    => $data['latitude'],
+                'longitude '  => $data['longitude'],
+                'zoomLevel'   => $data['zoom_level'],
+            ]
+        );
+    }
+
+    /**
+     * @param string $tag
+     *
+     * @return Tag|null
+     */
+    public function findOrCreate(string $tag): ?Tag
+    {
+        if (null === $this->tags) {
+            $this->tags = $this->user->tags()->get();
+        }
+
+        /** @var Tag $object */
+        foreach ($this->tags as $object) {
+            if ($object->tag === $tag) {
+                return $object;
+            }
+        }
+
+        $newTag = $this->create(
+            [
+                'tag'         => $tag,
+                'date'        => null,
+                'description' => null,
+                'latitude'    => null,
+                'longitude'   => null,
+                'zoom_level'  => null,
+            ]
+        );
+        $this->tags->push($newTag);
+
+        return $newTag;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+}

app/Factory/TransactionCurrencyFactory.php

@@ -0,0 +1,94 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionCurrencyFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\TransactionCurrency;
+use Illuminate\Database\QueryException;
+use Log;
+
+/**
+ * Class TransactionCurrencyFactory
+ */
+class TransactionCurrencyFactory
+{
+    /**
+     * @param array $data
+     *
+     * @return TransactionCurrency|null
+     */
+    public function create(array $data): ?TransactionCurrency
+    {
+        $result = null;
+        try {
+            /** @var TransactionCurrency $currency */
+            $result = TransactionCurrency::create(
+                [
+                    'name'           => $data['name'],
+                    'code'           => $data['code'],
+                    'symbol'         => $data['symbol'],
+                    'decimal_places' => $data['decimal_places'],
+                ]
+            );
+        } catch (QueryException $e) {
+            Log::error(sprintf('Could not create new currency: %s', $e->getMessage()));
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int|null    $currencyId
+     * @param null|string $currencyCode
+     *
+     * @return TransactionCurrency|null
+     */
+    public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency
+    {
+        $currencyCode = (string)$currencyCode;
+        $currencyId   = (int)$currencyId;
+
+        if (strlen($currencyCode) === 0 && (int)$currencyId === 0) {
+            return null;
+        }
+
+        // first by ID:
+        if ($currencyId > 0) {
+            $currency = TransactionCurrency::find($currencyId);
+            if (null !== $currency) {
+                return $currency;
+            }
+        }
+        // then by code:
+        if (strlen($currencyCode) > 0) {
+            $currency = TransactionCurrency::whereCode($currencyCode)->first();
+            if (null !== $currency) {
+                return $currency;
+            }
+        }
+
+        return null;
+    }
+
+
+}

app/Factory/TransactionFactory.php

@@ -0,0 +1,154 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Services\Internal\Support\TransactionServiceTrait;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class TransactionFactory
+ */
+class TransactionFactory
+{
+    use TransactionServiceTrait;
+
+    /** @var User */
+    private $user;
+
+    /**
+     * @param array $data
+     *
+     * @return Transaction
+     */
+    public function create(array $data): Transaction
+    {
+        $currencyId = isset($data['currency']) ? $data['currency']->id : $data['currency_id'];
+
+        return Transaction::create(
+            [
+                'reconciled'              => $data['reconciled'],
+                'account_id'              => $data['account']->id,
+                'transaction_journal_id'  => $data['transaction_journal']->id,
+                'description'             => $data['description'],
+                'transaction_currency_id' => $currencyId,
+                'amount'                  => $data['amount'],
+                'foreign_amount'          => $data['foreign_amount'],
+                'foreign_currency_id'     => null,
+                'identifier'              => $data['identifier'],
+            ]
+        );
+    }
+
+    /**
+     * Create a pair of transactions based on the data given in the array.
+     *
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return Collection
+     */
+    public function createPair(TransactionJournal $journal, array $data): Collection
+    {
+        // all this data is the same for both transactions:
+        $currency    = $this->findCurrency($data['currency_id'], $data['currency_code']);
+        $description = $journal->description === $data['description'] ? null : $data['description'];
+
+        // type of source account depends on journal type:
+        $sourceType    = $this->accountType($journal, 'source');
+        $sourceAccount = $this->findAccount($sourceType, $data['source_id'], $data['source_name']);
+
+        // same for destination account:
+        $destinationType    = $this->accountType($journal, 'destination');
+        $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']);
+        // first make a "negative" (source) transaction based on the data in the array.
+        $source = $this->create(
+            [
+                'description'         => $description,
+                'amount'              => app('steam')->negative((string)$data['amount']),
+                'foreign_amount'      => null,
+                'currency'            => $currency,
+                'account'             => $sourceAccount,
+                'transaction_journal' => $journal,
+                'reconciled'          => $data['reconciled'],
+                'identifier'          => $data['identifier'],
+            ]
+        );
+        // then make a "positive" transaction based on the data in the array.
+        $dest = $this->create(
+            [
+                'description'         => $description,
+                'amount'              => app('steam')->positive((string)$data['amount']),
+                'foreign_amount'      => null,
+                'currency'            => $currency,
+                'account'             => $destinationAccount,
+                'transaction_journal' => $journal,
+                'reconciled'          => $data['reconciled'],
+                'identifier'          => $data['identifier'],
+            ]
+        );
+
+        // set foreign currency
+        $foreign = $this->findCurrency($data['foreign_currency_id'], $data['foreign_currency_code']);
+        $this->setForeignCurrency($source, $foreign);
+        $this->setForeignCurrency($dest, $foreign);
+
+        // set foreign amount:
+        if (null !== $data['foreign_amount']) {
+            $this->setForeignAmount($source, app('steam')->negative((string)$data['foreign_amount']));
+            $this->setForeignAmount($dest, app('steam')->positive((string)$data['foreign_amount']));
+        }
+
+        // set budget:
+        if ($journal->transactionType->type === TransactionType::TRANSFER) {
+            $data['budget_id']   = null;
+            $data['budget_name'] = null;
+        }
+
+        $budget = $this->findBudget($data['budget_id'], $data['budget_name']);
+        $this->setBudget($source, $budget);
+        $this->setBudget($dest, $budget);
+
+        // set category
+        $category = $this->findCategory($data['category_id'], $data['category_name']);
+        $this->setCategory($source, $category);
+        $this->setCategory($dest, $category);
+
+        return new Collection([$source, $dest]);
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
+
+}

app/Factory/TransactionJournalFactory.php

@@ -0,0 +1,153 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionJournalFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Services\Internal\Support\JournalServiceTrait;
+use FireflyIII\User;
+use Log;
+
+/**
+ * Class TransactionJournalFactory
+ */
+class TransactionJournalFactory
+{
+    use JournalServiceTrait;
+    /** @var User */
+    private $user;
+
+    /**
+     * @param array $data
+     *
+     * @return TransactionJournal
+     * @throws FireflyException
+     */
+    public function create(array $data): TransactionJournal
+    {
+        Log::debug('Start of TransactionJournalFactory::create()');
+        // store basic journal first.
+        $type            = $this->findTransactionType($data['type']);
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user);
+        $journal         = TransactionJournal::create(
+            [
+                'user_id'                 => $data['user'],
+                'transaction_type_id'     => $type->id,
+                'bill_id'                 => null,
+                'transaction_currency_id' => $defaultCurrency->id,
+                'description'             => $data['description'],
+                'date'                    => $data['date']->format('Y-m-d'),
+                'order'                   => 0,
+                'tag_count'               => 0,
+                'completed'               => 0,
+            ]
+        );
+
+        // store basic transactions:
+        /** @var TransactionFactory $factory */
+        $factory = app(TransactionFactory::class);
+        $factory->setUser($this->user);
+
+        /** @var array $trData */
+        foreach ($data['transactions'] as $trData) {
+            $factory->createPair($journal, $trData);
+        }
+        $journal->completed = true;
+        $journal->save();
+
+        // link bill:
+        $this->connectBill($journal, $data);
+
+        // link piggy bank (if transfer)
+        $this->connectPiggyBank($journal, $data);
+
+        // link tags:
+        $this->connectTags($journal, $data);
+
+        // store note:
+        $this->storeNote($journal, (string)$data['notes']);
+
+        // 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', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id'];
+
+        foreach ($fields as $field) {
+            $this->storeMeta($journal, $data, $field);
+        }
+        Log::debug('End of TransactionJournalFactory::create()');
+
+        return $journal;
+    }
+
+    /**
+     * Set the user.
+     *
+     * @param User $user
+     */
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $data
+     */
+    protected function connectPiggyBank(TransactionJournal $journal, array $data): void
+    {
+        /** @var PiggyBankFactory $factory */
+        $factory = app(PiggyBankFactory::class);
+        $factory->setUser($this->user);
+
+        $piggyBank = $factory->find($data['piggy_bank_id'], $data['piggy_bank_name']);
+        if (null !== $piggyBank) {
+            /** @var PiggyBankEventFactory $factory */
+            $factory = app(PiggyBankEventFactory::class);
+            $factory->create($journal, $piggyBank);
+        }
+    }
+
+    /**
+     * Get the transaction type. Since this is mandatory, will throw an exception when nothing comes up. Will always
+     * use TransactionType repository.
+     *
+     * @param string $type
+     *
+     * @return TransactionType
+     * @throws FireflyException
+     */
+    protected function findTransactionType(string $type): TransactionType
+    {
+        $factory         = app(TransactionTypeFactory::class);
+        $transactionType = $factory->find($type);
+        if (null === $transactionType) {
+            Log::error(sprintf('Could not find transaction type for "%s"', $type)); // @codeCoverageIgnore
+            throw new FireflyException(sprintf('Could not find transaction type for "%s"', $type)); // @codeCoverageIgnore
+        }
+
+        return $transactionType;
+    }
+
+}

app/Factory/TransactionJournalMetaFactory.php

@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionJournalMetaFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use Carbon\Carbon;
+use Exception;
+use FireflyIII\Models\TransactionJournalMeta;
+use Log;
+
+/**
+ * Class TransactionJournalMetaFactory
+ */
+class TransactionJournalMetaFactory
+{
+    /**
+     * @param array $data
+     *
+     * @return TransactionJournalMeta|null
+     */
+    public function updateOrCreate(array $data): ?TransactionJournalMeta
+    {
+        $value = $data['data'];
+        /** @var TransactionJournalMeta $entry */
+        $entry = $data['journal']->transactionJournalMeta()->where('name', $data['name'])->first();
+        if (null === $value && null !== $entry) {
+            try {
+                $entry->delete();
+            } catch (Exception $e) { // @codeCoverageIgnore
+                Log::error(sprintf('Could not delete transaction journal meta: %s', $e->getMessage())); // @codeCoverageIgnore
+            }
+
+            return null;
+        }
+
+        if ($data['data'] instanceof Carbon) {
+            $value = $data['data']->toW3cString();
+        }
+        if ((string)$value === '') {
+            // don't store blank strings.
+            if (null !== $entry) {
+                try {
+                    $entry->delete();
+                } catch (Exception $e) { // @codeCoverageIgnore
+                    Log::error(sprintf('Could not delete transaction journal meta: %s', $e->getMessage())); // @codeCoverageIgnore
+                }
+            }
+
+            return null;
+        }
+
+        if (null === $entry) {
+            $entry = new TransactionJournalMeta();
+            $entry->transactionJournal()->associate($data['journal']);
+            $entry->name = $data['name'];
+        }
+        $entry->data = $value;
+        $entry->save();
+
+        return $entry;
+    }
+
+}

app/Factory/TransactionTypeFactory.php

@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+/**
+ * TransactionTypeFactory.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+namespace FireflyIII\Factory;
+
+use FireflyIII\Models\TransactionType;
+
+/**
+ * @codeCoverageIgnore
+ * Class TransactionTypeFactory
+ */
+class TransactionTypeFactory
+{
+    /**
+     * @param string $type
+     *
+     * @return TransactionType|null
+     */
+    public function find(string $type): ?TransactionType
+    {
+        return TransactionType::whereType(ucfirst($type))->first();
+    }
+
+}

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Chart\Basic;
@@ -27,15 +26,12 @@ use FireflyIII\Support\ChartColour;
 use Steam;
 
 /**
- * Class ChartJsGenerator
- *
- * @package FireflyIII\Generator\Chart\Basic
+ * Class ChartJsGenerator.
  */
 class ChartJsGenerator implements GeneratorInterface
 {
-
     /**
-     * Will generate a Chart JS compatible array from the given input. Expects this format
+     * Will generate a Chart JS compatible array from the given input. Expects this format.
      *
      * Will take labels for all from first set.
      *
@@ -102,7 +98,7 @@ class ChartJsGenerator implements GeneratorInterface
     }
 
     /**
-     * Expects data as:
+     * Expects data as:.
      *
      * key => value
      *
@@ -123,7 +119,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) && bccomp($next, '0') === 1) {
+        if (!is_bool($next) && 1 === bccomp($next, '0')) {
             // next is positive, sort other way around.
             arsort($data);
         }
@@ -131,19 +127,18 @@ class ChartJsGenerator implements GeneratorInterface
 
         $index = 0;
         foreach ($data as $key => $value) {
-
             // make larger than 0
-            $chartData['datasets'][0]['data'][]            = floatval(Steam::positive($value));
+            $chartData['datasets'][0]['data'][]            = (float)Steam::positive($value);
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
             $chartData['labels'][]                         = $key;
-            $index++;
+            ++$index;
         }
 
         return $chartData;
     }
 
     /**
-     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:.
      *
      * 'label-of-entry' => value
      * 'label-of-entry' => value

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -16,23 +16,19 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Chart\Basic;
 
 /**
- * Interface GeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Basic
+ * Interface GeneratorInterface.
  */
 interface GeneratorInterface
 {
-
     /**
-     * Will generate a Chart JS compatible array from the given input. Expects this format
+     * Will generate a Chart JS compatible array from the given input. Expects this format.
      *
      * Will take labels for all from first set.
      *
@@ -66,7 +62,7 @@ interface GeneratorInterface
     public function multiSet(array $data): array;
 
     /**
-     * Expects data as:
+     * Expects data as:.
      *
      * key => value
      *
@@ -77,7 +73,7 @@ interface GeneratorInterface
     public function pieChart(array $data): array;
 
     /**
-     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:.
      *
      * 'label-of-entry' => value
      * 'label-of-entry' => value
@@ -88,5 +84,4 @@ interface GeneratorInterface
      * @return array
      */
     public function singleSet(string $setLabel, array $data): array;
-
 }

app/Generator/Report/Account/MonthReportGenerator.php

@@ -0,0 +1,145 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use Illuminate\Support\Collection;
+
+/**
+ * Class MonthReportGenerator.
+ */
+class MonthReportGenerator implements ReportGeneratorInterface
+{
+    /** @var Collection */
+    private $accounts;
+    /** @var Carbon */
+    private $end;
+    /** @var Collection */
+    private $expense;
+    /** @var Carbon */
+    private $start;
+
+    /**
+     * @return string
+     *
+     */
+    public function generate(): string
+    {
+        $accountIds      = implode(',', $this->accounts->pluck('id')->toArray());
+        $expenseIds      = implode(',', $this->expense->pluck('id')->toArray());
+        $reportType      = 'account';
+        $preferredPeriod = $this->preferredPeriod();
+
+        return view(
+            'reports.account.report',
+            compact('accountIds', 'reportType', 'expenseIds', 'preferredPeriod')
+        )->with('start', $this->start)->with('end', $this->end)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        $this->expense = $expense;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    protected function preferredPeriod(): string
+    {
+        return 'day';
+    }
+}

app/Generator/Report/Account/MultiYearReportGenerator.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Account;
+
+/**
+ * Class MultiYearReportGenerator.
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    // Doesn't do anything different.
+
+    /**
+     * @return string
+     */
+    protected function preferredPeriod(): string
+    {
+        return 'year';
+    }
+}

app/Generator/Report/Account/YearReportGenerator.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Account;
+
+/**
+ * Class YearReportGenerator.
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+    // Doesn't do anything different.
+
+    /**
+     * @return string
+     */
+    protected function preferredPeriod(): string
+    {
+        return 'month';
+    }
+}

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Audit;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
@@ -34,17 +32,15 @@ use Illuminate\Support\Collection;
 use Steam;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Audit
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
@@ -52,8 +48,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     public function generate(): string
     {
-
-
         $auditData = [];
         $dayBefore = clone $this->start;
         $dayBefore->subDay();
@@ -66,7 +60,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         $defaultShow = ['icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'to'];
         $reportType  = 'audit';
-        $accountIds  = join(',', $this->accounts->pluck('id')->toArray());
+        $accountIds  = implode(',', $this->accounts->pluck('id')->toArray());
         $hideable    = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date',
                         'interest_date', 'book_date', 'process_date',
                         // three new optional fields.
@@ -77,11 +71,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'create_date', 'update_date',
         ];
 
-
         return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
             ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
             ->render();
-
     }
 
     /**
@@ -128,6 +120,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *
@@ -157,7 +159,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @return array
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // not that long
-     *
      */
     private function getAuditReport(Account $account, Carbon $date): array
     {
@@ -171,9 +172,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $journals         = $journals->reverse();
         $dayBeforeBalance = Steam::balance($account, $date);
         $startBalance     = $dayBeforeBalance;
-        $currency         = $currencyRepos->find(intval($account->getMeta('currency_id')));
+        $currency         = $currencyRepos->find((int)$account->getMeta('currency_id'));
 
-        /** @var Transaction $journal */
+        /** @var Transaction $transaction */
         foreach ($journals as $transaction) {
             $transaction->before = $startBalance;
             $transactionAmount   = $transaction->transaction_amount;
@@ -191,9 +192,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $return = [
             'journals'         => $journals->reverse(),
             'exists'           => $journals->count() > 0,
-            'end'              => $this->end->formatLocalized(strval(trans('config.month_and_day'))),
+            'end'              => $this->end->formatLocalized((string)trans('config.month_and_day')),
             'endBalance'       => Steam::balance($account, $this->end),
-            'dayBefore'        => $date->formatLocalized(strval(trans('config.month_and_day'))),
+            'dayBefore'        => $date->formatLocalized((string)trans('config.month_and_day')),
             'dayBeforeBalance' => $dayBeforeBalance,
         ];
 

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -16,22 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Audit;
 
-
 /**
- * Class MultiYearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Audit
+ * Class MultiYearReportGenerator.
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }

app/Generator/Report/Audit/YearReportGenerator.php

@@ -16,23 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Audit;
 
-
 /**
- * Class YearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Audit
+ * Class YearReportGenerator.
  */
 class YearReportGenerator extends MonthReportGenerator
 {
-
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Budget;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
@@ -37,23 +35,21 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Budget
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Collection */
+    /** @var Collection */
     private $budgets;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
     /** @var Collection */
     private $expenses;
     /** @var Collection */
     private $income;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
@@ -70,8 +66,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
      */
     public function generate(): string
     {
-        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
-        $budgetIds       = join(',', $this->budgets->pluck('id')->toArray());
+        $accountIds      = implode(',', $this->accounts->pluck('id')->toArray());
+        $budgetIds       = implode(',', $this->budgets->pluck('id')->toArray());
         $expenses        = $this->getExpenses();
         $accountSummary  = $this->summarizeByAccount($expenses);
         $budgetSummary   = $this->summarizeByBudget($expenses);
@@ -132,6 +128,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *
@@ -188,14 +194,17 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
      */
     private function summarizeByBudget(Collection $collection): array
     {
-        $result = [];
+        $result = [
+            'sum' => '0',
+        ];
         /** @var Transaction $transaction */
         foreach ($collection as $transaction) {
-            $jrnlBudId         = intval($transaction->transaction_journal_budget_id);
-            $transBudId        = intval($transaction->transaction_budget_id);
+            $jrnlBudId         = (int)$transaction->transaction_journal_budget_id;
+            $transBudId        = (int)$transaction->transaction_budget_id;
             $budgetId          = max($jrnlBudId, $transBudId);
             $result[$budgetId] = $result[$budgetId] ?? '0';
             $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
+            $result['sum']     = bcadd($result['sum'], $transaction->transaction_amount);
         }
 
         return $result;

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -16,22 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Budget;
 
-
 /**
- * Class MultiYearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Budget
+ * Class MultiYearReportGenerator.
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }

app/Generator/Report/Budget/YearReportGenerator.php

@@ -16,23 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Budget;
 
-
 /**
- * Class YearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Budget
+ * Class YearReportGenerator.
  */
 class YearReportGenerator extends MonthReportGenerator
 {
-
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }