Merge branch 'release/4.7.6.2'

4.7.6.1

.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/apache-firefly.conf

@@ -12,13 +12,10 @@
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	<Directory /var/www/firefly-iii/public>
-		Options -Indexes +FollowSymLinks
-		AllowOverride All
-		Order allow,deny
-		allow from all
-	</Directory>
+    <Directory /var/www/firefly-iii/public>
+        Options -Indexes +FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        allow from all
+    </Directory>
 </VirtualHost>
-
-
-

.deploy/docker/apache2.conf

@@ -0,0 +1,221 @@
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
+#
+#
+# Summary of how the Apache 2 configuration works in Debian:
+# The Apache 2 web server configuration in Debian is quite different to
+# upstream's suggested way to configure the web server. This is because Debian's
+# default Apache2 installation attempts to make adding and removing modules,
+# virtual hosts, and extra configuration directives as flexible as possible, in
+# order to make automating the changes and administering the server as easy as
+# possible.
+
+# It is split into several files forming the configuration hierarchy outlined
+# below, all located in the /etc/apache2/ directory:
+#
+#	/etc/apache2/
+#	|-- apache2.conf
+#	|	`--  ports.conf
+#	|-- mods-enabled
+#	|	|-- *.load
+#	|	`-- *.conf
+#	|-- conf-enabled
+#	|	`-- *.conf
+# 	`-- sites-enabled
+#	 	`-- *.conf
+#
+#
+# * apache2.conf is the main configuration file (this file). It puts the pieces
+#   together by including all remaining configuration files when starting up the
+#   web server.
+#
+# * ports.conf is always included from the main configuration file. It is
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
+#
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
+#
+#   They are activated by symlinking available configuration files from their
+#   respective *-available/ counterparts. These should be managed by using our
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
+#   their respective man pages for detailed information.
+#
+# * The binary is called apache2. Due to the use of environment variables, in
+#   the default configuration, apache2 needs to be started/stopped with
+#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
+#   work with the default configuration.
+
+
+# Global configuration
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
+#
+LogLevel warn
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride All
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+IncludeOptional conf-enabled/*.conf
+
+# Include the virtual host configurations:
+IncludeOptional sites-enabled/*.conf
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

.deploy/docker/cronjob.conf

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

.deploy/docker/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

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# make sure the correct directories exists (suggested by @chrif):
+mkdir -p $FIREFLY_PATH/storage/app
+mkdir -p $FIREFLY_PATH/storage/app/public
+mkdir -p $FIREFLY_PATH/storage/build
+mkdir -p $FIREFLY_PATH/storage/database
+mkdir -p $FIREFLY_PATH/storage/debugbar
+mkdir -p $FIREFLY_PATH/storage/export
+mkdir -p $FIREFLY_PATH/storage/framework/cache
+mkdir -p $FIREFLY_PATH/storage/framework/sessions
+mkdir -p $FIREFLY_PATH/storage/framework/testing
+mkdir -p $FIREFLY_PATH/storage/framework/views
+mkdir -p $FIREFLY_PATH/storage/logs
+mkdir -p $FIREFLY_PATH/storage/upload
+
+
+# make sure we own the volumes:
+chown -R www-data:www-data -R $FIREFLY_PATH/storage
+chmod -R 775 $FIREFLY_PATH/storage
+
+# remove any lingering files that may break upgrades:
+rm -f $FIREFLY_PATH/storage/logs/laravel.log
+
+cat .env.docker | envsubst > .env
+composer dump-autoload
+php artisan package:discover
+php artisan firefly:instructions install
+exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon

.deploy/docker/firefly-iii.conf

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

.deploy/docker/supervisord.conf

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

.deploy/docker/vhost.conf

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

.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
+

.dockerignore

@@ -0,0 +1,3 @@
+# Ignore composer specific files and vendor folder
+composer.phar
+vendor

.env.docker

@@ -1,55 +1,112 @@
+# 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_FORCE_SSL=false
-APP_FORCE_ROOT=
-APP_KEY=${FF_APP_KEY}
-APP_LOG=daily
-APP_LOG_LEVEL=warning
-APP_URL=http://localhost
 
-DB_CONNECTION=mysql
+# 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}
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=${TZ}
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
+APP_URL=${APP_URL}
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=${TRUSTED_PROXIES}
+
+# The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=${APP_LOG_LEVEL}
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
+DB_CONNECTION=${FF_DB_CONNECTION}
 DB_HOST=${FF_DB_HOST}
-DB_PORT=3306
+DB_PORT=${FF_DB_PORT}
 DB_DATABASE=${FF_DB_NAME}
 DB_USERNAME=${FF_DB_USER}
 DB_PASSWORD=${FF_DB_PASSWORD}
 
-BROADCAST_DRIVER=log
+# 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
+# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
+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}
+
+# Other mail drivers:
+MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
+MAILGUN_SECRET=${MAILGUN_SECRET}
+MANDRILL_SECRET=${MANDRILL_SECRET}
+SPARKPOST_SECRET=${SPARKPOST_SECRET}
+
+# Firefly III can send you the following messages
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=false
+
+# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+MAPBOX_API_KEY=${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=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
-
-GOOGLE_MAPS_API_KEY=
-ANALYTICS_ID=
-SITE_OWNER=mail@example.com
-USE_ENCRYPTION=true
-
+SEARCH_RESULT_LIMIT=50
 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
-
+PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=true
+IS_SANDSTORM=false
+IS_HEROKU=false
+BUNQ_USE_SANDBOX=false
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.env.example

@@ -1,12 +1,43 @@
-APP_ENV=production
+# 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_FORCE_SSL=false
-APP_FORCE_ROOT=
+
+# 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=Europe/Amsterdam
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
 
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=
+
+# The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=daily
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=notice
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -14,42 +45,68 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-BROADCAST_DRIVER=log
+# 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
-MAIL_HOST=mailtrap.io
+# If you want Firefly III to mail you, update these settings
+# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Other mail drivers:
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=
+MANDRILL_SECRET=
+SPARKPOST_SECRET=
+
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
-CACHE_PREFIX=firefly
+# 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
+
+# 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_APP_ID=
-
+PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false
+BUNQ_USE_SANDBOX=false
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.env.heroku

@@ -0,0 +1,112 @@
+# 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
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
+APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=**
+
+# The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
+DB_CONNECTION=pgsql
+
+
+
+
+
+
+# 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
+# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+# Other mail drivers:
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=
+MANDRILL_SECRET=
+SPARKPOST_SECRET=
+
+# 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
+BUNQ_USE_SANDBOX=false
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.env.sandstorm

@@ -1,12 +1,43 @@
-APP_ENV=production
-APP_DEBUG=true
-APP_FORCE_SSL=false
-APP_FORCE_ROOT=
+# 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
+
+# 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
-APP_LOG=syslog
-APP_LOG_LEVEL=debug
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
 
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=
+
+# The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -14,42 +45,68 @@ DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=firefly
 
-BROADCAST_DRIVER=log
+# 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
-MAIL_HOST=mailtrap.io
+# If you want Firefly III to mail you, update these settings
+# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Other mail drivers:
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=
+MANDRILL_SECRET=
+SPARKPOST_SECRET=
+
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
-CACHE_PREFIX=firefly
+# 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
+
+# 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_APP_ID=
-
+PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
-
+IS_DOCKER=false
+IS_SANDSTORM=true
+IS_HEROKU=false
+BUNQ_USE_SANDBOX=false
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.env.testing

@@ -1,45 +1,112 @@
+# 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_FORCE_SSL=false
-APP_FORCE_ROOT=
+
+# 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_LEVEL=debug
+
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=Europe/Amsterdam
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
 
-DB_CONNECTION=sqlite
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=
 
-BROADCAST_DRIVER=log
+# The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=dailytest
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=info
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
+DB_CONNECTION=sqlite
+
+
+
+
+
+
+# If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 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
-MAIL_HOST=mailtrap.io
+# If you want Firefly III to mail you, update these settings
+# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+# Other mail drivers:
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=
+MANDRILL_SECRET=
+SPARKPOST_SECRET=
+
+# Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
+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=
+
+# 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=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_APP_ID=
+PUSHER_ID=
+DEMO_USERNAME=
+DEMO_PASSWORD=
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false
+BUNQ_USE_SANDBOX=true
+MAILGUN_DOMAIN=
+MAILGUN_SECRET=

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.github/CONTRIBUTING.md

@@ -1,23 +0,0 @@
-# Welcome to Firefly III on Github!
-
-:+1::tada: Thank you for taking the time to contribute something to Firefly III!
-
-## Feature requests
-
-If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).
-
-## Bugs
-
-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. 
-
-## Installation problems
-
-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!
-
-## Pull requests
-
-I can only accept pull requests against the `develop` branch, never the `master` branch.
-
-## Translations :us: :fr: :de:
-
-If you see a spelling error, grammatical error or a weird translation in your language, please join [our CrowdIn](https://crowdin.com/project/firefly-iii) project. There, you can submit your translations and fixes. The GitHub repository will download these automatically and they will be included in the next release. 

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help Firefly III improve
+
+---
+
+**Bug description**
+I am running Firefly III version x.x.x
+
+(please give a clear and concise description of what the bug is)
+
+**Steps to reproduce**
+What do you need to do to trigger this bug?
+
+**Extra info**
+Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom).
+
+**Bonus points**
+Earn bonus points by:
+
+- Post a stacktrace from your log files
+- Add a screenshot

.github/ISSUE_TEMPLATE/Custom.md

@@ -0,0 +1,27 @@
+---
+name: I have a question or a problem
+about: Ask away!
+
+---
+
+I am running Firefly III version x.x.x
+
+**Description**
+
+
+
+**Steps to reproduce** 
+(if relevant of course)
+
+
+
+**Extra info**
+Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). 
+
+
+
+**Bonus points**
+Earn bonus points by:
+
+- Add a screenshot
+- Replicate the problem on the demo site https://demo.firefly-iii.org/

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea or feature for Firefly III
+
+---
+
+**Description**
+Please describe your feature request:
+
+- I would like Firefly III to do X.
+- What if you would add feature Y?
+- Firefly III doesn't do Z.
+
+**Solution**
+Describe what your feature would add to Firefly III.
+
+**What are alternatives?**
+Please describe what alternatives currently exist.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/code_of_conduct.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thegrumpydictator@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

.github/contributing.md

@@ -0,0 +1,15 @@
+# Welcome to Firefly III on Github!
+
+:+1::tada: Thank you for taking the time to contribute something to Firefly III!
+
+## Feature requests
+
+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
+
+When contributing to Firefly III, please first discuss the change you wish to make via issue, email, or any other method. I can only accept pull requests against the `develop` branch, never the `master` branch.
+
+## Translations :us: :fr: :de:
+
+If you see a spelling error, grammatical error or a weird translation in your language, please join [our CrowdIn](https://crowdin.com/project/firefly-iii) project. There, you can submit your translations and fixes. The GitHub repository will download these automatically and they will be included in the next release.

.github/pull_request_template.md

@@ -0,0 +1,9 @@
+Fixes # (if relevant)
+
+Changes in this pull request:
+
+- 
+- 
+- 
+
+@JC5

.github/stale.yml

@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 14
+
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+# - "[Status] Maybe Later"
+exemptLabels:
+  - enhancement
+  - feature
+  - bug
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.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.

.gitignore

@@ -1,7 +1,14 @@
 /node_modules
+/public/hot
 /public/storage
+/storage/*.key
 /vendor
+/.vagrant
 Homestead.json
 Homestead.yaml
+npm-debug.log
+yarn-error.log
 .env
 public/google*.html
+report.html
+composer.phar

.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/Vagrantfile

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

.sandstorm/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,347 @@
-# 3.4.3
+# 4.7.6.2
+- Docker file builds again.
+- Fix CSS of OAuth2 authorization view.
 
-* Initial release on Sandstorm.io
+# 4.7.6.1
+- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both.
+- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers
+- Docker build gave a cURL error whenever it runs PHP commands.
+
+# 4.7.6
+- [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB.
+- [Issue 306](https://github.com/firefly-iii/firefly-iii/issues/306) You can now add liabilities to Firefly III.
+- [Issue 740](https://github.com/firefly-iii/firefly-iii/issues/740) Various charts are now currency aware.
+- [Issue 833](https://github.com/firefly-iii/firefly-iii/issues/833) Bills can use non-default currencies.
+- [Issue 1578](https://github.com/firefly-iii/firefly-iii/issues/1578) Firefly III will notify you if the cron job hasn't fired.
+- [Issue 1623](https://github.com/firefly-iii/firefly-iii/issues/1623) New transactions will link back from the success message.
+- [Issue 1624](https://github.com/firefly-iii/firefly-iii/issues/1624) transactions will link to the object.
+- You can call the cron job over the web now (see docs).
+- You don't need to call the cron job every minute any more.
+- Various charts are now red/green to signify income and expenses.
+- Option to add or remove accounts from the net worth calculations.
+- This will be the last release on PHP 7.1. Future versions will require PHP 7.2.
+- [Issue 1460](https://github.com/firefly-iii/firefly-iii/issues/1460) Downloading transactions from bunq should go more smoothly.
+- [Issue 1464](https://github.com/firefly-iii/firefly-iii/issues/1464) Fixed the docker file to work on Raspberry Pi's.
+- [Issue 1540](https://github.com/firefly-iii/firefly-iii/issues/1540) The Docker file now has a working cron job for recurring transactions.
+- [Issue 1564](https://github.com/firefly-iii/firefly-iii/issues/1564) Fix double transfers when importing from bunq.
+- [Issue 1575](https://github.com/firefly-iii/firefly-iii/issues/1575) Some views would give a XSRF token warning
+- [Issue 1576](https://github.com/firefly-iii/firefly-iii/issues/1576) Fix assigning budgets
+- [Issue 1580](https://github.com/firefly-iii/firefly-iii/issues/1580) Missing string for translation
+- [Issue 1581](https://github.com/firefly-iii/firefly-iii/issues/1581) Expand help text
+- [Issue 1584](https://github.com/firefly-iii/firefly-iii/issues/1584) Link to administration is back.
+- [Issue 1586](https://github.com/firefly-iii/firefly-iii/issues/1586) Date fields in import were mislabeled.
+- [Issue 1593](https://github.com/firefly-iii/firefly-iii/issues/1593) Link types are translatable.
+- [Issue 1594](https://github.com/firefly-iii/firefly-iii/issues/1594) Very long breadcrumbs are weird.
+- [Issue 1598](https://github.com/firefly-iii/firefly-iii/issues/1598) Fix budget calculations.
+- [Issue 1597](https://github.com/firefly-iii/firefly-iii/issues/1597) Piggy banks are always inactive.
+- [Issue 1605](https://github.com/firefly-iii/firefly-iii/issues/1605) System will ignore foreign currency setting if user doesn't indicate the amount.
+- [Issue 1608](https://github.com/firefly-iii/firefly-iii/issues/1608) Spelling error in command line import.
+- [Issue 1609](https://github.com/firefly-iii/firefly-iii/issues/1609) Link to budgets page was absolute.
+- [Issue 1615](https://github.com/firefly-iii/firefly-iii/issues/1615) Fix currency bug in transactions.
+- [Issue 1616](https://github.com/firefly-iii/firefly-iii/issues/1616) Fix null pointer exception in pie charts.
+- [Issue 1617](https://github.com/firefly-iii/firefly-iii/issues/1617) Fix for complex tag names in URL's.
+- [Issue 1620](https://github.com/firefly-iii/firefly-iii/issues/1620) Fixed index reference in API.
+- [Issue 1639](https://github.com/firefly-iii/firefly-iii/issues/1639) Firefly III trusts the Heroku load balancer, fixing deployment on Heroku.
+- [Issue 1642](https://github.com/firefly-iii/firefly-iii/issues/1642) Fix issue with split journals.
+- [Issue 1643](https://github.com/firefly-iii/firefly-iii/issues/1643) Fix reconciliation issue.
+- Users can no longer give expenses a budget.
+- Fix bug in Spectre import.
+- Heroku would not make you owner.
+- Add `.htaccess` files to all public directories.
+- New secure headers will make Firefly III slightly more secure.
+
+# 4.7.5.3
+- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget.
+- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system.
+- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget.
+- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart.
+- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount
+- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm
+- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code.
+- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie)
+- Fixed a bug where transfers would be stored inversely when using the CSV import.
+- Retired the "Rabobank description"-fix, because it is no longer necessary.
+- Fixed a bug where users could not delete budget limits in the API.
+- Piggy bank notes are visible again.
+
+# 4.7.5.1
+- [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories.
+- [Issue 1532](https://github.com/firefly-iii/firefly-iii/issues/1532), broken dropdown for autosuggest things.
+- [Issue 1533](https://github.com/firefly-iii/firefly-iii/issues/1533), fix where the import could not import category names.
+- [Issue 1538](https://github.com/firefly-iii/firefly-iii/issues/1538), fix a bug where Spectre would not work when ignoring rules.
+- [Issue 1542](https://github.com/firefly-iii/firefly-iii/issues/1542), fix a bug where the importer was incapable of generating new currencies.
+- [Issue 1541](https://github.com/firefly-iii/firefly-iii/issues/1541), no longer ignore composer.lock in Docker ignore.
+- Bills are stored inactive.
+
+# 4.7.5
+- A new feature called "recurring transactions" that will make Firefly III automatically create transactions for you.
+- New API end points for attachments, available budgets, budgets, budget limits, categories, configuration, currency exchange rates, journal links, link types, piggy banks, preferences, recurring transactions, rules, rule groups and tags.
+- Added support for YunoHost.
+- The 2FA secret is visible so you can type it into 2FA apps.
+- Bunq and Spectre imports will now ask to apply rules.
+- Sandstorm users can now make API keys.
+- Various typo's in the English translations. [issue 1493](https://github.com/firefly-iii/firefly-iii/issues/1493)
+- Bug where Spectre was never called [issue 1492](https://github.com/firefly-iii/firefly-iii/issues/1492)
+- Clear cache after journal is created through API [issue 1483](https://github.com/firefly-iii/firefly-iii/issues/1483)
+- Make sure docker directories exist [issue 1500](https://github.com/firefly-iii/firefly-iii/issues/1500)
+- Broken link to bill edit [issue 1505](https://github.com/firefly-iii/firefly-iii/issues/1505)
+- Several bugs in the editing of split transactions [issue 1509](https://github.com/firefly-iii/firefly-iii/issues/1509)
+- Import routine ignored formatting of several date fields [issue 1510](https://github.com/firefly-iii/firefly-iii/issues/1510)
+- Piggy bank events now show the correct currency [issue 1446](https://github.com/firefly-iii/firefly-iii/issues/1446)
+- Inactive accounts are no longer suggested [issue 1463](https://github.com/firefly-iii/firefly-iii/issues/1463)
+- Some income / expense charts are less confusing [issue 1518](https://github.com/firefly-iii/firefly-iii/issues/1518)
+- Validation bug in multi-currency create view [issue 1521](https://github.com/firefly-iii/firefly-iii/issues/1521)
+
+# 4.7.4
+- [Issue 1409](https://github.com/firefly-iii/firefly-iii/issues/1409), add Indian Rupee and explain that users can do this themselves [issue 1413](https://github.com/firefly-iii/firefly-iii/issues/1413)
+- [Issue 1445](https://github.com/firefly-iii/firefly-iii/issues/1445), upgrade Curl in Docker image.
+- [Issue 1386](https://github.com/firefly-iii/firefly-iii/issues/1386), quick links to often used pages.
+- [Issue 1405](https://github.com/firefly-iii/firefly-iii/issues/1405), show proposed amount to piggy banks.
+- [Issue 1416](https://github.com/firefly-iii/firefly-iii/issues/1416), ability to delete lost attachments.
+- A completely rewritten import routine that can handle bunq (thanks everybody for testing!), CSV files and Spectre. Please make sure you read about this at http://bit.ly/FF3-new-import
+- [Issue 1392](https://github.com/firefly-iii/firefly-iii/issues/1392), explicitly mention rules are inactive (when they are).
+- [Issue 1406](https://github.com/firefly-iii/firefly-iii/issues/1406), bill conversion to rules will be smarter about the rules they create.
+- [Issue 1369](https://github.com/firefly-iii/firefly-iii/issues/1369), you can now properly order piggy banks again.
+- [Issue 1389](https://github.com/firefly-iii/firefly-iii/issues/1389), null-pointer in the import routine.
+- [Issue 1400](https://github.com/firefly-iii/firefly-iii/issues/1400), missing translation.
+- [Issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403), bill would always be marked as inactive in edit screen.
+- [Issue 1418](https://github.com/firefly-iii/firefly-iii/issues/1418), missing note text on bill page.
+- Export routine would break when encountering un-decryptable files.
+- [Issue 1425](https://github.com/firefly-iii/firefly-iii/issues/1425), empty fields when edit multiple transactions at once.
+- [Issue 1449](https://github.com/firefly-iii/firefly-iii/issues/1449), bad calculations in "budget left to spend" view.
+- [Issue 1451](https://github.com/firefly-iii/firefly-iii/issues/1451), same but in another view.
+- [Issue 1453](https://github.com/firefly-iii/firefly-iii/issues/1453), same as [issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403).
+- [Issue 1455](https://github.com/firefly-iii/firefly-iii/issues/1455), could add income to a budget.
+- [Issue 1442](https://github.com/firefly-iii/firefly-iii/issues/1442), issues with editing a split deposit.
+- [Issue 1452](https://github.com/firefly-iii/firefly-iii/issues/1452), date range problems with tags.
+- [Issue 1458](https://github.com/firefly-iii/firefly-iii/issues/1458), same for transactions.
+- [Issue 1415](https://github.com/firefly-iii/firefly-iii/issues/1415), will email you when OAuth2 keys are generated.
+
+# 4.7.3.2
+- Forgot to increase the version number :(.
+
+# 4.7.3.1
+- Fixed a critical bug where the rules-engine would fire inadvertently.
+
+# 4.7.3
+- Currency added to API
+- Firfely III will also generate a cash wallet for new users.
+- Can now reset Spectre and bunq settings
+- Docker file has a time zone
+- Allow database connection to be configured in Docker file
+- Can now view and edit attachments in edit-screen
+- User can visit hidden `/attachments` page
+- [Issue 1356](https://github.com/firefly-iii/firefly-iii/issues/1356): Budgets will show the remaining amount per day
+- [Issue 1367](https://github.com/firefly-iii/firefly-iii/issues/1367): Rules now come in strict and non-strict mode.
+- Added a security.txt
+- More support for trusted proxies
+- Improved edit routine for split transactions.
+- Upgrade routine can handle `proc_close` being disabled.
+- Bills now use rules to match transactions, making it more flexible.
+- [Issue 1328](https://github.com/firefly-iii/firefly-iii/issues/1328): piggy banks no have a more useful chart.
+- Spectre API upgraded to v4
+- Move to MariaDB ([issue 1366](https://github.com/firefly-iii/firefly-iii/issues/1366))
+- Piggy banks take currency from parent account ([issue 1334](https://github.com/firefly-iii/firefly-iii/issues/1334))
+- [Issue 1341](https://github.com/firefly-iii/firefly-iii/issues/1341): Removed depricated command from dockerfile
+- Several issues with docker image ([issue 1320](https://github.com/firefly-iii/firefly-iii/issues/1320), [issue 1382](https://github.com/firefly-iii/firefly-iii/issues/1382)).
+- Fix giant tags and division by zero ([issue 1325](https://github.com/firefly-iii/firefly-iii/issues/1325) and others)
+- Several issues with bunq import ([issue 1352](https://github.com/firefly-iii/firefly-iii/issues/1352), [issue 1330](https://github.com/firefly-iii/firefly-iii/issues/1330), [issue 1378](https://github.com/firefly-iii/firefly-iii/issues/1378), [issue 1380](https://github.com/firefly-iii/firefly-iii/issues/1380))
+- [Issue 1246](https://github.com/firefly-iii/firefly-iii/issues/1246): date picker is internationalised
+- [Issue 1327](https://github.com/firefly-iii/firefly-iii/issues/1327): fix formattting issues in piggy banks
+- [Issue 1348](https://github.com/firefly-iii/firefly-iii/issues/1348): 500 error in API
+- [Issue 1349](https://github.com/firefly-iii/firefly-iii/issues/1349): Errors in import routine
+- Several fixes for (multi-currency) reconciliation ([issue 1336](https://github.com/firefly-iii/firefly-iii/issues/1336), [issue 1363](https://github.com/firefly-iii/firefly-iii/issues/1363))
+- [Issue 1353](https://github.com/firefly-iii/firefly-iii/issues/1353): return NULL values in range-indicator
+- Bug in split transaction edit routine
+- Piggy bank percentage was very specific.
+- Logging in Slack is easier to config.
+- [Issue 1312](https://github.com/firefly-iii/firefly-iii/issues/1312) Import broken for ING accounts
+- [Issue 1313](https://github.com/firefly-iii/firefly-iii/issues/1313) Error when creating new asset account
+- [Issue 1317](https://github.com/firefly-iii/firefly-iii/issues/1317) Forgot an include :(
+- Null pointer exception in transaction overview.
+- Installations running in subdirs were incapable of creating OAuth tokens.
+- OAuth keys were not created in all cases.
+
+# 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))
+- 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)
+- Improved Sandstorm support.
+- [Issue 963](https://github.com/firefly-iii/firefly-iii/issues/963), as reported by [gavu](https://github.com/gavu)
+- [Issue 970](https://github.com/firefly-iii/firefly-iii/issues/970), as reported by [gavu](https://github.com/gavu)
+- [Issue 971](https://github.com/firefly-iii/firefly-iii/issues/971), as reported by [gavu](https://github.com/gavu)
+- Various Sandstorm.io related issues.
+
+# 4.6.9.1
+- Updated license
+- Updated file list
+
+# 4.6.9
+- First version that works!
+
+# 3.4.3
+- Initial release on Sandstorm.io

.sandstorm/global-setup.sh

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

.sandstorm/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,22 +31,21 @@ 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
 
 # Spawn mysqld, php
 HOME=/etc/mysql /usr/sbin/mysqld &
 
-/usr/sbin/php-fpm7.0 --nodaemonize --fpm-config /etc/php/7.0/fpm/php-fpm.conf &
+/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf &
 
 # Wait until mysql and php have bound their sockets, indicating readiness
 while [ ! -e /var/run/mysqld/mysqld.sock ] ; do
     echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock"
     sleep .5
 done
-while [ ! -e /var/run/php7.0-fpm.sock ] ; do
-    echo "waiting for php7.0-fpm to be available at /var/run/php7.0-fpm.sock"
+while [ ! -e /var/run/php7.1-fpm.sock ] ; do
+    echo "waiting for php7.1-fpm to be available at /var/run/php7.1-fpm.sock"
     sleep .5
 done
 
@@ -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

@@ -1,4 +1,4 @@
-@0x9411e6c8b3c8a4b6;
+@0xb0032512fca90cd9;
 
 using Spk = import "/sandstorm/package.capnp";
 # This imports:
@@ -15,8 +15,9 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 1,
-    appMarketingVersion = (defaultText = "3.4.6"),
+    appVersion = 16,
+    appMarketingVersion = (defaultText = "4.7.6.2"),
+
     actions = [
       # Define your "new document" handlers here.
       ( nounPhrase = (defaultText = "administration"),
@@ -40,10 +41,9 @@ 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 = mit),
-      license = (proprietary = (defaultText = embed "../LICENSE")),
+      license = (openSource = gpl3),
       # The license this package is distributed under.  See
       # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license
 
@@ -54,7 +54,6 @@ const pkgdef :Spk.PackageDefinition = (
 
       author = (
         contactEmail = "thegrumpydictator@gmail.com",
-        upstreamAuthor = "James Cole",
         pgpSignature = embed "pgp-signature",
       ),
 
@@ -66,9 +65,9 @@ const pkgdef :Spk.PackageDefinition = (
         # Sizes are given in device-independent pixels, so if you took these
         # screenshots on a Retina-style high DPI screen, divide each dimension by two.
 
-        (width = 1200, height = 1000, png = embed "screenshots/screenshot-1.png"),
-        (width = 1200, height = 1000, png = embed "screenshots/screenshot-2.png"),
-        (width = 1200, height = 1518, png = embed "screenshots/screenshot-3.png"),
+        (width = 1290, height = 800, png = embed "screenshots/screenshot-1.png"),
+        (width = 1290, height = 800, png = embed "screenshots/screenshot-2.png"),
+        (width = 1290, height = 800, png = embed "screenshots/screenshot-3.png"),
 
       ],
       changeLog = (defaultText = embed "changelog.md"),
@@ -97,7 +96,7 @@ const pkgdef :Spk.PackageDefinition = (
   # `spk dev` will write a list of all the files your app uses to this file.
   # You should review it later, before shipping your app.
 
-  alwaysInclude = ["app","bootstrap","config","database","public","resources","routes"],
+  alwaysInclude = ["opt/app/app","opt/app/bootstrap","opt/app/config","opt/app/database","opt/app/public","opt/app/resources","opt/app/routes","opt/app/vendor"],
   # Fill this list with more names of files or directories that should be
   # included in your package, even if not listed in sandstorm-files.list.
   # Use this to force-include stuff that you know you need but which may
@@ -176,7 +175,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 const myCommand :Spk.Manifest.Command = (
   # Here we define the command used to start up your server.
-  argv = ["/sandstorm-http-bridge", "8000", "--", "/opt/app/.sandstorm/launcher.sh"],
+  argv = ["/sandstorm-http-bridge", "8000", "--", "/bin/bash", "/opt/app/.sandstorm/launcher.sh"],
   environ = [
     # Note that this defines the *entire* environment seen by your app.
     (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),

.sandstorm/service-config/nginx.conf

@@ -53,10 +53,11 @@ http {
 		}
 		location ~ \.php$ {
 			try_files $uri =404;
-            fastcgi_pass unix:/var/run/php7.0-fpm.sock;
+            fastcgi_pass unix:/var/run/php7.1-fpm.sock;
             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
 
@@ -11,39 +12,63 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -y python-software-properties software-properties-common
 
+# install all languages
+sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.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
+
+
+
+
 # actually add repository
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
 add-apt-repository "deb http://packages.dotdeb.org jessie all"
 
+# add another repos
+apt-get install -y apt-transport-https lsb-release ca-certificates
+wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
+
 # install packages.
 apt-get update
-apt-get install -y nginx php7.0-fpm php7.0-mysql php7.0-cli php7.0-curl git php7.0-dev php7.0-intl php7.0-dom php7.0-mbstring php7.0-bcmath mysql-server
+apt-get install -y nginx php7.1-fpm php7.1-mysql php7.1-gd php7.1-cli php7.1-curl git php7.1-dev php7.1-zip php7.1-intl php7.1-dom php7.1-mbstring php7.1-bcmath mysql-server
 service nginx stop
-service php7.0-fpm stop
+service php7.1-fpm stop
 service mysql stop
 systemctl disable nginx
-systemctl disable php7.0-fpm
+systemctl disable php7.1-fpm
 systemctl disable mysql
-# patch /etc/php/7.0/fpm/pool.d/www.conf to not change uid/gid to www-data
+
+# make php.ini display errors:
+sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.1/fpm/php.ini
+
+# patch /etc/php/7.1/fpm/pool.d/www.conf to not change uid/gid to www-data
 sed --in-place='' \
        --expression='s/^listen.owner = www-data/;listen.owner = www-data/' \
        --expression='s/^listen.group = www-data/;listen.group = www-data/' \
-       /etc/php/7.0/fpm/pool.d/www.conf
-# patch /etc/php/7.0/fpm/php-fpm.conf to not have a pidfile
+       /etc/php/7.1/fpm/pool.d/www.conf
+# patch /etc/php/7.1/fpm/php-fpm.conf to not have a pidfile
 sed --in-place='' \
        --expression='s/^pid =/;pid =/' \
-       /etc/php/7.0/fpm/php-fpm.conf
+       /etc/php/7.1/fpm/php-fpm.conf
 
 # move sock file to better dir:
 sed --in-place='' \
-       --expression='s/^listen = \/run\/php\/php7.0-fpm.sock/listen = \/var\/run\/php7.0-fpm.sock/' \
-       /etc/php/7.0/fpm/pool.d/www.conf
+       --expression='s/^listen = \/run\/php\/php7.1-fpm.sock/listen = \/var\/run\/php7.1-fpm.sock/' \
+       /etc/php/7.1/fpm/pool.d/www.conf
 
-# patch /etc/php/7.0/fpm/pool.d/www.conf to no clear environment variables
+# patch /etc/php/7.1/fpm/pool.d/www.conf to no clear environment variables
 # so we can pass in SANDSTORM=1 to apps
 sed --in-place='' \
        --expression='s/^;clear_env = no/clear_env=no/' \
-       /etc/php/7.0/fpm/pool.d/www.conf
+       /etc/php/7.1/fpm/pool.d/www.conf
 # patch mysql conf to not change uid, and to use /var/tmp over /tmp
 # for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195
 sed --in-place='' \
@@ -59,3 +84,5 @@ cat <<EOF > /etc/mysql/conf.d/sandstorm.cnf
 # Set the main data file to grow by 1MB at a time, rather than 8MB at a time.
 innodb_autoextend_increment = 1
 EOF
+
+

.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

@@ -1,7 +1,6 @@
 language: php
 php:
-  - 7.0
-  - 7.1
+  - 7.1.18
 
 cache:
     directories:
@@ -13,20 +12,18 @@ install:
   - composer update --no-scripts
   - cp .env.testing .env
   - php artisan clear-compiled
-  - php artisan optimize
   - php artisan env
-  - cp .env.testing .env
-  - mv storage/database/databasecopy.sqlite storage/database/database.sqlite
+  - 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.xml
+  - travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
 
 # safelist
 branches:
   only:
   - develop
-  - master
+  - master

CHANGELOG.md

@@ -1,596 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-
-
-## [4.3.8] - 2017-04-08
-
-### Added
-- Better overview / show pages.
-- #628, as reported by [xzaz](https://github.com/xzaz).
-- Greatly expanded test coverage
-
-### Fixed
-- #619, as reported by [dfiel](https://github.com/dfiel).
-- #620, as reported by [forcaeluz](https://github.com/forcaeluz).
-- Attempt to fix #624, as reported by [TheSerenin](https://github.com/TheSerenin).
-- Favicon link is relative now, fixed by [welbert](https://github.com/welbert).
-- Some search bugs
-
-## [4.3.7] - 2017-03-06
-### Added
-- Nice user friendly views for empty lists.
-- Extended contribution guidelines.
-- First version of financial report filtered on tags.
-- Suggested monthly savings for piggy banks, by [Zsub](https://github.com/Zsub)
-- Better test coverage.
-
-### Changed
-- Slightly changed tag overview.
-- Consistent icon for bill in list.
-- Slightly changed account overview.
-
-### Removed
-- Removed IDE specific views from .gitignore, issue #598
-
-### Fixed
-- Force key generation during installation.
-- The `date` function takes the fieldname where a date is stored, not the literal date by [Zsub](https://github.com/Zsub)
-- Improved budget frontpage chart, as suggested by [skibbipl](https://github.com/skibbipl)
-- Issue #602 and #607, as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos).
-- Issue #605, as reported by [Zsub](https://github.com/Zsub).
-- Issue #599, as reported by [leander091](https://github.com/leander091).
-- Issue #610, as reported by [skibbipl](https://github.com/skibbipl).
-- Issue #611, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
-- Issue #612, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
-- Issue #614, as reported by [worldworm](https://github.com/worldworm).
-- Various other bug fixes.
-
-## [4.3.6] - 2017-02-20
-### Fixed
-- #578, reported by [xpfgsyb](https://github.com/xpfgsyb).
-
-## [4.3.5] - 2017-02-19
-### Added
-- Beta support for Sandstorm.IO
-- Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)!
-- Can now use special keywords in the search to search for specic dates, categories, etc.
-
-### Changed
-- Updated to laravel 5.4!
-- User friendly error message
-- Updated locales to support more operating systems, first reported in #536 by [dabenzel](https://github.com/dabenzel)
-- Updated budget report
-- Improved 404 page
-- Smooth curves, improved by [elamperti](https://github.com/elamperti).
-
-### Fixed
-- #549
-- #553
-- Fixed #559 reported by [elamperti](https://github.com/elamperti).
-- #565, as reported by a user over the mail
-- #566, as reported by [dspeckmann](https://github.com/dspeckmann)
-- #567, as reported by [winsomniak](https://github.com/winsomniak)
-- #569, as reported by [winsomniak](https://github.com/winsomniak)
-- #572, as reported by [zjean](https://github.com/zjean)
-- Many issues with the transaction filters which will fix reports (they tended to display the wrong amount).
-
-## [4.3.4] - 2017-02-02
-### Fixed
-- Fixed bug #550, reported by [worldworm](https://github.com/worldworm)!
-- Fixed bug #551, reported by [t-me](https://github.com/t-me)!
-
-## [4.3.3] - 2017-01-30
-
-_The 100th release of Firefly!_
-
-### Added
-- Add locales to Docker (#534) by [elohmeier](https://github.com/elohmeier).
-- Optional database encryption. On by default.
-- Datepicker for Firefox and other browsers.
-- New instruction block for updating and installing.
-- Ability to clone transactions.
-- Use multi-select Bootstrap thing instead of massive lists of checkboxes.
-
-### Removed
-- Lots of old Javascript
-
-### Fixed
-- Missing sort broke various charts
-- Bug in reports that made amounts behave weird
-- Various bug fixes
-
-### Security
-- Tested FF against the naughty string list.
-
-## [4.3.2] - 2017-01-09
-
-An intermediate release because something in the Twig and Twigbridge libraries is broken and I have to make sure it doesn't affect you guys. But some cool features were on their way so there's that oo.
-
-### Added
-- Some code for issue #475, consistent overviews.
-- Better currency display. Make sure you have locale packages installed.
-
-### Changed
-- Uses a new version of Laravel.
-
-### Fixed
-- The password reset routine was broken.
-- Issue #522, thanks to [xpfgsyb](https://github.com/xpfgsyb)
-- Issue #524, thanks to [worldworm](https://github.com/worldworm)
-- Issue #526, thanks to [worldworm](https://github.com/worldworm)
-- Issue #528, thanks to [skibbipl](https://github.com/skibbipl)
-- Various other fixes.
-
-## [4.3.1] - 2017-01-04
-### Added
-- Support for Russian and Polish. 
-- Support for a proper demo website.
-- Support for custom decimal places in currencies (#506, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
-- Most amounts are now right-aligned (#511, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
-- German is now a "complete" language, more than 75% translated!
-
-### Changed
-- **[New Github repository!](github.com/firefly-iii/firefly-iii)**
-- Better category overview.
-- #502, thanks to [zjean](https://github.com/zjean)
-
-### Removed
-- Removed a lot of administration functions.
-- Removed ability to activate users.
-
-### Fixed
-- #501, thanks to [zjean](https://github.com/zjean)
-- #513, thanks to [skibbipl](https://github.com/skibbipl) 
-
-### Security
-- #519, thanks to [xpfgsyb](https://github.com/xpfgsyb)
-
-## [4.3.0] - 2015-12-26
-### Added
-- New method of keeping track of available budget, see issue #489
-- Support for Spanish
-- Firefly III now has an extended demo mode. Will expand further in the future.
- 
-
-### Changed
-- New favicon
-- Import routine no longer gives transactions a description #483
-
-
-### Removed
-- All test data generation code.
-
-### Fixed
-- Removed import accounts from search results #478
-- Redirect after delete will no longer go back to deleted item #477
-- Cannot math #482
-- Fixed bug in virtual balance field #479
-
-## [4.2.2] - 2016-12-18
-### Added
-- New budget report (still a bit of a beta)
-- Can now edit user
-
-### Changed
-- New config for specific events. Still need to build Notifications.
-
-### Fixed
-- Various bugs
-- Issue #472 thanks to [zjean](https://github.com/zjean)
-
-## [4.2.1] - 2016-12-09
-### Added
-- BIC support (see #430)
-- New category report section and chart (see the general financial report)
-
-
-### Changed
-- Date range picker now also available on mobile devices (see #435)
-- Extended range of amounts for issue #439
-- Rewrote all routes. Old bookmarks may break.
-
-## [4.2.0] - 2016-11-27
-### Added
-- Lots of (empty) tests
-- Expanded transaction lists (#377)
-- New charts at account view
-- First code for #305
-
-
-### Changed
-- Updated all email messages.
-- Made some fonts local
-
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
-### Fixed
-- Issue #408
-- Various issues with split journals
-- Issue #414, thx [zjean](https://github.com/zjean)
-- Issue #419, thx [schwalberich](https://github.com/schwalberich) 
-- Issue #422, thx [xzaz](https://github.com/xzaz)
-- Various import bugs, such as #416 ([zjean](https://github.com/zjean))
-
-
-### Security
-- Initial release.
-
-
-## [4.1.7] - 2016-11-19
-### Added
-- Check for database table presence in console commands.
-- Category report
-- Reinstated old test routines.
-
-
-### Changed
-- Confirm account setting is no longer in `.env` file.
-- Titles are now in reverse (current page > parent > firefly iii)
-- Easier update of language files thanks to Github implementation.
-- Uniform colours for charts.
-
-### Fixed
-- Made all pages more mobile friendly.
-- Fixed #395 found by [marcoveeneman](https://github.com/marcoveeneman).
-- Fixed #398 found by [marcoveeneman](https://github.com/marcoveeneman).
-- Fixed #401 found by [marcoveeneman](https://github.com/marcoveeneman).
-- Many optimizations.
-- Updated many libraries.
-- Various bugs found by myself.
-
-
-## [4.1.6] - 2016-11-06
-### Added
-- New budget table for multi year report.
-
-### Changed
-- Greatly expanded help pages and their function.
-- Built a new transaction collector, which I think was the idea of [roberthorlings](https://github.com/roberthorlings) originally.
-- Rebuilt seach engine.
-
-### Fixed
-- #375, thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies.
-- #370 thanks to [ksmolder](https://github.com/ksmolder)
-- #378, thanks to [HomelessAvatar](https://github.com/HomelessAvatar)
-
-## [4.1.5] - 2016-11-01
-### Changed
-- Report parts are loaded using AJAX, making a lot of code more simple.
-- Help content will fall back to English.
-- Help content is translated through Crowdin.
-
-### Fixed
-- Issue #370
-
-## [4.1.4] - 2016-10-30
-### Added
-- New Dockerfile thanks to [schoentoon](https://github.com/schoentoon)
-- Added changing the destination account as rule action.
-- Added changing the source account as rule action.
-- Can convert transactions into different types.
-
-### Changed
-- Changed the export routine to be more future-proof.
-- Improved help routine.
-- Integrated CrowdIn translations.
-- Simplified reports
-- Change error message to refer to solution.
-
-### Fixed
-- #367 thanks to [HungryFeline](https://github.com/HungryFeline)
-- #366 thanks to [3mz3t](https://github.com/3mz3t)
-- #362 and #341 thanks to [bnw](https://github.com/bnw)
-- #355 thanks to [roberthorlings](https://github.com/roberthorlings)
-
-## [4.1.3] - 2016-10-22
-### Fixed
-- Some event handlers called the wrong method.
-
-## [4.1.2] - 2016-10-22
-
-### Fixed
-- A bug is fixed in the journal event handler that prevented Firefly III from actually storing journals.
-
-## [4.1.1] - 2016-10-22
-
-### Added
-- Option to show deposit accounts on the front page.
-- Script to upgrade split transactions
-- Can now save notes on piggy banks.
-- Extend user admin options.
-- Run import jobs from the command line
-
-
-### Changed
-- New preferences screen layout.
-
-### Deprecated
-- ``firefly:import`` is now ``firefly:start-import``
-
-### Removed
-- Lots of old code
-
-### Fixed
-- #357, where non utf-8 files would break Firefly.
-- Tab delimiter is not properly loaded from import configuration ([roberthorlings](https://github.com/roberthorlings))
-- System response to yearly bills
-
-## [4.0.2] - 2016-10-14
-### Added
-- Added ``intl`` dependency to composer file to ease installation (thanks [telyn](https://github.com/telyn))
-- Added support for Croatian.
-
-### Changed
-- Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
-- Fixed #344
-- Fixed #346, thanks to [SanderKleykens](https://github.com/SanderKleykens)
-- #351
-- Did some internal remodelling.
-
-### Fixed
-- PostgreSQL compatibility thanks to [SanderKleykens](https://github.com/SanderKleykens)
-- [roberthorlings](https://github.com/roberthorlings) fixed a bug in the ABN Amro import specific.
-
-
-## [4.0.1] - 2016-10-04
-### Added
-- New ING import specific by [tomwerf](https://github.com/tomwerf)
-- New Presidents Choice specific to fix #307
-- Added some trimming (#335)
-
-### Changed
-- Initial release.
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
-### Fixed
-- Fixed a bug where incoming transactions would not be properly filtered in several reports.
-- #334 by [cyberkov](https://github.com/cyberkov)
-- #337
-- #336
-- #338 found by [roberthorlings](https://github.com/roberthorlings)
-
-### Security
-- Initial release.
-
-
-
-
-## [4.0.0] - 2015-09-26
-### Added
-- Upgraded to Laravel 5.3, most other libraries upgraded as well.
-- Added GBP as currency, thanks to [Mortalife](https://github.com/Mortalife)
-
-### Changed
-- Jump to version 4.0.0.
-- Firefly III is now subject to a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) license. Previous versions of this software are still MIT licensed.
-
-### Fixed
-- Support for specific decimal places, thanks to [Mortalife](https://github.com/Mortalife)
-- Various CSS fixes
-- Various bugs, thanks to [fuf](https://github.com/fuf), [sandermulders](https://github.com/sandermulders) and [vissert](https://github.com/vissert)
-- Various queries optimized for MySQL 5.7
-
-## [3.10.4] - 2015-09-14
-### Fixed
-- Migration fix by [sandermulders](https://github.com/sandermulders)
-- Tricky import bug fix thanks to [vissert](https://github.com/vissert)
-- Currency preference will be correctly pulled from user settings, thanks to [fuf](https://github.com/fuf)
-- Simplified code for upgrade instructions.
-
-
-## [3.10.3] - 2016-08-29
-### Added
-- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) (#282)
-- First start of German translation
-
-### Changed
-- More optional fields for transactions and the ability to filter them.
-
-### Removed
-- Preference for budget maximum.
-
-### Fixed
-- A bug in the translation routine broke the import.
-- It was possible to destroy your Firefly installation by removing all currencies. Thanks [mondjef](https://github.com/mondjef)
-- Translation bugs.
-- Import bug.
-
-### Security
-- Firefly will not accept registrations beyond the first one, by default.
-
-
-## [3.10.2] - 2016-08-29
-### Added
-- New Chinese translations. Set Firefly III to show incomplete translations to follow the progress. Want to translate Firefly III in Chinese, or in any other language? Then check out [the Crowdin project](https://crowdin.com/project/firefly-iii).
-- Added more admin pages. They do nothing yet.
-
-### Changed
-- Import routine will now also apply user rules.
-- Various code cleanup.
-- Some small HTML changes.
-
-### Fixed
-- Bug in the mass edit routines.
-- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks [dfiel](https://github.com/dfiel) for reporting.
-- Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) 
-
-## [3.10.1] - 2016-08-25
-### Added
-- More feedback in the import procedure.
-- Extended model for import job.
-- Web bases import procedure.
-
-
-### Changed
-- Scrutinizer configuration
-- Various code clean up.
-
-### Removed
-- Code climate YAML file.
-
-### Fixed
-- Fixed a bug where a migration would check an empty table name.
-- Fixed various bugs in the import routine.
-- Fixed various bugs in the piggy banks pages.
-- Fixed a bug in the `firefly:verify` routine
-
-## [3.10] - 2015-05-25
-### Added
-- New charts in year report
-- Can add / remove money from piggy bank on mobile device.
-- Bill overview shows some useful things.
-- Firefly will track registration / activation IP addresses.
-
-
-### Changed
-- Rewrote the import routine.
-- The date picker now supports more ranges and periods.
-- Rewrote all migrations. #272
-
-### Fixed
-- Issue #264
-- Issue #265
-- Fixed amount calculation problems, #266, thanks [xzaz](https://github.com/xzaz)
-- Issue #271
-- Issue #278, #273, thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella)
-- Bug in attachment download routine would report the wrong size to the user's browser.
-- Various NULL errors fixed.
-- Various strict typing errors fixed.
-- Fixed pagination problems, #276, thanks [xzaz](https://github.com/xzaz)
-- Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first.
-- Bulk update problems, #280, thanks [stickgrinder](https://github.com/stickgrinder)
-- Fixed various problems with amount reporting of split transactions.
-
-## [3.9.1]
-### Fixed
-- Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269
-
-## [3.9.0]
-### Added
-- [zjean](https://github.com/zjean) has added code that allows you to force "https://"-URL's.
-- [tonicospinelli](https://github.com/tonicospinelli) has added Portuguese (Brazil) translations.
-- Firefly III supports the *splitting* of transactions:
-  - A withdrawal (expense) can be split into multiple sub-transactions (with multiple destinations)
-  - Likewise for deposits (incomes). You can set multiple sources.
-  - Likewise for transfers.
-
-### Changed
-- Update a lot of libraries.
-- Big improvement to test data generation.
-- Cleaned up many repositories.
-
-### Removed
-- Front page boxes will no longer respond to credit card bills.
-
-### Fixed
-- Many bugs
-
-## [3.8.4] - 2016-04-24
-### Added
-- Lots of new translations.
-- Can now set page size.
-- Can now mass edit transactions.
-- Can now mass delete transactions.
-- Firefly will now attempt to verify the integrity of your database when updating.
-
-### Changed
-- New version of Charts library.
-
-### Fixed
-- Several CSV related bugs.
-- Several other bugs.
-- Bugs fixed by [Bonno](https://github.com/Bonno).
-
-## [3.8.3] - 2016-04-17
-### Added
-- New audit report to see what happened.
-
-### Changed
-- New Chart JS release used.
-- Help function is more reliable.
-
-### Fixed
-- Expected bill amount is now correct.
-- Upgrade will now invalidate cache.
-- Search was broken.
-- Queries run better
-
-## [3.8.2] - 2016-04-03
-### Added
-- Small user administration at /admin.
-- Informational popups are working in reports.
-
-### Changed
-- User activation emails are better
-
-### Fixed
-- Some bugs related to accounts and rules.
-
-
-## [3.8.1] - 2016-03-29
-### Added
-- More translations
-- Extended cookie control.
-- User accounts can now be activated (disabled by default).
-- Bills can now take the source and destination account name into account.
-
-### Changed
-- The pages related to rules have new URL's.
-
-### Fixed
-- Spelling errors.
-- Problems related to the "account repository".
-- Some views showed empty (0.0) amounts.
-
-## [3.8.0] - 2016-03-20
-### Added
-- Two factor authentication, thanks to the excellent work of [zjean](https://github.com/zjean).
-- A new chart showing your net worth in year and multi-year reports.
-- You can now see if your current or future rules actually match any transactions, thanks to the excellent work of [roberthorlings](https://github.com/roberthorlings).
-- New date fields for transactions. They are not used yet in reports or anything, but they can be filled in.
-- New routine to export your data.
-- Firefly III will mail the site owner when blocked users try to login, or when blocked domains are used in registrations.
-
-
-### Changed
-- Firefly III now requires PHP 7.0 minimum.
-
-
-### Fixed
-- HTML fixes, thanks to [roberthorlings](https://github.com/roberthorlings) and [zjean](https://github.com/zjean)..
-- A bug fix in the ABN Amro importer, thanks to [roberthorlings](https://github.com/roberthorlings)
-- It was not possible to change the opening balance, once it had been set. Thanks to [xnyhps](https://github.com/xnyhps) and [marcoveeneman](https://github.com/marcoveeneman) for spotting this.
-- Various other bug fixes.
-
-
-
-## [3.4.2] - 2015-05-25
-### Added
-- Initial release.
-
-### Changed
-- Initial release.
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
-### Fixed
-- Initial release.
-
-### Security
-- Initial release.

Dockerfile

@@ -1,49 +1,114 @@
-FROM php:7-apache
+FROM php:7.1-apache
 
+# If building on a RPi, use --build-arg cores=3 to use all cores when compiling
+# to speed up the image build
+ARG CORES
+ENV CORES ${CORES:-1}
+
+ENV FIREFLY_PATH /var/www/firefly-iii/
+ENV CURL_VERSION 7.60.0
+ENV OPENSSL_VERSION 1.1.1-pre6
+
+LABEL version="1.0" maintainer="thegrumpydictator@gmail.com"
+
+
+# install packages
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends libcurl4-openssl-dev \
                                                zlib1g-dev \
                                                libjpeg62-turbo-dev \
-                                               libpng12-dev \
+                                               wget \
+                                               libpng-dev \
                                                libicu-dev \
-                                               libmcrypt-dev \
                                                libedit-dev \
                                                libtidy-dev \
                                                libxml2-dev \
+                                               unzip \
                                                libsqlite3-dev \
+                                               nano \
+                                               libpq-dev \
                                                libbz2-dev \
                                                gettext-base \
+                                               cron \
+                                               rsyslog \
+                                               supervisor \
                                                locales && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+                                               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
+# Install latest curl
+RUN cd /tmp && \
+    wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
+    tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
+    cd openssl-${OPENSSL_VERSION} && \
+    ./config && \
+    make -j${CORES} && \
+    make install
 
-# 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
+RUN cd /tmp && \
+    wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
+    tar -xvf curl-${CURL_VERSION}.tar.gz && \
+    cd curl-${CURL_VERSION} && \
+    ./configure --with-ssl --host=$(gcc -dumpmachine) && \
+    make -j${CORES} && \
+    make install
+
+# Make sure that libcurl is using the newer curl libaries
+RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/00-curl.conf && ldconfig
+
+# Mimic the Debian/Ubuntu config file structure for supervisor
+COPY .deploy/docker/supervisord.conf /etc/supervisor/supervisord.conf
+RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor
+
+# copy Firefly III supervisor conf file.
+COPY ./.deploy/docker/firefly-iii.conf /etc/supervisor/conf.d/firefly-iii.conf
+
+# copy cron job supervisor conf file.
+COPY ./.deploy/docker/cronjob.conf /etc/supervisor/conf.d/cronjob.conf
+
+# test crons added via crontab
+RUN echo "0 3 * * * /usr/local/bin/php /var/www/firefly-iii/artisan firefly:cron" | crontab -
+#RUN (crontab -l ; echo "*/1 * * * * free >> /var/www/firefly-iii/public/cron.html") 2>&1 | crontab -
+# Install PHP exentions.
+RUN docker-php-ext-install -j$(nproc) gd intl tidy zip bcmath pdo_mysql bz2 pdo_pgsql
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Generate locales supported by Firefly III
+RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
+
+# copy Apache config to correct spot.
+COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
 
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
 
-# Setup the Composer installer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
-  curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig && \
-  php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" && \
-  chmod +x /tmp/composer-setup.php && \
-  php /tmp/composer-setup.php && \
-  mv composer.phar /usr/local/bin/composer && \
-  rm -f /tmp/composer-setup.{php,sig}
+# Enable apache mod ssl..
+RUN a2enmod ssl
 
-ADD . /var/www/firefly-iii
-RUN chown -R www-data:www-data /var/www/
-ADD docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-USER www-data
+# Enable default site (Firefly III)
+COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
 
-WORKDIR /var/www/firefly-iii
+# 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 --no-scripts --no-dev
+# Copy in Firefly Source
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
 
-USER root
+# Fix the link to curl:
+RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4
 
-ENTRYPOINT ["/var/www/firefly-iii/docker/entrypoint.sh"]
+# Run composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
+
+# Expose port 80
+EXPOSE 80
+
+# Run entrypoint thing
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]

LICENSE

@@ -1,7 +1,674 @@
-Copyright (C) 2016 thegrumpydictator@gmail.com
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-https://creativecommons.org/licenses/by-sa/4.0/
+                            Preamble
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Procfile

@@ -0,0 +1 @@
+web: vendor/bin/heroku-php-nginx -C nginx_app.conf public/

README.md

@@ -1,38 +0,0 @@
-# Firefly III: A personal finances manager 
-
-[![Requires PHP7](https://img.shields.io/badge/php-7.0-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-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![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/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc)
-
-[![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)
-
-"Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared  household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
-
-## Try it out!
-
-Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
-
-## Installation
-
-To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
-
-## 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 is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
-
-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

@@ -0,0 +1,62 @@
+{
+  "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",
+    "finances",
+    "manager",
+    "management",
+    "euro",
+    "dollar",
+    "laravel",
+    "money",
+    "currency",
+    "financials",
+    "financial",
+    "budgets",
+    "administration",
+    "tool",
+    "tooling",
+    "help",
+    "helper",
+    "assistant",
+    "planning",
+    "organizing",
+    "bills",
+    "personal finance",
+    "budgets",
+    "budgeting",
+    "budgeting tool",
+    "budgeting application",
+    "transactions",
+    "self hosted",
+    "self-hosted",
+    "transfers",
+    "management"
+  ],
+  "addons": [
+    {
+      "plan": "heroku-postgresql",
+      "options": {
+        "version": "9.5"
+      }
+    }
+  ],
+  "scripts": {
+    "postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
+  },
+  "buildpacks": [
+    {
+      "url": "heroku/php"
+    }
+  ],
+  "env": {
+    "APP_KEY": {
+      "description": "This key is used to encrypt your data.",
+      "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
+    }
+  }
+}

app/Api/V1/Controllers/AboutController.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use DB;
+use FireflyIII\Transformers\UserTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ * Returns basic information about this installation.
+ *
+ * Class AboutController.
+ */
+class AboutController extends Controller
+{
+    /**
+     * Returns system information.
+     *
+     * @return JsonResponse
+     */
+    public function about(): JsonResponse
+    {
+        $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');
+    }
+
+    /**
+     * Returns information about the user.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function user(Request $request): JsonResponse
+    {
+        $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,251 @@
+<?php
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+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 FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class AccountController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AccountController extends Controller
+{
+    /** @var CurrencyRepositoryInterface The currency repository */
+    private $currencyRepository;
+    /** @var AccountRepositoryInterface The account repository */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+                // @var AccountRepositoryInterface repository
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param \FireflyIII\Models\Account $account
+     *
+     * @return JsonResponse
+     */
+    public function delete(Account $account): JsonResponse
+    {
+        $this->repository->destroy($account, null);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // 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)app('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');
+    }
+
+    /**
+     * Show single instance.
+     *
+     * @param Request $request
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function show(Request $request, Account $account): JsonResponse
+    {
+        $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');
+    }
+
+    /**
+     * Store a new instance.
+     *
+     * @param AccountRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function store(AccountRequest $request): JsonResponse
+    {
+        $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): JsonResponse
+    {
+        $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');
+    }
+
+    /**
+     * All the available types.
+     *
+     * @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,],
+            'liability'                  => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
+            'liabilities'                => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD],
+            'cc'                         => [AccountType::CREDITCARD],
+            'creditcard'                 => [AccountType::CREDITCARD],
+            'credit_card'                => [AccountType::CREDITCARD],
+            AccountType::DEFAULT         => [AccountType::DEFAULT],
+            AccountType::CASH            => [AccountType::CASH],
+            AccountType::ASSET           => [AccountType::ASSET],
+            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],
+            AccountType::MORTGAGE        => [AccountType::MORTGAGE],
+            AccountType::DEBT            => [AccountType::DEBT],
+            AccountType::CREDITCARD      => [AccountType::CREDITCARD],
+
+        ];
+        $return = $types['all'];
+        if (isset($types[$type])) {
+            $return = $types[$type];
+        }
+
+        return $return; // @codeCoverageIgnore
+    }
+}

app/Api/V1/Controllers/AttachmentController.php

@@ -0,0 +1,235 @@
+<?php
+/**
+ * AttachmentController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\AttachmentRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response as LaravelResponse;
+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;
+
+/**
+ * Class AttachmentController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AttachmentController extends Controller
+{
+    /** @var AttachmentRepositoryInterface The attachment repository */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AttachmentRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Attachment $attachment
+     *
+     * @return JsonResponse
+     */
+    public function delete(Attachment $attachment): JsonResponse
+    {
+        $this->repository->destroy($attachment);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Download an attachment.
+     *
+     * @param Attachment $attachment
+     *
+     * @return LaravelResponse
+     * @throws FireflyException
+     */
+    public function download(Attachment $attachment): LaravelResponse
+    {
+        if (false === $attachment->uploaded) {
+            throw new FireflyException('No file has been uploaded for this attachment (yet).');
+        }
+        if ($this->repository->exists($attachment)) {
+            $content = $this->repository->getContent($attachment);
+            $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
+
+            /** @var LaravelResponse $response */
+            $response = response($content, 200);
+            $response
+                ->header('Content-Description', 'File Transfer')
+                ->header('Content-Type', 'application/octet-stream')
+                ->header('Content-Disposition', 'attachment; filename=' . $quoted)
+                ->header('Content-Transfer-Encoding', 'binary')
+                ->header('Connection', 'Keep-Alive')
+                ->header('Expires', '0')
+                ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
+                ->header('Pragma', 'public')
+                ->header('Content-Length', \strlen($content));
+
+            return $response;
+        }
+        throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $collection  = $this->repository->get();
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($attachments, new AttachmentTransformer($this->parameters), 'attachments');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param Request    $request
+     * @param Attachment $attachment
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Attachment $attachment): JsonResponse
+    {
+        $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($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param AttachmentRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(AttachmentRequest $request): JsonResponse
+    {
+        $data       = $request->getAll();
+        $attachment = $this->repository->store($data);
+        $manager    = new Manager;
+        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param AttachmentRequest $request
+     * @param Attachment        $attachment
+     *
+     * @return JsonResponse
+     */
+    public function update(AttachmentRequest $request, Attachment $attachment): JsonResponse
+    {
+        $data = $request->getAll();
+        $this->repository->update($attachment, $data);
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Upload an attachment.
+     *
+     * @param Request    $request
+     * @param Attachment $attachment
+     *
+     * @return JsonResponse
+     */
+    public function upload(Request $request, Attachment $attachment): JsonResponse
+    {
+        /** @var AttachmentHelperInterface $helper */
+        $helper = app(AttachmentHelperInterface::class);
+        $body   = $request->getContent();
+        $helper->saveAttachmentFromApi($attachment, $body);
+
+        return response()->json([], 204);
+    }
+
+}

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * AvailableBudgetController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Transformers\AvailableBudgetTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class AvailableBudgetController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AvailableBudgetController extends Controller
+{
+    /** @var CurrencyRepositoryInterface The currency repository */
+    private $currencyRepository;
+    /** @var BudgetRepositoryInterface The budget repository */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                     = auth()->user();
+                $this->repository         = app(BudgetRepositoryInterface::class);
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param AvailableBudget $availableBudget
+     *
+     * @return JsonResponse
+     */
+    public function delete(AvailableBudget $availableBudget): JsonResponse
+    {
+        $this->repository->destroyAvailableBudget($availableBudget);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of available budgets. Count it and split it.
+        $collection       = $this->repository->getAvailableBudgets();
+        $count            = $collection->count();
+        $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($availableBudgets, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param Request          $request
+     * @param  AvailableBudget $availableBudget
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, AvailableBudget $availableBudget): JsonResponse
+    {
+
+        $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($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param AvailableBudgetRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(AvailableBudgetRequest $request): JsonResponse
+    {
+        $data     = $request->getAll();
+        $currency = $this->currencyRepository->findNull($data['currency_id']);
+        if (null === $currency) {
+            $currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
+        }
+        if (null === $currency) {
+            throw new FireflyException('Could not find the indicated currency.');
+        }
+        $availableBudget = $this->repository->setAvailableBudget($currency, $data['start_date'], $data['end_date'], $data['amount']);
+        $manager         = new Manager;
+        $baseUrl         = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param AvailableBudgetRequest $request
+     * @param AvailableBudget        $availableBudget
+     *
+     * @return JsonResponse
+     */
+    public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
+    {
+        $data = $request->getAll();
+        $this->repository->updateAvailableBudget($availableBudget, $data);
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/BillController.php

@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\BillRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class BillController.
+ */
+class BillController extends Controller
+{
+    /** @var BillRepositoryInterface The bill repository */
+    private $repository;
+
+    /**
+     * BillController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var BillRepositoryInterface repository */
+                $this->repository = app(BillRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  Bill $bill
+     *
+     * @return JsonResponse
+     */
+    public function delete(Bill $bill): JsonResponse
+    {
+        $this->repository->destroy($bill);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $pageSize  = (int)app('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');
+    }
+
+
+    /**
+     * Show the specified bill.
+     *
+     * @param Request $request
+     * @param Bill    $bill
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Bill $bill): JsonResponse
+    {
+        $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');
+    }
+
+    /**
+     * Store a bill.
+     *
+     * @param BillRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(BillRequest $request): JsonResponse
+    {
+        $bill = $this->repository->store($request->getAll());
+        if (null !== $bill) {
+            $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');
+        }
+        throw new FireflyException('Could not store new bill.'); // @codeCoverageIgnore
+
+    }
+
+
+    /**
+     * Update a bill.
+     *
+     * @param BillRequest $request
+     * @param Bill        $bill
+     *
+     * @return JsonResponse
+     */
+    public function update(BillRequest $request, Bill $bill): JsonResponse
+    {
+        $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/BudgetController.php

@@ -0,0 +1,188 @@
+<?php
+/**
+ * BudgetController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\BudgetRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class BudgetController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BudgetController extends Controller
+{
+    /** @var BudgetRepositoryInterface The budget repository */
+    private $repository;
+
+    /**
+     * BudgetController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var BudgetRepositoryInterface repository */
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Budget $budget
+     *
+     * @return JsonResponse
+     */
+    public function delete(Budget $budget): JsonResponse
+    {
+        $this->repository->destroy($budget);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getBudgets();
+        $count      = $collection->count();
+        $budgets    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($budgets, new BudgetTransformer($this->parameters), 'budgets');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * Show a budget.
+     *
+     * @param Request $request
+     * @param Budget  $budget
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Budget $budget): JsonResponse
+    {
+        $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($budget, new BudgetTransformer($this->parameters), 'budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store a budget.
+     *
+     * @param BudgetRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(BudgetRequest $request): JsonResponse
+    {
+        $budget = $this->repository->store($request->getAll());
+        if (null !== $budget) {
+            $manager = new Manager();
+            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+            $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+
+            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        }
+        throw new FireflyException('Could not store new budget.'); // @codeCoverageIgnore
+    }
+
+
+    /**
+     * Update a budget.
+     *
+     * @param BudgetRequest $request
+     * @param Budget        $budget
+     *
+     * @return JsonResponse
+     */
+    public function update(BudgetRequest $request, Budget $budget): JsonResponse
+    {
+        $data    = $request->getAll();
+        $budget  = $this->repository->update($budget, $data);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+}

app/Api/V1/Controllers/BudgetLimitController.php

@@ -0,0 +1,197 @@
+<?php
+/**
+ * BudgetLimitController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+
+use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+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;
+
+
+/**
+ * Class BudgetLimitController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BudgetLimitController extends Controller
+{
+    /** @var BudgetRepositoryInterface The budget repository */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function delete(BudgetLimit $budgetLimit): JsonResponse
+    {
+        $this->repository->destroyBudgetLimit($budgetLimit);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $budgetId = (int)($request->get('budget_id') ?? 0);
+        $budget   = $this->repository->findNull($budgetId);
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $this->parameters->set('budget_id', $budgetId);
+
+        $collection = new Collection;
+        if (null === $budget) {
+            $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        if (null !== $budget) {
+            $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+        }
+
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($budgetLimits, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param Request     $request
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, BudgetLimit $budgetLimit): JsonResponse
+    {
+        $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($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param BudgetLimitRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(BudgetLimitRequest $request): JsonResponse
+    {
+        $data   = $request->getAll();
+        $budget = $this->repository->findNull($data['budget_id']);
+        if (null === $budget) {
+            throw new FireflyException('Unknown budget.');
+        }
+        $data['budget'] = $budget;
+        $budgetLimit    = $this->repository->storeBudgetLimit($data);
+        $manager        = new Manager;
+        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param BudgetLimitRequest $request
+     * @param BudgetLimit        $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
+    {
+        $data   = $request->getAll();
+        $budget = $this->repository->findNull($data['budget_id']);
+        if (null === $budget) {
+            $budget = $budgetLimit->budget;
+        }
+        $data['budget'] = $budget;
+        $budgetLimit    = $this->repository->updateBudgetLimit($budgetLimit, $data);
+        $manager        = new Manager;
+        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/CategoryController.php

@@ -0,0 +1,188 @@
+<?php
+/**
+ * CategoryController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\CategoryRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Transformers\CategoryTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class CategoryController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CategoryController extends Controller
+{
+    /** @var CategoryRepositoryInterface The category repository */
+    private $repository;
+
+    /**
+     * CategoryController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var CategoryRepositoryInterface repository */
+                $this->repository = app(CategoryRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Category $category
+     *
+     * @return JsonResponse
+     */
+    public function delete(Category $category): JsonResponse
+    {
+        $this->repository->destroy($category);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getCategories();
+        $count      = $collection->count();
+        $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($categories, new CategoryTransformer($this->parameters), 'categories');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * Show the category.
+     *
+     * @param Request  $request
+     * @param Category $category
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Category $category): JsonResponse
+    {
+        $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($category, new CategoryTransformer($this->parameters), 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store new category.
+     *
+     * @param CategoryRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(CategoryRequest $request): JsonResponse
+    {
+        $category = $this->repository->store($request->getAll());
+        if (null !== $category) {
+            $manager = new Manager();
+            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+            $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+
+            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        }
+        throw new FireflyException('Could not store new category.'); // @codeCoverageIgnore
+    }
+
+
+    /**
+     * Update the category.
+     *
+     * @param CategoryRequest $request
+     * @param Category        $category
+     *
+     * @return JsonResponse
+     */
+    public function update(CategoryRequest $request, Category $category): JsonResponse
+    {
+        $data     = $request->getAll();
+        $category = $this->repository->update($category, $data);
+        $manager  = new Manager();
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+}

app/Api/V1/Controllers/ConfigurationController.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * ConfigurationController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Configuration;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+/**
+ * Class ConfigurationController.
+ */
+class ConfigurationController extends Controller
+{
+
+
+    /** @var UserRepositoryInterface The user repository */
+    private $repository;
+
+    /**
+     * BudgetController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @noinspection UnusedConstructorDependenciesInspection */
+                $this->repository = app(UserRepositoryInterface::class);
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                if (!$this->repository->hasRole($admin, 'owner')) {
+                    /** @noinspection ExceptionsAnnotatingAndHandlingInspection */
+                    throw new FireflyException('No access to method.'); // @codeCoverageIgnore
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Show all configuration.
+     *
+     * @return JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $configData = $this->getConfigData();
+
+        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update the configuration.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function update(Request $request): JsonResponse
+    {
+        $name  = $request->get('name');
+        $value = $request->get('value');
+        $valid = ['is_demo_site', 'permission_update_check', 'single_user_mode'];
+        if (!\in_array($name, $valid, true)) {
+            throw new FireflyException('You cannot edit this configuration value.');
+        }
+        $configValue = '';
+        switch ($name) {
+            case 'is_demo_site':
+            case 'single_user_mode':
+                $configValue = 'true' === $value;
+                break;
+            case 'permission_update_check':
+                $configValue = (int)$value >= -1 && (int)$value <= 1 ? (int)$value : -1;
+                break;
+        }
+        app('fireflyconfig')->set($name, $configValue);
+        $configData = $this->getConfigData();
+
+        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Get all config values.
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function getConfigData(): array
+    {
+        /** @var Configuration $isDemoSite */
+        $isDemoSite = app('fireflyconfig')->get('is_demo_site');
+        /** @var Configuration $updateCheck */
+        $updateCheck = app('fireflyconfig')->get('permission_update_check');
+        /** @var Configuration $lastCheck */
+        $lastCheck = app('fireflyconfig')->get('last_update_check');
+        /** @var Configuration $singleUser */
+        $singleUser = app('fireflyconfig')->get('single_user_mode');
+        $data       = [
+            'is_demo_site'            => null === $isDemoSite ? null : $isDemoSite->data,
+            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
+            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
+            'single_user_mode'        => null === $singleUser ? null : $singleUser->data,
+        ];
+
+        return $data;
+    }
+}

app/Api/V1/Controllers/Controller.php

@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use Carbon\Carbon;
+use Carbon\Exceptions\InvalidDateException;
+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
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
+class Controller extends BaseController
+{
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    /** @var ParameterBag Parameters from the URI are stored here. */
+    protected $parameters;
+
+    /**
+     * Controller constructor.
+     *
+     */
+    public function __construct()
+    {
+        // get global parameters
+        $this->parameters = $this->getParameters();
+    }
+
+    /**
+     * Method to help build URI's.
+     *
+     * @return string
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    protected function buildParams(): string
+    {
+        $return = '?';
+        $params = [];
+        foreach ($this->parameters as $key => $value) {
+            if ('page' === $key) {
+                continue;
+            }
+            if ($value instanceof Carbon) {
+                $params[$key] = $value->format('Y-m-d');
+                continue;
+            }
+            $params[$key] = $value;
+        }
+        $return .= http_build_query($params);
+
+        return $return;
+    }
+
+    /**
+     * Method to grab all parameters from the URI.
+     *
+     * @return ParameterBag
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function getParameters(): ParameterBag
+    {
+        $bag  = new ParameterBag;
+        $page = (int)request()->get('page');
+        if (0 === $page) {
+            $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/CurrencyController.php

@@ -0,0 +1,219 @@
+<?php
+/**
+ * CurrencyController.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/>.
+ */
+
+declare(strict_types=1);
+
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\CurrencyRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class CurrencyController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CurrencyController extends Controller
+{
+    /** @var CurrencyRepositoryInterface The currency repository */
+    private $repository;
+    /** @var UserRepositoryInterface The user repository */
+    private $userRepository;
+
+    /**
+     * CurrencyRepository constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var CurrencyRepositoryInterface repository */
+                $this->repository     = app(CurrencyRepositoryInterface::class);
+                $this->userRepository = app(UserRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function delete(TransactionCurrency $currency): JsonResponse
+    {
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        if (!$this->userRepository->hasRole($admin, 'owner')) {
+            // access denied:
+            throw new FireflyException('No access to method, user is not owner.'); // @codeCoverageIgnore
+        }
+        if (!$this->repository->canDeleteCurrency($currency)) {
+            throw new FireflyException('No access to method, currency is in use.'); // @codeCoverageIgnore
+        }
+        $this->repository->destroy($currency);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->get();
+        $count      = $collection->count();
+        // slice them:
+        $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator  = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
+
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        $resource = new FractalCollection($currencies, new CurrencyTransformer($this->parameters), 'currencies');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * Show a currency.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $manager = new Manager();
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store new currency.
+     *
+     * @param CurrencyRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(CurrencyRequest $request): JsonResponse
+    {
+        $currency = $this->repository->store($request->getAll());
+
+        if (null !== $currency) {
+            if (true === $request->boolean('default')) {
+                app('preferences')->set('currencyPreference', $currency->code);
+                app('preferences')->mark();
+            }
+            $manager = new Manager();
+            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+            $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+            $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+            $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+
+            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        }
+        throw new FireflyException('Could not store new currency.'); // @codeCoverageIgnore
+
+    }
+
+
+    /**
+     * Update a currency.
+     *
+     * @param CurrencyRequest     $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function update(CurrencyRequest $request, TransactionCurrency $currency): JsonResponse
+    {
+        $data     = $request->getAll();
+        $currency = $this->repository->update($currency, $data);
+
+        if (true === $request->boolean('default')) {
+            app('preferences')->set('currencyPreference', $currency->code);
+            app('preferences')->mark();
+        }
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * CurrencyExchangeRateController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Services\Currency\ExchangeRateInterface;
+use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ * Class CurrencyExchangeRateController
+ */
+class CurrencyExchangeRateController extends Controller
+{
+    /** @var CurrencyRepositoryInterface The currency repository */
+    private $repository;
+
+    /**
+     * CurrencyExchangeRateController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                $this->repository = app(CurrencyRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+
+    }
+
+    /**
+     * Show an exchange rate.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $fromCurrency = $this->repository->findByCodeNull($request->get('from') ?? 'EUR');
+        $toCurrency   = $this->repository->findByCodeNull($request->get('to') ?? 'USD');
+
+        if (null === $fromCurrency) {
+            throw new FireflyException('Unknown source currency.');
+        }
+        if (null === $toCurrency) {
+            throw new FireflyException('Unknown destination currency.');
+        }
+
+        $dateObj = Carbon::createFromFormat('Y-m-d', $request->get('date') ?? date('Y-m-d'));
+        $this->parameters->set('from', $fromCurrency->code);
+        $this->parameters->set('to', $toCurrency->code);
+        $this->parameters->set('date', $dateObj->format('Y-m-d'));
+
+        $rate = $this->repository->getExchangeRate($fromCurrency, $toCurrency, $dateObj);
+        if (null === $rate) {
+            /** @var User $admin */
+            $admin = auth()->user();
+            // create service:
+            /** @var ExchangeRateInterface $service */
+            $service = app(ExchangeRateInterface::class);
+            $service->setUser($admin);
+            $rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
+        }
+
+        $resource = new Item($rate, new CurrencyExchangeRateTransformer($this->parameters), 'currency_exchange_rates');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+}

app/Api/V1/Controllers/JournalLinkController.php

@@ -0,0 +1,216 @@
+<?php
+/**
+ * JournalLinkController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\JournalLinkRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\TransactionJournalLink;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use FireflyIII\Transformers\JournalLinkTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class JournalLinkController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class JournalLinkController extends Controller
+{
+    /** @var JournalRepositoryInterface The journal repository */
+    private $journalRepository;
+    /** @var LinkTypeRepositoryInterface The link type repository */
+    private $repository;
+
+    /**
+     * JournalLinkController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+
+                $this->repository        = app(LinkTypeRepositoryInterface::class);
+                $this->journalRepository = app(JournalRepositoryInterface::class);
+
+                $this->repository->setUser($user);
+                $this->journalRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param TransactionJournalLink $link
+     *
+     * @return JsonResponse
+     */
+    public function delete(TransactionJournalLink $link): JsonResponse
+    {
+        $this->repository->destroyLink($link);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // read type from URI
+        $name = $request->get('name') ?? null;
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        $linkType = $this->repository->findByName($name);
+
+        // get list of accounts. Count it and split it.
+        $collection   = $this->repository->getJournalLinks($linkType);
+        $count        = $collection->count();
+        $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.journal_links.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($journalLinks, new JournalLinkTransformer($this->parameters), 'journal_links');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request                $request
+     * @param TransactionJournalLink $journalLink
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, TransactionJournalLink $journalLink): JsonResponse
+    {
+        $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($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param JournalLinkRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(JournalLinkRequest $request): JsonResponse
+    {
+        $manager = new Manager;
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+        $data    = $request->getAll();
+        $inward  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
+        $outward = $this->journalRepository->findNull($data['outward_id'] ?? 0);
+        if (null === $inward || null === $outward) {
+            throw new FireflyException('Source or destination is NULL.');
+        }
+        $data['direction'] = 'inward';
+
+        $journalLink = $this->repository->storeLink($data, $inward, $outward);
+        $resource    = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Update object.
+     *
+     * @param JournalLinkRequest     $request
+     * @param TransactionJournalLink $journalLink
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function update(JournalLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
+    {
+        $manager = new Manager;
+
+        // add include parameter:
+        $include = $request->get('include') ?? '';
+        $manager->parseIncludes($include);
+
+
+        $data            = $request->getAll();
+        $data['inward']  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
+        $data['outward'] = $this->journalRepository->findNull($data['outward_id'] ?? 0);
+        if (null === $data['inward'] || null === $data['outward']) {
+            throw new FireflyException('Source or destination is NULL.');
+        }
+        $data['direction'] = 'inward';
+        $journalLink       = $this->repository->updateLink($journalLink, $data);
+
+        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/LinkTypeController.php

@@ -0,0 +1,210 @@
+<?php
+/**
+ * LinkTypeController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\LinkTypeRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\LinkType;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Transformers\LinkTypeTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class LinkTypeController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LinkTypeController extends Controller
+{
+    /** @var LinkTypeRepositoryInterface The link type repository */
+    private $repository;
+
+    /** @var UserRepositoryInterface The user repository */
+    private $userRepository;
+
+    /**
+     * LinkTypeController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                 = auth()->user();
+                $this->repository     = app(LinkTypeRepositoryInterface::class);
+                $this->userRepository = app(UserRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param LinkType $linkType
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function delete(LinkType $linkType): JsonResponse
+    {
+        if (false === $linkType->editable) {
+            throw new FireflyException(sprintf('You cannot delete this link type (#%d, "%s")', $linkType->id, $linkType->name));
+        }
+        $this->repository->destroy($linkType, null);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $collection = $this->repository->get();
+        $count      = $collection->count();
+        $linkTypes  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.link_types.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($linkTypes, new LinkTypeTransformer($this->parameters), 'link_types');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request  $request
+     * @param LinkType $linkType
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, LinkType $linkType): JsonResponse
+    {
+        $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($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param LinkTypeRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(LinkTypeRequest $request): JsonResponse
+    {
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        if (!$this->userRepository->hasRole($admin, 'owner')) {
+            throw new FireflyException('You need the "owner"-role to do this.');
+        }
+        $data = $request->getAll();
+        // if currency ID is 0, find the currency by the code:
+        $linkType = $this->repository->store($data);
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Update object.
+     *
+     * @param LinkTypeRequest $request
+     * @param LinkType        $linkType
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function update(LinkTypeRequest $request, LinkType $linkType): JsonResponse
+    {
+        if (false === $linkType->editable) {
+            throw new FireflyException(sprintf('You cannot edit this link type (#%d, "%s")', $linkType->id, $linkType->name));
+        }
+
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        if (!$this->userRepository->hasRole($admin, 'owner')) {
+            throw new FireflyException('You need the "owner"-role to do this.');
+        }
+
+        $data = $request->getAll();
+        $this->repository->update($linkType, $data);
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/PiggyBankController.php

@@ -0,0 +1,188 @@
+<?php
+/**
+ * PiggyBankController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\PiggyBankRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Transformers\PiggyBankTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class PiggyBankController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PiggyBankController extends Controller
+{
+
+    /** @var PiggyBankRepositoryInterface The piggy bank repository */
+    private $repository;
+
+    /**
+     * PiggyBankController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                $this->repository = app(PiggyBankRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param PiggyBank $piggyBank
+     *
+     * @return JsonResponse
+     */
+    public function delete(PiggyBank $piggyBank): JsonResponse
+    {
+        $this->repository->destroy($piggyBank);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getPiggyBanks();
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($piggyBanks, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request   $request
+     * @param PiggyBank $piggyBank
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, PiggyBank $piggyBank): JsonResponse
+    {
+        $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($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param PiggyBankRequest $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function store(PiggyBankRequest $request): JsonResponse
+    {
+        $piggyBank = $this->repository->store($request->getAll());
+        if (null !== $piggyBank) {
+            $manager = new Manager();
+            $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+            $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+            $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+
+            return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+        }
+        throw new FireflyException('Could not store new piggy bank.');
+
+    }
+
+    /**
+     * Update piggy bank.
+     *
+     * @param PiggyBankRequest $request
+     * @param PiggyBank        $piggyBank
+     *
+     * @return JsonResponse
+     */
+    public function update(PiggyBankRequest $request, PiggyBank $piggyBank): JsonResponse
+    {
+        $piggyBank = $this->repository->update($piggyBank, $request->getAll());
+        $manager   = new Manager();
+        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/PreferenceController.php

@@ -0,0 +1,145 @@
+<?php
+/**
+ * PreferencesController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\PreferenceRequest;
+use FireflyIII\Models\Preference;
+use FireflyIII\Transformers\PreferenceTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ *
+ * Class PreferenceController
+ */
+class PreferenceController extends Controller
+{
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        /** @var User $user */
+        $user        = auth()->user();
+        $available   = [
+            'language', 'customFiscalYear', 'fiscalYearStart', 'currencyPreference',
+            'transaction_journal_optional_fields', 'frontPageAccounts', 'viewRange',
+            'listPageSize, twoFactorAuthEnabled',
+        ];
+        $preferences = new Collection;
+        foreach ($available as $name) {
+            $pref = app('preferences')->getForUser($user, $name);
+            if (null !== $pref) {
+                $preferences->push($pref);
+            }
+        }
+
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($preferences, new PreferenceTransformer($this->parameters), 'preferences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request    $request
+     * @param Preference $preference
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Preference $preference): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($preference, new PreferenceTransformer($this->parameters), 'preferences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Update a preference.
+     *
+     * @param PreferenceRequest $request
+     * @param Preference        $preference
+     *
+     * @return JsonResponse
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function update(PreferenceRequest $request, Preference $preference): JsonResponse
+    {
+
+        $data     = $request->getAll();
+        $newValue = $data['data'];
+        switch ($preference->name) {
+            default:
+                break;
+            case 'transaction_journal_optional_fields':
+            case 'frontPageAccounts':
+                $newValue = explode(',', $data['data']);
+                break;
+            case 'listPageSize':
+                $newValue = (int)$data['data'];
+                break;
+            case 'customFiscalYear':
+            case 'twoFactorAuthEnabled':
+                $newValue = 1 === (int)$data['data'];
+                break;
+        }
+        $result = app('preferences')->set($preference->name, $newValue);
+
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($result, new PreferenceTransformer($this->parameters), 'preferences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/RecurrenceController.php

@@ -0,0 +1,180 @@
+<?php
+/**
+ * RecurrenceController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\RecurrenceRequest;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Transformers\RecurrenceTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class RecurrenceController
+ */
+class RecurrenceController extends Controller
+{
+    /** @var RecurringRepositoryInterface The recurring transaction repository */
+    private $repository;
+
+    /**
+     * RecurrenceController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+
+                /** @var RecurringRepositoryInterface repository */
+                $this->repository = app(RecurringRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param Recurrence $recurrence
+     *
+     * @return JsonResponse
+     */
+    public function delete(Recurrence $recurrence): JsonResponse
+    {
+        $this->repository->destroy($recurrence);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getAll();
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($piggyBanks, new RecurrenceTransformer($this->parameters), 'recurrences');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request    $request
+     * @param Recurrence $recurrence
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Recurrence $recurrence): JsonResponse
+    {
+        $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($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param RecurrenceRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(RecurrenceRequest $request): JsonResponse
+    {
+        $recurrence = $this->repository->store($request->getAll());
+        $manager    = new Manager();
+        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update single recurrence.
+     *
+     * @param RecurrenceRequest $request
+     * @param Recurrence        $recurrence
+     *
+     * @return JsonResponse
+     */
+    public function update(RecurrenceRequest $request, Recurrence $recurrence): JsonResponse
+    {
+        $data     = $request->getAll();
+        $category = $this->repository->update($recurrence, $data);
+        $manager  = new Manager();
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($category, new RecurrenceTransformer($this->parameters), 'recurrences');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/RuleController.php

@@ -0,0 +1,178 @@
+<?php
+/**
+ * RuleController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\RuleRequest;
+use FireflyIII\Models\Rule;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class RuleController
+ */
+class RuleController extends Controller
+{
+    /** @var RuleRepositoryInterface The rule repository */
+    private $ruleRepository;
+
+    /**
+     * RuleController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+
+                $this->ruleRepository = app(RuleRepositoryInterface::class);
+                $this->ruleRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param Rule $rule
+     *
+     * @return JsonResponse
+     */
+    public function delete(Rule $rule): JsonResponse
+    {
+        $this->ruleRepository->destroy($rule);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->ruleRepository->getAll();
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($rules, new RuleTransformer($this->parameters), 'rules');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request $request
+     * @param Rule    $rule
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Rule $rule): JsonResponse
+    {
+        $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($rule, new RuleTransformer($this->parameters), 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param RuleRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(RuleRequest $request): JsonResponse
+    {
+        $rule    = $this->ruleRepository->store($request->getAll());
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update a rule.
+     *
+     * @param RuleRequest $request
+     * @param Rule        $rule
+     *
+     * @return JsonResponse
+     */
+    public function update(RuleRequest $request, Rule $rule): JsonResponse
+    {
+        $rule    = $this->ruleRepository->update($rule, $request->getAll());
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/RuleGroupController.php

@@ -0,0 +1,179 @@
+<?php
+/**
+ * RuleGroupController.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\RuleGroupRequest;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Transformers\RuleGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+
+/**
+ * Class RuleGroupController
+ */
+class RuleGroupController extends Controller
+{
+    /** @var RuleGroupRepositoryInterface The rule group repository */
+    private $ruleGroupRepository;
+
+    /**
+     * RuleGroupController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+
+                $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
+                $this->ruleGroupRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function delete(RuleGroup $ruleGroup): JsonResponse
+    {
+        $this->ruleGroupRepository->destroy($ruleGroup, null);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of rule groups. Count it and split it.
+        $collection = $this->ruleGroupRepository->get();
+        $count      = $collection->count();
+        $ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rule_groups.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        $resource = new FractalCollection($ruleGroups, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request   $request
+     * @param RuleGroup $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, RuleGroup $ruleGroup): JsonResponse
+    {
+        $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($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param RuleGroupRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(RuleGroupRequest $request): JsonResponse
+    {
+        $ruleGroup = $this->ruleGroupRepository->store($request->getAll());
+        $manager   = new Manager();
+        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Update a rule group.
+     *
+     * @param RuleGroupRequest $request
+     * @param RuleGroup        $ruleGroup
+     *
+     * @return JsonResponse
+     */
+    public function update(RuleGroupRequest $request, RuleGroup $ruleGroup): JsonResponse
+    {
+        $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll());
+        $manager   = new Manager();
+        $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/TransactionController.php

@@ -0,0 +1,307 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\TransactionRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+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 FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+/**
+ * Class TransactionController
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class TransactionController extends Controller
+{
+
+    /** @var JournalRepositoryInterface The journal repository */
+    private $repository;
+
+    /**
+     * TransactionController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $admin */
+                $admin = auth()->user();
+
+                /** @var JournalRepositoryInterface repository */
+                $this->repository = app(JournalRepositoryInterface::class);
+                $this->repository->setUser($admin);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \FireflyIII\Models\Transaction $transaction
+     *
+     * @return JsonResponse
+     */
+    public function delete(Transaction $transaction): JsonResponse
+    {
+        $journal = $transaction->transactionJournal;
+        $this->repository->destroy($journal);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $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->getPaginatedTransactions();
+        $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');
+    }
+
+
+    /**
+     * Show a single transaction.
+     *
+     * @param Request     $request
+     * @param Transaction $transaction
+     * @param string      $include
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Transaction $transaction, string $include = null): JsonResponse
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // add include parameter:
+        $include = $include ?? '';
+        $include = $request->get('include') ?? $include;
+        $manager->parseIncludes($include);
+
+        // collect transactions using the journal collector
+        $collector = app(TransactionCollectorInterface::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->getTransactions();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Store a new transaction.
+     *
+     * @param TransactionRequest         $request
+     *
+     * @param JournalRepositoryInterface $repository
+     *
+     * @throws FireflyException
+     * @return JsonResponse
+     */
+    public function store(TransactionRequest $request, JournalRepositoryInterface $repository): JsonResponse
+    {
+        $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(TransactionCollectorInterface::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->getTransactions();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
+    /**
+     * Update a transaction.
+     *
+     * @param TransactionRequest         $request
+     * @param JournalRepositoryInterface $repository
+     * @param Transaction                $transaction
+     *
+     * @return JsonResponse
+     */
+    public function update(TransactionRequest $request, JournalRepositoryInterface $repository, Transaction $transaction): JsonResponse
+    {
+        $data         = $request->getAll();
+        $data['user'] = auth()->user()->id;
+        $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(TransactionCollectorInterface::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->getTransactions();
+        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * All the types you can request.
+     *
+     * @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,],
+        ];
+        $return = $types['default'];
+        if (isset($types[$type])) {
+            $return = $types[$type];
+        }
+
+        return $return;
+
+    }
+}

app/Api/V1/Controllers/UserController.php

@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Api\V1\Requests\UserRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Transformers\UserTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+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;
+
+
+/**
+ * Class UserController.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class UserController extends Controller
+{
+
+    /** @var UserRepositoryInterface The user repository */
+    private $repository;
+
+    /**
+     * UserController constructor.
+     */
+    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 JsonResponse
+     * @throws FireflyException
+     */
+    public function delete(User $user): JsonResponse
+    {
+        /** @var User $admin */
+        $admin = auth()->user();
+        if ($this->repository->hasRole($admin, 'owner')) {
+            $this->repository->destroy($user);
+
+            return response()->json([], 204);
+        }
+        throw new FireflyException('No access to method.'); // @codeCoverageIgnore
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // user preferences
+        $pageSize = (int)app('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');
+    }
+
+    /**
+     * Show a single user.
+     *
+     * @param Request $request
+     * @param User    $user
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, User $user): JsonResponse
+    {
+        // 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');
+    }
+
+    /**
+     * Store a new user.
+     *
+     * @param UserRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(UserRequest $request): JsonResponse
+    {
+        $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');
+    }
+
+    /**
+     * Update a user.
+     *
+     * @param UserRequest $request
+     * @param User        $user
+     *
+     * @return JsonResponse
+     */
+    public function update(UserRequest $request, User $user): JsonResponse
+    {
+        $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,136 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+/**
+ * Class AccountRequest
+ */
+class AccountRequest extends Request
+{
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'name'                 => $this->string('name'),
+            'active'               => $this->boolean('active'),
+            'include_net_worth'    => $this->boolean('include_net_worth'),
+            'accountType'          => $this->string('type'),
+            'account_type_id'      => null,
+            'currency_id'          => $this->integer('currency_id'),
+            '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'),
+            'interest'             => $this->string('interest'),
+            'interest_period'      => $this->string('interest_period'),
+        ];
+        // new fields for liabilities
+        //            'liability_type'       => $this->string('liability_type'),
+        //            'liability_start_date' => $this->date('liability_start_date'),
+
+
+        //];
+        if ('liability' === $data['accountType']) {
+            $data['openingBalance']     = bcmul($this->string('liability_amount'), '-1');
+            $data['openingBalanceDate'] = $this->date('liability_start_date');
+            $data['accountType']        = $this->string('liability_type');
+            $data['account_type_id']    = null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @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',
+            'include_net_worth'       => 'required|boolean',
+            'cc_type'                 => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
+            'cc_monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:cc_type,monthlyFull',
+            'type'                    => 'required|in:' . $types,
+            'notes'                   => 'min:0|max:65536',
+            // required fields for liabilities:
+            'liability_type'          => 'required_if:type,liability|in:loan,debt,mortgage,credit card',
+            'liability_amount'        => 'required_if:type,liability|min:0|numeric',
+            'liability_start_date'    => 'required_if:type,liability|date',
+            'interest'                => 'required_if:type,liability|between:0,100|numeric',
+            'interest_period'         => 'required_if:type,liability|in:daily,monthly,yearly',
+
+        ];
+        switch ($this->method()) {
+            default:
+                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/AttachmentRequest.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * AttachmentRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\ImportJob;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Rules\IsValidAttachmentModel;
+
+/**
+ * Class AttachmentRequest
+ */
+class AttachmentRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'filename' => $this->string('filename'),
+            'title'    => $this->string('title'),
+            'notes'    => $this->string('notes'),
+            'model'    => $this->string('model'),
+            'model_id' => $this->integer('model_id'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $models = implode(
+            ',', [
+                   Bill::class,
+                   ImportJob::class,
+                   TransactionJournal::class,
+               ]
+        );
+        $model  = $this->string('model');
+        $rules  = [
+            'filename' => 'required|between:1,255',
+            'title'    => 'between:1,255',
+            'notes'    => 'between:1,65000',
+            'model'    => sprintf('required|in:%s', $models),
+            'model_id' => ['required', 'numeric', new IsValidAttachmentModel($model)],
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                unset($rules['model'], $rules['model_id']);
+                $rules['filename'] = 'between:1,255';
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * AvailableBudgetRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+/**
+ * Class AvailableBudgetRequest
+ */
+class AvailableBudgetRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+            'amount'        => $this->string('amount'),
+            'start_date'    => $this->date('start_date'),
+            'end_date'      => $this->date('end_date'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'currency_id'   => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
+            'amount'        => 'required|numeric|more:0',
+            'start_date'    => 'required|date|before:end_date',
+            'end_date'      => 'required|date|after:start_date',
+        ];
+
+        return $rules;
+    }
+
+
+}

app/Api/V1/Requests/BillRequest.php

@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use Illuminate\Validation\Validator;
+
+/**
+ * Class BillRequest
+ */
+class BillRequest extends Request
+{
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'name'          => $this->string('name'),
+            '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;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'          => 'required|between:1,255|uniqueObjectForUser:bills,name',
+            '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;
+                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', (string)trans('validation.amount_min_over_max'));
+                }
+            }
+        );
+    }
+}

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * BudgetLimitRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+
+/**
+ * Class BudgetLimitRequest
+ */
+class BudgetLimitRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'budget_id'  => $this->integer('budget_id'),
+            'start_date' => $this->date('start_date'),
+            'end_date'   => $this->date('end_date'),
+            'amount'     => $this->string('amount'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'budget_id'  => 'required|exists:budgets,id|belongsToUser:budgets,id',
+            'start_date' => 'required|before:end_date|date',
+            'end_date'   => 'required|after:start_date|date',
+            'amount'     => 'required|more:0',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                $rules['budget_id'] = 'required|exists:budgets,id|belongsToUser:budgets,id';
+                break;
+        }
+
+        return $rules;
+    }
+
+}

app/Api/V1/Requests/BudgetRequest.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * BudgetRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Budget;
+
+/**
+ * Class BudgetRequest
+ */
+class BudgetRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'   => $this->string('name'),
+            'active' => $this->boolean('active'),
+            'order'  => 0,
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'   => 'required|between:1,100|uniqueObjectForUser:budgets,name',
+            'active' => 'required|boolean',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var Budget $budget */
+                $budget        = $this->route()->parameter('budget');
+                $rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id);
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/CategoryRequest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * CategoryRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Category;
+
+/**
+ * Class CategoryRequest
+ */
+class CategoryRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'   => $this->string('name'),
+            'active' => $this->boolean('active'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'   => 'required|between:1,100|uniqueObjectForUser:categories,name',
+            'active' => 'required|boolean',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var Category $category */
+                $category      = $this->route()->parameter('category');
+                $rules['name'] = sprintf('required|between:1,100|uniqueObjectForUser:categories,name,%d', $category->id);
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/CurrencyRequest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * CurrencyRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+
+/**
+ * Class CurrencyRequest
+ */
+class CurrencyRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'           => $this->string('name'),
+            'code'           => $this->string('code'),
+            'symbol'         => $this->string('symbol'),
+            'decimal_places' => $this->integer('decimal_places'),
+            'default'        => $this->boolean('default'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'           => 'required|between:1,255|unique:transaction_currencies,name',
+            'code'           => 'required|between:3,3|unique:transaction_currencies,code',
+            'symbol'         => 'required|between:1,5|unique:transaction_currencies,symbol',
+            'decimal_places' => 'required|between:0,20|numeric|min:0|max:20',
+            'default'        => 'boolean',
+        ];
+
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                $currency        = $this->route()->parameter('currency');
+                $rules['name']   = 'required|between:1,255|unique:transaction_currencies,name,' . $currency->id;
+                $rules['code']   = 'required|between:1,255|unique:transaction_currencies,code,' . $currency->id;
+                $rules['symbol'] = 'required|between:1,255|unique:transaction_currencies,symbol,' . $currency->id;
+                break;
+        }
+
+        return $rules;
+
+    }
+}

app/Api/V1/Requests/JournalLinkRequest.php

@@ -0,0 +1,131 @@
+<?php
+/**
+ * JournalLinkRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Validation\Validator;
+
+/**
+ *
+ * Class JournalLinkRequest
+ */
+class JournalLinkRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'link_type_id'   => $this->integer('link_type_id'),
+            'link_type_name' => $this->string('link_type_name'),
+            'inward_id'      => $this->integer('inward_id'),
+            'outward_id'     => $this->integer('outward_id'),
+            'notes'          => $this->string('notes'),
+        ];
+    }
+
+    /**
+     *
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'link_type_id'   => 'exists:link_types,id|required_without:link_type_name',
+            'link_type_name' => 'exists:link_types,name|required_without:link_type_id',
+            'inward_id'      => 'required|belongsToUser:transaction_journals,id',
+            'outward_id'     => 'required|belongsToUser:transaction_journals,id',
+            'notes'          => 'between:0,65000',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->validateExistingLink($validator);
+            }
+        );
+    }
+
+    /**
+     * @param Validator $validator
+     */
+    private function validateExistingLink(Validator $validator): void
+    {
+        /** @var LinkTypeRepositoryInterface $repository */
+        $repository = app(LinkTypeRepositoryInterface::class);
+        $repository->setUser(auth()->user());
+
+        /** @var JournalRepositoryInterface $journalRepos */
+        $journalRepos = app(JournalRepositoryInterface::class);
+        $journalRepos->setUser(auth()->user());
+
+        $data      = $validator->getData();
+        $inwardId  = (int)($data['inward_id'] ?? 0);
+        $outwardId = (int)($data['outward_id'] ?? 0);
+        $inward    = $journalRepos->findNull($inwardId);
+        $outward   = $journalRepos->findNull($outwardId);
+
+        if (null === $inward) {
+            $validator->errors()->add('inward_id', 'Invalid inward ID.');
+
+            return;
+        }
+        if (null === $outward) {
+            $validator->errors()->add('outward_id', 'Invalid outward ID.');
+
+            return;
+        }
+
+        if ($repository->findLink($inward, $outward)) {
+            $validator->errors()->add('outward_id', 'Already have a link between inward and outward.');
+            $validator->errors()->add('inward_id', 'Already have a link between inward and outward.');
+        }
+    }
+}

app/Api/V1/Requests/LinkTypeRequest.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * LinkTypeRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\LinkType;
+use Illuminate\Validation\Rule;
+
+/**
+ *
+ * Class LinkTypeRequest
+ */
+class LinkTypeRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'    => $this->string('name'),
+            'outward' => $this->string('outward'),
+            'inward'  => $this->string('inward'),
+        ];
+
+
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'    => 'required|unique:link_types,name|min:1',
+            'outward' => 'required|unique:link_types,outward|min:1|different:inward',
+            'inward'  => 'required|unique:link_types,inward|min:1|different:outward',
+        ];
+
+
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var LinkType $linkType */
+                $linkType         = $this->route()->parameter('linkType');
+                $rules['name']    = ['required', Rule::unique('link_types', 'name')->ignore($linkType->id), 'min:1'];
+                $rules['outward'] = ['required', 'different:inward', Rule::unique('link_types', 'outward')->ignore($linkType->id), 'min:1'];
+                $rules['inward']  = ['required', 'different:outward', Rule::unique('link_types', 'inward')->ignore($linkType->id), 'min:1'];
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/PiggyBankRequest.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * PiggyBankRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\PiggyBank;
+use FireflyIII\Rules\IsAssetAccountId;
+
+/**
+ *
+ * Class PiggyBankRequest
+ */
+class PiggyBankRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'name'           => $this->string('name'),
+            'account_id'     => $this->integer('account_id'),
+            'targetamount'   => $this->string('target_amount'),
+            'current_amount' => $this->string('current_amount'),
+            'start_date'     => $this->date('start_date'),
+            'target_date'    => $this->date('target_date'),
+            'notes'           => $this->string('notes'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'           => 'required|between:1,255|uniquePiggyBankForUser',
+            'account_id'     => ['required', 'belongsToUser:accounts', new IsAssetAccountId],
+            'target_amount'  => 'required|numeric|more:0',
+            'current_amount' => 'numeric|more:0|lte:target_amount',
+            'start_date'     => 'date|nullable',
+            'target_date'    => 'date|nullable',
+            'notes'          => 'max:65000',
+        ];
+
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var PiggyBank $piggyBank */
+                $piggyBank     = $this->route()->parameter('piggyBank');
+                $rules['name'] = 'required|between:1,255|uniquePiggyBankForUser:' . $piggyBank->id;
+                break;
+        }
+
+
+        return $rules;
+    }
+
+}

app/Api/V1/Requests/PreferenceRequest.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * PreferenceRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+/**
+ *
+ * Class PreferenceRequest
+ */
+class PreferenceRequest extends Request
+{
+
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'data' => $this->get('data'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'data' => 'required|between:1,65000',
+        ];
+    }
+
+}

app/Api/V1/Requests/RecurrenceRequest.php

@@ -0,0 +1,203 @@
+<?php
+/**
+ * RecurrenceRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use Carbon\Carbon;
+use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Validation\RecurrenceValidation;
+use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class RecurrenceRequest
+ */
+class RecurrenceRequest extends Request
+{
+    use RecurrenceValidation, TransactionValidation;
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $return = [
+            'recurrence'   => [
+                'type'         => $this->string('type'),
+                'title'        => $this->string('title'),
+                'description'  => $this->string('description'),
+                'first_date'   => $this->date('first_date'),
+                'repeat_until' => $this->date('repeat_until'),
+                'repetitions'  => $this->integer('nr_of_repetitions'),
+                'apply_rules'  => $this->boolean('apply_rules'),
+                'active'       => $this->boolean('active'),
+            ],
+            'meta'         => [
+                'piggy_bank_id'   => $this->integer('piggy_bank_id'),
+                'piggy_bank_name' => $this->string('piggy_bank_name'),
+                'tags'            => explode(',', $this->string('tags')),
+            ],
+            'transactions' => $this->getTransactionData(),
+            'repetitions'  => $this->getRepetitionData(),
+        ];
+
+        return $return;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $today = Carbon::now()->addDay();
+
+        return [
+            'type'                                 => 'required|in:withdrawal,transfer,deposit',
+            'title'                                => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
+            'description'                          => 'between:1,65000',
+            'first_date'                           => sprintf('required|date|after:%s', $today->format('Y-m-d')),
+            'repeat_until'                         => sprintf('date|after:%s', $today->format('Y-m-d')),
+            'nr_of_repetitions'                    => 'numeric|between:1,31',
+            'apply_rules'                          => 'required|boolean',
+            'active'                               => 'required|boolean',
+            'tags'                                 => 'between:1,64000',
+            'piggy_bank_id'                        => 'numeric',
+            'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
+            'repetitions.*.moment'                 => 'between:0,10',
+            'repetitions.*.skip'                   => 'required|numeric|between:0,31',
+            'repetitions.*.weekend'                => 'required|numeric|min:1|max:4',
+            '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.*.category_name'         => 'between:1,255|nullable',
+            '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',
+            'transactions.*.amount'                => 'required|numeric|more:0',
+            'transactions.*.description'           => 'required|between:1,255',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->validateOneTransaction($validator);
+                $this->validateOneRepetition($validator);
+                $this->validateRecurrenceRepetition($validator);
+                $this->validateRepetitionMoment($validator);
+                $this->validateForeignCurrencyInformation($validator);
+                $this->validateAccountInformation($validator);
+            }
+        );
+    }
+
+
+    /**
+     * Returns the repetition data as it is found in the submitted data.
+     *
+     * @return array
+     */
+    private function getRepetitionData(): array
+    {
+        $return = [];
+        // repetition data:
+        /** @var array $repetitions */
+        $repetitions = $this->get('repetitions');
+        /** @var array $repetition */
+        foreach ($repetitions as $repetition) {
+            $return[] = [
+                'type'    => $repetition['type'],
+                'moment'  => $repetition['moment'],
+                'skip'    => (int)$repetition['skip'],
+                'weekend' => (int)$repetition['weekend'],
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns the transaction data as it is found in the submitted data. It's a complex method according to code
+     * standards but it just has a lot of ??-statements because of the fields that may or may not exist.
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        // transaction data:
+        /** @var array $transactions */
+        $transactions = $this->get('transactions');
+        /** @var array $transaction */
+        foreach ($transactions as $transaction) {
+            $return[] = [
+                '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,
+                'description'           => $transaction['description'],
+            ];
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Requests/Request.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
+
+/**
+ * Class Request.
+ *
+ * Technically speaking this class does not have to be extended like this but who knows what the future brings.
+ *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
+class Request extends FireflyIIIRequest
+{
+
+}

app/Api/V1/Requests/RuleGroupRequest.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * RuleGroupRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\RuleGroup;
+
+
+/**
+ *
+ * Class RuleGroupRequest
+ */
+class RuleGroupRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return [
+            'title'       => $this->string('title'),
+            'description' => $this->string('description'),
+            'active'      => $this->boolean('active'),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'title'       => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
+            'description' => 'between:1,5000|nullable',
+            'active'      => 'required|boolean',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var RuleGroup $ruleGroup */
+                $ruleGroup      = $this->route()->parameter('ruleGroup');
+                $rules['title'] = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id;
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/RuleRequest.php

@@ -0,0 +1,187 @@
+<?php
+/**
+ * RuleRequest.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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use Illuminate\Validation\Validator;
+
+
+/**
+ * Class RuleRequest
+ */
+class RuleRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'title'            => $this->string('title'),
+            'description'      => $this->string('description'),
+            'rule_group_id'    => $this->integer('rule_group_id'),
+            'rule_group_title' => $this->string('rule_group_title'),
+            'trigger'          => $this->string('trigger'),
+            'strict'           => $this->boolean('strict'),
+            'stop_processing'  => $this->boolean('stop_processing'),
+            'active'           => $this->boolean('active'),
+            'rule_triggers'    => $this->getRuleTriggers(),
+            'rule_actions'     => $this->getRuleActions(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $validTriggers = array_keys(config('firefly.rule-triggers'));
+        $validActions  = array_keys(config('firefly.rule-actions'));
+
+        // some actions require text:
+        $contextActions = implode(',', config('firefly.rule-actions-text'));
+
+        $rules = [
+            'title'                           => 'required|between:1,100|uniqueObjectForUser:rules,title',
+            'description'                     => 'between:1,5000|nullable',
+            'rule_group_id'                   => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
+            'rule_group_title'                => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
+            'trigger'                         => 'required|in:store-journal,update-journal',
+            'rule_triggers.*.name'            => 'required|in:' . implode(',', $validTriggers),
+            'rule_triggers.*.stop_processing' => 'boolean',
+            'rule_triggers.*.value'           => 'required|min:1|ruleTriggerValue',
+            'rule_actions.*.name'             => 'required|in:' . implode(',', $validActions),
+            'rule_actions.*.value'            => 'required_if:rule_actions.*.type,' . $contextActions . '|ruleActionValue',
+            'rule_actions.*.stop_processing'  => 'boolean',
+            'strict'                          => 'required|boolean',
+            'stop_processing'                 => 'required|boolean',
+            'active'                          => 'required|boolean',
+        ];
+
+        return $rules;
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->atLeastOneTrigger($validator);
+                $this->atLeastOneAction($validator);
+            }
+        );
+    }
+
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneAction(Validator $validator): void
+    {
+        $data        = $validator->getData();
+        $repetitions = $data['rule_actions'] ?? [];
+        // need at least one transaction
+        if (0 === \count($repetitions)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
+        }
+    }
+
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneTrigger(Validator $validator): void
+    {
+        $data        = $validator->getData();
+        $repetitions = $data['rule_triggers'] ?? [];
+        // need at least one transaction
+        if (0 === \count($repetitions)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleActions(): array
+    {
+        $actions = $this->get('rule_actions');
+        $return  = [];
+        if (\is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'name'            => $action['name'],
+                    'value'           => $action['value'],
+                    'stop_processing' => 1 === (int)($action['stop-processing'] ?? '0'),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('rule_triggers');
+        $return   = [];
+        if (\is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'name'            => $trigger['name'],
+                    'value'           => $trigger['value'],
+                    'stop_processing' => 1 === (int)($trigger['stop-processing'] ?? '0'),
+                ];
+            }
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Requests/TransactionRequest.php

@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Validation\TransactionValidation;
+use Illuminate\Validation\Validator;
+
+
+/**
+ * Class TransactionRequest
+ */
+class TransactionRequest extends Request
+{
+    use TransactionValidation;
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data. Is pretty complex because of all the ??-statements.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            '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')),
+            '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'),
+            'transactions'       => $this->getTransactionData(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    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',
+        ];
+
+        if ('PUT' === $this->method()) {
+            unset($rules['type'], $rules['piggy_bank_id'], $rules['piggy_bank_name']);
+        }
+
+        return $rules;
+
+
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->validateOneTransaction($validator);
+                $this->validateDescriptions($validator);
+                $this->validateJournalDescription($validator);
+                $this->validateSplitDescriptions($validator);
+                $this->validateForeignCurrencyInformation($validator);
+                $this->validateAccountInformation($validator);
+                $this->validateSplitAccounts($validator);
+            }
+        );
+    }
+
+    /**
+     * Get transaction data.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @return array
+     */
+    private function getTransactionData(): array
+    {
+        $return = [];
+        foreach ($this->get('transactions') as $index => $transaction) {
+            $return[] = [
+                '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,
+            ];
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Requests/UserRequest.php

@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+
+
+/**
+ * Class UserRequest
+ */
+class UserRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        $result = false;
+        // Only allow authenticated users
+        if (auth()->check()) {
+            /** @var User $user */
+            $user = auth()->user();
+
+            /** @var UserRepositoryInterface $repository */
+            $repository = app(UserRepositoryInterface::class);
+
+            if ($repository->hasRole($user, 'owner')) {
+                $result = true; // @codeCoverageIgnore
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'email'        => $this->string('email'),
+            'blocked'      => $this->boolean('blocked'),
+            'blocked_code' => $this->string('blocked_code'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @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/Bootstrap/ConfigureLogging.php

@@ -1,63 +0,0 @@
-<?php
-/**
- * ConfigureLogging.php
- * Copyright (C) 2016 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.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Bootstrap;
-
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Foundation\Bootstrap\ConfigureLogging as IlluminateConfigureLogging;
-use Illuminate\Log\Writer;
-
-/**
- * Class ConfigureLogging
- *
- * @package FireflyIII\Bootstrap
- */
-class ConfigureLogging extends IlluminateConfigureLogging
-{
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     *
-     * @return void
-     */
-    protected function configureDailyHandler(Application $app, Writer $log)
-    {
-        $config = $app->make('config');
-
-        $maxFiles = $config->get('app.log_max_files');
-
-        $log->useDailyFiles(
-            $app->storagePath() . '/logs/firefly-iii.log', is_null($maxFiles) ? 5 : $maxFiles,
-            $config->get('app.log_level', 'debug')
-        );
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     *
-     * @return void
-     */
-    protected function configureSingleHandler(Application $app, Writer $log)
-    {
-        $log->useFiles(
-            $app->storagePath() . '/logs/firefly-iii.log',
-            $app->make('config')->get('app.log_level', 'debug')
-        );
-    }
-}

app/Console/Commands/CreateExport.php

@@ -0,0 +1,146 @@
+<?php
+/**
+ * CreateExport.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/>.
+ */
+
+/** @noinspection MultipleReturnStatementsInspection */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use Carbon\Carbon;
+use FireflyIII\Export\ProcessorInterface;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Illuminate\Console\Command;
+use Storage;
+
+/**
+ * Class CreateExport.
+ *
+ * Generates export from the command line.
+ *
+ * @codeCoverageIgnore
+ */
+class CreateExport extends Command
+{
+    use VerifiesAccessToken;
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Use this command to create a new import. Your user ID can be found on the /profile page.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature
+        = 'firefly:create-export
+                            {--user= : The user ID that the import should import for.}
+                            {--token= : The user\'s access token.}
+                            {--with_attachments : Include user\'s attachments?}
+                            {--with_uploads : Include user\'s uploads?}';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function handle(): int
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return 1;
+        }
+        $this->line('Full export is running...');
+        // make repositories
+        /** @var UserRepositoryInterface $userRepository */
+        $userRepository = app(UserRepositoryInterface::class);
+        /** @var ExportJobRepositoryInterface $jobRepository */
+        $jobRepository = app(ExportJobRepositoryInterface::class);
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        /** @var JournalRepositoryInterface $journalRepository */
+        $journalRepository = app(JournalRepositoryInterface::class);
+
+        // set user
+        $user = $userRepository->findNull((int)$this->option('user'));
+        if (null === $user) {
+            return 1;
+        }
+        $jobRepository->setUser($user);
+        $journalRepository->setUser($user);
+        $accountRepository->setUser($user);
+
+        // first date
+        $firstJournal = $journalRepository->firstNull();
+        $first        = new Carbon;
+        if (null !== $firstJournal) {
+            $first = $firstJournal->date;
+        }
+
+        // create job and settings.
+        $job      = $jobRepository->create();
+        $settings = [
+            'accounts'           => $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]),
+            'startDate'          => $first,
+            'endDate'            => new Carbon,
+            'exportFormat'       => 'csv',
+            'includeAttachments' => $this->option('with_attachments'),
+            'includeOldUploads'  => $this->option('with_uploads'),
+            'job'                => $job,
+        ];
+
+        /** @var ProcessorInterface $processor */
+        $processor = app(ProcessorInterface::class);
+        $processor->setSettings($settings);
+
+        $processor->collectJournals();
+        $processor->convertJournals();
+        $processor->exportJournals();
+        if ($settings['includeAttachments']) {
+            $processor->collectAttachments();
+        }
+
+        if ($settings['includeOldUploads']) {
+            $processor->collectOldUploads();
+        }
+
+        $processor->createZipFile();
+        $disk     = Storage::disk('export');
+        $fileName = sprintf('export-%s.zip', date('Y-m-d_H-i-s'));
+        $disk->move($job->key . '.zip', $fileName);
+
+        $this->line('The export has finished! You can find the ZIP file in this location:');
+        $this->line(storage_path(sprintf('export/%s', $fileName)));
+
+        return 0;
+    }
+}

app/Console/Commands/CreateImport.php

@@ -1,31 +1,48 @@
 <?php
 /**
  * CreateImport.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This file is part of Firefly III.
  *
- * See the LICENSE file for details.
+ * 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);
+/** @noinspection MultipleReturnStatementsInspection */
+
+declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
-use Artisan;
+use Exception;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
+use FireflyIII\Import\Routine\RoutineInterface;
+use FireflyIII\Import\Storage\ImportArrayStorage;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Log;
 
 /**
- * Class CreateImport
+ * Class CreateImport.
  *
- * @package FireflyIII\Console\Commands
+ * @codeCoverageIgnore
  */
 class CreateImport extends Command
 {
+    use VerifiesAccessToken;
     /**
      * The console command description.
      *
@@ -38,104 +55,246 @@ class CreateImport extends Command
      *
      * @var string
      */
-    protected $signature = 'firefly:create-import {file} {configuration} {--user=1} {--type=csv} {--start}';
+    protected $signature
+        = 'firefly:create-import
+                            {file? : The file to import.}
+                            {configuration? : The configuration file to use for the import.}
+                            {--type=csv : The file type of the import.}
+                            {--provider=file : The file type of the import.}
+                            {--user=1 : 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.
+     * Run the command.
      *
+     * @throws FireflyException
      */
-    public function __construct()
+    public function handle(): int
     {
-        parent::__construct();
-    }
+        if (!$this->verifyAccessToken()) {
+            $this->errorLine('Invalid access token.');
 
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
-     */
-    public function handle()
-    {
+            return 1;
+        }
         /** @var UserRepositoryInterface $userRepository */
-        $userRepository = app(UserRepositoryInterface::class);
-        $file           = $this->argument('file');
-        $configuration  = $this->argument('configuration');
-        $user           = $userRepository->find(intval($this->option('user')));
-        $cwd            = getcwd();
-        $type           = strtolower($this->option('type'));
+        $userRepository    = app(UserRepositoryInterface::class);
+        $file              = (string)$this->argument('file');
+        $configuration     = (string)$this->argument('configuration');
+        $user              = $userRepository->findNull((int)$this->option('user'));
+        $cwd               = getcwd();
+        $provider          = strtolower((string)$this->option('provider'));
+        $configurationData = [];
+
+        if (null === $user) {
+            $this->errorLine('User is NULL.');
+
+            return 1;
+        }
 
         if (!$this->validArguments()) {
-            return;
+            $this->errorLine('Invalid arguments.');
+
+            return 1;
+        }
+        if (\strlen($configuration) > 0) {
+            $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 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));
 
-            return;
-        }
-
-        $this->info(sprintf('Going to create a job to import file: %s', $file));
-        $this->info(sprintf('Using configuration file: %s', $configuration));
-        $this->info(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
-        $this->info(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', $provider));
 
         /** @var ImportJobRepositoryInterface $jobRepository */
         $jobRepository = app(ImportJobRepositoryInterface::class);
         $jobRepository->setUser($user);
-        $job = $jobRepository->create($type);
-        $this->line(sprintf('Created job "%s"...', $job->key));
+        $importJob = $jobRepository->create($provider);
+        $this->infoLine(sprintf('Created job "%s"', $importJob->key));
 
-        Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
-        $this->line('Stored import data...');
+        // make sure that job has no prerequisites.
+        if ((bool)config(sprintf('import.has_prereq.%s', $provider))) {
+            // make prerequisites thing.
+            $class = (string)config(sprintf('import.prerequisites.%s', $provider));
+            if (!class_exists($class)) {
+                throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $provider)); // @codeCoverageIgnore
+            }
+            /** @var PrerequisitesInterface $object */
+            $object = app($class);
+            $object->setUser($user);
+            if (!$object->isComplete()) {
+                $this->errorLine(sprintf('Import provider "%s" has prerequisites that can only be filled in using the browser.', $provider));
 
-        $job->configuration = $configurationData;
-        $job->status        = 'settings_complete';
-        $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...');
-            Log::debug('Go for import!');
-            Artisan::call('firefly:start-import', ['key' => $job->key]);
-            $this->line('Done!');
+                return 1;
+            }
         }
 
-        return;
+        // store file as attachment.
+        if (\strlen($file) > 0) {
+            $messages = $jobRepository->storeCLIUpload($importJob, 'import_file', $file);
+            if ($messages->count() > 0) {
+                $this->errorLine($messages->first());
+
+                return 1;
+            }
+            $this->infoLine('File content saved.');
+        }
+
+        $this->infoLine('Job configuration saved.');
+        $jobRepository->setConfiguration($importJob, $configurationData);
+        $jobRepository->setStatus($importJob, 'ready_to_run');
+
+
+        if (true === $this->option('start')) {
+            $this->infoLine('The import routine has started. The process is not visible. Please wait.');
+            Log::debug('Go for import!');
+
+            // run it!
+            $key       = sprintf('import.routine.%s', $provider);
+            $className = config($key);
+            if (null === $className || !class_exists($className)) {
+                // @codeCoverageIgnoreStart
+                $this->errorLine(sprintf('No routine for provider "%s"', $provider));
+
+                return 1;
+                // @codeCoverageIgnoreEnd
+            }
+
+            // keep repeating this call until job lands on "provider_finished"
+            $valid = ['provider_finished'];
+            $count = 0;
+            while (!\in_array($importJob->status, $valid, true) && $count < 6) {
+                Log::debug(sprintf('Now in loop #%d.', $count + 1));
+                /** @var RoutineInterface $routine */
+                $routine = app($className);
+                $routine->setImportJob($importJob);
+                try {
+                    $routine->run();
+                } catch (FireflyException|Exception $e) {
+                    $message = 'The import routine crashed: ' . $e->getMessage();
+                    Log::error($message);
+                    Log::error($e->getTraceAsString());
+
+                    // set job errored out:
+                    $jobRepository->setStatus($importJob, 'error');
+                    $this->errorLine($message);
+
+                    return 1;
+                }
+                $count++;
+            }
+            if ('provider_finished' === $importJob->status) {
+                $this->infoLine('Import has finished. Please wait for storage of data.');
+                // set job to be storing data:
+                $jobRepository->setStatus($importJob, 'storing_data');
+
+                /** @var ImportArrayStorage $storage */
+                $storage = app(ImportArrayStorage::class);
+                $storage->setImportJob($importJob);
+
+                try {
+                    $storage->store();
+                } catch (FireflyException|Exception $e) {
+                    $message = 'The import routine crashed: ' . $e->getMessage();
+                    Log::error($message);
+                    Log::error($e->getTraceAsString());
+
+                    // set job errored out:
+                    $jobRepository->setStatus($importJob, 'error');
+                    $this->errorLine($message);
+
+                    return 1;
+                }
+                // set storage to be finished:
+                $jobRepository->setStatus($importJob, 'storage_finished');
+            }
+
+            // give feedback:
+            $this->infoLine('Job has finished.');
+            if (null !== $importJob->tag) {
+                $this->infoLine(sprintf('%d transaction(s) have been imported.', $importJob->tag->transactionJournals->count()));
+                $this->infoLine(sprintf('You can find your transactions under tag "%s"', $importJob->tag->tag));
+            }
+
+            if (null === $importJob->tag) {
+                $this->errorLine('No transactions have been imported :(.');
+            }
+            if (\count($importJob->errors) > 0) {
+                $this->infoLine(sprintf('%d error(s) occurred:', \count($importJob->errors)));
+                foreach ($importJob->errors as $err) {
+                    $this->errorLine('- ' . $err);
+                }
+            }
+        }
+        // clear cache for user:
+        app('preferences')->setForUser($user, 'lastActivity', microtime());
+
+        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'));
+        $file          = (string)$this->argument('file');
+        $configuration = (string)$this->argument('configuration');
+        $cwd           = getcwd();
+        $validTypes    = config('import.options.file.import_formats');
+        $type          = strtolower($this->option('type'));
+        $provider      = strtolower($this->option('provider'));
+        $enabled       = (bool)config(sprintf('import.enabled.%s', $provider));
 
-        if (is_null($user->id)) {
-            $this->error(sprintf('There is no user with ID %d.', $this->option('user')));
-
-            return false;
-        }
-        if (!in_array($type, $validTypes)) {
-            $this->error(sprintf('Cannot import file of type "%s"', $type));
+        if (false === $enabled) {
+            $this->errorLine(sprintf('Provider "%s" is not enabled.', $provider));
 
             return false;
         }
 
-        if (!file_exists($file)) {
-            $this->error(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
+        if ('file' === $provider && !\in_array($type, $validTypes, true)) {
+            $this->errorLine(sprintf('Cannot import file of type "%s"', $type));
 
             return false;
         }
 
-        if (!file_exists($configuration)) {
-            $this->error(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
+        if ('file' === $provider && !file_exists($file)) {
+            $this->errorLine(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd));
+
+            return false;
+        }
+
+        if ('file' === $provider && !file_exists($configuration)) {
+            $this->errorLine(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd));
 
             return false;
         }

app/Console/Commands/Cron.php

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

app/Console/Commands/DecryptAttachment.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * DecryptAttachment.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/>.
+ */
+
+/** @noinspection MultipleReturnStatementsInspection */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Console\Command;
+use Log;
+
+/**
+ * Class DecryptAttachment.
+ *
+ * @codeCoverageIgnore
+ */
+class DecryptAttachment extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Decrypts an attachment and dumps the content in a file in the given directory.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature
+        = 'firefly:decrypt-attachment {id:The ID of the attachment.} {name:The file name of the attachment.} 
+    {directory:Where the file must be stored.}';
+
+    /**
+     * Execute the console command.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        /** @var AttachmentRepositoryInterface $repository */
+        $repository     = app(AttachmentRepositoryInterface::class);
+        $attachmentId   = (int)$this->argument('id');
+        $attachment     = $repository->findWithoutUser($attachmentId);
+        $attachmentName = trim((string)$this->argument('name'));
+        $storagePath    = realpath(trim((string)$this->argument('directory')));
+        if (null === $attachment) {
+            $this->error(sprintf('No attachment with id #%d', $attachmentId));
+            Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
+
+            return 1;
+        }
+
+        if ($attachmentName !== $attachment->filename) {
+            $this->error('File name does not match.');
+            Log::error('DecryptAttachment: File name does not match.');
+
+            return 1;
+        }
+
+        if (!is_dir($storagePath)) {
+            $this->error(sprintf('Path "%s" is not a directory.', $storagePath));
+            Log::error(sprintf('DecryptAttachment: Path "%s" is not a directory.', $storagePath));
+
+            return 1;
+        }
+
+        if (!is_writable($storagePath)) {
+            $this->error(sprintf('Path "%s" is not writable.', $storagePath));
+            Log::error(sprintf('DecryptAttachment: Path "%s" is not writable.', $storagePath));
+
+            return 1;
+        }
+
+        $fullPath = $storagePath . DIRECTORY_SEPARATOR . $attachment->filename;
+        $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 (false === $result) {
+            $this->error('Could not write to file.');
+
+            return 1;
+        }
+        $this->info(sprintf('%d bytes written. Exiting now..', $result));
+
+        return 0;
+    }
+}

app/Console/Commands/EncryptFile.php

@@ -1,25 +1,36 @@
 <?php
 /**
  * EncryptFile.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This file is part of Firefly III.
  *
- * See the LICENSE file for details.
+ * 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);
+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
+ * Class EncryptFile.
  *
- * @package FireflyIII\Console\Commands
+ * @codeCoverageIgnore
  */
 class EncryptFile extends Command
 {
@@ -37,32 +48,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,30 +1,42 @@
 <?php
 /**
  * Import.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This file is part of Firefly III.
  *
- * See the LICENSE file for details.
+ * 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);
+/** @noinspection MultipleReturnStatementsInspection */
+/** @noinspection PhpDynamicAsStaticMethodCallInspection */
+
+declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
-use FireflyIII\Import\ImportProcedure;
-use FireflyIII\Import\Logging\CommandHandler;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
-use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class Import
+ * Class Import.
  *
- * @package FireflyIII\Console\Commands
+ * @codeCoverageIgnore
  */
 class Import extends Command
 {
@@ -43,102 +55,111 @@ class Import extends Command
     protected $signature = 'firefly:start-import {key}';
 
     /**
-     * Create a new command instance.
+     * Run the import routine.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      *
+     * @throws FireflyException
      */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     *
-     */
-    public function handle()
+    public function handle(): int
     {
         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));
+        $jobKey = (string)$this->argument('key');
+        /** @var ImportJob $job */
+        $job = ImportJob::where('key', $jobKey)->first();
+        if (null === $job) {
+            $this->errorLine(sprintf('No job found with key "%s"', $jobKey));
 
-            return;
+            return 1;
         }
         if (!$this->isValid($job)) {
-            Log::error('Job is not valid for some reason. Exit.');
+            $this->errorLine('Job is not valid for some reason. Exit.');
 
-            return;
+            return 1;
         }
 
-        $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);
-        $importProcedure = new ImportProcedure;
-        $result          = $importProcedure->runImport($job);
+        // 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
+        }
 
-        // display result to user:
-        $this->presentResults($result);
-        $this->line('The import has completed.');
+        /** @var RoutineInterface $routine */
+        $routine = app($className);
+        $routine->setImportJob($job);
+        $routine->run();
 
-        // get any errors from the importer:
-        $this->presentErrors($job);
+        /**
+         * @var int    $index
+         * @var string $error
+         */
+        foreach ($job->errors as $index => $error) {
+            $this->errorLine(sprintf('Error importing line #%d: %s', $index, $error));
+        }
 
-        return;
+        /** @var Tag $tag */
+        $tag   = $job->tag()->first();
+        $count = 0;
+        if (null === $tag) {
+            $count = $tag->transactionJournals()->count();
+        }
+
+        $this->infoLine(sprintf('The import has finished. %d transactions have been imported.', $count));
+
+        return 0;
     }
 
     /**
+     * Displays an error.
+     *
+     * @param string     $message
+     * @param array|null $data
+     */
+    private function errorLine(string $message, array $data = null): void
+    {
+        Log::error($message, $data ?? []);
+        $this->error($message);
+
+    }
+
+    /**
+     * Displays an informational 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.
+     *
      * @param ImportJob $job
      *
      * @return bool
      */
     private function isValid(ImportJob $job): bool
     {
-        if (is_null($job)) {
-            $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 != 'settings_complete') {
-            $this->error('This job is not ready to be imported.');
+        if ('configured' !== $job->status) {
+            Log::error(sprintf('This job is not ready to be imported (status is %s).', $job->status));
+            $this->errorLine('This job is not ready to be imported.');
 
             return false;
         }
 
         return true;
     }
-
-    /**
-     * @param ImportJob $job
-     */
-    private function presentErrors(ImportJob $job)
-    {
-        $extendedStatus = $job->extended_status;
-        if (isset($extendedStatus['errors']) && count($extendedStatus['errors']) > 0) {
-            $this->line(sprintf('The following %d error(s) occured during the import:', count($extendedStatus['errors'])));
-            foreach ($extendedStatus['errors'] as $error) {
-                $this->error($error);
-            }
-        }
-    }
-
-    /**
-     * @param Collection $result
-     */
-    private function presentResults(Collection $result)
-    {
-        /**
-         * @var int                $index
-         * @var TransactionJournal $journal
-         */
-        foreach ($result as $index => $journal) {
-            if (!is_null($journal->id)) {
-                $this->line(sprintf('Line #%d has been imported as transaction #%d.', $index, $journal->id));
-                continue;
-            }
-            $this->error(sprintf('Could not store line #%d', $index));
-        }
-    }
 }

app/Console/Commands/ScanAttachments.php

@@ -1,15 +1,27 @@
 <?php
 /**
  * ScanAttachments.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
+ * This file is part of Firefly III.
  *
- * See the LICENSE file for details.
+ * 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);
+/** @noinspection PhpDynamicAsStaticMethodCallInspection */
+
+declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
@@ -21,9 +33,9 @@ use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Storage;
 
 /**
- * Class ScanAttachments
+ * Class ScanAttachments.
  *
- * @package FireflyIII\Console\Commands
+ * @codeCoverageIgnore
  */
 class ScanAttachments extends Command
 {
@@ -41,19 +53,10 @@ class ScanAttachments extends Command
      */
     protected $signature = 'firefly:scan-attachments';
 
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): int
     {
         $attachments = Attachment::get();
         $disk        = Storage::disk('upload');
@@ -63,13 +66,13 @@ class ScanAttachments extends Command
             try {
                 $content = $disk->get($fileName);
             } catch (FileNotFoundException $e) {
-                $this->error(sprintf('Could not find data for attachment #%d', $attachment->id));
+                $this->error(sprintf('Could not find data for attachment #%d: %s', $attachment->id, $e->getMessage()));
                 continue;
             }
             try {
                 $decrypted = Crypt::decrypt($content);
             } catch (DecryptException $e) {
-                $this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id));
+                $this->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
                 continue;
             }
             $tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII');
@@ -81,5 +84,7 @@ class ScanAttachments extends Command
             $attachment->save();
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
         }
+
+        return 0;
     }
 }