Merge branch 'release/4.6.8'

* 'develop' of https://github.com/firefly-iii/firefly-iii: (30 commits)
  New translations firefly.php (French)
  New translations csv.php (French)
  New translations firefly.php (German)
  New translations intro.php (German)
  New translations intro.php (German)
  New translations intro.php (German)
  New translations list.php (German)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations list.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations bank.php (Slovenian)
  New translations list.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations intro.php (French)
  New translations firefly.php (French)
  New translations firefly.php (French)
  ...

.dockerignore

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

.env.docker

@@ -0,0 +1,56 @@
+APP_ENV=${FF_APP_ENV}
+APP_DEBUG=false
+APP_NAME=FireflyIII
+APP_KEY=${FF_APP_KEY}
+APP_LOG=daily
+APP_LOG_LEVEL=warning
+APP_URL=http://localhost
+
+DB_CONNECTION=mysql
+DB_HOST=${FF_DB_HOST}
+DB_PORT=3306
+DB_DATABASE=${FF_DB_NAME}
+DB_USERNAME=${FF_DB_USER}
+DB_PASSWORD=${FF_DB_PASSWORD}
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+CACHE_PREFIX=firefly
+
+EXCHANGE_RATE_SERVICE=fixerio
+
+GOOGLE_MAPS_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.env.example

@@ -1,10 +1,11 @@
-APP_ENV=production
+APP_ENV=local
 APP_DEBUG=false
-APP_FORCE_SSL=false
+APP_NAME=FireflyIII
-APP_FORCE_ROOT=
 APP_KEY=SomeRandomStringOf32CharsExactly
+APP_LOG=daily
 APP_LOG_LEVEL=warning
 APP_URL=http://localhost
+TRUSTED_PROXIES=
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -27,7 +28,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -40,13 +41,16 @@ SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
-GOOGLE_MAPS_API_KEY=
+EXCHANGE_RATE_SERVICE=fixerio
+
+MAPBOX_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
 
 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=
 
 DEMO_USERNAME=
 DEMO_PASSWORD=

.env.sandstorm

@@ -0,0 +1,55 @@
+APP_ENV=production
+APP_DEBUG=true
+APP_NAME=FireflyIII
+APP_KEY=SomeRandomStringOf32CharsExactly
+APP_LOG=syslog
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=firefly
+DB_USERNAME=firefly
+DB_PASSWORD=firefly
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+CACHE_PREFIX=firefly
+
+EXCHANGE_RATE_SERVICE=fixerio
+
+GOOGLE_MAPS_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=

.env.testing

@@ -1,8 +1,8 @@
 APP_ENV=testing
 APP_DEBUG=true
-APP_FORCE_SSL=false
+APP_NAME=FireflyIII
-APP_FORCE_ROOT=
 APP_KEY=TestTestTestTestTestTestTestTest
+APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
@@ -10,7 +10,7 @@ DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -26,7 +26,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com
 MAIL_USERNAME=null
@@ -37,9 +37,19 @@ SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 SHOW_INCOMPLETE_TRANSLATIONS=false
 
+CACHE_PREFIX=firefly
+
+EXCHANGE_RATE_SERVICE=fixerio
+
+GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
 
 PUSHER_KEY=
 PUSHER_SECRET=
-PUSHER_APP_ID=
+PUSHER_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.gitattributes

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

.github/CONTRIBUTING

@@ -1 +0,0 @@
-If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/) first. Thanks!

.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. If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).
+
+## 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/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://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. Bugs have a lot of priority! 
+
+## Installation problems
+
+Please take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them! If not, open an issue and I will help where I can.

.gitignore

@@ -1,14 +1,14 @@
 /node_modules
+/public/hot
 /public/storage
+/storage/*.key
 /vendor
-/.idea
+/.vagrant
 Homestead.json
 Homestead.yaml
+npm-debug.log
+yarn-error.log
 .env
-_development
-.env.local
-result.html
-test-import.sh
-test-import-report.txt
 public/google*.html
-.env.backup
+report.html
+composer.phar

.sandstorm/.gitattributes

@@ -0,0 +1,5 @@
+
+
+# vagrant-spk creates shell scripts, which must end in \n, even on a \r\n system.
+*.sh text eol=lf
+

.sandstorm/.gitignore

@@ -0,0 +1,5 @@
+
+
+# This file stores a list of sub-paths of .sandstorm/ that should be ignored by git.
+.vagrant
+

.sandstorm/Vagrantfile

@@ -0,0 +1,103 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Guess at a reasonable name for the VM based on the folder vagrant-spk is
+# run from.  The timestamp is there to avoid conflicts if you have multiple
+# folders with the same name.
+VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Time.now.utc.to_i}"
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+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"
+
+  if Vagrant.has_plugin?("vagrant-vbguest") then
+    # vagrant-vbguest is a Vagrant plugin that upgrades
+    # the version of VirtualBox Guest Additions within each
+    # guest. If you have the vagrant-vbguest plugin, then it
+    # needs to know how to compile kernel modules, etc., and so
+    # we give it this hint about operating system type.
+    config.vm.guest = "debian"
+  end
+
+  # We forward port 6080, the Sandstorm web port, so that developers can
+  # visit their sandstorm app from their browser as local.sandstorm.io:6080
+  # (aka 127.0.0.1:6080).
+  config.vm.network :forwarded_port, guest: 6080, host: 6080
+
+  # Use a shell script to "provision" the box. This installs Sandstorm using
+  # the bundled installer.
+  config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/global-setup.sh", keep_color: true
+  # Then, do stack-specific and app-specific setup.
+  config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/setup.sh", keep_color: true
+
+  # Shared folders are configured per-provider since vboxsf can't handle >4096 open files,
+  # NFS requires privilege escalation every time you bring a VM up,
+  # and 9p is only available on libvirt.
+
+  # Calculate the number of CPUs and the amount of RAM the system has,
+  # in a platform-dependent way; further logic below.
+  cpus = nil
+  total_kB_ram = nil
+
+  host = RbConfig::CONFIG['host_os']
+  if host =~ /darwin/
+    cpus = `sysctl -n hw.ncpu`.to_i
+    total_kB_ram =  `sysctl -n hw.memsize`.to_i / 1024
+  elsif host =~ /linux/
+    cpus = `nproc`.to_i
+    total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i
+  elsif host =~ /mingw/
+    # powershell may not be available on Windows XP and Vista, so wrap this in a rescue block
+    begin
+      cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i
+      total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024
+    rescue
+    end
+  end
+  # Use the same number of CPUs within Vagrant as the system, with 1
+  # as a default.
+  #
+  # Use at least 512MB of RAM, and if the system has more than 2GB of
+  # RAM, use 1/4 of the system RAM. This seems a reasonable compromise
+  # between having the Vagrant guest operating system not run out of
+  # RAM entirely (which it basically would if we went much lower than
+  # 512MB) and also allowing it to use up a healthily large amount of
+  # RAM so it can run faster on systems that can afford it.
+  if cpus.nil? or cpus.zero?
+    cpus = 1
+  end
+  if total_kB_ram.nil? or total_kB_ram < 2048000
+    assign_ram_mb = 512
+  else
+    assign_ram_mb = (total_kB_ram / 1024 / 4)
+  end
+  # Actually apply these CPU/memory values to the providers.
+  config.vm.provider :virtualbox do |vb, override|
+    vb.cpus = cpus
+    vb.memory = assign_ram_mb
+    vb.name = VM_NAME
+    vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"]
+
+    # /opt/app and /host-dot-sandstorm are used by vagrant-spk
+    override.vm.synced_folder "..", "/opt/app"
+    override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm"
+    # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
+    # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
+    override.vm.synced_folder "..", "/vagrant", disabled: true
+  end
+  config.vm.provider :libvirt do |libvirt, override|
+    libvirt.cpus = cpus
+    libvirt.memory = assign_ram_mb
+    libvirt.default_prefix = VM_NAME
+
+    # /opt/app and /host-dot-sandstorm are used by vagrant-spk
+    override.vm.synced_folder "..", "/opt/app", type: "9p", accessmode: "passthrough"
+    override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm", type: "9p", accessmode: "passthrough"
+    # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the
+    # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want.
+    override.vm.synced_folder "..", "/vagrant", type: "9p", accessmode: "passthrough", disabled: true
+  end
+end

.sandstorm/build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# Checks if there's a composer.json, and if so, installs/runs composer.
+# This script only runs once, when the app connects to sandstorm.
+set -euo pipefail
+
+
+
+cd /opt/app
+
+cp .env.sandstorm .env
+
+if [ -f /opt/app/composer.json ] ; then
+    if [ ! -f composer.phar ] ; then
+        curl -sS https://getcomposer.org/installer | php
+    fi
+    php composer.phar install --no-dev --no-suggest
+fi
+
+# link storage folder
+rm -rf /opt/app/storage
+ln -s /var/storage /opt/app

.sandstorm/changelog.md

@@ -0,0 +1,3 @@
+# 3.4.3
+
+* Initial release on Sandstorm.io

.sandstorm/description.md

@@ -0,0 +1,3 @@
+"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.
+
+Firefly works on the principle that if you know where you’re money is going, you can stop it from going there.

.sandstorm/global-setup.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -euo pipefail
+
+# Set options for curl. Since we only want to show errors from these curl commands, we also use
+# 'cat' to buffer the output; for more information:
+# https://github.com/sandstorm-io/vagrant-spk/issues/158
+
+CURL_OPTS="--silent --show-error"
+echo localhost > /etc/hostname
+hostname localhost
+
+# 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_CURRENT_VERSION=$(curl $CURL_OPTS -f "https://install.sandstorm.io/dev?from=0&type=install")
+SANDSTORM_PACKAGE="sandstorm-$SANDSTORM_CURRENT_VERSION.tar.xz"
+if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then
+    echo -n "Downloading Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
+    curl $CURL_OPTS --output "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "https://dl.sandstorm.io/$SANDSTORM_PACKAGE" 2>&1 | cat
+    mv "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE"
+    echo "...done."
+fi
+if [ ! -e /opt/sandstorm/latest/sandstorm ] ; then
+    echo -n "Installing Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
+    bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null
+    echo "...done."
+fi
+modprobe ip_tables
+# Make the vagrant user part of the sandstorm group so that commands like
+# `spk dev` work.
+usermod -a -G 'sandstorm' 'vagrant'
+# Bind to all addresses, so the vagrant port-forward works.
+sudo sed --in-place='' \
+        --expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' \
+        /opt/sandstorm/sandstorm.conf
+sudo service sandstorm restart
+# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP
+GATEWAY_IP=$(ip route  | grep ^default  | cut -d ' ' -f 3)
+if nc -z "$GATEWAY_IP" 3142 ; then
+    echo "Acquire::http::Proxy \"http://$GATEWAY_IP:3142\";" > /etc/apt/apt.conf.d/80httpproxy
+fi
+# Configure apt to retry fetching things that fail to download.
+echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80sandstorm-retry

.sandstorm/launcher.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Runs every time we create a new grain!
+
+# Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist
+mkdir -p /var/lib/mysql
+mkdir -p /var/lib/nginx
+mkdir -p /var/lib/php/sessions/
+mkdir -p /var/log
+mkdir -p /var/log/mysql
+mkdir -p /var/log/nginx
+# Wipe /var/run, since pidfiles and socket files from previous launches should go away
+# TODO someday: I'd prefer a tmpfs for these.
+rm -rf /var/run
+mkdir -p /var/run
+rm -rf /var/tmp
+mkdir -p /var/tmp
+mkdir -p /var/run/mysqld
+
+# make storage directories
+rm -rf /var/storage
+mkdir -p /var/storage/app/public
+mkdir -p /var/storage/build
+mkdir -p /var/storage/database
+mkdir -p /var/storage/debugbar
+mkdir -p /var/storage/export
+mkdir -p /var/storage/framework/cache
+mkdir -p /var/storage/framework/sessions
+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 &
+
+# 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"
+    sleep .5
+done
+
+echo "Installing database.."
+# Install database for Firefly III
+echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly'@'localhost' IDENTIFIED BY 'firefly';" | mysql -uroot
+echo "Done!"
+
+echo "Migrating..."
+php /opt/app/artisan migrate --seed --force
+echo "Done!"
+
+# Start nginx.
+/usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"

.sandstorm/sandstorm-pkgdef.capnp

@@ -0,0 +1,188 @@
+@0x9411e6c8b3c8a4b6;
+
+using Spk = import "/sandstorm/package.capnp";
+# This imports:
+#   $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp
+# Check out that file to see the full, documented package definition format.
+
+const pkgdef :Spk.PackageDefinition = (
+  # The package definition. Note that the spk tool looks specifically for the
+  # "pkgdef" constant.
+
+  id = "uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70",
+  # Your app ID is actually its public key. The private key was placed in
+  # your keyring. All updates must be signed with the same key.
+
+  manifest = (
+    appTitle = (defaultText = "Firefly III"),
+    appVersion = 1,
+    appMarketingVersion = (defaultText = "3.4.6"),
+    actions = [
+      # Define your "new document" handlers here.
+      ( nounPhrase = (defaultText = "administration"),
+        command = .myCommand
+        # The command to run when starting for the first time. (".myCommand"
+        # is just a constant defined at the bottom of the file.)
+      )
+    ],
+
+    continueCommand = .myCommand,
+    # This is the command called to start your app back up after it has been
+    # shut down for inactivity. Here we're using the same command as for
+    # starting a new instance, but you could use different commands for each
+    # case.
+
+    metadata = (
+         icons = (
+        appGrid = (png = (dpi1x = embed "app-graphics/firefly-iii-128.png")),
+        grain = (png = (dpi1x = embed "app-graphics/firefly-iii-24.png",
+                        dpi2x = embed "app-graphics/firefly-iii-48.png")),
+        market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png"))
+      ),
+
+      website = "https://firefly-iii.github.io/",
+      codeUrl = "https://github.com/firefly-iii/firefly-iii",
+      #license = (openSource = mit),
+      license = (proprietary = (defaultText = embed "../LICENSE")),
+      # The license this package is distributed under.  See
+      # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license
+
+      categories = [productivity],
+      # A list of categories/genres to which this app belongs, sorted with best fit first.
+      # See the list of categories at
+      # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#categories
+
+      author = (
+        contactEmail = "thegrumpydictator@gmail.com",
+        upstreamAuthor = "James Cole",
+        pgpSignature = embed "pgp-signature",
+      ),
+
+      pgpKeyring = embed "pgp-keyring",
+      description = (defaultText = embed "description.md"),
+      shortDescription = (defaultText = "Financial management"),
+      screenshots = [
+        # Screenshots to use for marketing purposes.  Examples below.
+        # 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"),
+
+      ],
+      changeLog = (defaultText = embed "changelog.md"),
+    ),
+  ),
+
+  sourceMap = (
+    # Here we defined where to look for files to copy into your package. The
+    # `spk dev` command actually figures out what files your app needs
+    # automatically by running it on a FUSE filesystem. So, the mappings
+    # here are only to tell it where to find files that the app wants.
+    searchPath = [
+      ( sourcePath = "." ),  # Search this directory first.
+      ( sourcePath = "/",    # Then search the system root directory.
+        hidePaths = [ "home", "proc", "sys",
+                      "etc/passwd", "etc/hosts", "etc/host.conf",
+                      "etc/nsswitch.conf", "etc/resolv.conf" ]
+        # You probably don't want the app pulling files from these places,
+        # so we hide them. Note that /dev, /var, and /tmp are implicitly
+        # hidden because Sandstorm itself provides them.
+      )
+    ]
+  ),
+
+  fileList = "sandstorm-files.list",
+  # `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"],
+  # 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
+  # not have been detected as a dependency during `spk dev`. If you list
+  # a directory here, its entire contents will be included recursively.
+
+  #bridgeConfig = (
+  #  # Used for integrating permissions and roles into the Sandstorm shell
+  #  # and for sandstorm-http-bridge to pass to your app.
+  #  # Uncomment this block and adjust the permissions and roles to make
+  #  # sense for your app.
+  #  # For more information, see high-level documentation at
+  #  # https://docs.sandstorm.io/en/latest/developing/auth/
+  #  # and advanced details in the "BridgeConfig" section of
+  #  # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp
+  #  viewInfo = (
+  #    # For details on the viewInfo field, consult "ViewInfo" in
+  #    # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
+  #
+  #    permissions = [
+  #    # Permissions which a user may or may not possess.  A user's current
+  #    # permissions are passed to the app as a comma-separated list of `name`
+  #    # fields in the X-Sandstorm-Permissions header with each request.
+  #    #
+  #    # IMPORTANT: only ever append to this list!  Reordering or removing fields
+  #    # will change behavior and permissions for existing grains!  To deprecate a
+  #    # permission, or for more information, see "PermissionDef" in
+  #    # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp
+  #      (
+  #        name = "editor",
+  #        # Name of the permission, used as an identifier for the permission in cases where string
+  #        # names are preferred.  Used in sandstorm-http-bridge's X-Sandstorm-Permissions HTTP header.
+  #
+  #        title = (defaultText = "editor"),
+  #        # Display name of the permission, e.g. to display in a checklist of permissions
+  #        # that may be assigned when sharing.
+  #
+  #        description = (defaultText = "grants ability to modify data"),
+  #        # Prose describing what this role means, suitable for a tool tip or similar help text.
+  #      ),
+  #    ],
+  #    roles = [
+  #      # Roles are logical collections of permissions.  For instance, your app may have
+  #      # a "viewer" role and an "editor" role
+  #      (
+  #        title = (defaultText = "editor"),
+  #        # Name of the role.  Shown in the Sandstorm UI to indicate which users have which roles.
+  #
+  #        permissions  = [true],
+  #        # An array indicating which permissions this role carries.
+  #        # It should be the same length as the permissions array in
+  #        # viewInfo, and the order of the lists must match.
+  #
+  #        verbPhrase = (defaultText = "can make changes to the document"),
+  #        # Brief explanatory text to show in the sharing UI indicating
+  #        # what a user assigned this role will be able to do with the grain.
+  #
+  #        description = (defaultText = "editors may view all site data and change settings."),
+  #        # Prose describing what this role means, suitable for a tool tip or similar help text.
+  #      ),
+  #      (
+  #        title = (defaultText = "viewer"),
+  #        permissions  = [false],
+  #        verbPhrase = (defaultText = "can view the document"),
+  #        description = (defaultText = "viewers may view what other users have written."),
+  #      ),
+  #    ],
+  #  ),
+  #  #apiPath = "/api",
+  #  # Apps can export an API to the world.  The API is to be used primarily by Javascript
+  #  # code and native apps, so it can't serve out regular HTML to browsers.  If a request
+  #  # comes in to your app's API, sandstorm-http-bridge will prefix the request's path with
+  #  # this string, if specified.
+  #),
+);
+
+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"],
+  environ = [
+    # Note that this defines the *entire* environment seen by your app.
+    (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
+    (key = "SANDSTORM", value = "1"),
+    # Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
+    # can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
+    # the app's Sandstorm-specific integration code.
+  ]
+);

.sandstorm/service-config/mime.types

@@ -0,0 +1,89 @@
+
+types {
+    text/html                             html htm shtml;
+    text/css                              css;
+    text/xml                              xml;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    application/javascript                js;
+    application/atom+xml                  atom;
+    application/rss+xml                   rss;
+
+    text/mathml                           mml;
+    text/plain                            txt;
+    text/vnd.sun.j2me.app-descriptor      jad;
+    text/vnd.wap.wml                      wml;
+    text/x-component                      htc;
+
+    image/png                             png;
+    image/tiff                            tif tiff;
+    image/vnd.wap.wbmp                    wbmp;
+    image/x-icon                          ico;
+    image/x-jng                           jng;
+    image/x-ms-bmp                        bmp;
+    image/svg+xml                         svg svgz;
+    image/webp                            webp;
+
+    application/font-woff                 woff;
+    application/java-archive              jar war ear;
+    application/json                      json;
+    application/mac-binhex40              hqx;
+    application/msword                    doc;
+    application/pdf                       pdf;
+    application/postscript                ps eps ai;
+    application/rtf                       rtf;
+    application/vnd.apple.mpegurl         m3u8;
+    application/vnd.ms-excel              xls;
+    application/vnd.ms-fontobject         eot;
+    application/vnd.ms-powerpoint         ppt;
+    application/vnd.wap.wmlc              wmlc;
+    application/vnd.google-earth.kml+xml  kml;
+    application/vnd.google-earth.kmz      kmz;
+    application/x-7z-compressed           7z;
+    application/x-cocoa                   cco;
+    application/x-java-archive-diff       jardiff;
+    application/x-java-jnlp-file          jnlp;
+    application/x-makeself                run;
+    application/x-perl                    pl pm;
+    application/x-pilot                   prc pdb;
+    application/x-rar-compressed          rar;
+    application/x-redhat-package-manager  rpm;
+    application/x-sea                     sea;
+    application/x-shockwave-flash         swf;
+    application/x-stuffit                 sit;
+    application/x-tcl                     tcl tk;
+    application/x-x509-ca-cert            der pem crt;
+    application/x-xpinstall               xpi;
+    application/xhtml+xml                 xhtml;
+    application/xspf+xml                  xspf;
+    application/zip                       zip;
+
+    application/octet-stream              bin exe dll;
+    application/octet-stream              deb;
+    application/octet-stream              dmg;
+    application/octet-stream              iso img;
+    application/octet-stream              msi msp msm;
+
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
+
+    audio/midi                            mid midi kar;
+    audio/mpeg                            mp3;
+    audio/ogg                             ogg;
+    audio/x-m4a                           m4a;
+    audio/x-realaudio                     ra;
+
+    video/3gpp                            3gpp 3gp;
+    video/mp2t                            ts;
+    video/mp4                             mp4;
+    video/mpeg                            mpeg mpg;
+    video/quicktime                       mov;
+    video/webm                            webm;
+    video/x-flv                           flv;
+    video/x-m4v                           m4v;
+    video/x-mng                           mng;
+    video/x-ms-asf                        asx asf;
+    video/x-ms-wmv                        wmv;
+    video/x-msvideo                       avi;
+}

.sandstorm/service-config/nginx.conf

@@ -0,0 +1,87 @@
+worker_processes 4;
+pid /var/run/nginx.pid;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+	# Basic Settings
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+	# server_names_hash_bucket_size 64;
+	server_tokens off;
+	server_name_in_redirect off;
+
+	include mime.types;
+	default_type application/octet-stream;
+
+	# Logging
+	access_log off;
+	error_log stderr;
+
+	# Prevent nginx from adding compression; this interacts badly with Sandstorm
+	# WebSession due to https://github.com/sandstorm-io/sandstorm/issues/289
+	gzip off;
+
+	# Trust the sandstorm-http-bridge's X-Forwarded-Proto.
+	map $http_x_forwarded_proto $fe_https {
+		default "";
+		https on;
+	}
+
+	server {
+		listen 8000 default_server;
+		listen [::]:8000 default_server ipv6only=on;
+
+		# Allow arbitrarily large bodies - Sandstorm can handle them, and requests
+		# are authenticated already, so there's no reason for apps to add additional
+		# limits by default.
+		client_max_body_size 0;
+
+		server_name localhost;
+		root /opt/app/public;
+		location / {
+			index index.php;
+			try_files $uri $uri/ /index.php?$query_string;
+			autoindex on;
+        	sendfile off;
+		}
+		location ~ \.php$ {
+			try_files $uri =404;
+            fastcgi_pass unix:/var/run/php7.0-fpm.sock;
+            fastcgi_index index.php;
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+			fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+
+
+			fastcgi_param  QUERY_STRING       $query_string;
+			fastcgi_param  REQUEST_METHOD     $request_method;
+			fastcgi_param  CONTENT_TYPE       $content_type;
+			fastcgi_param  CONTENT_LENGTH     $content_length;
+			
+			fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+			fastcgi_param  REQUEST_URI        $request_uri;
+			fastcgi_param  DOCUMENT_URI       $document_uri;
+			fastcgi_param  DOCUMENT_ROOT      $document_root;
+			fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+			fastcgi_param  HTTPS              $fe_https if_not_empty;
+			
+			fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+			fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+			
+			fastcgi_param  REMOTE_ADDR        $remote_addr;
+			fastcgi_param  REMOTE_PORT        $remote_port;
+			fastcgi_param  SERVER_ADDR        $server_addr;
+			fastcgi_param  SERVER_PORT        $server_port;
+			fastcgi_param  SERVER_NAME        $server_name;
+			
+			# PHP only, required if PHP was built with --enable-force-cgi-redirect
+			#fastcgi_param  REDIRECT_STATUS    200;
+		}
+	}
+}

.sandstorm/setup.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# When you change this file, you must take manual action. Read this doc:
+# - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh
+
+set -euo pipefail
+
+export DEBIAN_FRONTEND=noninteractive
+
+# install packages so we can install apt-add-repository.
+apt-get update
+apt-get install -y python-software-properties software-properties-common
+
+# actually add repository
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
+add-apt-repository "deb http://packages.dotdeb.org jessie all"
+
+# 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
+service nginx stop
+service php7.0-fpm stop
+service mysql stop
+systemctl disable nginx
+systemctl disable php7.0-fpm
+systemctl disable mysql
+# patch /etc/php/7.0/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
+sed --in-place='' \
+       --expression='s/^pid =/;pid =/' \
+       /etc/php/7.0/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
+
+# patch /etc/php/7.0/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
+# 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='' \
+        --expression='s/^user\t\t= mysql/#user\t\t= mysql/' \
+        --expression='s,^tmpdir\t\t= /tmp,tmpdir\t\t= /var/tmp,' \
+        --expression='/\[mysqld]/ a\ secure-file-priv = ""\' \
+        /etc/mysql/my.cnf
+# patch mysql conf to use smaller transaction logs to save disk space
+cat <<EOF > /etc/mysql/conf.d/sandstorm.cnf
+[mysqld]
+# Set the transaction log file to the minimum allowed size to save disk space.
+# innodb_log_file_size = 1048576
+# Set the main data file to grow by 1MB at a time, rather than 8MB at a time.
+innodb_autoextend_increment = 1
+EOF

.sandstorm/stack

@@ -0,0 +1 @@
+lemp

.travis.yml

@@ -1,17 +1,31 @@
 language: php
-sudo: false
 php:
-  - '7.0'
+  - 7.1
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
 
 install:
-  - phpenv config-rm xdebug.ini
   - rm composer.lock
   - 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
+  - phpunit -c phpunit.coverage.xml
+
+after_success:
+  - travis_retry php vendor/bin/coveralls -x storage/build/clover-all.xml
+
+# safelist
+branches:
+  only:
+  - develop
+  - master

CHANGELOG.md

@@ -2,51 +2,414 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.6.8] - 2017-10-15
+### Added
+- Verify routine will check if deposits have a budget (they shouldn't).
+- New translations!
+
+### Changed
+- Changed docker files for [issue 919](https://github.com/firefly-iii/firefly-iii/issues/919) and [issue 915](https://github.com/firefly-iii/firefly-iii/issues/915)
+
+### Fixed
+- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), as reported by [Wr0ngName](https://github.com/Wr0ngName)
+- Rules can no longer set a budget for a transfer or a deposit ([issue 916](https://github.com/firefly-iii/firefly-iii/issues/916))
+- Fixed [issue 925](https://github.com/firefly-iii/firefly-iii/issues/925), [issue 928](https://github.com/firefly-iii/firefly-iii/issues/928) as reported by [dzaikos](https://github.com/dzaikos) and [DeltaKiloz](https://github.com/DeltaKiloz)
+- A fix for [issue 926](https://github.com/firefly-iii/firefly-iii/issues/926), as reported by [Aquariu](https://github.com/Aquariu)
+
+## [4.6.7] - 2017-10-09
+### Added
+- [Issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu)
+
+### Fixed
+- [Issue 878](https://github.com/firefly-iii/firefly-iii/issues/878), fixed by [Findus23](https://github.com/Findus23)
+- [Issue 881](https://github.com/firefly-iii/firefly-iii/issues/881), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 884](https://github.com/firefly-iii/firefly-iii/issues/884), by [gavu](https://github.com/gavu)
+- [Issue 840](https://github.com/firefly-iii/firefly-iii/issues/840), reported by [MacPaille](https://github.com/MacPaille)
+- [Issue 882](https://github.com/firefly-iii/firefly-iii/issues/882), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), [issue 892](https://github.com/firefly-iii/firefly-iii/issues/892), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), reported by [gavu](https://github.com/gavu)
+- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), fixed by [pkoziol](https://github.com/pkoziol)
+- [Issue 903](https://github.com/firefly-iii/firefly-iii/issues/903), fixed by [hduijn](https://github.com/hduijn)
+- [Issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu)
+- [Issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu)
+- [Issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu)
+- [Issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by [TomWis97](https://github.com/TomWis97)
+- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName)
+
+## [4.6.6] - 2017-09-30
+### Added
+- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol).
+- [Issue 855](https://github.com/firefly-iii/firefly-iii/issues/855), by [ms32035](https://github.com/ms32035)
+- [Issue 786](https://github.com/firefly-iii/firefly-iii/issues/786), by [SmilingWorlock](https://github.com/SmilingWorlock)
+- [Issue 875](https://github.com/firefly-iii/firefly-iii/issues/875), by [gavu](https://github.com/gavu)
+- [Issue 834](https://github.com/firefly-iii/firefly-iii/issues/834), by [gavu](https://github.com/gavu) (and others)
+
+
+### Changed
+- Upgraded to Laravel 5.5
+- Add version parameter to CSS and JS files
+- [Issue 823](https://github.com/firefly-iii/firefly-iii/issues/823), [issue 824](https://github.com/firefly-iii/firefly-iii/issues/824) fixed Docker config by [DieBauer](https://github.com/DieBauer)
+
+### Fixed
+- [Issue 830](https://github.com/firefly-iii/firefly-iii/issues/830)
+- [Issue 822](https://github.com/firefly-iii/firefly-iii/issues/822), reported by [gazben](https://github.com/gazben)
+- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 835](https://github.com/firefly-iii/firefly-iii/issues/835), reported by [gavu](https://github.com/gavu)
+- [Issue 836](https://github.com/firefly-iii/firefly-iii/issues/836), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 838](https://github.com/firefly-iii/firefly-iii/issues/838), reported by [gavu](https://github.com/gavu)
+- [Issue 839](https://github.com/firefly-iii/firefly-iii/issues/839), reported by [gavu](https://github.com/gavu)
+- [Issue 843](https://github.com/firefly-iii/firefly-iii/issues/843), reported by [gavu](https://github.com/gavu)
+- [Issue 837](https://github.com/firefly-iii/firefly-iii/issues/837), reported by [gavu](https://github.com/gavu)
+- [Issue 845](https://github.com/firefly-iii/firefly-iii/issues/845), reported by [gavu](https://github.com/gavu)
+- [Issue 846](https://github.com/firefly-iii/firefly-iii/issues/846), reported by [gavu](https://github.com/gavu)
+- [Issue 848](https://github.com/firefly-iii/firefly-iii/issues/848), reported by [gavu](https://github.com/gavu)
+- [Issue 854](https://github.com/firefly-iii/firefly-iii/issues/854), reported by [gavu](https://github.com/gavu)
+- [Issue 866](https://github.com/firefly-iii/firefly-iii/issues/866), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 847](https://github.com/firefly-iii/firefly-iii/issues/847), reported by [gavu](https://github.com/gavu)
+- [Issue 853](https://github.com/firefly-iii/firefly-iii/issues/853), reported by [gavu](https://github.com/gavu)
+- [Issue 857](https://github.com/firefly-iii/firefly-iii/issues/857), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 865](https://github.com/firefly-iii/firefly-iii/issues/865), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 856](https://github.com/firefly-iii/firefly-iii/issues/856), reported by [ms32035](https://github.com/ms32035)
+- [Issue 860](https://github.com/firefly-iii/firefly-iii/issues/860), reported by [gavu](https://github.com/gavu)
+- [Issue 861](https://github.com/firefly-iii/firefly-iii/issues/861), reported by [gavu](https://github.com/gavu)
+- [Issue 870](https://github.com/firefly-iii/firefly-iii/issues/870), reported by [gavu](https://github.com/gavu)
+
+## [4.6.5] - 2017-09-09
+
+### Added
+- [Issue 616](https://github.com/firefly-iii/firefly-iii/issues/616), The ability to link transactions
+- [Issue 763](https://github.com/firefly-iii/firefly-iii/issues/763), as suggested by [tannie](https://github.com/tannie)
+- [Issue 770](https://github.com/firefly-iii/firefly-iii/issues/770), as suggested by [skibbipl](https://github.com/skibbipl)
+- [Issue 780](https://github.com/firefly-iii/firefly-iii/issues/780), as suggested by [skibbipl](https://github.com/skibbipl)
+- [Issue 784](https://github.com/firefly-iii/firefly-iii/issues/784), as suggested by [SmilingWorlock](https://github.com/SmilingWorlock)
+- Lots of code for future support of automated Bunq imports
+
+### Changed
+- Rewrote the export routine
+- [Issue 782](https://github.com/firefly-iii/firefly-iii/issues/782), as suggested by [NiceGuyIT](https://github.com/NiceGuyIT)
+- [Issue 800](https://github.com/firefly-iii/firefly-iii/issues/800), as suggested by [jleeong](https://github.com/jleeong)
+
+### Fixed
+- [Issue 724](https://github.com/firefly-iii/firefly-iii/issues/724), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 738](https://github.com/firefly-iii/firefly-iii/issues/738), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 760](https://github.com/firefly-iii/firefly-iii/issues/760), reported by [leander091](https://github.com/leander091)
+- [Issue 764](https://github.com/firefly-iii/firefly-iii/issues/764), reported by [tannie](https://github.com/tannie)
+- [Issue 792](https://github.com/firefly-iii/firefly-iii/issues/792), reported by [jleeong](https://github.com/jleeong)
+- [Issue 793](https://github.com/firefly-iii/firefly-iii/issues/793), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 797](https://github.com/firefly-iii/firefly-iii/issues/797), reported by [leander091](https://github.com/leander091)
+- [Issue 801](https://github.com/firefly-iii/firefly-iii/issues/801), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 803](https://github.com/firefly-iii/firefly-iii/issues/803), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 805](https://github.com/firefly-iii/firefly-iii/issues/805), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 806](https://github.com/firefly-iii/firefly-iii/issues/806), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 807](https://github.com/firefly-iii/firefly-iii/issues/807), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 808](https://github.com/firefly-iii/firefly-iii/issues/808), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 809](https://github.com/firefly-iii/firefly-iii/issues/809), reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 814](https://github.com/firefly-iii/firefly-iii/issues/814), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 818](https://github.com/firefly-iii/firefly-iii/issues/818), reported by [gavu](https://github.com/gavu)
+- [Issue 819](https://github.com/firefly-iii/firefly-iii/issues/819), reported by [DieBauer](https://github.com/DieBauer)
+- [Issue 820](https://github.com/firefly-iii/firefly-iii/issues/820), reported by [simonsmiley](https://github.com/simonsmiley) 
+- Various other fixes
+
+
+## [4.6.4] - 2017-08-13
+### Added
+- PHP7.1 support
+- Routine to decrypt attachments from the command line, for [issue 671](https://github.com/firefly-iii/firefly-iii/issues/671)
+- A routine that can check if your password has been stolen in the past.
+- Split transaction shows amount left to be split
+
+
+### Changed
+- Importer can (potentially) handle new import routines such as banks.
+- Importer can fall back from JSON errors 
+
+### Removed
+- PHP7.0 support
+- Support for extended tag modes
+- Remove "time jumps" to non-empty periods
+
+
+### Fixed
+- [Issue 717](https://github.com/firefly-iii/firefly-iii/issues/717), reported by [NiceGuyIT](https://github.com/NiceGuyIT)
+- [Issue 718](https://github.com/firefly-iii/firefly-iii/issues/718), reported by [wtercato](https://github.com/wtercato)
+- [Issue 722](https://github.com/firefly-iii/firefly-iii/issues/722), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 648](https://github.com/firefly-iii/firefly-iii/issues/648), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 730](https://github.com/firefly-iii/firefly-iii/issues/730), reported by [ragnarkarlsson](https://github.com/ragnarkarlsson)
+- [Issue 733](https://github.com/firefly-iii/firefly-iii/issues/733), reported by [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 735](https://github.com/firefly-iii/firefly-iii/issues/735), reported by [kristophr](https://github.com/kristophr)
+- [Issue 739](https://github.com/firefly-iii/firefly-iii/issues/739), reported by [skibbipl](https://github.com/skibbipl)
+- [Issue 515](https://github.com/firefly-iii/firefly-iii/issues/515), reported by [schwalberich](https://github.com/schwalberich)
+- [Issue 743](https://github.com/firefly-iii/firefly-iii/issues/743), reported by [simonsmiley](https://github.com/simonsmiley)
+- [Issue 746](https://github.com/firefly-iii/firefly-iii/issues/746), reported by [tannie](https://github.com/tannie)
+- [Issue 747](https://github.com/firefly-iii/firefly-iii/issues/747), reported by [tannie](https://github.com/tannie)
+
+
+## [4.6.3.1] - 2017-07-23
+### Fixed
+- Hotfix to close [issue 715](https://github.com/firefly-iii/firefly-iii/issues/715)
+
+## [4.6.3] - 2017-07-23
+
+This will be the last release to support PHP 7.0.
+
+### Added
+- New guidelines and new introduction tour to aid new users.
+- Rules can now be applied at will to transactions, not just rule groups.
+
+### Changed
+- Improved category overview.
+- Improved budget overview.
+- Improved budget report.
+- Improved command line import responsiveness and speed.
+- All code comparisons are now strict.
+- Improve search page.
+- Charts are easier to read thanks to [simonsmiley](https://github.com/simonsmiley)
+- Fixed [issue 708](https://github.com/firefly-iii/firefly-iii/issues/708).
+
+### Fixed
+- Fixed bug where import would not respect default account. [issue 694](https://github.com/firefly-iii/firefly-iii/issues/694)
+- Fixed various broken paths
+- Fixed several import inconsistencies.
+- Various bug fixes.
+
+## [4.6.2] - 2017-07-08
+### Added
+- Links added to boxes, idea by [simonsmiley](https://github.com/simonsmiley)
+
+### Fixed
+- Various bugs in import routine
+
+## [4.6.1] - 2017-07-02
+### Fixed
+- Fixed several small issues all around.
+
+## [4.6.0] - 2017-06-28
+
+### Changed
+- Revamped import routine. Will be buggy.
+
+### Fixed
+- [Issue 667](https://github.com/firefly-iii/firefly-iii/issues/667), postgresql reported by [skibbipl](https://github.com/skibbipl).
+- [Issue 680](https://github.com/firefly-iii/firefly-iii/issues/680), fixed by [Xeli](https://github.com/Xeli)
+- Fixed [issue 660](https://github.com/firefly-iii/firefly-iii/issues/660)
+- Fixes [issue 672](https://github.com/firefly-iii/firefly-iii/issues/672), reported by [dzaikos](https://github.com/dzaikos)
+- Fix a bug where the balance routine forgot to account for accounts without a currency preference.
+- Various other bugfixes.
+
+## [4.5.0] - 2017-06-07
+
+### Added
+- Better support for multi-currency transactions and display of transactions, accounts and everything. This requires a database overhaul (moving the currency information to specific transactions) so be careful when upgrading.
+- Translations for Spanish and Slovenian.
+- New interface for budget page, ~~stolen from~~ inspired by YNAB.
+- Expanded Docker to work with postgresql as well, thanks to [kressh](https://github.com/kressh)
+
+### Fixed
+- PostgreSQL support in database upgrade routine ([issue 644](https://github.com/firefly-iii/firefly-iii/issues/644), reported by [skibbipl](https://github.com/skibbipl))
+- Frontpage budget chart was off, fix by [nhaarman](https://github.com/nhaarman)
+- Was not possible to remove opening balance.
+
+## [4.4.3] - 2017-05-03
+### Added
+- Added support for Slovenian
+- Removed support for Spanish. No translations whatsoever by the guy who requested it.
+- Removed support for Russian. Same thing.
+- Removed support for Croatian. Same thing.
+- Removed support for Chinese Traditional, Hong Kong. Same thing.
+
+### Changed
+- The journal collector, an internal piece of code to collect transactions, now uses a slightly different method of collecting journals. This may cause problems.
+
+### Fixed
+- [Issue 638](https://github.com/firefly-iii/firefly-iii/issues/638) as reported by [worldworm](https://github.com/worldworm).
+- Possible fix for [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624)
+
+## [4.4.2] - 2017-04-27
+### Fixed
+- Fixed a bug where the opening balance could not be stored.
+
+## [4.4.1] - 2017-04-27
+
+### Added
+- Support for deployment on Heroku
+
+### Fixed
+- Bug in new-user routine.
+
+## [4.4.0] - 2017-04-23
+### Added
+- Firefly III can now handle foreign currencies better, including some code to get the exchange rate live from the web.
+- Can now make rules for attachments, see [issue 608](https://github.com/firefly-iii/firefly-iii/issues/608), as suggested by [dzaikos](https://github.com/dzaikos).
+
+### Fixed
+- Fixed [issue 629](https://github.com/firefly-iii/firefly-iii/issues/629), reported by forcaeluz
+- Fixed [issue 630](https://github.com/firefly-iii/firefly-iii/issues/630), reported by welbert
+- And more various bug fixes.
+
+## [4.3.8] - 2017-04-08
+
+### Added
+- Better overview / show pages.
+- [Issue 628](https://github.com/firefly-iii/firefly-iii/issues/628), as reported by [xzaz](https://github.com/xzaz).
+- Greatly expanded test coverage
+
+### Fixed
+- [Issue 619](https://github.com/firefly-iii/firefly-iii/issues/619), as reported by [dfiel](https://github.com/dfiel).
+- [Issue 620](https://github.com/firefly-iii/firefly-iii/issues/620), as reported by [forcaeluz](https://github.com/forcaeluz).
+- Attempt to fix [issue 624](https://github.com/firefly-iii/firefly-iii/issues/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](https://github.com/firefly-iii/firefly-iii/issues/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](https://github.com/firefly-iii/firefly-iii/issues/602) and [issue 607](https://github.com/firefly-iii/firefly-iii/issues/607), as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos).
+- [Issue 605](https://github.com/firefly-iii/firefly-iii/issues/605), as reported by [Zsub](https://github.com/Zsub).
+- [Issue 599](https://github.com/firefly-iii/firefly-iii/issues/599), as reported by [leander091](https://github.com/leander091).
+- [Issue 610](https://github.com/firefly-iii/firefly-iii/issues/610), as reported by [skibbipl](https://github.com/skibbipl).
+- [Issue 611](https://github.com/firefly-iii/firefly-iii/issues/611), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- [Issue 612](https://github.com/firefly-iii/firefly-iii/issues/612), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- [Issue 614](https://github.com/firefly-iii/firefly-iii/issues/614), as reported by [worldworm](https://github.com/worldworm).
+- Various other bug fixes.
+
+## [4.3.6] - 2017-02-20
+### Fixed
+- [Issue 578](https://github.com/firefly-iii/firefly-iii/issues/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 [issue 536](https://github.com/firefly-iii/firefly-iii/issues/536) by [dabenzel](https://github.com/dabenzel)
+- Updated budget report
+- Improved 404 page
+- Smooth curves, improved by [elamperti](https://github.com/elamperti).
+
+### Fixed
+- [Issue 549](https://github.com/firefly-iii/firefly-iii/issues/549)
+- [Issue 553](https://github.com/firefly-iii/firefly-iii/issues/553)
+- Fixed [issue 559](https://github.com/firefly-iii/firefly-iii/issues/559) reported by [elamperti](https://github.com/elamperti).
+- [Issue 565](https://github.com/firefly-iii/firefly-iii/issues/565), as reported by a user over the mail
+- [Issue 566](https://github.com/firefly-iii/firefly-iii/issues/566), as reported by [dspeckmann](https://github.com/dspeckmann)
+- [Issue 567](https://github.com/firefly-iii/firefly-iii/issues/567), as reported by [winsomniak](https://github.com/winsomniak)
+- [Issue 569](https://github.com/firefly-iii/firefly-iii/issues/569), as reported by [winsomniak](https://github.com/winsomniak)
+- [Issue 572](https://github.com/firefly-iii/firefly-iii/issues/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 [issue 550](https://github.com/firefly-iii/firefly-iii/issues/550), reported by [worldworm](https://github.com/worldworm)!
+- Fixed bug [issue 551](https://github.com/firefly-iii/firefly-iii/issues/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 ([issue 534](https://github.com/firefly-iii/firefly-iii/issues/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](https://github.com/firefly-iii/firefly-iii/issues/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](https://github.com/firefly-iii/firefly-iii/issues/522), thanks to [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 524](https://github.com/firefly-iii/firefly-iii/issues/524), thanks to [worldworm](https://github.com/worldworm)
+- [Issue 526](https://github.com/firefly-iii/firefly-iii/issues/526), thanks to [worldworm](https://github.com/worldworm)
+- [Issue 528](https://github.com/firefly-iii/firefly-iii/issues/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).
+- Support for custom decimal places in currencies ([issue 506](https://github.com/firefly-iii/firefly-iii/issues/506), suggested by [xpfgsyb](https://github.com/xpfgsyb)).
-- Most amounts are now right-aligned (#511, suggested by @xpfgsyb).
+- Most amounts are now right-aligned ([issue 511](https://github.com/firefly-iii/firefly-iii/issues/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
+- [Issue 502](https://github.com/firefly-iii/firefly-iii/issues/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
+- [Issue 501](https://github.com/firefly-iii/firefly-iii/issues/501), thanks to [zjean](https://github.com/zjean)
-- #513, thanks to @skibbipl 
+- [Issue 513](https://github.com/firefly-iii/firefly-iii/issues/513), thanks to [skibbipl](https://github.com/skibbipl) 
 
 ### Security
-- #519, thanks to @xpfgsyb
+- [Issue 519](https://github.com/firefly-iii/firefly-iii/issues/519), thanks to [xpfgsyb](https://github.com/xpfgsyb)
 
-## [4.3.0] - 2015-12-26
+## [4.3.0] - 2016-12-26
 ### Added
-- New method of keeping track of available budget, see issue #489
+- New method of keeping track of available budget, see [issue 489](https://github.com/firefly-iii/firefly-iii/issues/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
+- Import routine no longer gives transactions a description [issue 483](https://github.com/firefly-iii/firefly-iii/issues/483)
 
 
 ### Removed
 - All test data generation code.
 
 ### Fixed
-- Removed import accounts from search results #478
+- Removed import accounts from search results [issue 478](https://github.com/firefly-iii/firefly-iii/issues/478)
-- Redirect after delete will no longer go back to deleted item #477
+- Redirect after delete will no longer go back to deleted item [issue 477](https://github.com/firefly-iii/firefly-iii/issues/477)
-- Cannot math #482
+- Cannot math [issue 482](https://github.com/firefly-iii/firefly-iii/issues/482)
-- Fixed bug in virtual balance field #479
+- Fixed bug in virtual balance field [issue 479](https://github.com/firefly-iii/firefly-iii/issues/479)
 
 ## [4.2.2] - 2016-12-18
 ### Added
@@ -58,50 +421,38 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Various bugs
-- Issue #472 thanks to @zjean
+- [Issue 472](https://github.com/firefly-iii/firefly-iii/issues/472) thanks to [zjean](https://github.com/zjean)
 
 ## [4.2.1] - 2016-12-09
 ### Added
-- BIC support (see #430)
+- BIC support (see [issue 430](https://github.com/firefly-iii/firefly-iii/issues/430))
 - New category report section and chart (see the general financial report)
 
 
 ### Changed
-- Date range picker now also available on mobile devices (see #435)
+- Date range picker now also available on mobile devices (see [issue 435](https://github.com/firefly-iii/firefly-iii/issues/435))
-- Extended range of amounts for issue #439
+- Extended range of amounts for [issue 439](https://github.com/firefly-iii/firefly-iii/issues/439)
 - Rewrote all routes. Old bookmarks may break.
 
 ## [4.2.0] - 2016-11-27
 ### Added
 - Lots of (empty) tests
-- Expanded transaction lists (#377)
+- Expanded transaction lists ([issue 377](https://github.com/firefly-iii/firefly-iii/issues/377))
 - New charts at account view
-- First code for #305
+- First code for [issue 305](https://github.com/firefly-iii/firefly-iii/issues/305)
 
 
 ### Changed
 - Updated all email messages.
 - Made some fonts local
 
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
 ### Fixed
-- Issue #408
+- [Issue 408](https://github.com/firefly-iii/firefly-iii/issues/408)
 - Various issues with split journals
-- Issue #414, thx @zjean
+- [Issue 414](https://github.com/firefly-iii/firefly-iii/issues/414), thx [zjean](https://github.com/zjean)
-- Issue #419, thx @schwalberich 
+- [Issue 419](https://github.com/firefly-iii/firefly-iii/issues/419), thx [schwalberich](https://github.com/schwalberich) 
-- Issue #422, thx @xzaz
+- [Issue 422](https://github.com/firefly-iii/firefly-iii/issues/422), thx [xzaz](https://github.com/xzaz)
-- Various import bugs, such as #416 (@zjean)
+- Various import bugs, such as [issue 416](https://github.com/firefly-iii/firefly-iii/issues/416) ([zjean](https://github.com/zjean))
-
-
-### Security
-- Initial release.
-
 
 ## [4.1.7] - 2016-11-19
 ### Added
@@ -118,9 +469,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Made all pages more mobile friendly.
-- Fixed #395 found by @marcoveeneman.
+- Fixed [issue 395](https://github.com/firefly-iii/firefly-iii/issues/395) found by [marcoveeneman](https://github.com/marcoveeneman).
-- Fixed #398 found by @marcoveeneman.
+- Fixed [issue 398](https://github.com/firefly-iii/firefly-iii/issues/398) found by [marcoveeneman](https://github.com/marcoveeneman).
-- Fixed #401 found by @marcoveeneman.
+- Fixed [issue 401](https://github.com/firefly-iii/firefly-iii/issues/401) found by [marcoveeneman](https://github.com/marcoveeneman).
 - Many optimizations.
 - Updated many libraries.
 - Various bugs found by myself.
@@ -132,13 +483,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Greatly expanded help pages and their function.
-- Built a new transaction collector, which I think was the idea of @roberthorlings originally.
+- 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 which made it impossible to resurrect currencies.
+- [Issue 375](https://github.com/firefly-iii/firefly-iii/issues/375), thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies.
-- #370 thanks to @ksmolder
+- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) thanks to [ksmolder](https://github.com/ksmolder)
-- #378, thanks to @HomelessAvatar
+- [Issue 378](https://github.com/firefly-iii/firefly-iii/issues/378), thanks to [HomelessAvatar](https://github.com/HomelessAvatar)
 
 ## [4.1.5] - 2016-11-01
 ### Changed
@@ -147,11 +498,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Help content is translated through Crowdin.
 
 ### Fixed
-- Issue #370
+- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370)
 
 ## [4.1.4] - 2016-10-30
 ### Added
-- New Dockerfile thanks to @schoentoon
+- 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.
@@ -164,10 +515,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Change error message to refer to solution.
 
 ### Fixed
-- #367 thanks to @HungryFeline
+- [Issue 367](https://github.com/firefly-iii/firefly-iii/issues/367) thanks to [HungryFeline](https://github.com/HungryFeline)
-- #366 thanks to @3mz3t
+- [Issue 366](https://github.com/firefly-iii/firefly-iii/issues/366) thanks to [3mz3t](https://github.com/3mz3t)
-- #362 and #341 thanks to @bnw
+- [Issue 362](https://github.com/firefly-iii/firefly-iii/issues/362) and [issue 341](https://github.com/firefly-iii/firefly-iii/issues/341) thanks to [bnw](https://github.com/bnw)
-- #355 thanks to @roberthorlings
+- [Issue 355](https://github.com/firefly-iii/firefly-iii/issues/355) thanks to [roberthorlings](https://github.com/roberthorlings)
 
 ## [4.1.3] - 2016-10-22
 ### Fixed
@@ -198,81 +549,66 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Lots of old code
 
 ### Fixed
-- #357, where non utf-8 files would break Firefly.
+- [Issue 357](https://github.com/firefly-iii/firefly-iii/issues/357), where non utf-8 files would break Firefly.
-- Tab delimiter is not properly loaded from import configuration (@roberthorlings)
+- 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)
+- 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 [issue 344](https://github.com/firefly-iii/firefly-iii/issues/344)
-- Fixed #346, thanks to @SanderKleykens
+- Fixed [issue 346](https://github.com/firefly-iii/firefly-iii/issues/346), thanks to [SanderKleykens](https://github.com/SanderKleykens)
-- #351
+- [Issue 351](https://github.com/firefly-iii/firefly-iii/issues/351)
 - Did some internal remodelling.
 
 ### Fixed
-- PostgreSQL compatibility thanks to @SanderKleykens
+- PostgreSQL compatibility thanks to [SanderKleykens](https://github.com/SanderKleykens)
-- @RobertHorlings fixed a bug in the ABN Amro import specific.
+- [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
+- New ING import specific by [tomwerf](https://github.com/tomwerf)
-- New Presidents Choice specific to fix #307
+- New Presidents Choice specific to fix [issue 307](https://github.com/firefly-iii/firefly-iii/issues/307)
-- Added some trimming (#335)
+- Added some trimming ([issue 335](https://github.com/firefly-iii/firefly-iii/issues/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
+- [Issue 334](https://github.com/firefly-iii/firefly-iii/issues/334) by [cyberkov](https://github.com/cyberkov)
-- #337
+- [Issue 337](https://github.com/firefly-iii/firefly-iii/issues/337)
-- #336
+- [Issue 336](https://github.com/firefly-iii/firefly-iii/issues/336)
-- #338 found by @roberthorlings
+- [Issue 338](https://github.com/firefly-iii/firefly-iii/issues/338) found by [roberthorlings](https://github.com/roberthorlings)
 
-### Security
+## [4.0.0] - 2016-09-26
-- 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
+- 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
+- Support for specific decimal places, thanks to [Mortalife](https://github.com/Mortalife)
 - Various CSS fixes
-- Various bugs, thanks to @fuf, @sandermulders and @vissert
+- 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
+## [3.10.4] - 2016-09-14
 ### Fixed
-- Migration fix by @sandermulders
+- Migration fix by [sandermulders](https://github.com/sandermulders)
-- Tricky import bug fix thanks to @vissert
+- Tricky import bug fix thanks to [vissert](https://github.com/vissert)
-- Currency preference will be correctly pulled from user settings, thanks to @fuf
+- 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 (#282)
+- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) ([issue 282](https://github.com/firefly-iii/firefly-iii/issues/282))
 - First start of German translation
 
 ### Changed
@@ -283,7 +619,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - A bug in the translation routine broke the import.
-- It was possible to destroy your Firefly installation by removing all currencies. Thanks @mondjef
+- It was possible to destroy your Firefly installation by removing all currencies. Thanks [mondjef](https://github.com/mondjef)
 - Translation bugs.
 - Import bug.
 
@@ -303,8 +639,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### 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 for reporting.
+- 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 
+- Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) 
 
 ## [3.10.1] - 2016-08-25
 ### Added
@@ -324,9 +660,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - 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
+- Fixed a bug in the `firefly:verify` routine
 
-## [3.10] - 2015-05-25
+## [3.10] - 2016-08-12
 ### Added
 - New charts in year report
 - Can add / remove money from piggy bank on mobile device.
@@ -337,30 +673,30 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Rewrote the import routine.
 - The date picker now supports more ranges and periods.
-- Rewrote all migrations. #272
+- Rewrote all migrations. [issue 272](https://github.com/firefly-iii/firefly-iii/issues/272)
 
 ### Fixed
-- Issue #264
+- [Issue 264](https://github.com/firefly-iii/firefly-iii/issues/264)
-- Issue #265
+- [Issue 265](https://github.com/firefly-iii/firefly-iii/issues/265)
-- Fixed amount calculation problems, #266, thanks @xzaz
+- Fixed amount calculation problems, [issue 266](https://github.com/firefly-iii/firefly-iii/issues/266), thanks [xzaz](https://github.com/xzaz)
-- Issue #271
+- [Issue 271](https://github.com/firefly-iii/firefly-iii/issues/271)
-- Issue #278, #273, thanks @StevenReitsma and @rubella
+- [Issue 278](https://github.com/firefly-iii/firefly-iii/issues/278), [issue 273](https://github.com/firefly-iii/firefly-iii/issues/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
+- Fixed pagination problems, [issue 276](https://github.com/firefly-iii/firefly-iii/issues/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
+- Bulk update problems, [issue 280](https://github.com/firefly-iii/firefly-iii/issues/280), thanks [stickgrinder](https://github.com/stickgrinder)
 - Fixed various problems with amount reporting of split transactions.
 
-[3.9.1]
+## [3.9.1] - 2016-06-06
 ### Fixed
-- Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269
+- Fixed a bug where removing money from a piggy bank would not work. See [issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) and [issue 269](https://github.com/firefly-iii/firefly-iii/issues/269)
 
-[3.9.0]
+## [3.9.0] - 2016-05-22
 ### Added
-- @zjean has added code that allows you to force "https://"-URL's.
+- [zjean](https://github.com/zjean) has added code that allows you to force "https://"-URL's.
-- @tonicospinelli has added Portuguese (Brazil) translations.
+- [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.
@@ -391,7 +727,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Several CSV related bugs.
 - Several other bugs.
-- Bugs fixed by @Bonno.
+- Bugs fixed by [Bonno](https://github.com/Bonno).
 
 ## [3.8.3] - 2016-04-17
 ### Added
@@ -438,7 +774,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### 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.
+- 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.

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/

Dockerfile

@@ -11,32 +11,43 @@ RUN apt-get update -y && \
                                                libtidy-dev \
                                                libxml2-dev \
                                                libsqlite3-dev \
-                                               libbz2-dev && \
+                                               libpq-dev \
+                                               libbz2-dev \
+                                               gettext-base \
+                                               locales && \
     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
+RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
+
+# 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
+
+COPY ./docker/apache2.conf /etc/apache2/apache2.conf
 
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
 
+# Enable apache mod ssl..
+RUN a2enmod ssl
+
 # Setup the Composer installer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer && \
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-  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}
 
-ADD . /var/www/firefly-iii
+# Copy Apache Configs
-RUN chown -R www-data:www-data /var/www/
+COPY ./docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
-ADD docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
 
-USER www-data
+ENV FIREFLY_PATH /var/www/firefly-iii
 
-WORKDIR /var/www/firefly-iii
+WORKDIR $FIREFLY_PATH
 
-RUN composer install --no-scripts --no-dev
+# The working directory
+COPY . $FIREFLY_PATH
 
-USER root
+RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
+
+RUN composer install --prefer-dist --no-dev --no-scripts
+
+EXPOSE 80
+
+ENTRYPOINT ["docker/entrypoint.sh"]

Procfile

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

README.md

@@ -1,36 +1,70 @@
 # Firefly III: A personal finances manager 
 
-[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php#v7.0.4) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/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) [![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
+[![Requires PHP7.1](https://img.shields.io/badge/php-7.1-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-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.
+"Firefly III" is a financial manager for your personal finances.
+It can help you keep track of your expenses and income.
+Firefly III supports the use of budgets. You can categorize and tag your transactions.
+It also supports credit cards, shared  household accounts and savings accounts.
+There are many financial reports available.
 
 ## Try it out!
 
-Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/firefly-iii/firefly-iii/tree/master)
 
-## Installation
+Firefly III can be run on Heroku.
+Register for a free Heroku account and instantly run Firefly III on your very own cloud instance.
+There is also a [demo site](https://firefly-iii.nder.be) with an example financial administration already present. 
 
-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/installation-guide/).
+## Getting started
+
+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).
+At the moment, installation is fairly complex. I hope to improve this in the future. If you need support, please open a ticket.
 
 ## 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.
+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
+### 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 becoming fancy or bloated.
+- 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/).
+Firefly III has become pretty awesome over the years! (but please excuse me for bragging, it's just that I'm proud of it).
+[You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
+
+### Contributing
+
+Please read [CONTRIBUTING.md](https://github.com/firefly-iii/firefly-iii/blob/master/.github/CONTRIBUTING.md) for details on contributing, and the process for submitting pull requests. Please check out the [code of conduct](https://github.com/firefly-iii/firefly-iii/blob/master/CODE_OF_CONDUCT.md) as well.
+
+### Versioning
+
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see [the tags](https://github.com/firefly-iii/firefly-iii/tags) on this repository.
+
+### Authors
+
+* James Cole
+* Over time, [many people have contributed to Firefly III](https://github.com/firefly-iii/firefly-iii/graphs/contributors).
+
+### License
+
+This work [is licensed](https://github.com/firefly-iii/firefly-iii/blob/master/LICENSE) under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/).
+
+### Other stuff
 
 If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
 
 If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).
+
+[![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/firefly-iii/firefly-iii/badge.svg?branch=master)](https://coveralls.io/github/firefly-iii/firefly-iii?branch=master)

app.json

@@ -0,0 +1,59 @@
+{
+  "name": "Firefly III",
+  "description": "A free and open source personal finances manager",
+  "repository": "https://github.com/firefly-iii/firefly-iii",
+  "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"
+  ],
+  "website": "https://firefly-iii.github.io/",
+  "addons": [
+    {
+      "plan": "heroku-postgresql"
+    }
+  ],
+  "scripts": {
+    "postdeploy": "export APP_KEY=$(php artisan --no-ansi key:generate --show)"
+  },
+  "buildpacks": [
+    {
+      "url": "heroku/php"
+    }
+  ],
+  "env": {
+    "APP_KEY": {
+      "description": "This key is used to encrypt your data.",
+      "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
+    }
+  }
+}

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,143 @@
+<?php
+/**
+ * CreateExport.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+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.
+ *
+ * @package FireflyIII\Console\Commands
+ */
+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?}';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return;
+        }
+        $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->find(intval($this->option('user')));
+        $jobRepository->setUser($user);
+        $journalRepository->setUser($user);
+        $accountRepository->setUser($user);
+
+        // first date
+        $firstJournal = $journalRepository->first();
+        $first        = new Carbon;
+        if (!is_null($firstJournal->id)) {
+            $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;
+    }
+}

app/Console/Commands/CreateImport.php

@@ -14,10 +14,14 @@ declare(strict_types = 1);
 namespace FireflyIII\Console\Commands;
 
 use Artisan;
+use FireflyIII\Import\Logging\CommandHandler;
+use FireflyIII\Import\Routine\ImportRoutine;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
+use Illuminate\Support\MessageBag;
 use Log;
+use Monolog\Formatter\LineFormatter;
 
 /**
  * Class CreateImport
@@ -26,6 +30,7 @@ use Log;
  */
 class CreateImport extends Command
 {
+    use VerifiesAccessToken;
     /**
      * The console command description.
      *
@@ -38,7 +43,14 @@ 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.}
+                            {--user= : The user ID that the import should import for.}
+                            {--token= : The user\'s access token.}
+                            {--start : Starts the job immediately.}';
 
     /**
      * Create a new command instance.
@@ -50,10 +62,18 @@ class CreateImport extends Command
     }
 
     /**
+     * Run the command.
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
     public function handle()
     {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return;
+        }
         /** @var UserRepositoryInterface $userRepository */
         $userRepository = app(UserRepositoryInterface::class);
         $file           = $this->argument('file');
@@ -73,35 +93,63 @@ class CreateImport extends Command
             return;
         }
 
-        $this->info(sprintf('Going to create a job to import file: %s', $file));
+        $this->line(sprintf('Going to create a job to import file: %s', $file));
-        $this->info(sprintf('Using configuration file: %s', $configuration));
+        $this->line(sprintf('Using configuration file: %s', $configuration));
-        $this->info(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
+        $this->line(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
-        $this->info(sprintf('Type of import: %s', $type));
+        $this->line(sprintf('Type of import: %s', $type));
+
 
         /** @var ImportJobRepositoryInterface $jobRepository */
-        $jobRepository = app(ImportJobRepositoryInterface::class, [$user]);
+        $jobRepository = app(ImportJobRepositoryInterface::class);
+        $jobRepository->setUser($user);
         $job = $jobRepository->create($type);
-        $this->line(sprintf('Created job "%s"...', $job->key));
+        $this->line(sprintf('Created job "%s"', $job->key));
 
-        Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]);
+
+        Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
         $this->line('Stored import data...');
 
+
         $job->configuration = $configurationData;
-        $job->status        = 'settings_complete';
+        $job->status        = 'configured';
         $job->save();
         $this->line('Stored configuration...');
 
+
         if ($this->option('start') === true) {
             $this->line('The import will start in a moment. This process is not visible...');
             Log::debug('Go for import!');
-            Artisan::call('firefly:start-import', ['key' => $job->key]);
+
-            $this->line('Done!');
+            // normally would refer to other firefly:start-import but that doesn't seem to work all to well...
+            $monolog   = Log::getMonolog();
+            $handler   = new CommandHandler($this);
+            $formatter = new LineFormatter(null, null, false, true);
+            $handler->setFormatter($formatter);
+            $monolog->pushHandler($handler);
+
+
+            // start the actual routine:
+            /** @var ImportRoutine $routine */
+            $routine = app(ImportRoutine::class);
+            $routine->setJob($job);
+            $routine->run();
+
+            // give feedback.
+            /** @var MessageBag $error */
+            foreach ($routine->errors as $index => $error) {
+                $this->error(sprintf('Error importing line #%d: %s', $index, $error));
+            }
+            $this->line(
+                sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines)
+            );
         }
 
         return;
     }
 
     /**
+     * Verify user inserts correct arguments.
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
@@ -115,12 +163,12 @@ class CreateImport extends Command
         $cwd            = getcwd();
         $validTypes     = array_keys(config('firefly.import_formats'));
         $type           = strtolower($this->option('type'));
-
         if (is_null($user->id)) {
             $this->error(sprintf('There is no user with ID %d.', $this->option('user')));
 
             return false;
         }
+
         if (!in_array($type, $validTypes)) {
             $this->error(sprintf('Cannot import file of type "%s"', $type));
 

app/Console/Commands/DecryptAttachment.php

@@ -0,0 +1,108 @@
+<?php
+/**
+ * DecryptAttachment.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Console\Command;
+use Log;
+
+/**
+ * Class DecryptAttachment
+ *
+ * @package FireflyIII\Console\Commands
+ */
+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.}';
+
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     */
+    public function handle()
+    {
+        /** @var AttachmentRepositoryInterface $repository */
+        $repository     = app(AttachmentRepositoryInterface::class);
+        $attachmentId   = intval($this->argument('id'));
+        $attachment     = $repository->findWithoutUser($attachmentId);
+        $attachmentName = trim($this->argument('name'));
+        $storagePath    = realpath(trim($this->argument('directory')));
+        if (is_null($attachment->id)) {
+            $this->error(sprintf('No attachment with id #%d', $attachmentId));
+            Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
+
+            return;
+        }
+
+        if ($attachmentName !== $attachment->filename) {
+            $this->error('File name does not match.');
+            Log::error('DecryptAttachment: File name does not match.');
+
+            return;
+        }
+
+        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;
+        }
+
+        if (!is_writable($storagePath)) {
+            $this->error(sprintf('Path "%s" is not writable.', $storagePath));
+            Log::error(sprintf('DecryptAttachment: Path "%s" is not writable.', $storagePath));
+
+            return;
+        }
+
+        $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 ($result === false) {
+            $this->error('Could not write to file.');
+
+            return;
+        }
+        $this->info(sprintf('%d bytes written. Exiting now..', $result));
+
+        return;
+    }
+}

app/Console/Commands/EncryptFile.php

@@ -35,7 +35,7 @@ class EncryptFile extends Command
      *
      * @var string
      */
-    protected $signature = 'firefly:encrypt {file} {key}';
+    protected $signature = 'firefly:encrypt-file {file} {key}';
 
     /**
      * Create a new command instance.

app/Console/Commands/Import.php

@@ -13,12 +13,11 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Console\Commands;
 
-use FireflyIII\Import\ImportProcedure;
 use FireflyIII\Import\Logging\CommandHandler;
+use FireflyIII\Import\Routine\ImportRoutine;
 use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Support\Collection;
+use Illuminate\Support\MessageBag;
 use Log;
 
 /**
@@ -52,13 +51,18 @@ class Import extends Command
     }
 
     /**
-     *
+     * Run the import routine.
      */
     public function handle()
     {
         Log::debug('Start start-import command');
         $jobKey = $this->argument('key');
-        $job    = ImportJob::whereKey($jobKey)->first();
+        $job    = ImportJob::where('key', $jobKey)->first();
+        if (is_null($job)) {
+            $this->error(sprintf('No job found with key "%s"', $jobKey));
+
+            return;
+        }
         if (!$this->isValid($job)) {
             Log::error('Job is not valid for some reason. Exit.');
 
@@ -70,20 +74,25 @@ class Import extends Command
         $monolog = Log::getMonolog();
         $handler = new CommandHandler($this);
         $monolog->pushHandler($handler);
-        $importProcedure = new ImportProcedure;
-        $result          = $importProcedure->runImport($job);
 
-        // display result to user:
+        /** @var ImportRoutine $routine */
-        $this->presentResults($result);
+        $routine = app(ImportRoutine::class);
-        $this->line('The import has completed.');
+        $routine->setJob($job);
+        $routine->run();
 
-        // get any errors from the importer:
+        /** @var MessageBag $error */
-        $this->presentErrors($job);
+        foreach ($routine->errors as $index => $error) {
+            $this->error(sprintf('Error importing line #%d: %s', $index, $error));
+        }
+
+        $this->line(sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines));
 
         return;
     }
 
     /**
+     * Check if job is valid to be imported.
+     *
      * @param ImportJob $job
      *
      * @return bool
@@ -91,12 +100,14 @@ class Import extends Command
     private function isValid(ImportJob $job): bool
     {
         if (is_null($job)) {
+            Log::error('This job does not seem to exist.');
             $this->error('This job does not seem to exist.');
 
             return false;
         }
 
-        if ($job->status != 'settings_complete') {
+        if ($job->status !== 'configured') {
+            Log::error(sprintf('This job is not ready to be imported (status is %s).', $job->status));
             $this->error('This job is not ready to be imported.');
 
             return false;
@@ -104,36 +115,4 @@ class Import extends Command
 
         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/MoveRepository.php

@@ -1,86 +0,0 @@
-<?php
-/**
- * MoveRepository.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\Console\Commands;
-
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-
-/**
- * Class MoveRepository
- *
- * @package FireflyIII\Console\Commands
- */
-class MoveRepository extends Command
-{
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Alerts the user that the Github repository will move, if they are interested to know this.';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'firefly:github-move';
-
-    /**
-     * Create a new command instance.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $moveDate = new Carbon('2017-01-01');
-        $final    = new Carbon('2017-03-01');
-        $now      = new Carbon;
-
-        // display message before 2017-01-01
-        if ($moveDate > $now) {
-            $this->line('+------------------------------------------------------------------------------+');
-            $this->line('');
-            $this->line('The Github repository for Firefly III will MOVE');
-            $this->line('This move will be on January 1st 2017');
-            $this->line('');
-            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
-            $this->line('');
-            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
-            $this->line('');
-            $this->line('+------------------------------------------------------------------------------+');
-        }
-
-        // display message after 2017-01-01 but before 2017-03-01
-        if ($moveDate <= $now && $now <= $final) {
-            $this->line('+------------------------------------------------------------------------------+');
-            $this->line('');
-            $this->line('The Github repository for Firefly III has MOVED');
-            $this->line('This move was on January 1st 2017!');
-            $this->line('');
-            $this->error('READ THIS WIKI PAGE FOR MORE INFORMATION');
-            $this->line('');
-            $this->info('https://github.com/firefly-iii/help/wiki/New-Github-repository');
-            $this->line('');
-            $this->line('+------------------------------------------------------------------------------+');
-        }
-
-    }
-}

app/Console/Commands/UpgradeDatabase.php

@@ -15,18 +15,32 @@ namespace FireflyIII\Console\Commands;
 
 
 use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Collection;
 use Log;
+use Preferences;
 use Schema;
 
 /**
  * Class UpgradeDatabase
  *
+ * Upgrade user database.
+ *
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it just touches a lot of things.
  * @package FireflyIII\Console\Commands
  */
 class UpgradeDatabase extends Command
@@ -60,19 +74,28 @@ class UpgradeDatabase extends Command
     {
         $this->setTransactionIdentifier();
         $this->migrateRepetitions();
+        $this->updateAccountCurrencies();
+        $this->line('Updating currency information..');
+        $this->updateTransferCurrencies();
+        $this->updateOtherCurrencies();
+        $this->line('Done updating currency information..');
+        $this->migrateNotes();
+        $this->info('Firefly III database is up to date.');
+
+        return;
+
+
     }
 
-    private function migrateRepetitions()
+    /**
+     * Migrate budget repetitions to new format where the end date is in the budget limit as well,
+     * making the limit_repetition table obsolete.
+     */
+    public function migrateRepetitions(): void
     {
-        if (!Schema::hasTable('budget_limits')) {
-            return;
-        }
-        // get all budget limits with end_date NULL
         $set = BudgetLimit::whereNull('end_date')->get();
-        $this->line(sprintf('Found %d budget limit(s) to update', $set->count()));
         /** @var BudgetLimit $budgetLimit */
         foreach ($set as $budgetLimit) {
-            // get limit repetition (should be just one):
             /** @var LimitRepetition $repetition */
             $repetition = $budgetLimit->limitrepetitions()->first();
             if (!is_null($repetition)) {
@@ -82,25 +105,30 @@ class UpgradeDatabase extends Command
                 $repetition->delete();
             }
         }
+
+        return;
     }
 
     /**
-     * This is strangely complex, because the HAVING modifier is a no-no. And subqueries in Laravel are weird.
+     * This method gives all transactions which are part of a split journal (so more than 2) a sort of "order" so they are easier
+     * to easier to match to their counterpart. When a journal is split, it has two or three transactions: -3, -4 and -5 for example.
+     *
+     * In the database this is reflected as 6 transactions: -3/+3, -4/+4, -5/+5.
+     *
+     * When either of these are the same amount, FF3 can't keep them apart: +3/-3, +3/-3, +3/-3. This happens more often than you would
+     * think. So each set gets a number (1,2,3) to keep them apart.
      */
-    private function setTransactionIdentifier()
+    public function setTransactionIdentifier(): void
     {
         // if table does not exist, return false
         if (!Schema::hasTable('transaction_journals')) {
             return;
         }
-
-
         $subQuery   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                                         ->whereNull('transaction_journals.deleted_at')
                                         ->whereNull('transactions.deleted_at')
                                         ->groupBy(['transaction_journals.id'])
                                         ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
-
         $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                         ->mergeBindings($subQuery->getQuery())
                         ->where('t_count', '>', 2)
@@ -108,8 +136,203 @@ class UpgradeDatabase extends Command
         $journalIds = array_unique($result->pluck('id')->toArray());
 
         foreach ($journalIds as $journalId) {
-            $this->updateJournal(intval($journalId));
+            $this->updateJournalidentifiers(intval($journalId));
         }
+
+        return;
+    }
+
+    /**
+     * Each (asset) account must have a reference to a preferred currency. If the account does not have one, it's forced upon the account.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's seven but it can't really be helped.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function updateAccountCurrencies(): void
+    {
+        $accounts = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                           ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->get(['accounts.*']);
+
+        $accounts->each(
+            function (Account $account) {
+                // get users preference, fall back to system pref.
+                $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+                $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
+                $accountCurrency     = intval($account->getMeta('currency_id'));
+                $openingBalance      = $account->getOpeningBalance();
+                $obCurrency          = intval($openingBalance->transaction_currency_id);
+
+                // both 0? set to default currency:
+                if ($accountCurrency === 0 && $obCurrency === 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // account is set to 0, opening balance is not?
+                if ($accountCurrency === 0 && $obCurrency > 0) {
+                    AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
+                    $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+
+                    return true;
+                }
+
+                // do not match and opening balance id is not null.
+                if ($accountCurrency !== $obCurrency && $openingBalance->id > 0) {
+                    // update opening balance:
+                    $openingBalance->transaction_currency_id = $accountCurrency;
+                    $openingBalance->save();
+                    $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
+
+                    return true;
+                }
+
+                return true;
+            }
+        );
+
+        return;
+    }
+
+    /**
+     * This routine verifies that withdrawals, deposits and opening balances have the correct currency settings for
+     * the accounts they are linked to.
+     *
+     * Both source and destination must match the respective currency preference of the related asset account.
+     * So FF3 must verify all transactions.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function updateOtherCurrencies(): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $set        = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->whereIn('transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $journal) use ($repository) {
+                // get the transaction with the asset account in it:
+                /** @var Transaction $transaction */
+                $transaction = $journal->transactions()
+                                       ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                       ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                                       ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->first(['transactions.*']);
+                if (is_null($transaction)) {
+                    return;
+                }
+                /** @var Account $account */
+                $account      = $transaction->account;
+                $currency     = $repository->find(intval($account->getMeta('currency_id')));
+                $transactions = $journal->transactions()->get();
+                $transactions->each(
+                    function (Transaction $transaction) use ($currency) {
+                        if (is_null($transaction->transaction_currency_id)) {
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                        }
+
+                        // when mismatch in transaction:
+                        if ($transaction->transaction_currency_id !== $currency->id) {
+                            $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
+                            $transaction->foreign_amount          = $transaction->amount;
+                            $transaction->transaction_currency_id = $currency->id;
+                            $transaction->save();
+                        }
+                    }
+                );
+                // also update the journal, of course:
+                $journal->transaction_currency_id = $currency->id;
+                $journal->save();
+            }
+        );
+
+        return;
+    }
+
+    /**
+     * This routine verifies that transfers have the correct currency settings for the accounts they are linked to.
+     * For transfers, this is can be a destructive routine since we FORCE them into a currency setting whether they
+     * like it or not. Previous routines MUST have set the currency setting for both accounts for this to work.
+     *
+     * A transfer always has the
+     *
+     * Both source and destination must match the respective currency preference. So FF3 must verify ALL
+     * transactions.
+     */
+    public function updateTransferCurrencies()
+    {
+        $set = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->where('transaction_types.type', TransactionType::TRANSFER)
+            ->get(['transaction_journals.*']);
+
+        $set->each(
+            function (TransactionJournal $transfer) {
+                // select all "source" transactions:
+                /** @var Collection $transactions */
+                $transactions = $transfer->transactions()->where('amount', '<', 0)->get();
+                $transactions->each(
+                    function (Transaction $transaction) {
+                        $this->updateTransactionCurrency($transaction);
+                        $this->updateJournalCurrency($transaction);
+                    }
+                );
+            }
+        );
+    }
+
+    /**
+     * Move all the journal_meta notes to their note object counter parts.
+     */
+    private function migrateNotes(): void
+    {
+        $set = TransactionJournalMeta::whereName('notes')->get();
+        /** @var TransactionJournalMeta $meta */
+        foreach ($set as $meta) {
+            $journal = $meta->transactionJournal;
+            $note    = $journal->notes()->first();
+            if (is_null($note)) {
+                $note = new Note;
+                $note->noteable()->associate($journal);
+            }
+
+            $note->text = $meta->data;
+            $note->save();
+            Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id));
+            $meta->delete();
+
+        }
+    }
+
+
+    /**
+     * This method makes sure that the transaction journal uses the currency given in the transaction.
+     *
+     * @param Transaction $transaction
+     */
+    private function updateJournalCurrency(Transaction $transaction): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+        $journal    = $transaction->transactionJournal;
+
+        if (!(intval($currency->id) === intval($journal->transaction_currency_id))) {
+            $this->line(
+                sprintf(
+                    'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
+                    $journal->transactionCurrency->code
+                )
+            );
+            $journal->transaction_currency_id = $currency->id;
+            $journal->save();
+        }
+
+        return;
     }
 
     /**
@@ -118,7 +341,7 @@ class UpgradeDatabase extends Command
      *
      * @param int $journalId
      */
-    private function updateJournal(int $journalId)
+    private function updateJournalidentifiers(int $journalId): void
     {
         $identifier   = 0;
         $processed    = [];
@@ -146,14 +369,134 @@ class UpgradeDatabase extends Command
             if (!is_null($opposing)) {
                 // give both a new identifier:
                 $transaction->identifier = $identifier;
-                $transaction->save();
                 $opposing->identifier    = $identifier;
+                $transaction->save();
                 $opposing->save();
                 $processed[] = $transaction->id;
                 $processed[] = $opposing->id;
-                $this->line(sprintf('Database upgrade for journal #%d, transactions #%d and #%d', $journalId, $transaction->id, $opposing->id));
             }
             $identifier++;
         }
+
+        return;
+    }
+
+    /**
+     * This method makes sure that the tranaction uses the same currency as the source account does.
+     * If not, the currency is updated to include a reference to its original currency as the "foreign" currency.
+     *
+     * The transaction that is sent to this function MUST be the source transaction (amount negative).
+     *
+     * Method is long and complex bit I'm taking it for granted.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
+     * @param Transaction $transaction
+     */
+    private function updateTransactionCurrency(Transaction $transaction): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
+
+        // has no currency ID? Must have, so fill in using account preference:
+        if (is_null($transaction->transaction_currency_id)) {
+            $transaction->transaction_currency_id = $currency->id;
+            Log::debug(sprintf('Transaction #%d has no currency setting, now set to %s', $transaction->id, $currency->code));
+            $transaction->save();
+        }
+
+        // does not match the source account (see above)? Can be fixed
+        // when mismatch in transaction and NO foreign amount is set:
+        if ($transaction->transaction_currency_id !== $currency->id && is_null($transaction->foreign_amount)) {
+            Log::debug(
+                sprintf(
+                    'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.', $transaction->id,
+                    $transaction->transaction_currency_id, $currency->id, $transaction->amount
+                )
+            );
+            $transaction->transaction_currency_id = $currency->id;
+            $transaction->save();
+        }
+
+        // grab opposing transaction:
+        /** @var TransactionJournal $journal */
+        $journal = $transaction->transactionJournal;
+        /** @var Transaction $opposing */
+        $opposing         = $journal->transactions()->where('amount', '>', 0)->where('identifier', $transaction->identifier)->first();
+        $opposingCurrency = $repository->find(intval($opposing->account->getMeta('currency_id')));
+
+        if (is_null($opposingCurrency->id)) {
+            Log::error(sprintf('Account #%d ("%s") must have currency preference but has none.', $opposing->account->id, $opposing->account->name));
+
+            return;
+        }
+
+        // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
+        if ($opposingCurrency->id === $currency->id) {
+            // update both transactions to match:
+            $transaction->foreign_amount       = null;
+            $transaction->foreign_currency_id  = null;
+            $opposing->foreign_amount          = null;
+            $opposing->foreign_currency_id     = null;
+            $opposing->transaction_currency_id = $currency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Cleaned up transaction #%d and #%d', $transaction->id, $opposing->id));
+
+            return;
+        }
+        // if destination account currency is different, both transactions must have this currency as foreign currency id.
+        if ($opposingCurrency->id !== $currency->id) {
+            $transaction->foreign_currency_id = $opposingCurrency->id;
+            $opposing->foreign_currency_id    = $opposingCurrency->id;
+            $transaction->save();
+            $opposing->save();
+            Log::debug(sprintf('Verified foreign currency ID of transaction #%d and #%d', $transaction->id, $opposing->id));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore:
+        if (is_null($transaction->foreign_amount) && !is_null($opposing->foreign_amount)) {
+            $transaction->foreign_amount = bcmul(strval($opposing->foreign_amount), '-1');
+            $transaction->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (1) #%d to %s', $transaction->id, $transaction->foreign_amount));
+        }
+
+        // if foreign amount of one is null and the other is not, use this to restore (other way around)
+        if (is_null($opposing->foreign_amount) && !is_null($transaction->foreign_amount)) {
+            $opposing->foreign_amount = bcmul(strval($transaction->foreign_amount), '-1');
+            $opposing->save();
+            Log::debug(sprintf('Restored foreign amount of transaction (2) #%d to %s', $opposing->id, $opposing->foreign_amount));
+        }
+
+        // when both are zero, try to grab it from journal:
+        if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) {
+
+            $foreignAmount = $journal->getMeta('foreign_amount');
+            if (is_null($foreignAmount)) {
+                Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id));
+                $transaction->foreign_amount = bcmul(strval($transaction->amount), '-1');
+                $opposing->foreign_amount    = bcmul(strval($opposing->amount), '-1');
+                $transaction->save();
+                $opposing->save();
+
+                return;
+            }
+            $foreignPositive = app('steam')->positive(strval($foreignAmount));
+            Log::debug(
+                sprintf(
+                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount
+                )
+            );
+            $transaction->foreign_amount = bcmul($foreignPositive, '-1');
+            $opposing->foreign_amount    = $foreignPositive;
+            $transaction->save();
+            $opposing->save();
+        }
+
+
+        return;
     }
 }

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -33,7 +33,7 @@ class UpgradeFireflyInstructions extends Command
      *
      * @var string
      */
-    protected $signature = 'firefly:upgrade-instructions';
+    protected $signature = 'firefly:instructions {task}';
 
     /**
      * Create a new command instance.
@@ -49,11 +49,50 @@ class UpgradeFireflyInstructions extends Command
      */
     public function handle()
     {
-        //
+
+        if ($this->argument('task') === 'update') {
+            $this->updateInstructions();
+        }
+        if ($this->argument('task') === 'install') {
+            $this->installInstructions();
+        }
+    }
+
+    /**
+     * Show a nice box
+     *
+     * @param string $text
+     */
+    private function boxed(string $text)
+    {
+        $parts = explode("\n", wordwrap($text));
+        foreach ($parts as $string) {
+            $this->line('| ' . sprintf('%-77s', $string) . '|');
+        }
+    }
+
+    /**
+     * Show a nice info box
+     *
+     * @param string $text
+     */
+    private function boxedInfo(string $text)
+    {
+        $parts = explode("\n", wordwrap($text));
+        foreach ($parts as $string) {
+            $this->info('| ' . sprintf('%-77s', $string) . '|');
+        }
+    }
+
+    /**
+     * Render instructions.
+     */
+    private function installInstructions()
+    {
         /** @var string $version */
         $version = config('firefly.version');
-        $config  = config('upgrade.text');
+        $config  = config('upgrade.text.install');
-        $text    = null;
+        $text    = '';
         foreach (array_keys($config) as $compare) {
             // if string starts with:
             $len = strlen($compare);
@@ -62,22 +101,72 @@ class UpgradeFireflyInstructions extends Command
             }
 
         }
-
+        $this->showLine();
+        $this->boxed('');
         if (is_null($text)) {
-            $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
+
-            $this->info('There are no extra upgrade instructions.');
+            $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
-            $this->line('Firefly III should be ready for use.');
+            $this->boxedInfo('There are no extra installation instructions.');
+            $this->boxed('Firefly III should be ready for use.');
+            $this->boxed('');
+            $this->showLine();
 
             return;
         }
 
-        $this->line('+------------------------------------------------------------------------------+');
+        $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
-        $this->line('');
+        $this->boxedInfo($text);
-        $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
+        $this->boxed('');
-        $this->info(wordwrap($text));
+        $this->showLine();
-        $this->line('');
+    }
-        $this->line('+------------------------------------------------------------------------------+');
 
+    /**
+     * Show a line
+     */
+    private function showLine()
+    {
+        $line = '+';
+        for ($i = 0; $i < 78; $i++) {
+            $line .= '-';
+        }
+        $line .= '+';
+        $this->line($line);
 
     }
+
+    /**
+     * Render upgrade instructions.
+     */
+    private function updateInstructions()
+    {
+        /** @var string $version */
+        $version = config('firefly.version');
+        $config  = config('upgrade.text.upgrade');
+        $text    = '';
+        foreach (array_keys($config) as $compare) {
+            // if string starts with:
+            $len = strlen($compare);
+            if (substr($version, 0, $len) === $compare) {
+                $text = $config[$compare];
+            }
+
+        }
+        $this->showLine();
+        $this->boxed('');
+        if (is_null($text)) {
+
+            $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
+            $this->boxedInfo('There are no extra upgrade instructions.');
+            $this->boxed('Firefly III should be ready for use.');
+            $this->boxed('');
+            $this->showLine();
+
+            return;
+        }
+
+        $this->boxed(sprintf('Thank you for updating to Firefly III, v%s!', $version));
+        $this->boxedInfo($text);
+        $this->boxed('');
+        $this->showLine();
+    }
 }

app/Console/Commands/UseEncryption.php

@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+/**
+ * UseEncryption.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+/**
+ * Class UseEncryption
+ *
+ * @package FireflyIII\Console\Commands
+ */
+class UseEncryption extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will make sure that entries in the database will be encrypted (or not) according to the settings in .env';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:use-encryption';
+
+    /**
+     * Create a new command instance.
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->handleObjects('Account', 'name', 'encrypted');
+        $this->handleObjects('Bill', 'name', 'name_encrypted');
+        $this->handleObjects('Bill', 'match', 'match_encrypted');
+        $this->handleObjects('Budget', 'name', 'encrypted');
+        $this->handleObjects('Category', 'name', 'encrypted');
+        $this->handleObjects('PiggyBank', 'name', 'encrypted');
+        $this->handleObjects('TransactionJournal', 'description', 'encrypted');
+    }
+
+    /**
+     * Run each object and encrypt them (or not).
+     *
+     * @param string $class
+     * @param string $field
+     * @param string $indicator
+     */
+    public function handleObjects(string $class, string $field, string $indicator)
+    {
+        $fqn     = sprintf('FireflyIII\Models\%s', $class);
+        $encrypt = config('firefly.encryption') ? 0 : 1;
+        $set     = $fqn::where($indicator, $encrypt)->get();
+
+        foreach ($set as $entry) {
+            $newName       = $entry->$field;
+            $entry->$field = $newName;
+            $entry->save();
+        }
+
+        $this->line(sprintf('Updated %d %s.', $set->count(), strtolower(Str::plural($class))));
+    }
+}

app/Console/Commands/VerifiesAccessToken.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * VerifiesAccessToken.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Log;
+use Preferences;
+
+/**
+ * Trait VerifiesAccessToken
+ *
+ * Verifies user access token for sensitive commands.
+ *
+ * @package FireflyIII\Console\Commands
+ */
+trait VerifiesAccessToken
+{
+    /**
+     * Abstract method to make sure trait knows about method "option".
+     *
+     * @param null $key
+     *
+     * @return mixed
+     */
+    abstract public function option($key = null);
+
+    /**
+     * Returns false when given token does not match given user token.
+     *
+     * @return bool
+     */
+    protected function verifyAccessToken(): bool
+    {
+        $userId = intval($this->option('user'));
+        $token  = strval($this->option('token'));
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+        $user       = $repository->find($userId);
+
+        if (is_null($user->id)) {
+            Log::error(sprintf('verifyAccessToken(): no such user for input "%d"', $userId));
+
+            return false;
+        }
+        $accessToken = Preferences::getForUser($user, 'access_token', null);
+        if (is_null($accessToken)) {
+            Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
+
+            return false;
+        }
+        if (!($accessToken->data === $token)) {
+            Log::error(sprintf('Invalid access token for user #%d.', $userId));
+
+            return false;
+        }
+
+        return true;
+    }
+
+}

app/Console/Commands/VerifyDatabase.php

@@ -17,6 +17,8 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\LinkType;
+use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -25,12 +27,15 @@ use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
+use Preferences;
 use Schema;
 use stdClass;
 
 /**
  * Class VerifyDatabase
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
  * @package FireflyIII\Console\Commands
  */
 class VerifyDatabase extends Command
@@ -69,30 +74,91 @@ class VerifyDatabase extends Command
         $this->reportObject('budget');
         $this->reportObject('category');
         $this->reportObject('tag');
-
-        // accounts with no transactions.
         $this->reportAccounts();
-        // budgets with no limits
         $this->reportBudgetLimits();
-        // budgets with no transactions
-
-        // sum of transactions is not zero.
         $this->reportSum();
-        //  any deleted transaction journals that have transactions that are NOT deleted:
         $this->reportJournals();
-        // deleted transactions that are connected to a not deleted journal.
         $this->reportTransactions();
-        // deleted accounts that still have not deleted transactions or journals attached to them.
         $this->reportDeletedAccounts();
-
-        // report on journals with no transactions at all.
         $this->reportNoTransactions();
-
-        // transfers with budgets.
         $this->reportTransfersBudgets();
-
-        // report on journals with the wrong types of accounts.
         $this->reportIncorrectJournals();
+        $this->repairPiggyBanks();
+        $this->createLinkTypes();
+        $this->createAccessTokens();
+
+    }
+
+    /**
+     * Create user access tokens, if not present already.
+     */
+    private function createAccessTokens()
+    {
+        $users = User::get();
+        /** @var User $user */
+        foreach ($users as $user) {
+            $pref = Preferences::getForUser($user, 'access_token', null);
+            if (is_null($pref)) {
+                $token = $user->generateAccessToken();
+                Preferences::setForUser($user, 'access_token', $token);
+                $this->line(sprintf('Generated access token for user %s', $user->email));
+            }
+        }
+    }
+
+    /**
+     * Create default link types if necessary.
+     */
+    private function createLinkTypes()
+    {
+        $set = [
+            'Related'       => ['relates to', 'relates to'],
+            'Refund'        => ['(partially) refunds', 'is (partially) refunded by'],
+            'Paid'          => ['(partially) pays for', 'is (partially) paid for by'],
+            'Reimbursement' => ['(partially) reimburses', 'is (partially) reimbursed by'],
+        ];
+        foreach ($set as $name => $values) {
+            $link = LinkType::where('name', $name)->where('outward', $values[0])->where('inward', $values[1])->first();
+            if (is_null($link)) {
+                $link          = new LinkType;
+                $link->name    = $name;
+                $link->outward = $values[0];
+                $link->inward  = $values[1];
+            }
+            $link->editable = false;
+            $link->save();
+        }
+    }
+
+    /**
+     * Eeport (and fix) piggy banks. Make sure there are only transfers linked to piggy bank events.
+     */
+    private function repairPiggyBanks(): void
+    {
+        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
+        $set->each(
+            function (PiggyBankEvent $event) {
+                if (is_null($event->transaction_journal_id)) {
+                    return true;
+                }
+                /** @var TransactionJournal $journal */
+                $journal = $event->transactionJournal()->first();
+                if (is_null($journal)) {
+                    return true;
+                }
+
+                $type = $journal->transactionType->type;
+                if ($type !== TransactionType::TRANSFER) {
+                    $event->transaction_journal_id = null;
+                    $event->save();
+                    $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
+                }
+
+                return true;
+            }
+        );
+
+        return;
     }
 
     /**
@@ -131,7 +197,7 @@ class VerifyDatabase extends Command
         /** @var Budget $entry */
         foreach ($set as $entry) {
             $line = sprintf(
-                'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
+                'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
                 $entry->user_id, $entry->email, $entry->id, $entry->name
             );
             $this->line($line);
@@ -168,6 +234,9 @@ class VerifyDatabase extends Command
         }
     }
 
+    /**
+     * Report on journals with bad account types linked to them.
+     */
     private function reportIncorrectJournals()
     {
         $configuration = [
@@ -234,7 +303,7 @@ class VerifyDatabase extends Command
     }
 
     /**
-     *
+     * Report on journals without transactions.
      */
     private function reportNoTransactions()
     {
@@ -252,13 +321,15 @@ class VerifyDatabase extends Command
     }
 
     /**
+     * Report on things with no linked journals.
+     *
      * @param string $name
      */
     private function reportObject(string $name)
     {
         $plural = str_plural($name);
         $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
-        $field  = $name == 'tag' ? 'tag' : 'name';
+        $field  = $name === 'tag' ? 'tag' : 'name';
         $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
                         ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
                         ->distinct()
@@ -277,7 +348,7 @@ class VerifyDatabase extends Command
             }
 
             $line = sprintf(
-                'Notice: User #%d (%s) has %s #%d ("%s") which has no transactions.',
+                'User #%d (%s) has %s #%d ("%s") which has no transactions.',
                 $entry->user_id, $entry->email, $name, $entry->id, $objName
             );
             $this->line($line);
@@ -323,22 +394,22 @@ class VerifyDatabase extends Command
     }
 
     /**
-     *
+     * Report on transfers that have budgets.
      */
     private function reportTransfersBudgets()
     {
         $set = TransactionJournal::distinct()
                                  ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                                  ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-                                 ->where('transaction_types.type', TransactionType::TRANSFER)
+                                 ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT])
-                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {
             $this->error(
                 sprintf(
-                    'Error: Transaction journal #%d is a transfer, but has a budget. Edit it without changing anything, so the budget will be removed.',
+                    'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.',
-                    $entry->id
+                    $entry->id, $entry->transactionType->type
                 )
             );
         }

app/Console/Kernel.php

@@ -1,54 +1,26 @@
 <?php
+declare(strict_types=1);
+
+
 /**
  * Kernel.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
- *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
-
 namespace FireflyIII\Console;
 
-use FireflyIII\Console\Commands\CreateImport;
+use Illuminate\Console\Scheduling\Schedule;
-use FireflyIII\Console\Commands\EncryptFile;
-use FireflyIII\Console\Commands\Import;
-use FireflyIII\Console\Commands\MoveRepository;
-use FireflyIII\Console\Commands\ScanAttachments;
-use FireflyIII\Console\Commands\UpgradeDatabase;
-use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
-use FireflyIII\Console\Commands\VerifyDatabase;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 /**
- * Class Kernel
+ * File to make sure commnds work.
- *
- * @package FireflyIII\Console
  */
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The bootstrap classes for the application.
-     *
-     * Next upgrade verify these are the same.
-     *
-     * @var array
-     */
-    protected $bootstrappers
-        = [
-            'Illuminate\Foundation\Bootstrap\DetectEnvironment',
-            'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-            'FireflyIII\Bootstrap\ConfigureLogging',
-            'Illuminate\Foundation\Bootstrap\HandleExceptions',
-            'Illuminate\Foundation\Bootstrap\RegisterFacades',
-            'Illuminate\Foundation\Bootstrap\SetRequestForConsole',
-            'Illuminate\Foundation\Bootstrap\RegisterProviders',
-            'Illuminate\Foundation\Bootstrap\BootProviders',
-        ];
-
     /**
      * The Artisan commands provided by your application.
      *
@@ -56,23 +28,30 @@ class Kernel extends ConsoleKernel
      */
     protected $commands
         = [
-            UpgradeFireflyInstructions::class,
+            //
-            VerifyDatabase::class,
-            Import::class,
-            CreateImport::class,
-            EncryptFile::class,
-            ScanAttachments::class,
-            UpgradeDatabase::class,
-            MoveRepository::class,
         ];
 
     /**
-     * Register the Closure based commands for the application.
+     * Register the commands for the application.
      *
      * @return void
      */
     protected function commands()
     {
+        $this->load(__DIR__ . '/Commands');
+
         require base_path('routes/console.php');
     }
+
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
+     *
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function schedule(Schedule $schedule)
+    {
+    }
 }

app/Events/AdminRequestedTestMessage.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * AdminRequestedTestMessage.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+use Log;
+
+/**
+ * Class AdminRequestedTestMessage
+ *
+ * @package FireflyIII\Events
+ */
+class AdminRequestedTestMessage extends Event
+{
+    use SerializesModels;
+
+    public $ipAddress;
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  User  $user
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $ipAddress)
+    {
+        Log::debug(sprintf('Triggered AdminRequestedTestMessage for user #%d (%s) and IP %s!', $user->id, $user->email, $ipAddress));
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/Event.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Events;
 
 /**

app/Events/StoredTransactionJournal.php

@@ -26,7 +26,9 @@ class StoredTransactionJournal extends Event
 
     use SerializesModels;
 
+    /** @var TransactionJournal */
     public $journal;
+    /** @var int */
     public $piggyBankId;
 
     /**

app/Events/UpdatedTransactionJournal.php

@@ -26,6 +26,7 @@ class UpdatedTransactionJournal extends Event
 
     use SerializesModels;
 
+    /** @var TransactionJournal */
     public $journal;
 
     /**

app/Events/UserChangedEmail.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * UserChangedEmail.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class UserChangedEmail
+ *
+ * @package FireflyIII\Events
+ */
+class UserChangedEmail extends Event
+{
+    use SerializesModels;
+
+    /** @var  string */
+    public $ipAddress;
+    /** @var  string */
+    public $newEmail;
+    /** @var  string */
+    public $oldEmail;
+    /** @var User */
+    public $user;
+
+    /**
+     * UserChangedEmail constructor.
+     *
+     * @param User   $user
+     * @param string $newEmail
+     * @param string $oldEmail
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $newEmail, string $oldEmail, string $ipAddress)
+    {
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+        $this->oldEmail  = $oldEmail;
+        $this->newEmail  = $newEmail;
+    }
+}

app/Exceptions/FireflyException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 

app/Exceptions/Handler.php

@@ -1,49 +1,45 @@
 <?php
+declare(strict_types=1);
+
+
 /**
  * Handler.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
- *
  * This software may be modified and distributed under the terms of the
  * Creative Commons Attribution-ShareAlike 4.0 International License.
  *
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
 namespace FireflyIII\Exceptions;
 
 use ErrorException;
 use Exception;
 use FireflyIII\Jobs\MailError;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Session\TokenMismatchException;
-use Illuminate\Validation\ValidationException as ValException;
 use Request;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
-/**
+
- * Class Handler
- *
- * @package FireflyIII\Exceptions
- */
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of the exception types that should not be reported.
+     * A list of the inputs that are never flashed for validation exceptions.
+     *
+     * @var array
+     */
+    protected $dontFlash
+        = [
+            'password',
+            'password_confirmation',
+        ];
+    /**
+     * A list of the exception types that are not reported.
      *
      * @var array
      */
     protected $dontReport
         = [
-            AuthenticationException::class,
+            //
-            AuthorizationException::class,
-            HttpException::class,
-            ModelNotFoundException::class,
-            TokenMismatchException::class,
-            ValException::class,
         ];
 
     /**
@@ -66,14 +62,13 @@ class Handler extends ExceptionHandler
         return parent::render($request, $exception);
     }
 
-
     /**
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  Exception $exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param  \Exception $exception
      *
      * @return void
      */
@@ -97,6 +92,7 @@ class Handler extends ExceptionHandler
                 'file'         => $exception->getFile(),
                 'line'         => $exception->getLine(),
                 'code'         => $exception->getCode(),
+                'version'      => config('firefly.version'),
             ];
 
             // create job that will mail.
@@ -105,22 +101,7 @@ class Handler extends ExceptionHandler
             dispatch($job);
         }
 
+
         parent::report($exception);
     }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param  \Illuminate\Http\Request $request
-     *
-     * @return \Illuminate\Http\Response
-     */
-    protected function unauthenticated($request)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
-    }
 }

app/Exceptions/NotImplementedException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 

app/Exceptions/ValidationException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 /**

app/Export/Collector/AttachmentCollector.php

@@ -16,7 +16,6 @@ namespace FireflyIII\Export\Collector;
 use Carbon\Carbon;
 use Crypt;
 use FireflyIII\Models\Attachment;
-use FireflyIII\Models\ExportJob;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Collection;
@@ -43,10 +42,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
 
     /**
      * AttachmentCollector constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
         /** @var AttachmentRepositoryInterface repository */
         $this->repository = app(AttachmentRepositoryInterface::class);
@@ -54,7 +51,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
         $this->uploadDisk = Storage::disk('upload');
         $this->exportDisk = Storage::disk('export');
 
-        parent::__construct($job);
+        parent::__construct();
     }
 
     /**
@@ -125,6 +122,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
      */
     private function getAttachments(): Collection
     {
+        $this->repository->setUser($this->user);
         $attachments = $this->repository->getBetween($this->start, $this->end);
 
         return $attachments;

app/Export/Collector/BasicCollector.php

@@ -15,6 +15,7 @@ namespace FireflyIII\Export\Collector;
 
 
 use FireflyIII\Models\ExportJob;
+use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
@@ -26,18 +27,17 @@ class BasicCollector
 {
     /** @var ExportJob */
     protected $job;
+    /** @var  User */
+    protected $user;
     /** @var Collection */
     private $entries;
 
     /**
      * BasicCollector constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
         $this->entries = new Collection;
-        $this->job     = $job;
     }
 
     /**
@@ -56,5 +56,22 @@ class BasicCollector
         $this->entries = $entries;
     }
 
+    /**
+     * @param ExportJob $job
+     */
+    public function setJob(ExportJob $job)
+    {
+        $this->job  = $job;
+        $this->user = $job->user;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
 
 }

app/Export/Collector/CollectorInterface.php

@@ -13,6 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Export\Collector;
 
+use FireflyIII\Models\ExportJob;
 use Illuminate\Support\Collection;
 
 /**
@@ -40,4 +41,11 @@ interface CollectorInterface
      */
     public function setEntries(Collection $entries);
 
+    /**
+     * @param ExportJob $job
+     *
+     * @return mixed
+     */
+    public function setJob(ExportJob $job);
+
 }

app/Export/Collector/JournalExportCollector.php

@@ -1,347 +0,0 @@
-<?php
-/**
- * JournalExportCollector.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\Export\Collector;
-
-use Carbon\Carbon;
-use Crypt;
-use DB;
-use FireflyIII\Models\Transaction;
-use Illuminate\Database\Query\JoinClause;
-use Illuminate\Support\Collection;
-
-/**
- * Class JournalExportCollector
- *
- * @package FireflyIII\Export\Collector
- */
-class JournalExportCollector extends BasicCollector implements CollectorInterface
-{
-    /** @var  Collection */
-    private $accounts;
-    /** @var  Carbon */
-    private $end;
-    /** @var  Carbon */
-    private $start;
-
-    /** @var  Collection */
-    private $workSet;
-
-    /**
-     * @return bool
-     */
-    public function run(): bool
-    {
-        /*
-         * Instead of collecting journals we collect transactions for the given accounts.
-         * We left join the OPPOSING transaction AND some journal data.
-         * After that we complement this info with budgets, categories, etc.
-         *
-         * This is way more efficient and will also work on split journals.
-         */
-        $this->getWorkSet();
-
-        /*
-         * Extract:
-         * possible budget ids for journals
-         * possible category ids journals
-         * possible budget ids for transactions
-         * possible category ids for transactions
-         *
-         * possible IBAN and account numbers?
-         *
-         */
-        $journals     = $this->extractJournalIds();
-        $transactions = $this->extractTransactionIds();
-
-
-        // extend work set with category data from journals:
-        $this->categoryDataForJournals($journals);
-
-        // extend work set with category cate from transactions (overrules journals):
-        $this->categoryDataForTransactions($transactions);
-
-        // same for budgets:
-        $this->budgetDataForJournals($journals);
-        $this->budgetDataForTransactions($transactions);
-
-        $this->setEntries($this->workSet);
-
-        return true;
-    }
-
-    /**
-     * @param Collection $accounts
-     */
-    public function setAccounts(Collection $accounts)
-    {
-        $this->accounts = $accounts;
-    }
-
-    /**
-     * @param Carbon $start
-     * @param Carbon $end
-     */
-    public function setDates(Carbon $start, Carbon $end)
-    {
-        $this->start = $start;
-        $this->end   = $end;
-    }
-
-    /**
-     * @param array $journals
-     *
-     * @return bool
-     */
-    private function budgetDataForJournals(array $journals): bool
-    {
-        $set = DB::table('budget_transaction_journal')
-                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
-                 ->whereIn('budget_transaction_journal.transaction_journal_id', $journals)
-                 ->get(
-                     [
-                         'budget_transaction_journal.budget_id',
-                         'budget_transaction_journal.transaction_journal_id',
-                         'budgets.name',
-                         'budgets.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_journal_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-                if (isset($array[$obj->transaction_journal_id])) {
-                    $obj->budget_id   = $array[$obj->transaction_journal_id]['id'];
-                    $obj->budget_name = $array[$obj->transaction_journal_id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $transactions
-     *
-     * @return bool
-     */
-    private function budgetDataForTransactions(array $transactions): bool
-    {
-        $set = DB::table('budget_transaction')
-                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction.budget_id')
-                 ->whereIn('budget_transaction.transaction_id', $transactions)
-                 ->get(
-                     [
-                         'budget_transaction.budget_id',
-                         'budget_transaction.transaction_id',
-                         'budgets.name',
-                         'budgets.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_id] = ['id' => $obj->budget_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-
-                // first transaction
-                if (isset($array[$obj->id])) {
-                    $obj->budget_id   = $array[$obj->id]['id'];
-                    $obj->budget_name = $array[$obj->id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $journals
-     *
-     * @return bool
-     */
-    private function categoryDataForJournals(array $journals): bool
-    {
-        $set = DB::table('category_transaction_journal')
-                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
-                 ->whereIn('category_transaction_journal.transaction_journal_id', $journals)
-                 ->get(
-                     [
-                         'category_transaction_journal.category_id',
-                         'category_transaction_journal.transaction_journal_id',
-                         'categories.name',
-                         'categories.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_journal_id] = ['id' => $obj->category_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-                if (isset($array[$obj->transaction_journal_id])) {
-                    $obj->category_id   = $array[$obj->transaction_journal_id]['id'];
-                    $obj->category_name = $array[$obj->transaction_journal_id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @param array $transactions
-     *
-     * @return bool
-     */
-    private function categoryDataForTransactions(array $transactions): bool
-    {
-        $set = DB::table('category_transaction')
-                 ->leftJoin('categories', 'categories.id', '=', 'category_transaction.category_id')
-                 ->whereIn('category_transaction.transaction_id', $transactions)
-                 ->get(
-                     [
-                         'category_transaction.category_id',
-                         'category_transaction.transaction_id',
-                         'categories.name',
-                         'categories.encrypted',
-                     ]
-                 );
-        $set->each(
-            function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
-            }
-        );
-        $array = [];
-        foreach ($set as $obj) {
-            $array[$obj->transaction_id] = ['id' => $obj->category_id, 'name' => $obj->name];
-        }
-
-        $this->workSet->each(
-            function ($obj) use ($array) {
-
-                // first transaction
-                if (isset($array[$obj->id])) {
-                    $obj->category_id   = $array[$obj->id]['id'];
-                    $obj->category_name = $array[$obj->id]['name'];
-                }
-            }
-        );
-
-        return true;
-
-    }
-
-    /**
-     * @return array
-     */
-    private function extractJournalIds(): array
-    {
-        return $this->workSet->pluck('transaction_journal_id')->toArray();
-    }
-
-    /**
-     * @return array
-     */
-    private function extractTransactionIds()
-    {
-        $set      = $this->workSet->pluck('id')->toArray();
-        $opposing = $this->workSet->pluck('opposing_id')->toArray();
-        $complete = $set + $opposing;
-
-        return array_unique($complete);
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    private function getWorkSet()
-    {
-        $accountIds    = $this->accounts->pluck('id')->toArray();
-        $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                                    ->leftJoin(
-                                        'transactions AS opposing', function (JoinClause $join) {
-                                        $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
-                                             ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
-                                             ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
-                                    }
-                                    )
-                                    ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
-                                    ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id')
-                                    ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
-                                    ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
-                                    ->whereIn('transactions.account_id', $accountIds)
-                                    ->where('transaction_journals.user_id', $this->job->user_id)
-                                    ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
-                                    ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
-                                    ->where('transaction_journals.completed', 1)
-                                    ->whereNull('transaction_journals.deleted_at')
-                                    ->whereNull('transactions.deleted_at')
-                                    ->whereNull('opposing.deleted_at')
-                                    ->orderBy('transaction_journals.date', 'DESC')
-                                    ->orderBy('transactions.identifier', 'ASC')
-                                    ->get(
-                                        [
-                                            'transactions.id',
-                                            'transactions.amount',
-                                            'transactions.description',
-                                            'transactions.account_id',
-                                            'accounts.name as account_name',
-                                            'accounts.encrypted as account_name_encrypted',
-                                            'transactions.identifier',
-
-                                            'opposing.id as opposing_id',
-                                            'opposing.amount AS opposing_amount',
-                                            'opposing.description as opposing_description',
-                                            'opposing.account_id as opposing_account_id',
-                                            'opposing_accounts.name as opposing_account_name',
-                                            'opposing_accounts.encrypted as opposing_account_encrypted',
-                                            'opposing.identifier as opposing_identifier',
-
-                                            'transaction_journals.id as transaction_journal_id',
-                                            'transaction_journals.date',
-                                            'transaction_journals.description as journal_description',
-                                            'transaction_journals.encrypted as journal_encrypted',
-                                            'transaction_journals.transaction_type_id',
-                                            'transaction_types.type as transaction_type',
-                                            'transaction_journals.transaction_currency_id',
-                                            'transaction_currencies.code AS transaction_currency_code',
-
-                                        ]
-                                    );
-    }
-}

app/Export/Collector/UploadCollector.php

@@ -14,8 +14,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Export\Collector;
 
 use Crypt;
-use FireflyIII\Models\ExportJob;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Log;
 use Storage;
 
@@ -30,27 +30,15 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     private $exportDisk;
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $uploadDisk;
-    /** @var string */
-    private $vintageFormat;
 
     /**
      * AttachmentCollector constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
-        parent::__construct($job);
+        parent::__construct();
-
-        Log::debug('Going to collect attachments', ['key' => $job->key]);
-
-        // make storage:
         $this->uploadDisk = Storage::disk('upload');
         $this->exportDisk = Storage::disk('export');
-
-        // file names associated with the old import routine.
-        $this->vintageFormat = sprintf('csv-upload-%d-', auth()->user()->id);
-
     }
 
     /**
@@ -60,10 +48,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      */
     public function run(): bool
     {
-        // collect old upload files (names beginning with "csv-upload".
+        Log::debug('Going to collect attachments', ['key' => $this->job->key]);
-        $this->collectVintageUploads();
-
-        // then collect current upload files:
         $this->collectModernUploads();
 
         return true;
@@ -76,7 +61,8 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      */
     private function collectModernUploads(): bool
     {
-        $set  = $this->job->user->importJobs()->where('status', 'import_complete')->get(['import_jobs.*']);
+        $set = $this->job->user->importJobs()->whereIn('status', ['import_complete', 'finished'])->get(['import_jobs.*']);
+        Log::debug(sprintf('Found %d import jobs', $set->count()));
         $keys = [];
         if ($set->count() > 0) {
             $keys = $set->pluck('key')->toArray();
@@ -89,59 +75,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         return true;
     }
 
-    /**
-     * This method collects all the uploads that are uploaded using the "old" importer. So from before the summer of 2016.
-     *
-     * @return bool
-     */
-    private function collectVintageUploads(): bool
-    {
-        // grab upload directory.
-        $files = $this->uploadDisk->files();
-
-        foreach ($files as $entry) {
-            $this->processVintageUpload($entry);
-        }
-
-        return true;
-    }
-
-    /**
-     * This method tells you when the vintage upload file was actually uploaded.
-     *
-     * @param string $entry
-     *
-     * @return string
-     */
-    private function getVintageUploadDate(string $entry): string
-    {
-        // this is an original upload.
-        $parts          = explode('-', str_replace(['.csv.encrypted', $this->vintageFormat], '', $entry));
-        $originalUpload = intval($parts[1]);
-        $date           = date('Y-m-d \a\t H-i-s', $originalUpload);
-
-        return $date;
-    }
-
-    /**
-     * Tells you if a file name is a vintage upload.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function isVintageImport(string $entry): bool
-    {
-        $len = strlen($this->vintageFormat);
-        // file is part of the old import routine:
-        if (substr($entry, 0, $len) === $this->vintageFormat) {
-
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * @param string $key
      *
@@ -159,7 +92,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         $content = '';
         try {
             $content = Crypt::decrypt($this->uploadDisk->get(sprintf('%s.upload', $key)));
-        } catch (DecryptException $e) {
+        } catch (FileNotFoundException | DecryptException $e) {
             Log::error(sprintf('Could not decrypt old import file "%s". Skipped because: %s', $key, $e->getMessage()));
         }
 
@@ -174,47 +107,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface
         return true;
     }
 
-    /**
-     * If the file is a vintage upload, process it.
-     *
-     * @param string $entry
-     *
-     * @return bool
-     */
-    private function processVintageUpload(string $entry): bool
-    {
-        if ($this->isVintageImport($entry)) {
-            $this->saveVintageImportFile($entry);
-
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * This will store the content of the old vintage upload somewhere.
-     *
-     * @param string $entry
-     */
-    private function saveVintageImportFile(string $entry)
-    {
-        $content = '';
-        try {
-            $content = Crypt::decrypt($this->uploadDisk->get($entry));
-        } catch (DecryptException $e) {
-            Log::error('Could not decrypt old CSV import file ' . $entry . '. Skipped because ' . $e->getMessage());
-        }
-
-        if (strlen($content) > 0) {
-            // add to export disk.
-            $date = $this->getVintageUploadDate($entry);
-            $file = $this->job->key . '-Old import dated ' . $date . '.csv';
-            $this->exportDisk->put($file, $content);
-            $this->getEntries()->push($file);
-        }
-    }
-
-
 }

app/Export/Entry/Entry.php

@@ -13,7 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Export\Entry;
 
-use Crypt;
+use FireflyIII\Models\Transaction;
 
 /**
  * To extend the exported object, in case of new features in Firefly III for example,
@@ -30,6 +30,7 @@ use Crypt;
  *
  * Class Entry
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @package FireflyIII\Export\Entry
  */
@@ -37,25 +38,43 @@ final class Entry
 {
     // @formatter:off
     public $journal_id;
+    public $transaction_id = 0;
+
     public $date;
     public $description;
 
     public $currency_code;
     public $amount;
+    public $foreign_currency_code = '';
+    public $foreign_amount        = '0';
 
     public $transaction_type;
 
-    public $source_account_id;
+    public $asset_account_id;
-    public $source_account_name;
+    public $asset_account_name;
-
+    public $asset_account_iban;
-    public $destination_account_id;
+    public $asset_account_bic;
-    public $destination_account_name;
+    public $asset_account_number;
+    public $asset_currency_code;
 
+    public $opposing_account_id;
+    public $opposing_account_name;
+    public $opposing_account_iban;
+    public $opposing_account_bic;
+    public $opposing_account_number;
+    public $opposing_currency_code;
 
     public $budget_id;
     public $budget_name;
+
     public $category_id;
     public $category_name;
+
+    public $bill_id;
+    public $bill_name;
+
+    public $notes;
+    public $tags;
     // @formatter:on
 
     /**
@@ -66,49 +85,77 @@ final class Entry
     }
 
     /**
-     * @param $object
+     * Converts a given transaction (as collected by the collector) into an export entry.
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // complex but little choice.
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
+     *
+     * @param Transaction $transaction
      *
      * @return Entry
      */
-    public static function fromObject($object): Entry
+    public static function fromTransaction(Transaction $transaction): Entry
     {
         $entry                 = new self;
-        $entry->journal_id               = $object->transaction_journal_id;
+        $entry->journal_id     = $transaction->journal_id;
-        $entry->description              = self::decrypt($object->journal_encrypted, $object->journal_description);
+        $entry->transaction_id = $transaction->id;
-        $entry->amount                   = $object->amount;
+        $entry->date           = $transaction->date->format('Ymd');
-        $entry->date                     = $object->date;
+        $entry->description    = $transaction->description;
-        $entry->transaction_type         = $object->transaction_type;
+        if (strlen(strval($transaction->transaction_description)) > 0) {
-        $entry->currency_code            = $object->transaction_currency_code;
+            $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
-        $entry->source_account_id        = $object->account_id;
-        $entry->source_account_name      = self::decrypt($object->account_name_encrypted, $object->account_name);
-        $entry->destination_account_id   = $object->opposing_account_id;
-        $entry->destination_account_name = self::decrypt($object->opposing_account_encrypted, $object->opposing_account_name);
-        $entry->category_id              = $object->category_id ?? '';
-        $entry->category_name            = $object->category_name ?? '';
-        $entry->budget_id                = $object->budget_id ?? '';
-        $entry->budget_name              = $object->budget_name ?? '';
-
-        // update description when transaction description is different:
-        if (!is_null($object->description) && $object->description != $entry->description) {
-            $entry->description = $entry->description . ' (' . $object->description . ')';
         }
+        $entry->currency_code = $transaction->transactionCurrency->code;
+        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+
+        $entry->foreign_currency_code = is_null($transaction->foreign_currency_id) ? null : $transaction->foreignCurrency->code;
+        $entry->foreign_amount        = is_null($transaction->foreign_currency_id)
+            ? null
+            : strval(
+                round(
+                    $transaction->transaction_foreign_amount, $transaction->foreignCurrency->decimal_places
+                )
+            );
+
+        $entry->transaction_type     = $transaction->transaction_type_type;
+        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
+        $entry->asset_account_iban   = $transaction->account_iban;
+        $entry->asset_account_number = $transaction->account_number;
+        $entry->asset_account_bic    = $transaction->account_bic;
+        $entry->asset_currency_code  = $transaction->account_currency_code;
+
+        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
+        $entry->opposing_account_iban   = $transaction->opposing_account_iban;
+        $entry->opposing_account_number = $transaction->opposing_account_number;
+        $entry->opposing_account_bic    = $transaction->opposing_account_bic;
+        $entry->opposing_currency_code  = $transaction->opposing_currency_code;
+
+        /** budget */
+        $entry->budget_id   = $transaction->transaction_budget_id;
+        $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
+        if (is_null($transaction->transaction_budget_id)) {
+            $entry->budget_id   = $transaction->transaction_journal_budget_id;
+            $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
+        }
+
+        /** category */
+        $entry->category_id   = $transaction->transaction_category_id;
+        $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
+        if (is_null($transaction->transaction_category_id)) {
+            $entry->category_id   = $transaction->transaction_journal_category_id;
+            $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
+        }
+
+        /** budget */
+        $entry->bill_id   = $transaction->bill_id;
+        $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
+
+        $entry->tags  = $transaction->tags;
+        $entry->notes = $transaction->notes;
 
         return $entry;
     }
 
-    /**
-     * @param int $isEncrypted
-     * @param     $value
-     *
-     * @return string
-     */
-    protected static function decrypt(int $isEncrypted, $value)
-    {
-        if ($isEncrypted === 1) {
-            return Crypt::decrypt($value);
-        }
-
-        return $value;
-    }
 
 }

app/Export/ExpandedProcessor.php

@@ -0,0 +1,346 @@
+<?php
+/**
+ * ExpandedProcessor.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Export;
+
+
+use Crypt;
+use DB;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use Illuminate\Support\Collection;
+use Log;
+use Storage;
+use ZipArchive;
+
+/**
+ * Class ExpandedProcessor
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // its doing a lot.
+ *
+ * @package FireflyIII\Export
+ */
+class ExpandedProcessor implements ProcessorInterface
+{
+
+    /** @var Collection */
+    public $accounts;
+    /** @var  string */
+    public $exportFormat;
+    /** @var  bool */
+    public $includeAttachments;
+    /** @var  bool */
+    public $includeOldUploads;
+    /** @var  ExportJob */
+    public $job;
+    /** @var array */
+    public $settings;
+    /** @var  Collection */
+    private $exportEntries;
+    /** @var  Collection */
+    private $files;
+    /** @var  Collection */
+    private $journals;
+
+    /**
+     * Processor constructor.
+     */
+    public function __construct()
+    {
+        $this->journals      = new Collection;
+        $this->exportEntries = new Collection;
+        $this->files         = new Collection;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool
+    {
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class);
+        $attachmentCollector->setJob($this->job);
+        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
+        $attachmentCollector->run();
+        $this->files = $this->files->merge($attachmentCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * Collects all transaction journals.
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function collectJournals(): bool
+    {
+        // use journal collector thing.
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setUser($this->job->user);
+        $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate'])
+                  ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation()
+                  ->removeFilter(InternalTransferFilter::class);
+        $transactions = $collector->getJournals();
+        // get some more meta data for each entry:
+        $ids         = $transactions->pluck('journal_id')->toArray();
+        $assetIds    = $transactions->pluck('account_id')->toArray();
+        $opposingIds = $transactions->pluck('opposing_account_id')->toArray();
+        $notes       = $this->getNotes($ids);
+        $tags        = $this->getTags($ids);
+        /** @var array $ibans */
+        $ibans      = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $currencies = $this->getAccountCurrencies($ibans);
+        $transactions->each(
+            function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
+                $journalId                            = intval($transaction->journal_id);
+                $accountId                            = intval($transaction->account_id);
+                $opposingId                           = intval($transaction->opposing_account_id);
+                $currencyId                           = $ibans[$accountId]['currency_id'] ?? 0;
+                $opposingCurrencyId                   = $ibans[$opposingId]['currency_id'] ?? 0;
+                $transaction->notes                   = $notes[$journalId] ?? '';
+                $transaction->tags                    = join(',', $tags[$journalId] ?? []);
+                $transaction->account_number          = $ibans[$accountId]['accountNumber'] ?? '';
+                $transaction->account_bic             = $ibans[$accountId]['BIC'] ?? '';
+                $transaction->account_currency_code   = $currencies[$currencyId] ?? '';
+                $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
+                $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
+                $transaction->opposing_currency_code  = $currencies[$opposingCurrencyId] ?? '';
+
+            }
+        );
+
+        $this->journals = $transactions;
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool
+    {
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class);
+        $uploadCollector->setJob($this->job);
+        $uploadCollector->run();
+
+        $this->files = $this->files->merge($uploadCollector->getEntries());
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool
+    {
+        $this->journals->each(
+            function (Transaction $transaction) {
+                $this->exportEntries->push(Entry::fromTransaction($transaction));
+            }
+        );
+        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws FireflyException
+     */
+    public function createZipFile(): bool
+    {
+        $zip      = new ZipArchive;
+        $file     = $this->job->key . '.zip';
+        $fullPath = storage_path('export') . '/' . $file;
+
+        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+            throw new FireflyException('Cannot store zip file.');
+        }
+        // for each file in the collection, add it to the zip file.
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $entry) {
+            // is part of this job?
+            $zipFileName = str_replace($this->job->key . '-', '', $entry);
+            $zip->addFromString($zipFileName, $disk->get($entry));
+        }
+
+        $zip->close();
+
+        // delete the files:
+        $this->deleteFiles();
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool
+    {
+        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
+        $exporter      = app($exporterClass);
+        $exporter->setJob($this->job);
+        $exporter->setEntries($this->exportEntries);
+        $exporter->run();
+        $this->files->push($exporter->getFileName());
+
+        return true;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    /**
+     * Save export job settings to class.
+     *
+     * @param array $settings
+     */
+    public function setSettings(array $settings)
+    {
+        // save settings
+        $this->settings           = $settings;
+        $this->accounts           = $settings['accounts'];
+        $this->exportFormat       = $settings['exportFormat'];
+        $this->includeAttachments = $settings['includeAttachments'];
+        $this->includeOldUploads  = $settings['includeOldUploads'];
+        $this->job                = $settings['job'];
+    }
+
+    /**
+     *
+     */
+    private function deleteFiles()
+    {
+        $disk = Storage::disk('export');
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
+
+    /**
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getAccountCurrencies(array $array): array
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $return     = [];
+        $ids        = [];
+        $repository->setUser($this->job->user);
+        foreach ($array as $value) {
+            $ids[] = $value['currency_id'] ?? 0;
+        }
+        $ids    = array_unique($ids);
+        $result = $repository->getByIds($ids);
+
+        foreach ($result as $currency) {
+            $return[$currency->id] = $currency->code;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Get all IBAN / SWIFT / account numbers
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getIbans(array $array): array
+    {
+        $array  = array_unique($array);
+        $return = [];
+        $set    = AccountMeta::whereIn('account_id', $array)
+                             ->leftJoin('accounts', 'accounts.id', 'account_meta.account_id')
+                             ->where('accounts.user_id', $this->job->user_id)
+                             ->whereIn('account_meta.name', ['accountNumber', 'BIC', 'currency_id'])
+                             ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
+        /** @var AccountMeta $meta */
+        foreach ($set as $meta) {
+            $id                       = intval($meta->account_id);
+            $return[$id][$meta->name] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns, if present, for the given journal ID's the notes.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getNotes(array $array): array
+    {
+        $array  = array_unique($array);
+        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
+                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
+                                        ->where('transaction_journals.user_id', $this->job->user_id)
+                                        ->where('journal_meta.name', 'notes')->get(
+                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
+            );
+        $return = [];
+        /** @var TransactionJournalMeta $meta */
+        foreach ($set as $meta) {
+            $id          = intval($meta->transaction_journal_id);
+            $return[$id] = $meta->data;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Returns a comma joined list of all the users tags linked to these journals.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function getTags(array $array): array
+    {
+        $set    = DB::table('tag_transaction_journal')
+                    ->whereIn('tag_transaction_journal.transaction_journal_id', $array)
+                    ->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+                    ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'tag_transaction_journal.transaction_journal_id')
+                    ->where('transaction_journals.user_id', $this->job->user_id)
+                    ->get(['tag_transaction_journal.transaction_journal_id', 'tags.tag']);
+        $result = [];
+        foreach ($set as $entry) {
+            $id            = intval($entry->transaction_journal_id);
+            $result[$id]   = isset($result[$id]) ? $result[$id] : [];
+            $result[$id][] = Crypt::decrypt($entry->tag);
+        }
+
+        return $result;
+    }
+}

app/Export/Exporter/BasicExporter.php

@@ -26,17 +26,15 @@ class BasicExporter
 {
     /** @var  ExportJob */
     protected $job;
+    /** @var Collection */
     private $entries;
 
     /**
      * BasicExporter constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
         $this->entries = new Collection;
-        $this->job     = $job;
     }
 
     /**
@@ -55,5 +53,13 @@ class BasicExporter
         $this->entries = $entries;
     }
 
+    /**
+     * @param ExportJob $job
+     */
+    public function setJob(ExportJob $job)
+    {
+        $this->job = $job;
+    }
+
 
 }

app/Export/Exporter/CsvExporter.php

@@ -14,7 +14,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Export\Exporter;
 
 use FireflyIII\Export\Entry\Entry;
-use FireflyIII\Models\ExportJob;
 use League\Csv\Writer;
 use SplFileObject;
 
@@ -30,13 +29,10 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
     /**
      * CsvExporter constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
-        parent::__construct($job);
+        parent::__construct();
-
     }
 
     /**
@@ -62,7 +58,11 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
         // get field names for header row:
         $first   = $this->getEntries()->first();
+        $headers = [];
+        if (!is_null($first)) {
             $headers = array_keys(get_object_vars($first));
+        }
+
         $rows[] = $headers;
 
         /** @var Entry $entry */

app/Export/Exporter/ExporterInterface.php

@@ -13,6 +13,7 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Export\Exporter;
 
+use FireflyIII\Models\ExportJob;
 use Illuminate\Support\Collection;
 
 /**
@@ -45,4 +46,9 @@ interface ExporterInterface
      */
     public function setEntries(Collection $entries);
 
+    /**
+     * @param ExportJob $job
+     */
+    public function setJob(ExportJob $job);
+
 }

app/Export/Processor.php

@@ -1,195 +0,0 @@
-<?php
-/**
- * Processor.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\Export;
-
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Export\Collector\AttachmentCollector;
-use FireflyIII\Export\Collector\JournalExportCollector;
-use FireflyIII\Export\Collector\UploadCollector;
-use FireflyIII\Export\Entry\Entry;
-use FireflyIII\Models\ExportJob;
-use Illuminate\Filesystem\FilesystemAdapter;
-use Illuminate\Support\Collection;
-use Log;
-use Storage;
-use ZipArchive;
-
-/**
- * Class Processor
- *
- * @package FireflyIII\Export
- */
-class Processor implements ProcessorInterface
-{
-
-    /** @var Collection */
-    public $accounts;
-    /** @var  string */
-    public $exportFormat;
-    /** @var  bool */
-    public $includeAttachments;
-    /** @var  bool */
-    public $includeOldUploads;
-    /** @var  ExportJob */
-    public $job;
-    /** @var array */
-    public $settings;
-    /** @var  Collection */
-    private $exportEntries;
-    /** @var  Collection */
-    private $files;
-    /** @var  Collection */
-    private $journals;
-
-    /**
-     * Processor constructor.
-     *
-     * @param array $settings
-     */
-    public function __construct(array $settings)
-    {
-        // save settings
-        $this->settings           = $settings;
-        $this->accounts           = $settings['accounts'];
-        $this->exportFormat       = $settings['exportFormat'];
-        $this->includeAttachments = $settings['includeAttachments'];
-        $this->includeOldUploads  = $settings['includeOldUploads'];
-        $this->job                = $settings['job'];
-        $this->journals           = new Collection;
-        $this->exportEntries      = new Collection;
-        $this->files              = new Collection;
-
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectAttachments(): bool
-    {
-        /** @var AttachmentCollector $attachmentCollector */
-        $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
-        $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']);
-        $attachmentCollector->run();
-        $this->files = $this->files->merge($attachmentCollector->getEntries());
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectJournals(): bool
-    {
-        /** @var JournalExportCollector $collector */
-        $collector = app(JournalExportCollector::class, [$this->job]);
-        $collector->setDates($this->settings['startDate'], $this->settings['endDate']);
-        $collector->setAccounts($this->settings['accounts']);
-        $collector->run();
-        $this->journals = $collector->getEntries();
-        Log::debug(sprintf('Count %d journals in collectJournals() ', $this->journals->count()));
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function collectOldUploads(): bool
-    {
-        /** @var UploadCollector $uploadCollector */
-        $uploadCollector = app(UploadCollector::class, [$this->job]);
-        $uploadCollector->run();
-
-        $this->files = $this->files->merge($uploadCollector->getEntries());
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function convertJournals(): bool
-    {
-        $count = 0;
-        foreach ($this->journals as $object) {
-            $this->exportEntries->push(Entry::fromObject($object));
-            $count++;
-        }
-        Log::debug(sprintf('Count %d entries in exportEntries (convertJournals)', $this->exportEntries->count()));
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     * @throws FireflyException
-     */
-    public function createZipFile(): bool
-    {
-        $zip      = new ZipArchive;
-        $file     = $this->job->key . '.zip';
-        $fullPath = storage_path('export') . '/' . $file;
-
-        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
-            throw new FireflyException('Cannot store zip file.');
-        }
-        // for each file in the collection, add it to the zip file.
-        $disk = Storage::disk('export');
-        foreach ($this->getFiles() as $entry) {
-            // is part of this job?
-            $zipFileName = str_replace($this->job->key . '-', '', $entry);
-            $zip->addFromString($zipFileName, $disk->get($entry));
-        }
-
-        $zip->close();
-
-        // delete the files:
-        $this->deleteFiles();
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function exportJournals(): bool
-    {
-        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
-        $exporter      = app($exporterClass, [$this->job]);
-        $exporter->setEntries($this->exportEntries);
-        $exporter->run();
-        $this->files->push($exporter->getFileName());
-
-        return true;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getFiles(): Collection
-    {
-        return $this->files;
-    }
-
-    /**
-     *
-     */
-    private function deleteFiles()
-    {
-        $disk = Storage::disk('export');
-        foreach ($this->getFiles() as $file) {
-            $disk->delete($file);
-        }
-    }
-}

app/Export/ProcessorInterface.php

@@ -25,11 +25,8 @@ interface ProcessorInterface
 
     /**
      * Processor constructor.
-     *
-     * @param array $settings
-     *
      */
-    public function __construct(array $settings);
+    public function __construct();
 
     /**
      * @return bool
@@ -65,4 +62,9 @@ interface ProcessorInterface
      * @return Collection
      */
     public function getFiles(): Collection;
+
+    /**
+     * @param array $settings
+     */
+    public function setSettings(array $settings);
 }

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\Basic;
 
 use FireflyIII\Support\ChartColour;
+use Steam;
 
 /**
  * Class ChartJsGenerator
@@ -80,6 +81,9 @@ class ChartJsGenerator implements GeneratorInterface
             if (isset($set['fill'])) {
                 $currentSet['fill'] = $set['fill'];
             }
+            if (isset($set['currency_symbol'])) {
+                $currentSet['currency_symbol'] = $set['currency_symbol'];
+            }
 
             $chartData['datasets'][] = $currentSet;
         }
@@ -104,15 +108,22 @@ class ChartJsGenerator implements GeneratorInterface
             ],
             'labels'   => [],
         ];
+
+        // sort by value, keep keys.
+        // different sort when values are positive and when they're negative.
+        asort($data);
+        $next = next($data);
+        if (!is_bool($next) && bccomp($next, '0') === 1) {
+            // next is positive, sort other way around.
+            arsort($data);
+        }
+        unset($next);
+
         $index = 0;
         foreach ($data as $key => $value) {
 
             // make larger than 0
-            if (bccomp($value, '0') === -1) {
+            $chartData['datasets'][0]['data'][]            = floatval(Steam::positive($value));
-                $value = bcmul($value, '-1');
-            }
-
-            $chartData['datasets'][0]['data'][]            = $value;
             $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
             $chartData['labels'][]                         = $key;
             $index++;

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -22,10 +22,15 @@ interface GeneratorInterface
 {
 
     /**
-     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     * Will generate a Chart JS compatible array from the given input. Expects this format
+     *
+     * Will take labels for all from first set.
      *
      * 0: [
      *    'label' => 'label of set',
+     *    'type' => bar or line, optional
+     *    'yAxisID' => ID of yAxis, optional, will not be included when unused.
+     *    'fill' => if to fill a line? optional, will not be included when unused.
      *    'entries' =>
      *        [
      *         'label-of-entry' => 'value'
@@ -33,12 +38,16 @@ interface GeneratorInterface
      *    ]
      * 1: [
      *    'label' => 'label of another set',
+     *    'type' => bar or line, optional
+     *    'yAxisID' => ID of yAxis, optional, will not be included when unused.
+     *    'fill' => if to fill a line? optional, will not be included when unused.
      *    'entries' =>
      *        [
      *         'label-of-entry' => 'value'
      *        ]
      *    ]
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five.
      *
      * @param array $data
      *

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -19,6 +19,7 @@ use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Steam;
 
@@ -129,36 +130,54 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Account $account
      * @param Carbon  $date
      *
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // not that long
+     *
      */
     private function getAuditReport(Account $account, Carbon $date): array
     {
+        /** @var CurrencyRepositoryInterface $currencyRepos */
+        $currencyRepos = app(CurrencyRepositoryInterface::class);
 
         /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
         $journals         = $collector->getJournals();
         $journals         = $journals->reverse();
         $dayBeforeBalance = Steam::balance($account, $date);
         $startBalance     = $dayBeforeBalance;
-
+        $currency         = $currencyRepos->find(intval($account->getMeta('currency_id')));
 
         /** @var Transaction $journal */
         foreach ($journals as $transaction) {
             $transaction->before = $startBalance;
             $transactionAmount   = $transaction->transaction_amount;
+
+            if ($currency->id === $transaction->foreign_currency_id) {
+                $transactionAmount = $transaction->transaction_foreign_amount;
+            }
+
             $newBalance            = bcadd($startBalance, $transactionAmount);
             $transaction->after    = $newBalance;
             $startBalance          = $newBalance;
+            $transaction->currency = $currency;
         }
 
-        /*
-         * Reverse set again.
-         */
         $return = [
             'journals'         => $journals->reverse(),
             'exists'           => $journals->count() > 0,

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -18,6 +18,9 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
@@ -132,51 +135,19 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     }
 
     /**
-     * @param Collection $collection
+     * @param Collection $tags
-     * @param int        $sortFlag
      *
-     * @return array
+     * @return ReportGeneratorInterface
      */
-    private function getAverages(Collection $collection, int $sortFlag): array
+    public function setTags(Collection $tags): ReportGeneratorInterface
     {
-        $result = [];
+        return $this;
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
     }
 
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -185,47 +156,21 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         }
 
         /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL])
-                  ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter();
+                  ->setBudgets($this->budgets)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
 
-        $accountIds     = $this->accounts->pluck('id')->toArray();
         $transactions   = $collector->getJournals();
-        $transactions   = self::filterExpenses($transactions, $accountIds);
         $this->expenses = $transactions;
 
         return $transactions;
     }
 
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MonthReportGenerator.php

@@ -18,6 +18,10 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
@@ -142,51 +146,19 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     }
 
     /**
-     * @param Collection $collection
+     * @param Collection $tags
-     * @param int        $sortFlag
      *
-     * @return array
+     * @return ReportGeneratorInterface
      */
-    private function getAverages(Collection $collection, int $sortFlag): array
+    public function setTags(Collection $tags): ReportGeneratorInterface
     {
-        $result = [];
+        return $this;
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
     }
 
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -195,14 +167,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         }
 
         /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
-                  ->setCategories($this->categories)->withOpposingAccount()->disableFilter();
+                  ->setCategories($this->categories)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
 
-        $accountIds     = $this->accounts->pluck('id')->toArray();
         $transactions   = $collector->getJournals();
-        $transactions   = self::filterExpenses($transactions, $accountIds);
         $this->expenses = $transactions;
 
         return $transactions;
@@ -211,104 +185,27 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     /**
      * @return Collection
      */
-    private function getIncome(): Collection
+    protected function getIncome(): Collection
     {
         if ($this->income->count() > 0) {
             return $this->income;
         }
 
         /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount();
-        $accountIds   = $this->accounts->pluck('id')->toArray();
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
         $transactions = $collector->getJournals();
-        $transactions = self::filterIncome($transactions, $accountIds);
         $this->income = $transactions;
 
         return $transactions;
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
-     * @param array $spent
-     * @param array $earned
-     *
-     * @return array
-     */
-    private function getObjectSummary(array $spent, array $earned): array
-    {
-        $return = [];
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($spent as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['spent'] = $entry;
-        }
-        unset($entry);
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($earned as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['earned'] = $entry;
-        }
-
-
-        return $return;
-    }
-
-
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getTopIncome(): Collection
-    {
-        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class MultiYearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Category/YearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class YearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/ReportGeneratorFactory.php

@@ -49,7 +49,7 @@ class ReportGeneratorFactory
         $class = sprintf('FireflyIII\Generator\Report\%s\%sReportGenerator', $type, $period);
         if (class_exists($class)) {
             /** @var ReportGeneratorInterface $obj */
-            $obj = new $class;
+            $obj = app($class);
             $obj->setStartDate($start);
             $obj->setEndDate($end);
 

app/Generator/Report/ReportGeneratorInterface.php

@@ -64,4 +64,11 @@ interface ReportGeneratorInterface
      */
     public function setStartDate(Carbon $date): ReportGeneratorInterface;
 
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface;
+
 }

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -106,4 +106,14 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         return $this;
     }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
 }

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -103,4 +103,14 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
 
         return $this;
     }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
 }

app/Generator/Report/Standard/YearReportGenerator.php

@@ -103,4 +103,14 @@ class YearReportGenerator implements ReportGeneratorInterface
 
         return $this;
     }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        return $this;
+    }
 }

app/Generator/Report/Support.php

@@ -15,7 +15,6 @@ namespace FireflyIII\Generator\Report;
 
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
-use Log;
 
 
 /**
@@ -25,57 +24,122 @@ use Log;
  */
 class Support
 {
-
     /**
-     * @param Collection $collection
-     * @param array      $accounts
-     *
      * @return Collection
      */
-    public static function filterExpenses(Collection $collection, array $accounts): Collection
+    public function getTopExpenses(): Collection
     {
-        return self::filterTransactions($collection, $accounts, 1);
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getTopIncome(): Collection
+    {
+        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
+
+        return $transactions;
     }
 
     /**
      * @param Collection $collection
-     * @param array      $accounts
+     * @param int        $sortFlag
      *
-     * @return Collection
+     * @return array
      */
-    public static function filterIncome(Collection $collection, array $accounts): Collection
+    protected function getAverages(Collection $collection, int $sortFlag): array
     {
-        return self::filterTransactions($collection, $accounts, -1);
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            // opposing name and ID:
+            $opposingId = $transaction->opposing_account_id;
+
+            // is not set?
+            if (!isset($result[$opposingId])) {
+                $name                = $transaction->opposing_account_name;
+                $result[$opposingId] = [
+                    'name'    => $name,
+                    'count'   => 1,
+                    'id'      => $opposingId,
+                    'average' => $transaction->transaction_amount,
+                    'sum'     => $transaction->transaction_amount,
+                ];
+                continue;
+            }
+            $result[$opposingId]['count']++;
+            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
+            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
+        }
+
+        // sort result by average:
+        $average = [];
+        foreach ($result as $key => $row) {
+            $average[$key] = floatval($row['average']);
+        }
+
+        array_multisort($average, $sortFlag, $result);
+
+        return $result;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param array $spent
+     * @param array $earned
+     *
+     * @return array
+     */
+    protected function getObjectSummary(array $spent, array $earned): array
+    {
+        $return = [];
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($spent as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['spent'] = $entry;
+        }
+        unset($entry);
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($earned as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['earned'] = $entry;
+        }
+
+
+        return $return;
     }
 
     /**
      * @param Collection $collection
-     * @param array      $accounts
-     * @param int        $modifier
      *
-     * @return Collection
+     * @return array
      */
-    public static function filterTransactions(Collection $collection, array $accounts, int $modifier): Collection
+    protected function summarizeByAccount(Collection $collection): array
     {
-        $result = $collection->filter(
+        $result = [];
-            function (Transaction $transaction) use ($accounts, $modifier) {
+        /** @var Transaction $transaction */
-                $opposing = $transaction->opposing_account_id;
+        foreach ($collection as $transaction) {
-                // remove internal transfer
+            $accountId          = $transaction->account_id;
-                if (in_array($opposing, $accounts)) {
+            $result[$accountId] = $result[$accountId] ?? '0';
-                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id));
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-
-                    return null;
         }
-                // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === $modifier) {
-                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
-
-                    return null;
-                }
-
-                return $transaction;
-            }
-        );
 
         return $result;
     }

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -0,0 +1,228 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+
+    /** @var Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+    /** @var Collection */
+    private $tags;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->expenses = new Collection;
+        $this->income   = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $tagTags         = join(',', $this->tags->pluck('tag')->toArray());
+        $reportType      = 'tag';
+        $expenses        = $this->getExpenses();
+        $income          = $this->getIncome();
+        $accountSummary  = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income));
+        $tagSummary      = $this->getObjectSummary($this->summarizeByTag($expenses), $this->summarizeByTag($income));
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $averageIncome   = $this->getAverages($income, SORT_DESC);
+        $topExpenses     = $this->getTopExpenses();
+        $topIncome       = $this->getTopIncome();
+
+
+        // render!
+        return view(
+            'reports.tag.month', compact(
+                                   'accountIds', 'tagTags', 'reportType', 'accountSummary', 'tagSummary', 'averageExpenses', 'averageIncome', 'topIncome',
+                                   'topExpenses'
+                               )
+        )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getExpenses(): Collection
+    {
+        if ($this->expenses->count() > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getIncome(): Collection
+    {
+        if ($this->income->count() > 0) {
+            return $this->income;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount();
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+        $this->income = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function summarizeByTag(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $journal     = $transaction->transactionJournal;
+            $journalTags = $journal->tags;
+            /** @var Tag $journalTag */
+            foreach ($journalTags as $journalTag) {
+                $journalTagId          = $journalTag->id;
+                $result[$journalTagId] = $result[$journalTagId] ?? '0';
+                $result[$journalTagId] = bcadd($transaction->transaction_amount, $result[$journalTagId]);
+            }
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Tag/MultiYearReportGenerator.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Tag/YearReportGenerator.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Handlers/Events/AdminEventHandler.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * AdminEventHandler.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\AdminRequestedTestMessage;
+use FireflyIII\Mail\AdminTestMail;
+use Log;
+use Mail;
+use Session;
+use Swift_TransportException;
+
+/**
+ * Class AdminEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class AdminEventHandler
+{
+    /**
+     * @param AdminRequestedTestMessage $event
+     *
+     * @return bool
+     */
+    public function sendTestMessage(AdminRequestedTestMessage $event): bool
+    {
+
+        $email     = $event->user->email;
+        $ipAddress = $event->ipAddress;
+
+        Log::debug(sprintf('Now in sendTestMessage event handler. Email is %s, IP is %s', $email, $ipAddress));
+        try {
+            Log::debug('Trying to send message...');
+            Mail::to($email)->send(new AdminTestMail($email, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::debug('Send message failed! :(');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
+            Session::flash('error', 'Possible email error: ' . $e->getMessage());
+        }
+        Log::debug('If no error above this line, message was sent.');
+
+        // @codeCoverageIgnoreEnd
+        return true;
+    }
+}

app/Handlers/Events/StoredJournalEventHandler.php

@@ -14,59 +14,96 @@ declare(strict_types = 1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\StoredTransactionJournal;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
-use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
-use FireflyIII\Rules\Processor;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
 use FireflyIII\Support\Events\BillScanner;
+use FireflyIII\TransactionRules\Processor;
 use Log;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class StoredJournalEventHandler
  *
  * @package FireflyIII\Handlers\Events
  */
 class StoredJournalEventHandler
 {
+    /** @var  JRI */
+    public $journalRepository;
+    /** @var  PRI */
+    public $repository;
+
+    /** @var  RGRI */
+    public $ruleGroupRepository;
+
+    /**
+     * StoredJournalEventHandler constructor.
+     *
+     * @param PRI  $repository
+     * @param JRI  $journalRepository
+     * @param RGRI $ruleGroupRepository
+     */
+    public function __construct(PRI $repository, JRI $journalRepository, RGRI $ruleGroupRepository)
+    {
+        $this->repository          = $repository;
+        $this->journalRepository   = $journalRepository;
+        $this->ruleGroupRepository = $ruleGroupRepository;
+    }
+
     /**
      * This method connects a new transfer to a piggy bank.
      *
      * @param StoredTransactionJournal $event
      *
      * @return bool
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function connectToPiggyBank(StoredTransactionJournal $event): bool
     {
-        /** @var TransactionJournal $journal */
         $journal     = $event->journal;
         $piggyBankId = $event->piggyBankId;
-        Log::debug(sprintf('Trying to connect journal %d to piggy bank %d.', $journal->id, $piggyBankId));
+        $piggyBank   = $this->repository->find($piggyBankId);
 
-        /*
+        // is a transfer?
-         * Verify existence of piggy bank:
+        if (!$this->journalRepository->isTransfer($journal)) {
-         */
+            Log::info(sprintf('Will not connect %s #%d to a piggy bank.', $journal->transactionType->type, $journal->id));
-        if (!$this->verifyExistence($event)) {
-            Log::error(sprintf('No such piggy bank or no repetition on %s', $journal->date->format('Y-m-d')));
 
             return true;
         }
 
-        /*
+        // piggy exists?
-         * Get relevant data:
+        if (is_null($piggyBank->id)) {
-         */
+            Log::error(sprintf('There is no piggy bank with ID #%d', $piggyBankId));
-        $piggyBank                 = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+
-        $repetition                = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+            return true;
-        $amount                    = $this->getExactAmount($journal, $piggyBank, $repetition);
+        }
-        $repetition->currentamount = bcadd($repetition->currentamount, $amount);
+
-        $repetition->save();
+        // repetition exists?
+        $repetition = $this->repository->getRepetition($piggyBank, $journal->date);
+        if (is_null($repetition->id)) {
+            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
+
+            return true;
+        }
+
+        // get the amount
+        $amount = $this->repository->getExactAmount($piggyBank, $repetition, $journal);
+        if (bccomp($amount, '0') === 0) {
+            Log::debug('Amount is zero, will not create event.');
+
+            return true;
+        }
+
+        // update amount
+        $this->repository->addAmountToRepetition($repetition, $amount);
+        $event = $this->repository->createEventWithJournal($piggyBank, $amount, $journal);
 
-        /** @var PiggyBankEvent $event */
-        $event = PiggyBankEvent::create(
-            ['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]
-        );
         Log::debug(sprintf('Created piggy bank event #%d', $event->id));
 
         return true;
@@ -83,16 +120,11 @@ class StoredJournalEventHandler
     {
         // get all the user's rule groups, with the rules, order by 'order'.
         $journal = $storedJournalEvent->journal;
-        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        $groups  = $this->ruleGroupRepository->getActiveGroups($journal->user);
-        //
+
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            $rules = $group->rules()
+            $rules = $this->ruleGroupRepository->getActiveStoreRules($group);
-                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
-                           ->where('rule_triggers.trigger_type', 'user_action')
-                           ->where('rule_triggers.trigger_value', 'store-journal')
-                           ->where('rules.active', 1)
-                           ->get(['rules.*']);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
 
@@ -100,9 +132,8 @@ class StoredJournalEventHandler
                 $processor->handleTransactionJournal($journal);
 
                 if ($rule->stop_processing) {
-                    return true;
+                    break;
                 }
-
             }
         }
 
@@ -123,81 +154,4 @@ class StoredJournalEventHandler
 
         return true;
     }
-
-    /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 6 but I can live with it.
-     * @param TransactionJournal  $journal
-     * @param PiggyBank           $piggyBank
-     * @param PiggyBankRepetition $repetition
-     *
-     * @return string
-     */
-    private function getExactAmount(TransactionJournal $journal, PiggyBank $piggyBank, PiggyBankRepetition $repetition): string
-    {
-        $amount  = TransactionJournal::amountPositive($journal);
-        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
-        $room    = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount));
-        $compare = bcmul($repetition->currentamount, '-1');
-
-        Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-
-        // if piggy account matches source account, the amount is positive
-        if (in_array($piggyBank->account_id, $sources)) {
-            $amount = bcmul($amount, '-1');
-            Log::debug(sprintf('Account #%d is the source, so will remove amount from piggy bank.', $piggyBank->account_id));
-        }
-
-
-        // if the amount is positive, make sure it fits in piggy bank:
-        if (bccomp($amount, '0') === 1 && bccomp($room, $amount) === -1) {
-            // amount is positive and $room is smaller than $amount
-            Log::debug(sprintf('Room in piggy bank for extra money is %f', $room));
-            Log::debug(sprintf('There is NO room to add %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-            Log::debug(sprintf('New amount is %f', $room));
-
-            return $room;
-        }
-
-        // amount is negative and $currentamount is smaller than $amount
-        if (bccomp($amount, '0') === -1 && bccomp($compare, $amount) === 1) {
-            Log::debug(sprintf('Max amount to remove is %f', $repetition->currentamount));
-            Log::debug(sprintf('Cannot remove %f from piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-            Log::debug(sprintf('New amount is %f', $compare));
-
-            return $compare;
-        }
-
-        return $amount;
-    }
-
-    /**
-     * @param StoredTransactionJournal $event
-     *
-     * @return bool
-     */
-    private function verifyExistence(StoredTransactionJournal $event): bool
-    {
-        /** @var TransactionJournal $journal */
-        $journal     = $event->journal;
-        $piggyBankId = $event->piggyBankId;
-
-        /** @var PiggyBank $piggyBank */
-        $piggyBank = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
-
-        if (is_null($piggyBank)) {
-            Log::error('No such piggy bank!');
-
-            return false;
-        }
-        Log::debug(sprintf('Found piggy bank #%d: "%s"', $piggyBank->id, $piggyBank->name));
-        // update piggy bank rep for date of transaction journal.
-        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
-        if (is_null($repetition)) {
-            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
-
-            return false;
-        }
-
-        return true;
-    }
 }

app/Handlers/Events/UpdatedJournalEventHandler.php

@@ -17,16 +17,31 @@ namespace FireflyIII\Handlers\Events;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
-use FireflyIII\Rules\Processor;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Support\Events\BillScanner;
+use FireflyIII\TransactionRules\Processor;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class UpdatedJournalEventHandler
  *
  * @package FireflyIII\Handlers\Events
  */
 class UpdatedJournalEventHandler
 {
+    /** @var  RuleGroupRepositoryInterface */
+    public $repository;
+
+    /**
+     * StoredJournalEventHandler constructor.
+     *
+     * @param RuleGroupRepositoryInterface $ruleGroupRepository
+     */
+    public function __construct(RuleGroupRepositoryInterface $ruleGroupRepository)
+    {
+        $this->repository = $ruleGroupRepository;
+    }
 
     /**
      * This method will check all the rules when a journal is updated.
@@ -39,16 +54,11 @@ class UpdatedJournalEventHandler
     {
         // get all the user's rule groups, with the rules, order by 'order'.
         $journal = $updatedJournalEvent->journal;
-        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        $groups  = $this->repository->getActiveGroups($journal->user);
-        //
+
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            $rules = $group->rules()
+            $rules = $this->repository->getActiveUpdateRules($group);
-                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
-                           ->where('rule_triggers.trigger_type', 'user_action')
-                           ->where('rule_triggers.trigger_value', 'update-journal')
-                           ->where('rules.active', 1)
-                           ->get(['rules.*']);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
                 $processor = Processor::make($rule);

app/Handlers/Events/UserEventHandler.php

@@ -15,11 +15,15 @@ namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Events\UserChangedEmail;
+use FireflyIII\Mail\ConfirmEmailChangeMail;
+use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
+use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
+use FireflyIII\Mail\UndoEmailChangeMail;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Illuminate\Mail\Message;
 use Log;
 use Mail;
-use Session;
+use Preferences;
 use Swift_TransportException;
 
 /**
@@ -55,16 +59,50 @@ class UserEventHandler
     }
 
     /**
-     * Handle user logout events.
+     * @param UserChangedEmail $event
      *
      * @return bool
      */
-    public function logoutUser(): bool
+    public function sendEmailChangeConfirmMail(UserChangedEmail $event): bool
     {
-        // dump stuff from the session:
+        $newEmail  = $event->newEmail;
-        Session::forget('twofactor-authenticated');
+        $oldEmail  = $event->oldEmail;
-        Session::forget('twofactor-authenticated-date');
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $token     = Preferences::getForUser($user, 'email_change_confirm_token', 'invalid');
+        $uri       = route('profile.confirm-email-change', [$token->data]);
+        try {
+            Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
 
+        // @codeCoverageIgnoreEnd
+        return true;
+    }
+
+    /**
+     * @param UserChangedEmail $event
+     *
+     * @return bool
+     */
+    public function sendEmailChangeUndoMail(UserChangedEmail $event): bool
+    {
+        $newEmail  = $event->newEmail;
+        $oldEmail  = $event->oldEmail;
+        $user      = $event->user;
+        $ipAddress = $event->ipAddress;
+        $token     = Preferences::getForUser($user, 'email_change_undo_token', 'invalid');
+        $uri       = route('profile.undo-email-change', [$token->data, hash('sha256', $oldEmail)]);
+        try {
+            Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $uri, $ipAddress));
+            // @codeCoverageIgnoreStart
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        // @codeCoverageIgnoreEnd
         return true;
     }
 
@@ -83,15 +121,14 @@ class UserEventHandler
 
         // send email.
         try {
-            Mail::send(
+            Mail::to($email)->send(new RequestedNewPasswordMail($url, $ipAddress));
-                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
+            // @codeCoverageIgnoreStart
-                $message->to($email, $email)->subject('Your password reset request');
-            }
-            );
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
 
+        // @codeCoverageIgnoreEnd
+
         return true;
     }
 
@@ -108,23 +145,23 @@ class UserEventHandler
 
         $sendMail = env('SEND_REGISTRATION_MAIL', true);
         if (!$sendMail) {
-            return true;
+            return true; // @codeCoverageIgnore
         }
         // get the email address
         $email     = $event->user->email;
-        $address   = route('index');
+        $uri       = route('index');
         $ipAddress = $event->ipAddress;
+
         // send email.
         try {
-            Mail::send(
+            Mail::to($email)->send(new RegisteredUserMail($uri, $ipAddress));
-                ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
+            // @codeCoverageIgnoreStart
-                $message->to($email, $email)->subject('Welcome to Firefly III!');
-            }
-            );
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
 
+        // @codeCoverageIgnoreEnd
+
         return true;
     }
 }

app/Helpers/Attachments/AttachmentHelper.php

@@ -10,12 +10,15 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Attachments;
 
 use Crypt;
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
+use Log;
 use Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -27,14 +30,16 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 class AttachmentHelper implements AttachmentHelperInterface
 {
 
+    /** @var  Collection */
+    public $attachments;
     /** @var MessageBag */
     public $errors;
     /** @var MessageBag */
     public $messages;
     /** @var array */
-    protected $allowedMimes;
+    protected $allowedMimes = [];
     /** @var int */
-    protected $maxUploadSize;
+    protected $maxUploadSize = 0;
 
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     protected $uploadDisk;
@@ -44,10 +49,11 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function __construct()
     {
-        $this->maxUploadSize = config('firefly.maxUploadSize');
+        $this->maxUploadSize = intval(config('firefly.maxUploadSize'));
-        $this->allowedMimes  = config('firefly.allowedMimes');
+        $this->allowedMimes  = (array)config('firefly.allowedMimes');
         $this->errors        = new MessageBag;
         $this->messages      = new MessageBag;
+        $this->attachments   = new Collection;
         $this->uploadDisk    = Storage::disk('upload');
     }
 
@@ -63,6 +69,14 @@ class AttachmentHelper implements AttachmentHelperInterface
         return $path;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getAttachments(): Collection
+    {
+        return $this->attachments;
+    }
+
     /**
      * @return MessageBag
      */
@@ -85,7 +99,7 @@ class AttachmentHelper implements AttachmentHelperInterface
      *
      * @return bool
      */
-    public function saveAttachmentsForModel(Model $model, array $files = null): bool
+    public function saveAttachmentsForModel(Model $model, ?array $files): bool
     {
         if (is_array($files)) {
             foreach ($files as $entry) {
@@ -109,7 +123,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $md5   = md5_file($file->getRealPath());
         $name  = $file->getClientOriginalName();
         $class = get_class($model);
-        $count = auth()->user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
+        $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
 
         if ($count > 0) {
             $msg = (string)trans('validation.file_already_attached', ['name' => $name]);
@@ -136,7 +150,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         }
 
         $attachment = new Attachment; // create Attachment object.
-        $attachment->user()->associate(auth()->user());
+        $attachment->user()->associate($model->user);
         $attachment->attachable()->associate($model);
         $attachment->md5      = md5_file($file->getRealPath());
         $attachment->filename = $file->getClientOriginalName();
@@ -144,17 +158,20 @@ class AttachmentHelper implements AttachmentHelperInterface
         $attachment->size     = $file->getSize();
         $attachment->uploaded = 0;
         $attachment->save();
+        Log::debug('Created attachment:', $attachment->toArray());
 
         $fileObject = $file->openFile('r');
         $fileObject->rewind();
         $content   = $fileObject->fread($file->getSize());
         $encrypted = Crypt::encrypt($content);
+        Log::debug(sprintf('Full file length is %d and upload size is %d.', strlen($content), $file->getSize()));
+        Log::debug(sprintf('Encrypted content is %d', strlen($encrypted)));
 
         // store it:
         $this->uploadDisk->put($attachment->fileName(), $encrypted);
-
         $attachment->uploaded = 1; // update attachment
         $attachment->save();
+        $this->attachments->push($attachment);
 
         $name = e($file->getClientOriginalName()); // add message:
         $msg  = (string)trans('validation.file_attached', ['name' => $name]);
@@ -162,8 +179,6 @@ class AttachmentHelper implements AttachmentHelperInterface
 
         // return it.
         return $attachment;
-
-
     }
 
     /**
@@ -187,6 +202,8 @@ class AttachmentHelper implements AttachmentHelperInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param UploadedFile $file
      *
      * @return bool
@@ -217,7 +234,7 @@ class AttachmentHelper implements AttachmentHelperInterface
             return false;
         }
         if (!$this->validSize($file)) {
-            return false;
+            return false; // @codeCoverageIgnore
         }
         if ($this->hasFile($file, $model)) {
             return false;

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -10,10 +10,12 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Attachments;
 
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 
 /**
@@ -31,6 +33,11 @@ interface AttachmentHelperInterface
      */
     public function getAttachmentLocation(Attachment $attachment): string;
 
+    /**
+     * @return Collection
+     */
+    public function getAttachments(): Collection;
+
     /**
      * @return MessageBag
      */
@@ -44,8 +51,10 @@ interface AttachmentHelperInterface
     /**
      * @param Model      $model
      *
+     * @param null|array $files
+     *
      * @return bool
      */
-    public function saveAttachmentsForModel(Model $model, array $files = null): bool;
+    public function saveAttachmentsForModel(Model $model, ?array $files): bool;
 
 }

app/Helpers/Chart/MetaPieChart.php

@@ -12,20 +12,28 @@ declare(strict_types = 1);
 namespace FireflyIII\Helpers\Chart;
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
+use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Steam;
 
 /**
  * Class MetaPieChart
  *
  * @package FireflyIII\Helpers\Chart
+ *
+ *
  */
 class MetaPieChart implements MetaPieChartInterface
 {
@@ -45,19 +53,20 @@ class MetaPieChart implements MetaPieChartInterface
             'account'  => ['opposing_account_id'],
             'budget'   => ['transaction_journal_budget_id', 'transaction_budget_id'],
             'category' => ['transaction_journal_category_id', 'transaction_category_id'],
+            'tag'      => [],
         ];
-
     /** @var array */
     protected $repositories
         = [
             'account'  => AccountRepositoryInterface::class,
             'budget'   => BudgetRepositoryInterface::class,
             'category' => CategoryRepositoryInterface::class,
+            'tag'      => TagRepositoryInterface::class,
         ];
-
-
     /** @var  Carbon */
     protected $start;
+    /** @var  Collection */
+    protected $tags;
     /** @var  string */
     protected $total = '0';
     /** @var  User */
@@ -68,6 +77,7 @@ class MetaPieChart implements MetaPieChartInterface
         $this->accounts   = new Collection;
         $this->budgets    = new Collection;
         $this->categories = new Collection;
+        $this->tags       = new Collection;
     }
 
     /**
@@ -75,33 +85,39 @@ class MetaPieChart implements MetaPieChartInterface
      * @param string $group
      *
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function generate(string $direction, string $group): array
     {
         $transactions = $this->getTransactions($direction);
         $grouped      = $this->groupByFields($transactions, $this->grouping[$group]);
         $chartData    = $this->organizeByType($group, $grouped);
+        $key          = strval(trans('firefly.everything_else'));
 
         // also collect all other transactions
         if ($this->collectOtherObjects && $direction === 'expense') {
             /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [$this->user]);
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setUser($this->user);
             $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]);
+
             $journals        = $collector->getJournals();
             $sum             = strval($journals->sum('transaction_amount'));
             $sum             = bcmul($sum, '-1');
             $sum             = bcsub($sum, $this->total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+            $chartData[$key] = $sum;
         }
 
         if ($this->collectOtherObjects && $direction === 'income') {
             /** @var JournalCollectorInterface $collector */
-            $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setUser($this->user);
             $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
             $journals        = $collector->getJournals();
             $sum             = strval($journals->sum('transaction_amount'));
             $sum             = bcsub($sum, $this->total);
-            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+            $chartData[$key] = $sum;
         }
 
         return $chartData;
@@ -109,6 +125,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $accounts
      *
      * @return MetaPieChartInterface
@@ -121,6 +139,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $budgets
      *
      * @return MetaPieChartInterface
@@ -133,6 +153,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $categories
      *
      * @return MetaPieChartInterface
@@ -145,6 +167,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param bool $collectOtherObjects
      *
      * @return MetaPieChartInterface
@@ -157,6 +181,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Carbon $end
      *
      * @return MetaPieChartInterface
@@ -169,6 +195,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Carbon $start
      *
      * @return MetaPieChartInterface
@@ -181,6 +209,22 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $tags
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setTags(Collection $tags): MetaPieChartInterface
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
      * @param User $user
      *
      * @return MetaPieChartInterface
@@ -192,37 +236,44 @@ class MetaPieChart implements MetaPieChartInterface
         return $this;
     }
 
-    protected function getTransactions(string $direction)
+    /**
+     * @param string $direction
+     *
+     * @return Collection
+     */
+    protected function getTransactions(string $direction): Collection
     {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
         $types     = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
-        $modifier = -1;
+        $collector->addFilter(NegativeAmountFilter::class);
         if ($direction === 'expense') {
             $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
-            $modifier = 1;
+            $collector->addFilter(PositiveAmountFilter::class);
+            $collector->removeFilter(NegativeAmountFilter::class);
         }
-        /** @var JournalCollectorInterface $collector */
+
-        $collector = app(JournalCollectorInterface::class, [auth()->user()]);
+        $collector->setUser($this->user);
         $collector->setAccounts($this->accounts);
         $collector->setRange($this->start, $this->end);
         $collector->setTypes($types);
         $collector->withOpposingAccount();
+        $collector->addFilter(OpposingAccountFilter::class);
 
         if ($direction === 'income') {
-            $collector->disableFilter();
+            $collector->removeFilter(TransferFilter::class);
         }
 
-        if ($this->budgets->count() > 0) {
         $collector->setBudgets($this->budgets);
-        }
-        if ($this->categories->count() > 0) {
         $collector->setCategories($this->categories);
+
+        if ($this->tags->count() > 0) {
+            $collector->setTags($this->tags);
+            $collector->withCategoryInformation();
+            $collector->withBudgetInformation();
         }
 
-        $accountIds   = $this->accounts->pluck('id')->toArray();
+        return $collector->getJournals();
-        $transactions = $collector->getJournals();
-        $set          = Support::filterTransactions($transactions, $accountIds, $modifier);
-
-        return $set;
     }
 
     /**
@@ -230,9 +281,17 @@ class MetaPieChart implements MetaPieChartInterface
      * @param array      $fields
      *
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
      */
-    protected function groupByFields(Collection $set, array $fields)
+    protected function groupByFields(Collection $set, array $fields): array
     {
+        if (count($fields) === 0 && $this->tags->count() > 0) {
+            // do a special group on tags:
+            return $this->groupByTag($set);
+        }
+
         $grouped = [];
         /** @var Transaction $transaction */
         foreach ($set as $transaction) {
@@ -258,16 +317,14 @@ class MetaPieChart implements MetaPieChartInterface
     {
         $chartData  = [];
         $names      = [];
-        $repository = app($this->repositories[$type], [$this->user]);
+        $repository = app($this->repositories[$type]);
+        $repository->setUser($this->user);
         foreach ($array as $objectId => $amount) {
             if (!isset($names[$objectId])) {
                 $object           = $repository->find(intval($objectId));
-                $names[$objectId] = $object->name;
+                $names[$objectId] = $object->name ?? $object->tag;
             }
-            if (bccomp($amount, '0') === -1) {
+            $amount                       = Steam::positive($amount);
-                $amount = bcmul($amount, '-1');
-            }
-
             $this->total                  = bcadd($this->total, $amount);
             $chartData[$names[$objectId]] = $amount;
         }
@@ -275,4 +332,27 @@ class MetaPieChart implements MetaPieChartInterface
         return $chartData;
 
     }
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    private function groupByTag(Collection $set): array
+    {
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $journal = $transaction->transactionJournal;
+            $tags    = $journal->tags;
+            /** @var Tag $tag */
+            foreach ($tags as $tag) {
+                $tagId           = $tag->id;
+                $grouped[$tagId] = $grouped[$tagId] ?? '0';
+                $grouped[$tagId] = bcadd($transaction->transaction_amount, $grouped[$tagId]);
+            }
+        }
+
+        return $grouped;
+    }
 }

app/Helpers/Chart/MetaPieChartInterface.php

@@ -72,6 +72,13 @@ interface MetaPieChartInterface
      */
     public function setStart(Carbon $start): MetaPieChartInterface;
 
+    /**
+     * @param Collection $tags
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setTags(Collection $tags): MetaPieChartInterface;
+
     /**
      * @param User $user
      *

app/Helpers/Collection/Account.php

@@ -1,107 +0,0 @@
-<?php
-/**
- * Account.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\Helpers\Collection;
-
-use Illuminate\Support\Collection;
-
-/**
- * Class Account
- *
- * @package FireflyIII\Helpers\Collection
- */
-class Account
-{
-
-    /** @var Collection */
-    protected $accounts;
-    /** @var string */
-    protected $difference = '';
-    /** @var string */
-    protected $end = '';
-    /** @var string */
-    protected $start = '';
-
-    /**
-     * Account constructor.
-     */
-    public function __construct()
-    {
-        $this->accounts = new Collection;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getAccounts(): Collection
-    {
-        return $this->accounts;
-    }
-
-    /**
-     * @param Collection $accounts
-     */
-    public function setAccounts(Collection $accounts)
-    {
-        $this->accounts = $accounts;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDifference(): string
-    {
-        return $this->difference;
-    }
-
-    /**
-     * @param string $difference
-     */
-    public function setDifference(string $difference)
-    {
-        $this->difference = $difference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEnd(): string
-    {
-        return $this->end;
-    }
-
-    /**
-     * @param string $end
-     */
-    public function setEnd(string $end)
-    {
-        $this->end = $end;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStart(): string
-    {
-        return $this->start;
-    }
-
-    /**
-     * @param string $start
-     */
-    public function setStart(string $start)
-    {
-        $this->start = $start;
-    }
-
-
-}

app/Helpers/Collection/Balance.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use Illuminate\Support\Collection;