Merge branch 'release/4.3.5'

New Crowdin translations

.env.docker

@@ -0,0 +1,55 @@
+APP_ENV=${FF_APP_ENV}
+APP_DEBUG=false
+APP_FORCE_SSL=false
+APP_FORCE_ROOT=
+APP_KEY=${FF_APP_KEY}
+APP_LOG=daily
+APP_LOG_LEVEL=warning
+APP_URL=http://localhost
+
+DB_CONNECTION=mysql
+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=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+CACHE_PREFIX=firefly
+
+GOOGLE_MAPS_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_APP_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.env.example

@@ -3,6 +3,7 @@ APP_DEBUG=false
 APP_FORCE_SSL=false
 APP_FORCE_ROOT=
 APP_KEY=SomeRandomStringOf32CharsExactly
+APP_LOG=daily
 APP_LOG_LEVEL=warning
 APP_URL=http://localhost
 
@@ -38,9 +39,17 @@ SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 SHOW_INCOMPLETE_TRANSLATIONS=false
 
+CACHE_PREFIX=firefly
+
+GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
 
 PUSHER_KEY=
 PUSHER_SECRET=
 PUSHER_APP_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.env.sandstorm

@@ -0,0 +1,55 @@
+APP_ENV=production
+APP_DEBUG=true
+APP_FORCE_SSL=false
+APP_FORCE_ROOT=
+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=mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+SHOW_INCOMPLETE_TRANSLATIONS=false
+
+CACHE_PREFIX=firefly
+
+GOOGLE_MAPS_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=mail@example.com
+USE_ENCRYPTION=true
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_APP_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+

.github/CONTRIBUTING.md

@@ -0,0 +1,19 @@
+# Welcome to Firefly III on Github!
+
+:+1::tada: Thank you for taking the time to contribute something to Firefly III!
+
+## Feature requests
+
+If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).
+
+## Bugs
+
+If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. 
+
+## Installation problems
+
+Take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them!
+
+## Pull requests
+
+I can only accept pull requests against the `develop` branch, never the `master` branch.

.gitignore

@@ -11,5 +11,4 @@ result.html
 test-import.sh
 test-import-report.txt
 public/google*.html
-_ide_helper_models.php
 .env.backup

.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.3"),
+    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 = [],
+  # 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

.scrutinizer.yml

@@ -2,7 +2,50 @@
 tools:
   external_code_coverage: false
 filter:
-    excluded_paths:
-        - app/Support/Migration/*
-        - app/database/migrations/*
-        - database/migrations/*
+  paths:
+    - app/*
+    - public/js/ff/*
+  excluded_paths:
+    - "database/migrations/*"
+    - "bootstrap/*"
+    - "config/*"
+    - "docker/*"
+    - "public/js/lib/*"
+    - "public/lib/adminlte/js/*"
+    - "public/lib/bootstrap/js/*"
+    - "resources/*"
+    - "routes/*"
+    - "storage/*"
+checks:
+    php:
+        use_self_instead_of_fqcn: true
+        uppercase_constants: true
+        return_doc_comments: true
+        return_doc_comment_if_not_inferrable: true
+        remove_extra_empty_lines: true
+        parameter_doc_comments: true
+        optional_parameters_at_the_end: true
+        no_short_variable_names:
+            minimum: '3'
+        no_short_method_names:
+            minimum: '3'
+        no_long_variable_names:
+            maximum: '20'
+        no_goto: true
+        newline_at_end_of_file: true
+        encourage_single_quotes: true
+        avoid_todo_comments: true
+        avoid_perl_style_comments: true
+        avoid_fixme_comments: true
+        avoid_multiple_statements_on_same_line: true
+        align_assignments: true
+        duplication: false
+    javascript: true
+
+coding_style:
+    php:
+        spaces:
+            around_operators:
+                concatenation: true
+            other:
+                after_type_cast: false

.travis.yml

@@ -1,18 +1,23 @@
 language: php
-sudo: false
 php:
-  - '7.0'
+  - 7.0
+  - 7.1
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
 
 install:
-  - phpenv config-rm xdebug.ini
-  - composer selfupdate
+  - if [[ "$(php -v | grep 'PHP 7')" ]]; then phpenv config-rm xdebug.ini; fi
   - rm composer.lock
   - composer update --no-scripts
+  - cp .env.testing .env
   - php artisan clear-compiled
   - php artisan optimize
   - php artisan env
-  - ./test.sh -r
-  - php artisan env
+  - cp .env.testing .env
+  - mv storage/database/databasecopy.sqlite storage/database/database.sqlite
 
 script:
   - phpunit

CHANGELOG.md

@@ -2,7 +2,179 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [4.1.7] - 2015-05-25
+## [4.3.5] - 2017-02-19
+### Added
+- Beta support for Sandstorm.IO
+- Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)!
+- Can now use special keywords in the search to search for specic dates, categories, etc.
+
+### Changed
+- Updated to laravel 5.4!
+- User friendly error message
+- Updated locales to support more operating systems, first reported in #536 by [dabenzel](https://github.com/dabenzel)
+- Updated budget report
+- Improved 404 page
+- Smooth curves, improved by [elamperti](https://github.com/elamperti).
+
+### Fixed
+- #549
+- #553
+- Fixed #559 reported by [elamperti](https://github.com/elamperti).
+- #565, as reported by a user over the mail
+- #566, as reported by [dspeckmann](https://github.com/dspeckmann)
+- #567, as reported by [winsomniak](https://github.com/winsomniak)
+- #569, as reported by [winsomniak](https://github.com/winsomniak)
+- #572, as reported by [zjean](https://github.com/zjean)
+- Many issues with the transaction filters which will fix reports (they tended to display the wrong amount).
+
+## [4.3.4] - 2017-02-02
+### Fixed
+- Fixed bug #550, reported by [worldworm](https://github.com/worldworm)!
+- Fixed bug #551, reported by [t-me](https://github.com/t-me)!
+
+## [4.3.3] - 2017-01-30
+
+_The 100th release of Firefly!_
+
+### Added
+- Add locales to Docker (#534) by [elohmeier](https://github.com/elohmeier).
+- Optional database encryption. On by default.
+- Datepicker for Firefox and other browsers.
+- New instruction block for updating and installing.
+- Ability to clone transactions.
+- Use multi-select Bootstrap thing instead of massive lists of checkboxes.
+
+### Removed
+- Lots of old Javascript
+
+### Fixed
+- Missing sort broke various charts
+- Bug in reports that made amounts behave weird
+- Various bug fixes
+
+### Security
+- Tested FF against the naughty string list.
+
+## [4.3.2] - 2017-01-09
+
+An intermediate release because something in the Twig and Twigbridge libraries is broken and I have to make sure it doesn't affect you guys. But some cool features were on their way so there's that oo.
+
+### Added
+- Some code for issue #475, consistent overviews.
+- Better currency display. Make sure you have locale packages installed.
+
+### Changed
+- Uses a new version of Laravel.
+
+### Fixed
+- The password reset routine was broken.
+- Issue #522, thanks to [xpfgsyb](https://github.com/xpfgsyb)
+- Issue #524, thanks to [worldworm](https://github.com/worldworm)
+- Issue #526, thanks to [worldworm](https://github.com/worldworm)
+- Issue #528, thanks to [skibbipl](https://github.com/skibbipl)
+- Various other fixes.
+
+## [4.3.1] - 2017-01-04
+### Added
+- Support for Russian and Polish. 
+- Support for a proper demo website.
+- Support for custom decimal places in currencies (#506, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
+- Most amounts are now right-aligned (#511, suggested by [xpfgsyb](https://github.com/xpfgsyb)).
+- German is now a "complete" language, more than 75% translated!
+
+### Changed
+- **[New Github repository!](github.com/firefly-iii/firefly-iii)**
+- Better category overview.
+- #502, thanks to [zjean](https://github.com/zjean)
+
+### Removed
+- Removed a lot of administration functions.
+- Removed ability to activate users.
+
+### Fixed
+- #501, thanks to [zjean](https://github.com/zjean)
+- #513, thanks to [skibbipl](https://github.com/skibbipl) 
+
+### Security
+- #519, thanks to [xpfgsyb](https://github.com/xpfgsyb)
+
+## [4.3.0] - 2015-12-26
+### Added
+- New method of keeping track of available budget, see issue #489
+- Support for Spanish
+- Firefly III now has an extended demo mode. Will expand further in the future.
+ 
+
+### Changed
+- New favicon
+- Import routine no longer gives transactions a description #483
+
+
+### Removed
+- All test data generation code.
+
+### Fixed
+- Removed import accounts from search results #478
+- Redirect after delete will no longer go back to deleted item #477
+- Cannot math #482
+- Fixed bug in virtual balance field #479
+
+## [4.2.2] - 2016-12-18
+### Added
+- New budget report (still a bit of a beta)
+- Can now edit user
+
+### Changed
+- New config for specific events. Still need to build Notifications.
+
+### Fixed
+- Various bugs
+- Issue #472 thanks to [zjean](https://github.com/zjean)
+
+## [4.2.1] - 2016-12-09
+### Added
+- BIC support (see #430)
+- New category report section and chart (see the general financial report)
+
+
+### Changed
+- Date range picker now also available on mobile devices (see #435)
+- Extended range of amounts for issue #439
+- Rewrote all routes. Old bookmarks may break.
+
+## [4.2.0] - 2016-11-27
+### Added
+- Lots of (empty) tests
+- Expanded transaction lists (#377)
+- New charts at account view
+- First code for #305
+
+
+### Changed
+- Updated all email messages.
+- Made some fonts local
+
+
+### Deprecated
+- Initial release.
+
+### Removed
+- Initial release.
+
+### Fixed
+- Issue #408
+- Various issues with split journals
+- Issue #414, thx [zjean](https://github.com/zjean)
+- Issue #419, thx [schwalberich](https://github.com/schwalberich) 
+- Issue #422, thx [xzaz](https://github.com/xzaz)
+- Various import bugs, such as #416 ([zjean](https://github.com/zjean))
+
+
+### Security
+- Initial release.
+
+
+## [4.1.7] - 2016-11-19
 ### Added
 - Check for database table presence in console commands.
 - Category report
@@ -17,9 +189,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Made all pages more mobile friendly.
-- Fixed #395 found by @marcoveeneman.
-- Fixed #398 found by @marcoveeneman.
-- Fixed #401 found by @marcoveeneman.
+- Fixed #395 found by [marcoveeneman](https://github.com/marcoveeneman).
+- Fixed #398 found by [marcoveeneman](https://github.com/marcoveeneman).
+- Fixed #401 found by [marcoveeneman](https://github.com/marcoveeneman).
 - Many optimizations.
 - Updated many libraries.
 - Various bugs found by myself.
@@ -31,13 +203,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.
-- #370 thanks to @ksmolder
-- #378, thanks to @HomelessAvatar
+- #375, thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies.
+- #370 thanks to [ksmolder](https://github.com/ksmolder)
+- #378, thanks to [HomelessAvatar](https://github.com/HomelessAvatar)
 
 ## [4.1.5] - 2016-11-01
 ### Changed
@@ -50,7 +222,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [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.
@@ -63,10 +235,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Change error message to refer to solution.
 
 ### Fixed
-- #367 thanks to @HungryFeline
-- #366 thanks to @3mz3t
-- #362 and #341 thanks to @bnw
-- #355 thanks to @roberthorlings
+- #367 thanks to [HungryFeline](https://github.com/HungryFeline)
+- #366 thanks to [3mz3t](https://github.com/3mz3t)
+- #362 and #341 thanks to [bnw](https://github.com/bnw)
+- #355 thanks to [roberthorlings](https://github.com/roberthorlings)
 
 ## [4.1.3] - 2016-10-22
 ### Fixed
@@ -98,29 +270,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - #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 #346, thanks to @SanderKleykens
+- Fixed #346, thanks to [SanderKleykens](https://github.com/SanderKleykens)
 - #351
 - Did some internal remodelling.
 
 ### Fixed
-- PostgreSQL compatibility thanks to @SanderKleykens
-- @RobertHorlings fixed a bug in the ABN Amro import specific.
+- PostgreSQL compatibility thanks to [SanderKleykens](https://github.com/SanderKleykens)
+- [roberthorlings](https://github.com/roberthorlings) fixed a bug in the ABN Amro import specific.
 
 
 ## [4.0.1] - 2016-10-04
 ### Added
-- New ING import specific by @tomwerf
+- New ING import specific by [tomwerf](https://github.com/tomwerf)
 - New Presidents Choice specific to fix #307
 - Added some trimming (#335)
 
@@ -135,10 +307,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Fixed a bug where incoming transactions would not be properly filtered in several reports.
-- #334 by @cyberkov
+- #334 by [cyberkov](https://github.com/cyberkov)
 - #337
 - #336
-- #338 found by @roberthorlings
+- #338 found by [roberthorlings](https://github.com/roberthorlings)
 
 ### Security
 - Initial release.
@@ -149,29 +321,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [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
 ### Fixed
-- Migration fix by @sandermulders
-- Tricky import bug fix thanks to @vissert
-- Currency preference will be correctly pulled from user settings, thanks to @fuf
+- Migration fix by [sandermulders](https://github.com/sandermulders)
+- Tricky import bug fix thanks to [vissert](https://github.com/vissert)
+- Currency preference will be correctly pulled from user settings, thanks to [fuf](https://github.com/fuf)
 - Simplified code for upgrade instructions.
 
 
 ## [3.10.3] - 2016-08-29
 ### Added
-- More fields for mass-edit, thanks to @Vissert (#282)
+- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) (#282)
 - First start of German translation
 
 ### Changed
@@ -182,7 +354,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.
 
@@ -202,8 +374,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/JC5/firefly-iii/issues/290)), thanks @dfiel for reporting.
-- Sneaky bug in the import routine, fixed by @Bonno 
+- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks [dfiel](https://github.com/dfiel) for reporting.
+- Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) 
 
 ## [3.10.1] - 2016-08-25
 ### Added
@@ -223,7 +395,7 @@ 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
 ### Added
@@ -241,25 +413,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Issue #264
 - Issue #265
-- Fixed amount calculation problems, #266, thanks @xzaz
+- Fixed amount calculation problems, #266, thanks [xzaz](https://github.com/xzaz)
 - Issue #271
-- Issue #278, #273, thanks @StevenReitsma and @rubella
+- Issue #278, #273, thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella)
 - Bug in attachment download routine would report the wrong size to the user's browser.
 - Various NULL errors fixed.
 - Various strict typing errors fixed.
-- Fixed pagination problems, #276, thanks @xzaz
+- Fixed pagination problems, #276, thanks [xzaz](https://github.com/xzaz)
 - Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first.
-- Bulk update problems, #280, thanks @stickgrinder
+- Bulk update problems, #280, thanks [stickgrinder](https://github.com/stickgrinder)
 - Fixed various problems with amount reporting of split transactions.
 
-[3.9.1]
+## [3.9.1]
 ### Fixed
 - Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269
 
-[3.9.0]
+## [3.9.0]
 ### Added
-- @zjean has added code that allows you to force "https://"-URL's.
-- @tonicospinelli has added Portuguese (Brazil) translations.
+- [zjean](https://github.com/zjean) has added code that allows you to force "https://"-URL's.
+- [tonicospinelli](https://github.com/tonicospinelli) has added Portuguese (Brazil) translations.
 - Firefly III supports the *splitting* of transactions:
   - A withdrawal (expense) can be split into multiple sub-transactions (with multiple destinations)
   - Likewise for deposits (incomes). You can set multiple sources.
@@ -290,7 +462,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
@@ -337,7 +509,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.

Dockerfile

@@ -11,12 +11,17 @@ RUN apt-get update -y && \
                                                libtidy-dev \
                                                libxml2-dev \
                                                libsqlite3-dev \
-                                               libbz2-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
 
+# 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
+
 # Enable apache mod rewrite..
 RUN a2enmod rewrite
 
@@ -40,3 +45,5 @@ WORKDIR /var/www/firefly-iii
 RUN composer install --no-scripts --no-dev
 
 USER root
+
+ENTRYPOINT ["/var/www/firefly-iii/docker/entrypoint.sh"]

README.md

@@ -1,15 +1,17 @@
-# Firefly III [![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/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)
+# Firefly III: A personal finances manager 
 
-[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=master)](https://travis-ci.org/JC5/firefly-iii)
+[![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) 
 
-## A personal finances manager
+[![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)
 
-[![Screenshot](https://i.nder.be/hhfv03hp/400)](https://i.nder.be/hhfv03hp) [![Screenshot](https://i.nder.be/hhmwmqw9/400)](https://i.nder.be/hhmwmqw9)
-
-[![Screenshot](https://i.nder.be/g63q05m0/400)](https://i.nder.be/g63q05m0) [![Screenshot](https://i.nder.be/c2g30ngg/400)](https://i.nder.be/c2g30ngg)
+[![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)
 
 "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared  household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
 
+## Try it out!
+
+Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
+
 ## Installation
 
 To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/installation-guide/).
@@ -24,9 +26,11 @@ Firefly works on the principle that if you know where you're money is going, you
 
 - 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/).
 
+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).

app/Console/Commands/CreateImport.php

@@ -50,13 +50,10 @@ class CreateImport extends Command
     }
 
     /**
-     * Execute the console command.
-     *
-     * @return mixed
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
      */
     public function handle()
     {
-        // find the file
         /** @var UserRepositoryInterface $userRepository */
         $userRepository = app(UserRepositoryInterface::class);
         $file           = $this->argument('file');
@@ -69,7 +66,6 @@ class CreateImport extends Command
             return;
         }
 
-        // try to parse configuration data:
         $configurationData = json_decode(file_get_contents($configuration));
         if (is_null($configurationData)) {
             $this->error(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
@@ -83,22 +79,19 @@ class CreateImport extends Command
         $this->info(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));
 
-        // put the file in the proper place:
         Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]);
         $this->line('Stored import data...');
 
-        // store the configuration in the job:
         $job->configuration = $configurationData;
         $job->status        = 'settings_complete';
         $job->save();
         $this->line('Stored configuration...');
 
-        // if user wants to run it, do!
         if ($this->option('start') === true) {
             $this->line('The import will start in a moment. This process is not visible...');
             Log::debug('Go for import!');
@@ -111,10 +104,10 @@ class CreateImport extends Command
 
     /**
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
      */
     private function validArguments(): bool
     {
-        // find the file
         /** @var UserRepositoryInterface $userRepository */
         $userRepository = app(UserRepositoryInterface::class);
         $file           = $this->argument('file');

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

@@ -18,6 +18,7 @@ use FireflyIII\Import\Logging\CommandHandler;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 use Log;
 
 /**
@@ -51,9 +52,7 @@ class Import extends Command
     }
 
     /**
-     * Execute the console command.
      *
-     * @return mixed
      */
     public function handle()
     {
@@ -71,32 +70,15 @@ class Import extends Command
         $monolog = Log::getMonolog();
         $handler = new CommandHandler($this);
         $monolog->pushHandler($handler);
+        $importProcedure = new ImportProcedure;
+        $result          = $importProcedure->runImport($job);
 
-        $result = ImportProcedure::runImport($job);
-
-
-        /**
-         * @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));
-        }
-
+        // display result to user:
+        $this->presentResults($result);
         $this->line('The import has completed.');
 
         // get any errors from the importer:
-        $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);
-            }
-        }
+        $this->presentErrors($job);
 
         return;
     }
@@ -122,4 +104,36 @@ 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/ScanAttachments.php

@@ -60,42 +60,26 @@ class ScanAttachments extends Command
         /** @var Attachment $attachment */
         foreach ($attachments as $attachment) {
             $fileName = $attachment->fileName();
-
-            // try to grab file content:
             try {
                 $content = $disk->get($fileName);
             } catch (FileNotFoundException $e) {
                 $this->error(sprintf('Could not find data for attachment #%d', $attachment->id));
                 continue;
             }
-            // try to decrypt content.
             try {
                 $decrypted = Crypt::decrypt($content);
             } catch (DecryptException $e) {
                 $this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id));
                 continue;
             }
-
-            // make temp file:
             $tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII');
-
-            // store content in temp file:
             file_put_contents($tmpfname, $decrypted);
-
-            // get md5 and mime
-            $md5  = md5_file($tmpfname);
-            $mime = mime_content_type($tmpfname);
-
-            // update attachment:
+            $md5              = md5_file($tmpfname);
+            $mime             = mime_content_type($tmpfname);
             $attachment->md5  = $md5;
             $attachment->mime = $mime;
             $attachment->save();
-
-
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
-
-            // find file:
-
         }
     }
 }

app/Console/Commands/UpgradeDatabase.php

@@ -15,6 +15,8 @@ namespace FireflyIII\Console\Commands;
 
 
 use DB;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
@@ -57,8 +59,29 @@ class UpgradeDatabase extends Command
     public function handle()
     {
         $this->setTransactionIdentifier();
+        $this->migrateRepetitions();
+    }
 
-
+    private function migrateRepetitions()
+    {
+        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)) {
+                $budgetLimit->end_date = $repetition->enddate;
+                $budgetLimit->save();
+                $this->line(sprintf('Updated budget limit #%d', $budgetLimit->id));
+                $repetition->delete();
+            }
+        }
     }
 
     /**
@@ -72,12 +95,11 @@ class UpgradeDatabase extends Command
         }
 
 
-        $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')]);
+        $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())
@@ -86,43 +108,52 @@ class UpgradeDatabase extends Command
         $journalIds = array_unique($result->pluck('id')->toArray());
 
         foreach ($journalIds as $journalId) {
-            // grab all positive transactiosn from this journal that are not deleted.
-            // for each one, grab the negative opposing one which has 0 as an identifier and give it the same identifier.
-            $identifier   = 0;
-            $processed    = [];
-            $transactions = Transaction::where('transaction_journal_id', $journalId)->where('amount', '>', 0)->get();
-            /** @var Transaction $transaction */
-            foreach ($transactions as $transaction) {
-                // find opposing:
-                $amount = bcmul(strval($transaction->amount), '-1');
+            $this->updateJournal(intval($journalId));
+        }
+    }
 
-                try {
-                    /** @var Transaction $opposing */
-                    $opposing = Transaction
-                        ::where('transaction_journal_id', $journalId)
-                        ->where('amount', $amount)->where('identifier', '=', 0)
-                        ->whereNotIn('id', $processed)
-                        ->first();
-                } catch (QueryException $e) {
-                    Log::error($e->getMessage());
-                    $this->error('Firefly III could not find the "identifier" field in the "transactions" table.');
-                    $this->error(sprintf('This field is required for Firefly III version %s to run.', config('firefly.version')));
-                    $this->error('Please run "php artisan migrate" to add this field to the table.');
-                    $this->info('Then, run "php artisan firefly:upgrade-database" to try again.');
-                    break 2;
-                }
-                if (!is_null($opposing)) {
-                    // give both a new identifier:
-                    $transaction->identifier = $identifier;
-                    $transaction->save();
-                    $opposing->identifier = $identifier;
-                    $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++;
+    /**
+     * grab all positive transactiosn from this journal that are not deleted. for each one, grab the negative opposing one
+     * which has 0 as an identifier and give it the same identifier.
+     *
+     * @param int $journalId
+     */
+    private function updateJournal(int $journalId)
+    {
+        $identifier   = 0;
+        $processed    = [];
+        $transactions = Transaction::where('transaction_journal_id', $journalId)->where('amount', '>', 0)->get();
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            // find opposing:
+            $amount = bcmul(strval($transaction->amount), '-1');
+
+            try {
+                /** @var Transaction $opposing */
+                $opposing = Transaction::where('transaction_journal_id', $journalId)
+                                       ->where('amount', $amount)->where('identifier', '=', 0)
+                                       ->whereNotIn('id', $processed)
+                                       ->first();
+            } catch (QueryException $e) {
+                Log::error($e->getMessage());
+                $this->error('Firefly III could not find the "identifier" field in the "transactions" table.');
+                $this->error(sprintf('This field is required for Firefly III version %s to run.', config('firefly.version')));
+                $this->error('Please run "php artisan migrate" to add this field to the table.');
+                $this->info('Then, run "php artisan firefly:upgrade-database" to try again.');
+
+                return;
             }
+            if (!is_null($opposing)) {
+                // give both a new identifier:
+                $transaction->identifier = $identifier;
+                $transaction->save();
+                $opposing->identifier = $identifier;
+                $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++;
         }
     }
 }

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,47 @@ 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) . '|');
+        }
+    }
+
+    private function installInstructions()
+    {
         /** @var string $version */
         $version = config('firefly.version');
-        $config  = config('upgrade.text');
-        $text    = null;
+        $config  = config('upgrade.text.install');
+        $text    = '';
         foreach (array_keys($config) as $compare) {
             // if string starts with:
             $len = strlen($compare);
@@ -62,21 +98,69 @@ 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->line('Firefly III should be ready for use.');
-        } else {
-            $this->line('+------------------------------------------------------------------------------+');
-            $this->line('');
-            $this->line(sprintf('Thank you for installing Firefly III, v%s', $version));
-            $this->info(wordwrap($text));
-            $this->line('');
-            $this->line('+------------------------------------------------------------------------------+');
+
+            $this->boxed(sprintf('Thank you for installin Firefly III, v%s!', $version));
+            $this->boxedInfo('There are no extra installation instructions.');
+            $this->boxed('Firefly III should be ready for use.');
+            $this->boxed('');
+            $this->showLine();
+
+            return;
         }
 
+        $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
+        $this->boxedInfo($text);
+        $this->boxed('');
+        $this->showLine();
+    }
+
+    /**
+     * Show a line
+     */
+    private function showLine()
+    {
+        $line = '+';
+        for ($i = 0; $i < 78; $i++) {
+            $line .= '-';
+        }
+        $line .= '+';
+        $this->line($line);
 
     }
+
+    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,66 @@
+<?php
+
+namespace FireflyIII\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+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');
+    }
+
+    /**
+     * @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/VerifyDatabase.php

@@ -17,14 +17,13 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
 use Schema;
 use stdClass;
@@ -67,16 +66,16 @@ class VerifyDatabase extends Command
             return;
         }
 
+        $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
-        $this->reportBudgets();
-        // categories with no transactions
-        $this->reportCategories();
-        // tags with no transactions
-        $this->reportTags();
+
         // sum of transactions is not zero.
         $this->reportSum();
         //  any deleted transaction journals that have transactions that are NOT deleted:
@@ -101,14 +100,13 @@ class VerifyDatabase extends Command
      */
     private function reportAccounts()
     {
-        $set = Account
-            ::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-            ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-            ->whereNull('transactions.account_id')
-            ->get(
-                ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
-            );
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->whereNull('transactions.account_id')
+                      ->get(
+                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                      );
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -124,87 +122,42 @@ class VerifyDatabase extends Command
      */
     private function reportBudgetLimits()
     {
-        $set = Budget
-            ::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
-            ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-            ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
-            ->whereNull('budget_limits.id')
-            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
+        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email'])
+                     ->whereNull('budget_limits.id')
+                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']);
 
-        /** @var stdClass $entry */
+        /** @var Budget $entry */
         foreach ($set as $entry) {
-
             $line = sprintf(
                 'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
-                $entry->user_id, $entry->email, $entry->id, Crypt::decrypt($entry->name)
+                $entry->user_id, $entry->email, $entry->id, $entry->name
             );
             $this->line($line);
         }
     }
 
-    /**
-     * Reports on budgets without any transactions.
-     */
-    private function reportBudgets()
-    {
-        $set = Budget
-            ::leftJoin('budget_transaction_journal', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
-            ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-            ->distinct()
-            ->whereNull('budget_transaction_journal.budget_id')
-            ->whereNull('budgets.deleted_at')
-            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
-
-        /** @var stdClass $entry */
-        foreach ($set as $entry) {
-            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has budget #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
-                    . '") which has no transactions.';
-            $this->line($line);
-        }
-    }
-
-    /**
-     * Reports on categories without any transactions.
-     */
-    private function reportCategories()
-    {
-        $set = Category
-            ::leftJoin('category_transaction_journal', 'categories.id', '=', 'category_transaction_journal.category_id')
-            ->leftJoin('users', 'categories.user_id', '=', 'users.id')
-            ->distinct()
-            ->whereNull('category_transaction_journal.category_id')
-            ->whereNull('categories.deleted_at')
-            ->get(['categories.id', 'categories.name', 'categories.user_id', 'users.email']);
-
-        /** @var stdClass $entry */
-        foreach ($set as $entry) {
-            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has category #' . $entry->id . ' ("' . Crypt::decrypt($entry->name)
-                    . '") which has no transactions.';
-            $this->line($line);
-        }
-    }
-
     /**
      * Reports on deleted accounts that still have not deleted transactions or journals attached to them.
      */
     private function reportDeletedAccounts()
     {
-        $set = Account
-            ::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-            ->whereNotNull('accounts.deleted_at')
-            ->whereNotNull('transactions.id')
-            ->where(
-                function (Builder $q) {
-                    $q->whereNull('transactions.deleted_at');
-                    $q->orWhereNull('transaction_journals.deleted_at');
-                }
-            )
-            ->get(
-                ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
-                 'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at as journal_deleted_at']
-            );
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                      ->whereNotNull('accounts.deleted_at')
+                      ->whereNotNull('transactions.id')
+                      ->where(
+                          function (Builder $q) {
+                              $q->whereNull('transactions.deleted_at');
+                              $q->orWhereNull('transaction_journals.deleted_at');
+                          }
+                      )
+                      ->get(
+                          ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
+                           'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
+                           'transaction_journals.deleted_at as journal_deleted_at']
+                      );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $date = is_null($entry->transaction_deleted_at) ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
@@ -220,24 +173,24 @@ class VerifyDatabase extends Command
         $configuration = [
             // a withdrawal can not have revenue account:
             TransactionType::WITHDRAWAL => [AccountType::REVENUE],
-
             // deposit cannot have an expense account:
             TransactionType::DEPOSIT    => [AccountType::EXPENSE],
-
             // transfer cannot have either:
             TransactionType::TRANSFER   => [AccountType::EXPENSE, AccountType::REVENUE],
         ];
         foreach ($configuration as $transactionType => $accountTypes) {
-            $set = TransactionJournal
-                ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
-                ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
-                ->where('transaction_types.type', $transactionType)
-                ->whereIn('account_types.type', $accountTypes)
-                ->whereNull('transaction_journals.deleted_at')
-                ->get(['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type', 'transaction_types.type']);
+            $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                     ->where('transaction_types.type', $transactionType)
+                                     ->whereIn('account_types.type', $accountTypes)
+                                     ->whereNull('transaction_journals.deleted_at')
+                                     ->get(
+                                         ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
+                                          'transaction_types.type']
+                                     );
             foreach ($set as $entry) {
                 $this->error(
                     sprintf(
@@ -259,19 +212,18 @@ class VerifyDatabase extends Command
      */
     private function reportJournals()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-            ->whereNull('transactions.deleted_at')
-            ->whereNotNull('transactions.id')
-            ->get(
-                [
-                    'transaction_journals.id as journal_id',
-                    'transaction_journals.description',
-                    'transaction_journals.deleted_at as journal_deleted',
-                    'transactions.id as transaction_id',
-                    'transactions.deleted_at as transaction_deleted_at']
-            );
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                 ->whereNull('transactions.deleted_at')
+                                 ->whereNotNull('transactions.id')
+                                 ->get(
+                                     [
+                                         'transaction_journals.id as journal_id',
+                                         'transaction_journals.description',
+                                         'transaction_journals.deleted_at as journal_deleted',
+                                         'transactions.id as transaction_id',
+                                         'transactions.deleted_at as transaction_deleted_at']
+                                 );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -286,11 +238,10 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->groupBy('transaction_journals.id')
-            ->whereNull('transactions.transaction_journal_id')
-            ->get(['transaction_journals.id']);
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                 ->groupBy('transaction_journals.id')
+                                 ->whereNull('transactions.transaction_journal_id')
+                                 ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
@@ -300,6 +251,39 @@ class VerifyDatabase extends Command
 
     }
 
+    /**
+     * @param string $name
+     */
+    private function reportObject(string $name)
+    {
+        $plural = str_plural($name);
+        $class  = sprintf('FireflyIII\Models\%s', ucfirst($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()
+                        ->whereNull($name . '_transaction_journal.' . $name . '_id')
+                        ->whereNull($plural . '.deleted_at')
+                        ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
+
+        /** @var stdClass $entry */
+        foreach ($set as $entry) {
+
+            $objName = $entry->name;
+            try {
+                $objName = Crypt::decrypt($objName);
+            } catch (DecryptException $e) {
+                // it probably was not encrypted.
+            }
+
+            $line = sprintf(
+                'Notice: User #%d (%s) has %s #%d ("%s") which has no transactions.',
+                $entry->user_id, $entry->email, $name, $entry->id, $objName
+            );
+            $this->line($line);
+        }
+    }
+
     /**
      * Reports for each user when the sum of their transactions is not zero.
      */
@@ -317,40 +301,18 @@ class VerifyDatabase extends Command
         }
     }
 
-    /**
-     * Reports on tags without any transactions.
-     */
-    private function reportTags()
-    {
-        $set = Tag
-            ::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
-            ->leftJoin('users', 'tags.user_id', '=', 'users.id')
-            ->distinct()
-            ->whereNull('tag_transaction_journal.tag_id')
-            ->whereNull('tags.deleted_at')
-            ->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email']);
-
-        /** @var stdClass $entry */
-        foreach ($set as $entry) {
-            $line = 'Notice: User #' . $entry->user_id . ' (' . $entry->email . ') has tag #' . $entry->id . ' ("' . $entry->tag
-                    . '") which has no transactions.';
-            $this->line($line);
-        }
-    }
-
     /**
      * Reports on deleted transactions that are connected to a not deleted journal.
      */
     private function reportTransactions()
     {
-        $set = Transaction
-            ::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNotNull('transactions.deleted_at')
-            ->whereNull('transaction_journals.deleted_at')
-            ->get(
-                ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at']
-            );
+        $set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->whereNotNull('transactions.deleted_at')
+                          ->whereNull('transaction_journals.deleted_at')
+                          ->get(
+                              ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
+                               'transaction_journals.deleted_at']
+                          );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -365,12 +327,11 @@ class VerifyDatabase extends Command
      */
     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)
-            ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+        $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)
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {

app/Console/Kernel.php

@@ -16,12 +16,11 @@ namespace FireflyIII\Console;
 use FireflyIII\Console\Commands\CreateImport;
 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\UseEncryption;
 use FireflyIII\Console\Commands\VerifyDatabase;
-use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 /**
@@ -40,9 +39,9 @@ class Kernel extends ConsoleKernel
      */
     protected $bootstrappers
         = [
-            'Illuminate\Foundation\Bootstrap\DetectEnvironment',
+            'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
             'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-            'FireflyIII\Bootstrap\ConfigureLogging',
+            //'FireflyIII\Bootstrap\ConfigureLogging',
             'Illuminate\Foundation\Bootstrap\HandleExceptions',
             'Illuminate\Foundation\Bootstrap\RegisterFacades',
             'Illuminate\Foundation\Bootstrap\SetRequestForConsole',
@@ -64,7 +63,7 @@ class Kernel extends ConsoleKernel
             EncryptFile::class,
             ScanAttachments::class,
             UpgradeDatabase::class,
-            MoveRepository::class,
+            UseEncryption::class,
         ];
 
     /**
@@ -76,15 +75,4 @@ class Kernel extends ConsoleKernel
     {
         require base_path('routes/console.php');
     }
-
-    /**
-     * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
-     *
-     * @return void
-     */
-    protected function schedule(Schedule $schedule)
-    {
-    }
 }

app/Events/RequestedNewPassword.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * ConfirmedUser.php
+ * RequestedNewPassword.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
  *
  * This software may be modified and distributed under the terms of the
@@ -17,26 +17,30 @@ use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class ConfirmedUser
+ * Class RequestedNewPassword
  *
  * @package FireflyIII\Events
  */
-class ConfirmedUser extends Event
+class RequestedNewPassword extends Event
 {
     use SerializesModels;
 
     public $ipAddress;
+    public $token;
     public $user;
 
     /**
-     * Create a new event instance. This event is triggered when a user confirms their new account.
+     * Create a new event instance. This event is triggered when a users tries to reset his or her password.
      *
      * @param  User  $user
+     * @param string $token
      * @param string $ipAddress
      */
-    public function __construct(User $user, string $ipAddress)
+    public function __construct(User $user, string $token, string $ipAddress)
     {
         $this->user      = $user;
+        $this->token     = $token;
         $this->ipAddress = $ipAddress;
     }
+
 }

app/Events/ResentConfirmation.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * ResentConfirmation.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\Events;
-
-use FireflyIII\User;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Class ResentConfirmation
- *
- * @package FireflyIII\Events
- */
-class ResentConfirmation extends Event
-{
-    use SerializesModels;
-
-    public $ipAddress;
-    public $user;
-
-    /**
-     * Create a new event instance. This event is triggered when a users wants a new confirmation.
-     *
-     * @param  User  $user
-     * @param string $ipAddress
-     */
-    public function __construct(User $user, string $ipAddress)
-    {
-        $this->user      = $user;
-        $this->ipAddress = $ipAddress;
-    }
-}

app/Events/StoredBudgetLimit.php

@@ -1,50 +0,0 @@
-<?php
-/**
- * StoredBudgetLimit.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\Events;
-
-use Carbon\Carbon;
-use FireflyIII\Models\BudgetLimit;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Class StoredBudgetLimit
- *
- * @package FireflyIII\Events
- */
-class StoredBudgetLimit extends Event
-{
-
-    use SerializesModels;
-
-    /** @var  BudgetLimit */
-    public $budgetLimit;
-
-    /** @var  Carbon */
-    public $end; // the only variable we can't get from the budget limit (if necessary).
-
-    /**
-     * BudgetLimitEvents constructor.
-     *
-     * @param BudgetLimit $budgetLimit
-     * @param Carbon      $end
-     */
-    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
-    {
-        //
-        $this->budgetLimit = $budgetLimit;
-        $this->end         = $end;
-
-    }
-
-}

app/Events/UpdatedBudgetLimit.php

@@ -1,50 +0,0 @@
-<?php
-/**
- * UpdatedBudgetLimit.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\Events;
-
-use Carbon\Carbon;
-use FireflyIII\Models\BudgetLimit;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Class UpdatedBudgetLimit
- *
- * @package FireflyIII\Events
- */
-class UpdatedBudgetLimit extends Event
-{
-
-    use SerializesModels;
-
-    /** @var  BudgetLimit */
-    public $budgetLimit;
-
-    /** @var  Carbon */
-    public $end; // the only variable we can't get from the budget limit (if necessary).
-
-    /**
-     * BudgetLimitEvents constructor.
-     *
-     * @param BudgetLimit $budgetLimit
-     * @param Carbon      $end
-     */
-    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
-    {
-        //
-        $this->budgetLimit = $budgetLimit;
-        $this->end         = $end;
-
-    }
-
-}

app/Exceptions/Handler.php

@@ -21,6 +21,7 @@ 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;
 
 /**
@@ -72,6 +73,7 @@ class Handler extends ExceptionHandler
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @param  Exception $exception
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
      *
      * @return void
      */
@@ -98,8 +100,8 @@ class Handler extends ExceptionHandler
             ];
 
             // create job that will mail.
-            $ip  = $_SERVER['REMOTE_ADDR'] ?? '0.0.0.0';
-            $job = new MailError($userData, env('SITE_OWNER', ''), $ip, $data);
+            $ipAddress = Request::ip() ?? '0.0.0.0';
+            $job       = new MailError($userData, env('SITE_OWNER', ''), $ipAddress, $data);
             dispatch($job);
         }
 
@@ -109,9 +111,9 @@ class Handler extends ExceptionHandler
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param $request
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     protected function unauthenticated($request)
     {

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();
     }
 
     /**

app/Export/Collector/BasicCollector.php

@@ -31,13 +31,10 @@ class BasicCollector
 
     /**
      * BasicCollector constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
         $this->entries = new Collection;
-        $this->job     = $job;
     }
 
     /**
@@ -56,5 +53,13 @@ class BasicCollector
         $this->entries = $entries;
     }
 
+    /**
+     * @param ExportJob $job
+     */
+    public function setJob(ExportJob $job)
+    {
+        $this->job = $job;
+    }
+
 
 }

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;
 
 /**
@@ -35,7 +36,16 @@ interface CollectorInterface
     /**
      * @param Collection $entries
      *
+     * @return void
+     *
      */
     public function setEntries(Collection $entries);
 
+    /**
+     * @param ExportJob $job
+     *
+     * @return mixed
+     */
+    public function setJob(ExportJob $job);
+
 }

app/Export/Collector/JournalExportCollector.php

@@ -19,6 +19,7 @@ use DB;
 use FireflyIII\Models\Transaction;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
+use Steam;
 
 /**
  * Class JournalExportCollector
@@ -118,7 +119,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
                  );
         $set->each(
             function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
             }
         );
         $array = [];
@@ -159,7 +160,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
                  );
         $set->each(
             function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
             }
         );
         $array = [];
@@ -202,7 +203,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
                  );
         $set->each(
             function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
             }
         );
         $array = [];
@@ -243,7 +244,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
                  );
         $set->each(
             function ($obj) {
-                $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name;
+                $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name);
             }
         );
         $array = [];
@@ -287,62 +288,61 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
     }
 
     /**
-     *
+     * @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', '=', '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',
+        $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',
+                                            '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',
+                                            '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,7 +14,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Export\Collector;
 
 use Crypt;
-use FireflyIII\Models\ExportJob;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Log;
 use Storage;
@@ -35,22 +34,12 @@ class UploadCollector extends BasicCollector implements CollectorInterface
 
     /**
      * AttachmentCollector constructor.
-     *
-     * @param ExportJob $job
      */
-    public function __construct(ExportJob $job)
+    public function __construct()
     {
-        parent::__construct($job);
-
-        Log::debug('Going to collect attachments', ['key' => $job->key]);
-
-        // make storage:
+        parent::__construct();
         $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,6 +49,11 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      */
     public function run(): bool
     {
+        Log::debug('Going to collect attachments', ['key' => $this->job->key]);
+
+        // file names associated with the old import routine.
+        $this->vintageFormat = sprintf('csv-upload-%d-', $this->job->user->id);
+
         // collect old upload files (names beginning with "csv-upload".
         $this->collectVintageUploads();
 
@@ -94,7 +88,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      *
      * @return bool
      */
-    private function collectVintageUploads():bool
+    private function collectVintageUploads(): bool
     {
         // grab upload directory.
         $files = $this->uploadDisk->files();

app/Export/Entry/Entry.php

@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Export\Entry;
 
 use Crypt;
+use Steam;
 
 /**
  * To extend the exported object, in case of new features in Firefly III for example,
@@ -29,6 +30,7 @@ use Crypt;
  *
  *
  * Class Entry
+ * @SuppressWarnings(PHPMD.LongVariable)
  *
  * @package FireflyIII\Export\Entry
  */
@@ -50,7 +52,6 @@ final class Entry
     public $destination_account_id;
     public $destination_account_name;
 
-
     public $budget_id;
     public $budget_name;
     public $category_id;
@@ -71,33 +72,21 @@ final class Entry
      */
     public static function fromObject($object): Entry
     {
-        $entry = new self;
-
-        // journal information:
-        $entry->journal_id       = $object->transaction_journal_id;
-        $entry->description      = $object->journal_encrypted === 1 ? Crypt::decrypt($object->journal_description) : $object->journal_description;
-        $entry->amount           = round($object->amount, 2); // always positive
-        $entry->date             = $object->date;
-        $entry->transaction_type = $object->transaction_type;
-        $entry->currency_code    = $object->transaction_currency_code;
-
-        // source information:
-        $entry->source_account_id   = $object->account_id;
-        $entry->source_account_name = $object->account_name_encrypted === 1 ? Crypt::decrypt($object->account_name) : $object->account_name;
-
-
-        // destination information
+        $entry                           = new self;
+        $entry->journal_id               = $object->transaction_journal_id;
+        $entry->description              = Steam::decrypt(intval($object->journal_encrypted), $object->journal_description);
+        $entry->amount                   = $object->amount;
+        $entry->date                     = $object->date;
+        $entry->transaction_type         = $object->transaction_type;
+        $entry->currency_code            = $object->transaction_currency_code;
+        $entry->source_account_id        = $object->account_id;
+        $entry->source_account_name      = Steam::decrypt(intval($object->account_name_encrypted), $object->account_name);
         $entry->destination_account_id   = $object->opposing_account_id;
-        $entry->destination_account_name = $object->opposing_account_encrypted === 1 ? Crypt::decrypt($object->opposing_account_name)
-            : $object->opposing_account_name;
-
-
-        // category and budget
-        $entry->category_id   = $object->category_id ?? '';
-        $entry->category_name = $object->category_name ?? '';
-        $entry->budget_id     = $object->budget_id ?? '';
-        $entry->budget_name   = $object->budget_name ?? '';
-
+        $entry->destination_account_name = Steam::decrypt(intval($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) {
@@ -107,4 +96,5 @@ final class Entry
         return $entry;
     }
 
+
 }

app/Export/Exporter/BasicExporter.php

@@ -26,17 +26,15 @@ class BasicExporter
 {
     /** @var  ExportJob */
     protected $job;
-    private   $entries;
+    /** @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();
     }
 
     /**

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;
 
 /**
@@ -40,7 +41,14 @@ interface ExporterInterface
     /**
      * @param Collection $entries
      *
+     * @return void
+     *
      */
     public function setEntries(Collection $entries);
 
+    /**
+     * @param ExportJob $job
+     */
+    public function setJob(ExportJob $job);
+
 }

app/Export/Processor.php

@@ -19,7 +19,6 @@ 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;
@@ -30,7 +29,7 @@ use ZipArchive;
  *
  * @package FireflyIII\Export
  */
-class Processor
+class Processor implements ProcessorInterface
 {
 
     /** @var Collection */
@@ -54,21 +53,12 @@ class Processor
 
     /**
      * Processor constructor.
-     *
-     * @param array $settings
      */
-    public function __construct(array $settings)
+    public function __construct()
     {
-        // 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;
+        $this->journals      = new Collection;
+        $this->exportEntries = new Collection;
+        $this->files         = new Collection;
 
     }
 
@@ -78,7 +68,8 @@ class Processor
     public function collectAttachments(): bool
     {
         /** @var AttachmentCollector $attachmentCollector */
-        $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
+        $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());
@@ -92,7 +83,8 @@ class Processor
     public function collectJournals(): bool
     {
         /** @var JournalExportCollector $collector */
-        $collector = app(JournalExportCollector::class, [$this->job]);
+        $collector = app(JournalExportCollector::class);
+        $collector->setJob($this->job);
         $collector->setDates($this->settings['startDate'], $this->settings['endDate']);
         $collector->setAccounts($this->settings['accounts']);
         $collector->run();
@@ -108,7 +100,8 @@ class Processor
     public function collectOldUploads(): bool
     {
         /** @var UploadCollector $uploadCollector */
-        $uploadCollector = app(UploadCollector::class, [$this->job]);
+        $uploadCollector = app(UploadCollector::class);
+        $uploadCollector->setJob($this->job);
         $uploadCollector->run();
 
         $this->files = $this->files->merge($uploadCollector->getEntries());
@@ -155,7 +148,7 @@ class Processor
         $zip->close();
 
         // delete the files:
-        $this->deleteFiles($disk);
+        $this->deleteFiles();
 
         return true;
     }
@@ -166,7 +159,8 @@ class Processor
     public function exportJournals(): bool
     {
         $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
-        $exporter      = app($exporterClass, [$this->job]);
+        $exporter      = app($exporterClass);
+        $exporter->setJob($this->job);
         $exporter->setEntries($this->exportEntries);
         $exporter->run();
         $this->files->push($exporter->getFileName());
@@ -183,10 +177,25 @@ class Processor
     }
 
     /**
-     * @param FilesystemAdapter $disk
+     * @param array $settings
      */
-    private function deleteFiles(FilesystemAdapter $disk)
+    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);
         }

app/Export/ProcessorInterface.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * ProcessorInterface.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 Illuminate\Support\Collection;
+
+/**
+ * Interface ProcessorInterface
+ *
+ * @package FireflyIII\Export
+ */
+interface ProcessorInterface
+{
+
+    /**
+     * Processor constructor.
+     */
+    public function __construct();
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool;
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function createZipFile(): bool;
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool;
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection;
+
+    /**
+     * @param array $settings
+     */
+    public function setSettings(array $settings);
+}

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -1,62 +0,0 @@
-<?php
-/**
- * AccountChartGeneratorInterface.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\Generator\Chart\Account;
-
-use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use Illuminate\Support\Collection;
-
-/**
- * Interface AccountChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Account
- */
-interface AccountChartGeneratorInterface
-{
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function revenueAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Account $account
-     * @param array   $labels
-     * @param array   $dataSet
-     *
-     * @return array
-     */
-    public function single(Account $account, array $labels, array $dataSet): array;
-}

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -1,132 +0,0 @@
-<?php
-/**
- * ChartJsAccountChartGenerator.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\Generator\Chart\Account;
-
-use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsAccountChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Account
- */
-class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        $data = [
-            'count'  => 1,
-            'labels' => [], 'datasets' => [[
-                                               'label' => trans('firefly.spent'),
-                                               'data'  => []]]];
-        foreach ($accounts as $account) {
-            if ($account->difference > 0) {
-                $data['labels'][]              = $account->name;
-                $data['datasets'][0]['data'][] = $account->difference;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        // language:
-        $format  = (string)trans('config.month_and_day');
-        $data    = ['count' => 0, 'labels' => [], 'datasets' => [],];
-        $current = clone $start;
-        while ($current <= $end) {
-            $data['labels'][] = $current->formatLocalized($format);
-            $current->addDay();
-        }
-
-        foreach ($accounts as $account) {
-            $data['datasets'][] = [
-                'label'                => $account->name,
-                'fillColor'            => 'rgba(220,220,220,0.2)',
-                'strokeColor'          => 'rgba(220,220,220,1)',
-                'pointColor'           => 'rgba(220,220,220,1)',
-                'pointStrokeColor'     => '#fff',
-                'pointHighlightFill'   => '#fff',
-                'pointHighlightStroke' => 'rgba(220,220,220,1)',
-                'data'                 => $account->balances,
-            ];
-        }
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function revenueAccounts(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        $data = [
-            'count'  => 1,
-            'labels' => [], 'datasets' => [[
-                                               'label' => trans('firefly.earned'),
-                                               'data'  => []]]];
-        foreach ($accounts as $account) {
-            if ($account->difference > 0) {
-                $data['labels'][]              = $account->name;
-                $data['datasets'][0]['data'][] = $account->difference;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Account $account
-     * @param array   $labels
-     * @param array   $dataSet
-     *
-     * @return array
-     */
-    public function single(Account $account, array $labels, array $dataSet): array
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => $labels,
-            'datasets' => [
-                [
-                    'label' => $account->name,
-                    'data'  => $dataSet,
-                ],
-            ],
-        ];
-
-        return $data;
-    }
-}

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -0,0 +1,147 @@
+<?php
+/**
+ * ChartJsGenerator.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\Generator\Chart\Basic;
+
+use FireflyIII\Support\ChartColour;
+use Steam;
+
+/**
+ * Class ChartJsGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+class ChartJsGenerator implements GeneratorInterface
+{
+
+    /**
+     * 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'
+     *        ]
+     *    ]
+     * 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
+     *
+     * @return array
+     */
+    public function multiSet(array $data): array
+    {
+        reset($data);
+        $first  = current($data);
+        $labels = is_array($first['entries']) ? array_keys($first['entries']) : [];
+
+        $chartData = [
+            'count'    => count($data),
+            'labels'   => $labels, // take ALL labels from the first set.
+            'datasets' => [],
+        ];
+        unset($first, $labels);
+
+        foreach ($data as $set) {
+            $currentSet = [
+                'label' => $set['label'],
+                'type'  => $set['type'] ?? 'line',
+                'data'  => array_values($set['entries']),
+            ];
+            if (isset($set['yAxisID'])) {
+                $currentSet['yAxisID'] = $set['yAxisID'];
+            }
+            if (isset($set['fill'])) {
+                $currentSet['fill'] = $set['fill'];
+            }
+
+            $chartData['datasets'][] = $currentSet;
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array
+    {
+        $chartData = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+        $index     = 0;
+        foreach ($data as $key => $value) {
+
+            // make larger than 0
+            $chartData['datasets'][0]['data'][]            = floatval(Steam::positive($value));
+            $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $chartData['labels'][]                         = $key;
+            $index++;
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array
+    {
+        $chartData = [
+            'count'    => 1,
+            'labels'   => array_keys($data), // take ALL labels from the first set.
+            'datasets' => [
+                [
+                    'label' => $setLabel,
+                    'data'  => array_values($data),
+                ],
+            ],
+        ];
+
+        return $chartData;
+    }
+}

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * GeneratorInterface.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\Generator\Chart\Basic;
+
+/**
+ * Interface GeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+interface GeneratorInterface
+{
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 0: [
+     *    'label' => 'label of set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     * 1: [
+     *    'label' => 'label of another set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     *
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiSet(array $data): array;
+
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array;
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array;
+
+}

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * BillChartGeneratorInterface.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\Generator\Chart\Bill;
-
-
-use FireflyIII\Models\Bill;
-use Illuminate\Support\Collection;
-
-/**
- * Interface BillChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Bill
- */
-interface BillChartGeneratorInterface
-{
-
-    /**
-     * @param string $paid
-     * @param string $unpaid
-     *
-     * @return array
-     */
-    public function frontpage(string $paid, string $unpaid): array;
-
-    /**
-     * @param Bill       $bill
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function single(Bill $bill, Collection $entries): array;
-
-}

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -1,94 +0,0 @@
-<?php
-/**
- * ChartJsBillChartGenerator.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\Generator\Chart\Bill;
-
-use FireflyIII\Models\Bill;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Support\ChartColour;
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsBillChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Bill
- */
-class ChartJsBillChartGenerator implements BillChartGeneratorInterface
-{
-
-    /**
-     * @param string $paid
-     * @param string $unpaid
-     *
-     * @return array
-     */
-    public function frontpage(string $paid, string $unpaid): array
-    {
-        $data = [
-            'datasets' => [
-                [
-                    'data'            => [round($unpaid, 2), round(bcmul($paid, '-1'), 2)],
-                    'backgroundColor' => [ChartColour::getColour(0), ChartColour::getColour(1)],
-                ],
-
-            ],
-            'labels'   => [strval(trans('firefly.unpaid')), strval(trans('firefly.paid'))],
-
-        ];
-
-        return $data;
-    }
-
-    /**
-     * @param Bill       $bill
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function single(Bill $bill, Collection $entries): array
-    {
-        $format       = (string)trans('config.month');
-        $data         = ['count' => 3, 'labels' => [], 'datasets' => [],];
-        $minAmount    = [];
-        $maxAmount    = [];
-        $actualAmount = [];
-        /** @var Transaction $entry */
-        foreach ($entries as $entry) {
-            $data['labels'][] = $entry->date->formatLocalized($format);
-            $minAmount[]      = round($bill->amount_min, 2);
-            $maxAmount[]      = round($bill->amount_max, 2);
-            // journalAmount has been collected in BillRepository::getJournals
-            $actualAmount[] = bcmul($entry->transaction_amount, '-1');
-        }
-
-        $data['datasets'][] = [
-            'type'  => 'bar',
-            'label' => trans('firefly.minAmount'),
-            'data'  => $minAmount,
-        ];
-        $data['datasets'][] = [
-            'type'  => 'line',
-            'label' => trans('firefly.billEntry'),
-            'data'  => $actualAmount,
-        ];
-        $data['datasets'][] = [
-            'type'  => 'bar',
-            'label' => trans('firefly.maxAmount'),
-            'data'  => $maxAmount,
-        ];
-
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-}

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -1,56 +0,0 @@
-<?php
-/**
- * BudgetChartGeneratorInterface.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\Generator\Chart\Budget;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface BudgetChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Budget
- */
-interface BudgetChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     * @param string     $dateFormat
-     *
-     * @return array
-     */
-    public function budgetLimit(Collection $entries, string $dateFormat): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function period(array $entries) : array;
-
-    /**
-     * @param Collection $budgets
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function year(Collection $budgets, Collection $entries): array;
-
-}

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -1,175 +0,0 @@
-<?php
-/**
- * ChartJsBudgetChartGenerator.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\Generator\Chart\Budget;
-
-
-use Illuminate\Support\Collection;
-use Navigation;
-
-/**
- * Class ChartJsBudgetChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Budget
- */
-class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
-{
-    /**
-     *
-     * @param Collection $entries
-     * @param string     $dateFormat
-     *
-     * @return array
-     */
-    public function budgetLimit(Collection $entries, string $dateFormat = 'month_and_day'): array
-    {
-        $format = strval(trans('config.' . $dateFormat));
-        $data   = [
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => 'Amount',
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        /** @var array $entry */
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = $entry[1];
-
-        }
-
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array
-    {
-        $data      = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-        $left      = [];
-        $spent     = [];
-        $overspent = [];
-        $filtered  = $entries->filter(
-            function ($entry) {
-                return ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0);
-            }
-        );
-        foreach ($filtered as $entry) {
-            $data['labels'][] = $entry[0];
-            $left[]           = round($entry[1], 2);
-            $spent[]          = round(bcmul($entry[2], '-1'), 2); // spent is coming in negative, must be positive
-            $overspent[]      = round(bcmul($entry[3], '-1'), 2); // same
-        }
-
-        $data['datasets'][] = [
-            'label' => trans('firefly.overspent'),
-            'data'  => $overspent,
-        ];
-        $data['datasets'][] = [
-            'label' => trans('firefly.left'),
-            'data'  => $left,
-        ];
-        $data['datasets'][] = [
-            'label' => trans('firefly.spent'),
-            'data'  => $spent,
-        ];
-
-        $data['count'] = 3;
-
-        return $data;
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function period(array $entries) : array
-    {
-
-        $data = [
-            'labels'   => array_keys($entries),
-            'datasets' => [
-                0 => [
-                    'label' => trans('firefly.budgeted'),
-                    'data'  => [],
-                ],
-                1 => [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-            'count'    => 2,
-        ];
-
-        foreach ($entries as $label => $entry) {
-            // data set 0 is budgeted
-            // data set 1 is spent:
-            $data['datasets'][0]['data'][] = $entry['budgeted'];
-            $data['datasets'][1]['data'][] = round(($entry['spent'] * -1), 2);
-
-        }
-
-        return $data;
-
-    }
-
-    /**
-     * @param Collection $budgets
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function year(Collection $budgets, Collection $entries): array
-    {
-        // language:
-        $format = (string)trans('config.month');
-
-        $data = [
-            'labels'   => [],
-            'datasets' => [],
-        ];
-
-        foreach ($budgets as $budget) {
-            $data['labels'][] = $budget->name;
-        }
-        // also add "no budget"
-        $data['labels'][] = strval(trans('firefly.no_budget'));
-
-        /** @var array $entry */
-        foreach ($entries as $entry) {
-            $array = [
-                'label' => $entry[0]->formatLocalized($format),
-                'data'  => [],
-            ];
-            array_shift($entry);
-            $array['data']      = $entry;
-            $data['datasets'][] = $array;
-
-        }
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-}

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -1,76 +0,0 @@
-<?php
-/**
- * CategoryChartGeneratorInterface.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\Generator\Chart\Category;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface CategoryChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Category
- */
-interface CategoryChartGeneratorInterface
-{
-
-    /**
-     * @param array $data
-     *
-     * @return array
-     */
-    public function pieChart(array $data): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function all(Collection $entries): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function mainReportChart(array $entries): array;
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function earnedInPeriod(Collection $categories, Collection $entries): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries): array;
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function spentInPeriod(Collection $categories, Collection $entries): array;
-}

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -1,239 +0,0 @@
-<?php
-/**
- * ChartJsCategoryChartGenerator.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\Generator\Chart\Category;
-
-use FireflyIII\Support\ChartColour;
-use Illuminate\Support\Collection;
-
-
-/**
- * Class ChartJsCategoryChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Category
- */
-class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function all(Collection $entries): array
-    {
-        $data = [
-            'count'    => 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.earned'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][] = $entry[1];
-            $spent            = $entry[2];
-            $earned           = $entry[3];
-
-            $data['datasets'][0]['data'][] = bccomp($spent, '0') === 0 ? null : round(bcmul($spent, '-1'), 4);
-            $data['datasets'][1]['data'][] = bccomp($earned, '0') === 0 ? null : round($earned, 4);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function earnedInPeriod(Collection $categories, Collection $entries): array
-    {
-
-        // language:
-        $format = (string)trans('config.month');
-
-        $data = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-
-        foreach ($categories as $category) {
-            $data['labels'][] = $category->name;
-        }
-
-        foreach ($entries as $entry) {
-            $date = $entry[0]->formatLocalized($format);
-            array_shift($entry);
-            $data['count']++;
-            $data['datasets'][] = ['label' => $date, 'data' => $entry];
-        }
-
-        return $data;
-
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        foreach ($entries as $entry) {
-            if ($entry->spent != 0) {
-                $data['labels'][]              = $entry->name;
-                $data['datasets'][0]['data'][] = round(bcmul($entry->spent, '-1'), 2);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function mainReportChart(array $entries): array
-    {
-
-        $data = [
-            'count'    => 0,
-            'labels'   => array_keys($entries),
-            'datasets' => [],
-        ];
-
-
-        foreach ($entries as $row) {
-            foreach ($row['in'] as $categoryId => $amount) {
-                // get in:
-                $data['datasets'][$categoryId . 'in']['data'][] = round($amount, 2);
-
-                // get out:
-                $opposite                                        = $row['out'][$categoryId];
-                $data['datasets'][$categoryId . 'out']['data'][] = round($opposite, 2);
-
-                // set name:
-                $data['datasets'][$categoryId . 'out']['label'] = $row['name'][$categoryId] . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')';
-                $data['datasets'][$categoryId . 'in']['label']  = $row['name'][$categoryId] . ' (' . strtolower(strval(trans('firefly.income'))) . ')';
-
-            }
-        }
-
-        // remove empty rows:
-        foreach ($data['datasets'] as $key => $content) {
-            if (array_sum($content['data']) === 0.0) {
-                unset($data['datasets'][$key]);
-            }
-        }
-
-        // re-key the datasets array:
-        $data['datasets'] = array_values($data['datasets']);
-        $data['count']    = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries): array
-    {
-        return $this->all($entries);
-
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function pieChart(array $entries): array
-    {
-        $data  = [
-            'datasets' => [
-                0 => [],
-            ],
-            'labels'   => [],
-        ];
-        $index = 0;
-        foreach ($entries as $entry) {
-
-            if (bccomp($entry['amount'], '0') === -1) {
-                $entry['amount'] = bcmul($entry['amount'], '-1');
-            }
-
-            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
-            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
-            $data['labels'][]                         = $entry['name'];
-            $index++;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $categories
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function spentInPeriod(Collection $categories, Collection $entries): array
-    {
-
-        // language:
-        $format = (string)trans('config.month');
-
-        $data = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-
-        foreach ($categories as $category) {
-            $data['labels'][] = $category->name;
-        }
-
-        foreach ($entries as $entry) {
-            $date = $entry[0]->formatLocalized($format);
-            array_shift($entry);
-            $data['count']++;
-            $data['datasets'][] = ['label' => $date, 'data' => $entry];
-        }
-
-        return $data;
-
-    }
-}

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -1,58 +0,0 @@
-<?php
-/**
- * ChartJsPiggyBankChartGenerator.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\Generator\Chart\PiggyBank;
-
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-
-
-/**
- * Class ChartJsPiggyBankChartGenerator
- *
- * @package FireflyIII\Generator\Chart\PiggyBank
- */
-class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    public function history(Collection $set): array
-    {
-
-        // language:
-        $format = (string)trans('config.month_and_day');
-
-        $data = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => 'Diff',
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $sum  = '0';
-        foreach ($set as $key => $value) {
-            $date                          = new Carbon($key);
-            $sum                           = bcadd($sum, $value);
-            $data['labels'][]              = $date->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($sum, 2);
-        }
-
-        return $data;
-    }
-}

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -1,180 +0,0 @@
-<?php
-/**
- * ChartJsReportChartGenerator.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\Generator\Chart\Report;
-
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsReportChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Report
- */
-class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
-{
-
-    /**
-     * Same as above but other translations.
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYearInOut(Collection $entries): array
-    {
-        $data = [
-            'count'    => 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized('%Y');
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
-            $data['datasets'][1]['data'][] = round($entry[2], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function multiYearInOutSummarized(string $income, string $expense, int $count): array
-    {
-        $data                          = [
-            'count'    => 2,
-            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round($expense, 2);
-        $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function netWorth(Collection $entries) : array
-    {
-        $format = (string)trans('config.month_and_day');
-        $data   = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.net_worth'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        foreach ($entries as $entry) {
-            $data['labels'][]              = trim($entry['date']->formatLocalized($format));
-            $data['datasets'][0]['data'][] = round($entry['net-worth'], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function yearInOut(Collection $entries): array
-    {
-        // language:
-        $format = (string)trans('config.month');
-
-        $data = [
-            'count'    => 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
-            $data['datasets'][1]['data'][] = round($entry[2], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function yearInOutSummarized(string $income, string $expense, int $count): array
-    {
-
-        $data                          = [
-            'count'    => 2,
-            'labels'   => [trans('firefly.sum_of_year'), trans('firefly.average_of_year')],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round($expense, 2);
-        $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
-
-        return $data;
-    }
-}

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -1,65 +0,0 @@
-<?php
-/**
- * ReportChartGeneratorInterface.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\Generator\Chart\Report;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface ReportChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Report
- */
-interface ReportChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYearInOut(Collection $entries): array;
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function multiYearInOutSummarized(string $income, string $expense, int $count): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function netWorth(Collection $entries) : array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function yearInOut(Collection $entries): array;
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function yearInOutSummarized(string $income, string $expense, int $count): array;
-
-}

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -16,7 +16,7 @@ namespace FireflyIII\Generator\Report\Audit;
 
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
-use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
@@ -25,7 +25,7 @@ use Steam;
 /**
  * Class MonthReportGenerator
  *
- * @package FireflyIII\Generator\Report\Standard
+ * @package FireflyIII\Generator\Report\Audit
  */
 class MonthReportGenerator implements ReportGeneratorInterface
 {
@@ -49,38 +49,13 @@ class MonthReportGenerator implements ReportGeneratorInterface
         /** @var Account $account */
         foreach ($this->accounts as $account) {
             // balance the day before:
-            $id               = $account->id;
-            $dayBeforeBalance = Steam::balance($account, $dayBefore);
-            $collector        = new JournalCollector(auth()->user());
-            $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
-            $journals     = $collector->getJournals();
-            $journals     = $journals->reverse();
-            $startBalance = $dayBeforeBalance;
-
-
-            /** @var Transaction $journal */
-            foreach ($journals as $transaction) {
-                $transaction->before = $startBalance;
-                $transactionAmount   = $transaction->transaction_amount;
-                $newBalance          = bcadd($startBalance, $transactionAmount);
-                $transaction->after  = $newBalance;
-                $startBalance        = $newBalance;
-            }
-
-            /*
-             * Reverse set again.
-             */
-            $auditData[$id]['journals']         = $journals->reverse();
-            $auditData[$id]['exists']           = $journals->count() > 0;
-            $auditData[$id]['end']              = $this->end->formatLocalized(strval(trans('config.month_and_day')));
-            $auditData[$id]['endBalance']       = Steam::balance($account, $this->end);
-            $auditData[$id]['dayBefore']        = $dayBefore->formatLocalized(strval(trans('config.month_and_day')));
-            $auditData[$id]['dayBeforeBalance'] = $dayBeforeBalance;
+            $id             = $account->id;
+            $auditData[$id] = $this->getAuditReport($account, $dayBefore);
         }
 
-        $reportType = 'audit';
-        $accountIds = join(',', $this->accounts->pluck('id')->toArray());
-
+        $defaultShow = ['icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'to'];
+        $reportType  = 'audit';
+        $accountIds  = join(',', $this->accounts->pluck('id')->toArray());
         $hideable    = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date',
                         'interest_date', 'book_date', 'process_date',
                         // three new optional fields.
@@ -88,10 +63,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'from', 'to', 'budget', 'category', 'bill',
                         // more new optional fields
                         'internal_reference', 'notes',
-
                         'create_date', 'update_date',
         ];
-        $defaultShow = ['icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'to'];
+
 
         return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
             ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
@@ -111,6 +85,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Collection $categories
      *
@@ -144,4 +128,56 @@ 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
+     */
+    private function getAuditReport(Account $account, Carbon $date): array
+    {
+
+        /** @var JournalCollectorInterface $collector */
+        $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;
+
+
+        /** @var Transaction $journal */
+        foreach ($journals as $transaction) {
+            $transaction->before = $startBalance;
+            $transactionAmount   = $transaction->transaction_amount;
+            $newBalance          = bcadd($startBalance, $transactionAmount);
+            $transaction->after  = $newBalance;
+            $startBalance        = $newBalance;
+        }
+
+        /*
+         * Reverse set again.
+         */
+        $return = [
+            'journals'         => $journals->reverse(),
+            'exists'           => $journals->count() > 0,
+            'end'              => $this->end->formatLocalized(strval(trans('config.month_and_day'))),
+            'endBalance'       => Steam::balance($account, $this->end),
+            'dayBefore'        => $date->formatLocalized(strval(trans('config.month_and_day'))),
+            'dayBeforeBalance' => $dayBeforeBalance,
+        ];
+
+        return $return;
+    }
+}

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -24,4 +24,4 @@ class MultiYearReportGenerator extends MonthReportGenerator
     /**
      * Doesn't do anything different.
      */
-}
+}

app/Generator/Report/Audit/YearReportGenerator.php

@@ -25,4 +25,4 @@ class YearReportGenerator extends MonthReportGenerator
     /**
      * Doesn't do anything different.
      */
-}
+}

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -0,0 +1,258 @@
+<?php
+/**
+ * MonthReportGenerator.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\Generator\Report\Budget;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Collection */
+    private $budgets;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->income   = new Collection;
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $budgetIds       = join(',', $this->budgets->pluck('id')->toArray());
+        $expenses        = $this->getExpenses();
+        $accountSummary  = $this->summarizeByAccount($expenses);
+        $budgetSummary   = $this->summarizeByBudget($expenses);
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $topExpenses     = $this->getTopExpenses();
+
+        // render!
+        return view('reports.budget.month', compact('accountIds', 'budgetIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
+            ->with('start', $this->start)->with('end', $this->end)
+            ->with('budgets', $this->budgets)
+            ->with('accounts', $this->accounts)
+            ->render();
+    }
+
+    /**
+     * @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
+    {
+        $this->budgets = $budgets;
+
+        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
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $collection
+     * @param int        $sortFlag
+     *
+     * @return array
+     */
+    private function getAverages(Collection $collection, int $sortFlag): array
+    {
+        $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;
+    }
+
+    /**
+     * @return Collection
+     */
+    private 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])
+                  ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter();
+
+        $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
+     *
+     * @return array
+     */
+    private function summarizeByBudget(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $jrnlBudId         = intval($transaction->transaction_journal_budget_id);
+            $transBudId        = intval($transaction->transaction_budget_id);
+            $budgetId          = max($jrnlBudId, $transBudId);
+            $result[$budgetId] = $result[$budgetId] ?? '0';
+            $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * MultiYearReportGenerator.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\Generator\Report\Budget;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Budget/YearReportGenerator.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * YearReportGenerator.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\Generator\Report\Budget;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Category/MonthReportGenerator.php

@@ -15,9 +15,9 @@ namespace FireflyIII\Generator\Report\Category;
 
 
 use Carbon\Carbon;
-use Crypt;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
-use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
@@ -60,10 +60,12 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
         $categoryIds     = join(',', $this->categories->pluck('id')->toArray());
         $reportType      = 'category';
-        $accountSummary  = $this->getAccountSummary();
-        $categorySummary = $this->getCategorySummary();
-        $averageExpenses = $this->getAverageExpenses();
-        $averageIncome   = $this->getAverageIncome();
+        $expenses        = $this->getExpenses();
+        $income          = $this->getIncome();
+        $accountSummary  = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income));
+        $categorySummary = $this->getObjectSummary($this->summarizeByCategory($expenses), $this->summarizeByCategory($income));
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $averageIncome   = $this->getAverages($income, SORT_DESC);
         $topExpenses     = $this->getTopExpenses();
         $topIncome       = $this->getTopIncome();
 
@@ -93,6 +95,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Collection $categories
      *
@@ -130,61 +142,32 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     }
 
     /**
-     * @return array
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
      */
-    private function getAccountSummary(): array
+    public function setTags(Collection $tags): ReportGeneratorInterface
     {
-        $spent  = $this->getSpentAccountSummary();
-        $earned = $this->getEarnedAccountSummary();
-        $return = [];
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($spent as $accountId => $entry) {
-            if (!isset($return[$accountId])) {
-                $return[$accountId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$accountId]['spent'] = $entry;
-        }
-        unset($entry);
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($earned as $accountId => $entry) {
-            if (!isset($return[$accountId])) {
-                $return[$accountId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$accountId]['earned'] = $entry;
-        }
-
-
-        return $return;
-
+        return $this;
     }
 
     /**
+     * @param Collection $collection
+     * @param int        $sortFlag
+     *
      * @return array
      */
-    private function getAverageExpenses(): array
+    private function getAverages(Collection $collection, int $sortFlag): array
     {
-        $expenses = $this->getExpenses();
-        $result   = [];
+        $result = [];
         /** @var Transaction $transaction */
-        foreach ($expenses as $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;
-                $encrypted           = intval($transaction->opposing_account_encrypted);
-                $name                = $encrypted === 1 ? Crypt::decrypt($name) : $name;
                 $result[$opposingId] = [
                     'name'    => $name,
                     'count'   => 1,
@@ -205,124 +188,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             $average[$key] = floatval($row['average']);
         }
 
-        array_multisort($average, SORT_ASC, $result);
-
-        return $result;
-
-    }
-
-    /**
-     * @return array
-     */
-    private function getAverageIncome(): array
-    {
-        $expenses = $this->getIncome();
-        $result   = [];
-        /** @var Transaction $transaction */
-        foreach ($expenses as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $encrypted           = intval($transaction->opposing_account_encrypted);
-                $name                = $encrypted === 1 ? Crypt::decrypt($name) : $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, SORT_DESC, $result);
-
-        return $result;
-    }
-
-    /**
-     * @return array
-     */
-    private function getCategorySummary(): array
-    {
-        $spent  = $this->getSpentCategorySummary();
-        $earned = $this->getEarnedCategorySummary();
-        $return = [];
-
-        /**
-         * @var int    $categoryId
-         * @var string $entry
-         */
-        foreach ($spent as $categoryId => $entry) {
-            if (!isset($return[$categoryId])) {
-                $return[$categoryId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$categoryId]['spent'] = $entry;
-        }
-        unset($entry);
-
-        /**
-         * @var int    $categoryId
-         * @var string $entry
-         */
-        foreach ($earned as $categoryId => $entry) {
-            if (!isset($return[$categoryId])) {
-                $return[$categoryId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$categoryId]['earned'] = $entry;
-        }
-
-        return $return;
-    }
-
-    /**
-     * @return array
-     */
-    private function getEarnedAccountSummary(): array
-    {
-        $transactions = $this->getIncome();
-        $result       = [];
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return array
-     */
-    private function getEarnedCategorySummary(): array
-    {
-        $transactions = $this->getIncome();
-        $result       = [];
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $jrnlCatId  = intval($transaction->transaction_journal_category_id);
-            $transCatId = intval($transaction->transaction_category_id);
-            $categoryId = max($jrnlCatId, $transCatId);
-
-            $result[$categoryId] = $result[$categoryId] ?? '0';
-            $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
-        }
+        array_multisort($average, $sortFlag, $result);
 
         return $result;
     }
@@ -338,7 +204,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             return $this->expenses;
         }
 
-        $collector = new JournalCollector(auth()->user());
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount()->disableFilter();
@@ -360,7 +227,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
             return $this->income;
         }
 
-        $collector = new JournalCollector(auth()->user());
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount();
@@ -373,43 +241,45 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     }
 
     /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param array $spent
+     * @param array $earned
+     *
      * @return array
      */
-    private function getSpentAccountSummary(): array
+    private function getObjectSummary(array $spent, array $earned): array
     {
-        $transactions = $this->getExpenses();
-        $result       = [];
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+        $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 $result;
+
+        return $return;
     }
 
-    /**
-     * @return array
-     */
-    private function getSpentCategorySummary(): array
-    {
-        $transactions = $this->getExpenses();
-        $result       = [];
-        /** @var Transaction $transaction */
-        foreach ($transactions as $transaction) {
-            $jrnlCatId  = intval($transaction->transaction_journal_category_id);
-            $transCatId = intval($transaction->transaction_category_id);
-            $categoryId = max($jrnlCatId, $transCatId);
-
-            $result[$categoryId] = $result[$categoryId] ?? '0';
-            $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
-        }
-
-        return $result;
-
-
-    }
 
     /**
      * @return Collection
@@ -418,14 +288,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     {
         $transactions = $this->getExpenses()->sortBy('transaction_amount');
 
-        $transactions = $transactions->each(
-            function (Transaction $transaction) {
-                if (intval($transaction->opposing_account_encrypted) === 1) {
-                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
-                }
-            }
-        );
-
         return $transactions;
     }
 
@@ -436,14 +298,44 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     {
         $transactions = $this->getIncome()->sortByDesc('transaction_amount');
 
-        $transactions = $transactions->each(
-            function (Transaction $transaction) {
-                if (intval($transaction->opposing_account_encrypted) === 1) {
-                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
-                }
-            }
-        );
-
         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
+     *
+     * @return array
+     */
+    private function summarizeByCategory(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $jrnlCatId           = intval($transaction->transaction_journal_category_id);
+            $transCatId          = intval($transaction->transaction_category_id);
+            $categoryId          = max($jrnlCatId, $transCatId);
+            $result[$categoryId] = $result[$categoryId] ?? '0';
+            $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -24,4 +24,4 @@ class MultiYearReportGenerator extends MonthReportGenerator
     /**
      * Doesn't do anything different.
      */
-}
+}

app/Generator/Report/Category/YearReportGenerator.php

@@ -25,4 +25,4 @@ class YearReportGenerator extends MonthReportGenerator
     /**
      * Doesn't do anything different.
      */
-}
+}

app/Generator/Report/ReportGeneratorFactory.php

@@ -57,4 +57,4 @@ class ReportGeneratorFactory
         }
         throw new FireflyException(sprintf('Cannot generate report. There is no "%s"-report for period "%s".', $type, $period));
     }
-}
+}

app/Generator/Report/ReportGeneratorInterface.php

@@ -36,6 +36,13 @@ interface ReportGeneratorInterface
      */
     public function setAccounts(Collection $accounts): ReportGeneratorInterface;
 
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface;
+
     /**
      * @param Collection $categories
      *
@@ -57,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

@@ -38,10 +38,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     public function generate(): string
     {
-        $helper = app(ReportHelperInterface::class);
-        $bills  = $helper->getBillReport($this->start, $this->end, $this->accounts);
-
-        // and some id's, joined:
+        /** @var ReportHelperInterface $helper */
+        $helper     = app(ReportHelperInterface::class);
+        $bills      = $helper->getBillReport($this->start, $this->end, $this->accounts);
         $accountIds = join(',', $this->accounts->pluck('id')->toArray());
         $reportType = 'default';
 
@@ -64,6 +63,26 @@ class MonthReportGenerator implements ReportGeneratorInterface
         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
      *
@@ -89,12 +108,12 @@ class MonthReportGenerator implements ReportGeneratorInterface
     }
 
     /**
-     * @param Collection $categories
+     * @param Collection $tags
      *
      * @return ReportGeneratorInterface
      */
-    public function setCategories(Collection $categories): ReportGeneratorInterface
+    public function setTags(Collection $tags): ReportGeneratorInterface
     {
         return $this;
     }
-}
+}

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -60,6 +60,16 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Collection $categories
      *
@@ -93,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

@@ -60,6 +60,16 @@ class YearReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Collection $categories
      *
@@ -93,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

@@ -11,7 +11,7 @@
 
 declare(strict_types = 1);
 
-namespace FireflyIII\Generator\Report\Category;
+namespace FireflyIII\Generator\Report;
 
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
@@ -34,27 +34,7 @@ class Support
      */
     public static function filterExpenses(Collection $collection, array $accounts): Collection
     {
-        $result = $collection->filter(
-            function (Transaction $transaction) use ($accounts) {
-                $opposing = $transaction->opposing_account_id;
-                // remove internal transfer
-                if (in_array($opposing, $accounts)) {
-                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id));
-
-                    return null;
-                }
-                // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === 1) {
-                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
-
-                    return null;
-                }
-
-                return $transaction;
-            }
-        );
-
-        return $result;
+        return self::filterTransactions($collection, $accounts, 1);
     }
 
     /**
@@ -64,9 +44,21 @@ class Support
      * @return Collection
      */
     public static function filterIncome(Collection $collection, array $accounts): Collection
+    {
+        return self::filterTransactions($collection, $accounts, -1);
+    }
+
+    /**
+     * @param Collection $collection
+     * @param array      $accounts
+     * @param int        $modifier
+     *
+     * @return Collection
+     */
+    public static function filterTransactions(Collection $collection, array $accounts, int $modifier): Collection
     {
         $result = $collection->filter(
-            function (Transaction $transaction) use ($accounts) {
+            function (Transaction $transaction) use ($accounts, $modifier) {
                 $opposing = $transaction->opposing_account_id;
                 // remove internal transfer
                 if (in_array($opposing, $accounts)) {
@@ -75,7 +67,7 @@ class Support
                     return null;
                 }
                 // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === -1) {
+                if (bccomp($transaction->transaction_amount, '0') === $modifier) {
                     Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
 
                     return null;
@@ -88,4 +80,4 @@ class Support
         return $result;
     }
 
-}
+}

app/Handlers/Events/BudgetEventHandler.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * BudgetEventHandler.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\Handlers\Events;
-
-
-use Carbon\Carbon;
-use FireflyIII\Events\StoredBudgetLimit;
-use FireflyIII\Events\UpdatedBudgetLimit;
-use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\LimitRepetition;
-use Illuminate\Database\QueryException;
-use Log;
-
-/**
- * Handles budget related events.
- *
- * Class BudgetEventHandler
- *
- * @package FireflyIII\Handlers\Events
- */
-class BudgetEventHandler
-{
-    /**
-     * This method creates a new budget limit repetition when a new budget limit has been created.
-     *
-     * @param StoredBudgetLimit $event
-     *
-     * @return bool
-     */
-    public function storeRepetition(StoredBudgetLimit $event):bool
-    {
-        return $this->processRepetitionChange($event->budgetLimit, $event->end);
-    }
-
-    /**
-     * Updates, if present the budget limit repetition part of a budget limit.
-     *
-     * @param UpdatedBudgetLimit $event
-     *
-     * @return bool
-     */
-    public function updateRepetition(UpdatedBudgetLimit $event): bool
-    {
-        return $this->processRepetitionChange($event->budgetLimit, $event->end);
-    }
-
-    /**
-     * @param BudgetLimit $budgetLimit
-     * @param Carbon      $date
-     *
-     * @return bool
-     */
-    private function processRepetitionChange(BudgetLimit $budgetLimit, Carbon $date):bool
-    {
-        $set = $budgetLimit->limitrepetitions()
-                           ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
-                           ->where('enddate', $date->format('Y-m-d 00:00:00'))
-                           ->get();
-        if ($set->count() == 0) {
-            $repetition            = new LimitRepetition;
-            $repetition->startdate = $budgetLimit->startdate;
-            $repetition->enddate   = $date;
-            $repetition->amount    = $budgetLimit->amount;
-            $repetition->budgetLimit()->associate($budgetLimit);
-
-            try {
-                $repetition->save();
-            } catch (QueryException $e) {
-                Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
-            }
-        }
-
-        if ($set->count() == 1) {
-            $repetition         = $set->first();
-            $repetition->amount = $budgetLimit->amount;
-            $repetition->save();
-
-        }
-
-        return true;
-    }
-}

app/Handlers/Events/StoredJournalEventHandler.php

@@ -16,6 +16,7 @@ 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;
@@ -42,62 +43,23 @@ class StoredJournalEventHandler
         /** @var TransactionJournal $journal */
         $journal     = $event->journal;
         $piggyBankId = $event->piggyBankId;
-
         Log::debug(sprintf('Trying to connect journal %d to piggy bank %d.', $journal->id, $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 true;
-        }
-        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')));
+        /*
+         * Verify existence of piggy bank:
+         */
+        if (!$this->verifyExistence($event)) {
+            Log::error(sprintf('No such piggy bank or no repetition on %s', $journal->date->format('Y-m-d')));
 
             return true;
         }
 
-        $amount = TransactionJournal::amountPositive($journal);
-        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
-        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
-        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) {
-            // amount is positive
-            $room = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount));
-            Log::debug(sprintf('Room in piggy bank for extra money is %f', $room));
-            if (bccomp($room, $amount) === -1) {
-                // $room is smaller than $amount
-                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));
-                $amount = $room;
-            }
-        }
-
-        if (bccomp($amount, '0') === -1) {
-            // amount is negative
-            Log::debug(sprintf('Max amount to remove is %f', $repetition->currentamount));
-            $compare = bcmul($repetition->currentamount, '-1');
-            if (bccomp($compare, $amount) === 1) {
-                // $currentamount is smaller than $amount
-                Log::debug(sprintf('Cannot remove %f from piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-                Log::debug(sprintf('New amount is %f', $compare));
-                $amount = $compare;
-            }
-        }
-
-
+        /*
+         * Get relevant data:
+         */
+        $piggyBank                 = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+        $repetition                = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+        $amount                    = $this->getExactAmount($journal, $piggyBank, $repetition);
         $repetition->currentamount = bcadd($repetition->currentamount, $amount);
         $repetition->save();
 
@@ -113,14 +75,14 @@ class StoredJournalEventHandler
     /**
      * This method grabs all the users rules and processes them.
      *
-     * @param StoredTransactionJournal $event
+     * @param StoredTransactionJournal $storedJournalEvent
      *
      * @return bool
      */
-    public function processRules(StoredTransactionJournal $event): bool
+    public function processRules(StoredTransactionJournal $storedJournalEvent): bool
     {
         // get all the user's rule groups, with the rules, order by 'order'.
-        $journal = $event->journal;
+        $journal = $storedJournalEvent->journal;
         $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
         //
         /** @var RuleGroup $group */
@@ -150,15 +112,92 @@ class StoredJournalEventHandler
     /**
      * This method calls a special bill scanner that will check if the stored journal is part of a bill.
      *
-     * @param StoredTransactionJournal $event
+     * @param StoredTransactionJournal $storedJournalEvent
      *
      * @return bool
      */
-    public function scanBills(StoredTransactionJournal $event): bool
+    public function scanBills(StoredTransactionJournal $storedJournalEvent): bool
     {
-        $journal = $event->journal;
+        $journal = $storedJournalEvent->journal;
         BillScanner::scan($journal);
 
         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

@@ -31,14 +31,14 @@ class UpdatedJournalEventHandler
     /**
      * This method will check all the rules when a journal is updated.
      *
-     * @param UpdatedTransactionJournal $event
+     * @param UpdatedTransactionJournal $updatedJournalEvent
      *
      * @return bool
      */
-    public function processRules(UpdatedTransactionJournal $event):bool
+    public function processRules(UpdatedTransactionJournal $updatedJournalEvent): bool
     {
         // get all the user's rule groups, with the rules, order by 'order'.
-        $journal = $event->journal;
+        $journal = $updatedJournalEvent->journal;
         $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
         //
         /** @var RuleGroup $group */
@@ -67,13 +67,13 @@ class UpdatedJournalEventHandler
     /**
      * This method calls a special bill scanner that will check if the updated journal is part of a bill.
      *
-     * @param UpdatedTransactionJournal $event
+     * @param UpdatedTransactionJournal $updatedJournalEvent
      *
      * @return bool
      */
-    public function scanBills(UpdatedTransactionJournal $event): bool
+    public function scanBills(UpdatedTransactionJournal $updatedJournalEvent): bool
     {
-        $journal = $event->journal;
+        $journal = $updatedJournalEvent->journal;
         BillScanner::scan($journal);
 
         return true;

app/Handlers/Events/UserEventHandler.php

@@ -13,18 +13,12 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Handlers\Events;
 
-use Exception;
-use FireflyConfig;
-use FireflyIII\Events\ConfirmedUser;
 use FireflyIII\Events\RegisteredUser;
-use FireflyIII\Events\ResentConfirmation;
+use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Mail\Message;
 use Log;
 use Mail;
-use Preferences;
-use Session;
 use Swift_TransportException;
 
 /**
@@ -34,7 +28,6 @@ use Swift_TransportException;
  *
  * The method name reflects what is being done. This is in the present tense.
  *
- *
  * @package FireflyIII\Handlers\Events
  */
 class UserEventHandler
@@ -61,46 +54,32 @@ class UserEventHandler
     }
 
     /**
-     * Handle user logout events.
+     * @param RequestedNewPassword $event
      *
      * @return bool
      */
-    public function logoutUser(): bool
+    public function sendNewPassword(RequestedNewPassword $event): bool
     {
-        // dump stuff from the session:
-        Session::forget('twofactor-authenticated');
-        Session::forget('twofactor-authenticated-date');
+        $email     = $event->user->email;
+        $ipAddress = $event->ipAddress;
+        $token     = $event->token;
+
+        $url = route('password.reset', [$token]);
+
+        // send email.
+        try {
+            Mail::send(
+                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Your password reset request');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
 
         return true;
     }
 
-    /**
-     * This method will send a newly registered user a confirmation message, urging him or her to activate their account.
-     *
-     * @param RegisteredUser $event
-     *
-     * @return bool
-     */
-    public function sendConfirmationMessage(RegisteredUser $event): bool
-    {
-        return $this->sendConfirmation($event->user, $event->ipAddress);
-    }
-
-    /**
-     * If the user has somehow lost his or her confirmation message, this event will send it to the user again.
-     *
-     * At the moment, this method is exactly the same as the ::sendConfirmationMessage method, but that will change.
-     *
-     * @param ResentConfirmation $event
-     *
-     * @return bool
-     */
-    function sendConfirmationMessageAgain(ResentConfirmation $event): bool
-    {
-        return $this->sendConfirmation($event->user, $event->ipAddress);
-
-    }
-
     /**
      * This method will send the user a registration mail, welcoming him or her to Firefly III.
      * This message is only sent when the configuration of Firefly III says so.
@@ -123,8 +102,8 @@ class UserEventHandler
         // send email.
         try {
             Mail::send(
-                ['emails.registered-html', 'emails.registered'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Welcome to Firefly III! ');
+                ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Welcome to Firefly III!');
             }
             );
         } catch (Swift_TransportException $e) {
@@ -133,76 +112,4 @@ class UserEventHandler
 
         return true;
     }
-
-    /**
-     * When the user is confirmed, this method stores the IP address of the user
-     * as a preference. Since this preference cannot be edited, it is effectively hidden
-     * from the user yet stored conveniently.
-     *
-     * @param ConfirmedUser $event
-     *
-     * @return bool
-     */
-    public function storeConfirmationIpAddress(ConfirmedUser $event): bool
-    {
-        Preferences::setForUser($event->user, 'confirmation_ip_address', $event->ipAddress);
-
-        return true;
-    }
-
-    /**
-     * This message stores the users IP address on registration, in much the same
-     * fashion as the previous method.
-     *
-     * @param RegisteredUser $event
-     *
-     * @return bool
-     */
-    public function storeRegistrationIpAddress(RegisteredUser $event): bool
-    {
-        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
-
-        return true;
-
-    }
-
-
-    /**
-     * @param User   $user
-     * @param string $ipAddress
-     *
-     * @return bool
-     */
-    private function sendConfirmation(User $user, string $ipAddress): bool
-    {
-        $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
-        if ($mustConfirmAccount === false) {
-            Preferences::setForUser($user, 'user_confirmed', true);
-            Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
-            Preferences::mark();
-
-            return true;
-        }
-        $email = $user->email;
-        $code  = str_random(16);
-        $route = route('do_confirm_account', [$code]);
-        Preferences::setForUser($user, 'user_confirmed', false);
-        Preferences::setForUser($user, 'user_confirmed_last_mail', time());
-        Preferences::setForUser($user, 'user_confirmed_code', $code);
-        try {
-            Mail::send(
-                ['emails.confirm-account-html', 'emails.confirm-account'], ['route' => $route, 'ip' => $ipAddress],
-                function (Message $message) use ($email) {
-                    $message->to($email, $email)->subject('Please confirm your Firefly III account');
-                }
-            );
-        } catch (Swift_TransportException $e) {
-            Log::error($e->getMessage());
-        } catch (Exception $e) {
-            Log::error($e->getMessage());
-        }
-
-        return true;
-    }
-
 }

app/Helpers/Attachments/AttachmentHelper.php

@@ -16,7 +16,6 @@ use Crypt;
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\MessageBag;
-use Input;
 use Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -33,9 +32,9 @@ class AttachmentHelper implements AttachmentHelperInterface
     /** @var MessageBag */
     public $messages;
     /** @var array */
-    protected $allowedMimes;
+    protected $allowedMimes = [];
     /** @var int */
-    protected $maxUploadSize;
+    protected $maxUploadSize = 0;
 
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     protected $uploadDisk;
@@ -45,8 +44,8 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function __construct()
     {
-        $this->maxUploadSize = config('firefly.maxUploadSize');
-        $this->allowedMimes  = config('firefly.allowedMimes');
+        $this->maxUploadSize = intval(config('firefly.maxUploadSize'));
+        $this->allowedMimes  = (array)config('firefly.allowedMimes');
         $this->errors        = new MessageBag;
         $this->messages      = new MessageBag;
         $this->uploadDisk    = Storage::disk('upload');
@@ -81,20 +80,19 @@ class AttachmentHelper implements AttachmentHelperInterface
     }
 
     /**
-     * @param Model $model
+     * @param Model      $model
+     * @param array|null $files
      *
      * @return bool
      */
-    public function saveAttachmentsForModel(Model $model): bool
+    public function saveAttachmentsForModel(Model $model, array $files = null): bool
     {
-        $files = $this->getFiles();
-
-        if (!is_null($files) && !is_array($files)) {
-            $this->processFile($files, $model);
-        }
-
         if (is_array($files)) {
-            $this->processFiles($files, $model);
+            foreach ($files as $entry) {
+                if (!is_null($entry)) {
+                    $this->processFile($entry, $model);
+                }
+            }
         }
 
         return true;
@@ -227,37 +225,4 @@ class AttachmentHelper implements AttachmentHelperInterface
 
         return true;
     }
-
-    /**
-     * @return array|null|UploadedFile
-     */
-    private function getFiles()
-    {
-        $files = null;
-        if (Input::hasFile('attachments')) {
-            $files = Input::file('attachments');
-        }
-
-        return $files;
-    }
-
-    /**
-     * @param array $files
-     *
-     * @param Model $model
-     *
-     * @return bool
-     */
-    private function processFiles(array $files, Model $model): bool
-    {
-        foreach ($files as $entry) {
-            if (!is_null($entry)) {
-                $this->processFile($entry, $model);
-            }
-        }
-
-        return true;
-    }
-
-
 }

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -46,6 +46,6 @@ interface AttachmentHelperInterface
      *
      * @return bool
      */
-    public function saveAttachmentsForModel(Model $model): bool;
+    public function saveAttachmentsForModel(Model $model, array $files = null): bool;
 
 }

app/Helpers/Chart/MetaPieChart.php

@@ -0,0 +1,277 @@
+<?php
+/**
+ * MetaPieChart.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\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+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\User;
+use Illuminate\Support\Collection;
+use Steam;
+
+/**
+ * Class MetaPieChart
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+class MetaPieChart implements MetaPieChartInterface
+{
+    /** @var  Collection */
+    protected $accounts;
+    /** @var  Collection */
+    protected $budgets;
+    /** @var  Collection */
+    protected $categories;
+    /** @var bool */
+    protected $collectOtherObjects = false;
+    /** @var  Carbon */
+    protected $end;
+    /** @var array */
+    protected $grouping
+        = [
+            'account'  => ['opposing_account_id'],
+            'budget'   => ['transaction_journal_budget_id', 'transaction_budget_id'],
+            'category' => ['transaction_journal_category_id', 'transaction_category_id'],
+        ];
+
+    /** @var array */
+    protected $repositories
+        = [
+            'account'  => AccountRepositoryInterface::class,
+            'budget'   => BudgetRepositoryInterface::class,
+            'category' => CategoryRepositoryInterface::class,
+        ];
+
+
+    /** @var  Carbon */
+    protected $start;
+    /** @var  string */
+    protected $total = '0';
+    /** @var  User */
+    protected $user;
+
+    public function __construct()
+    {
+        $this->accounts   = new Collection;
+        $this->budgets    = new Collection;
+        $this->categories = new Collection;
+    }
+
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array
+    {
+        $transactions = $this->getTransactions($direction);
+        $grouped      = $this->groupByFields($transactions, $this->grouping[$group]);
+        $chartData    = $this->organizeByType($group, $grouped);
+
+        // also collect all other transactions
+        if ($this->collectOtherObjects && $direction === 'expense') {
+            /** @var JournalCollectorInterface $collector */
+            $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;
+        }
+
+        if ($this->collectOtherObjects && $direction === 'income') {
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $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;
+        }
+
+        return $chartData;
+
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface
+    {
+        $this->budgets = $budgets;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface
+    {
+        $this->collectOtherObjects = $collectOtherObjects;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface
+    {
+        $this->end = $end;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface
+    {
+        $this->start = $start;
+
+        return $this;
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    protected function getTransactions(string $direction)
+    {
+        $types    = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
+        $modifier = -1;
+        if ($direction === 'expense') {
+            $types    = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
+            $modifier = 1;
+        }
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts);
+        $collector->setRange($this->start, $this->end);
+        $collector->setTypes($types);
+        $collector->withOpposingAccount();
+
+        if ($direction === 'income') {
+            $collector->disableFilter();
+        }
+
+        if ($this->budgets->count() > 0) {
+            $collector->setBudgets($this->budgets);
+        }
+        if ($this->categories->count() > 0) {
+            $collector->setCategories($this->categories);
+        }
+
+        $accountIds   = $this->accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = Support::filterTransactions($transactions, $accountIds, $modifier);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $set
+     * @param array      $fields
+     *
+     * @return array
+     */
+    protected function groupByFields(Collection $set, array $fields)
+    {
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $values = [];
+            foreach ($fields as $field) {
+                $values[] = intval($transaction->$field);
+            }
+            $value           = max($values);
+            $grouped[$value] = $grouped[$value] ?? '0';
+            $grouped[$value] = bcadd($transaction->transaction_amount, $grouped[$value]);
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $array
+     *
+     * @return array
+     */
+    protected function organizeByType(string $type, array $array): array
+    {
+        $chartData  = [];
+        $names      = [];
+        $repository = app($this->repositories[$type]);
+        foreach ($array as $objectId => $amount) {
+            if (!isset($names[$objectId])) {
+                $object           = $repository->find(intval($objectId));
+                $names[$objectId] = $object->name;
+            }
+            $amount                       = Steam::positive($amount);
+            $this->total                  = bcadd($this->total, $amount);
+            $chartData[$names[$objectId]] = $amount;
+        }
+
+        return $chartData;
+
+    }
+}

app/Helpers/Chart/MetaPieChartInterface.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * MetaPieChartInterface.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\Helpers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface MetaPieChartInterface
+ *
+ * @package FireflyIII\Helpers\Chart
+ */
+interface MetaPieChartInterface
+{
+    /**
+     * @param string $direction
+     * @param string $group
+     *
+     * @return array
+     */
+    public function generate(string $direction, string $group): array;
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setAccounts(Collection $accounts): MetaPieChartInterface;
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setBudgets(Collection $budgets): MetaPieChartInterface;
+
+    /**
+     * @param Collection $categories
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCategories(Collection $categories): MetaPieChartInterface;
+
+    /**
+     * @param bool $collectOtherObjects
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $end
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setEnd(Carbon $end): MetaPieChartInterface;
+
+    /**
+     * @param Carbon $start
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setStart(Carbon $start): MetaPieChartInterface;
+
+    /**
+     * @param User $user
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setUser(User $user): MetaPieChartInterface;
+
+}

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/BalanceLine.php

@@ -14,6 +14,7 @@ namespace FireflyIII\Helpers\Collection;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Budget as BudgetModel;
+use FireflyIII\Models\BudgetLimit;
 use Illuminate\Support\Collection;
 
 /**
@@ -34,12 +35,10 @@ class BalanceLine
 
     /** @var BudgetModel */
     protected $budget;
-    /** @var  Carbon */
-    protected $endDate;
+    /** @var  BudgetLimit */
+    protected $budgetLimit;
     /** @var int */
     protected $role = self::ROLE_DEFAULTROLE;
-    /** @var  Carbon */
-    protected $startDate;
 
     /**
      *
@@ -90,20 +89,28 @@ class BalanceLine
         $this->budget = $budget;
     }
 
+    /**
+     * @return BudgetLimit
+     */
+    public function getBudgetLimit(): BudgetLimit
+    {
+        return $this->budgetLimit;
+    }
+
+    /**
+     * @param BudgetLimit $budgetLimit
+     */
+    public function setBudgetLimit(BudgetLimit $budgetLimit)
+    {
+        $this->budgetLimit = $budgetLimit;
+    }
+
     /**
      * @return Carbon
      */
     public function getEndDate()
     {
-        return $this->endDate;
-    }
-
-    /**
-     * @param Carbon $endDate
-     */
-    public function setEndDate($endDate)
-    {
-        $this->endDate = $endDate;
+        return $this->budgetLimit->end_date ?? new Carbon;
     }
 
     /**
@@ -127,18 +134,11 @@ class BalanceLine
      */
     public function getStartDate()
     {
-        return $this->startDate;
-    }
-
-    /**
-     * @param Carbon $startDate
-     */
-    public function setStartDate($startDate)
-    {
-        $this->startDate = $startDate;
+        return $this->budgetLimit->start_date ?? new Carbon;
     }
 
     /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return string
      */
     public function getTitle(): string
@@ -147,13 +147,13 @@ class BalanceLine
             return $this->getBudget()->name;
         }
         if ($this->getRole() == self::ROLE_DEFAULTROLE) {
-            return trans('firefly.no_budget');
+            return strval(trans('firefly.no_budget'));
         }
         if ($this->getRole() == self::ROLE_TAGROLE) {
-            return trans('firefly.coveredWithTags');
+            return strval(trans('firefly.coveredWithTags'));
         }
         if ($this->getRole() == self::ROLE_DIFFROLE) {
-            return trans('firefly.leftUnbalanced');
+            return strval(trans('firefly.leftUnbalanced'));
         }
 
         return '';
@@ -169,7 +169,7 @@ class BalanceLine
      */
     public function leftOfRepetition(): string
     {
-        $start = $this->budget->amount ?? '0';
+        $start = $this->budgetLimit->amount ?? '0';
         /** @var BalanceEntry $balanceEntry */
         foreach ($this->getBalanceEntries() as $balanceEntry) {
             $start = bcadd($balanceEntry->getSpent(), $start);

app/Helpers/Collection/Bill.php

@@ -13,7 +13,10 @@ declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
 
+use Carbon\Carbon;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Support\Collection;
+use Log;
 
 /**
  * Class Bill
@@ -26,7 +29,11 @@ class Bill
     /**
      * @var Collection
      */
-    protected $bills;
+    private $bills;
+    /** @var  Carbon */
+    private $endDate;
+    /** @var  Carbon */
+    private $startDate;
 
     /**
      *
@@ -44,6 +51,43 @@ class Bill
         $this->bills->push($bill);
     }
 
+    /**
+     *
+     */
+    public function filterBills()
+    {
+        Log::debug('Now in filterBills()');
+        /** @var BillRepositoryInterface $repository */
+        $repository  = app(BillRepositoryInterface::class);
+        $start       = $this->startDate;
+        $end         = $this->endDate;
+        $lines       = $this->bills->filter(
+            function (BillLine $line) use ($repository, $start, $end) {
+                // next expected match?
+                $date = $start;
+                Log::debug(sprintf('Now at bill line for bill "%s"', $line->getBill()->name));
+                Log::debug(sprintf('Default date to use is start date: %s', $date->format('Y-m-d')));
+                if ($line->isHit()) {
+                    $date = $line->getLastHitDate();
+                    Log::debug(sprintf('Line was hit, see date: %s. Always include it.', $date->format('Y-m-d')));
+
+                    return $line;
+                }
+                $expected = $repository->nextExpectedMatch($line->getBill(), $date);
+                Log::debug(sprintf('Next expected match is %s', $expected->format('Y-m-d')));
+                if ($expected <= $end && $expected >= $start) {
+                    Log::debug('This date is inside report limits');
+
+                    return $line;
+                }
+                Log::debug('This date is OUTSIDE report limits');
+
+                return false;
+            }
+        );
+        $this->bills = $lines;
+    }
+
     /**
      * @return Collection
      */
@@ -62,4 +106,20 @@ class Bill
         return $set;
     }
 
+    /**
+     * @param Carbon $endDate
+     */
+    public function setEndDate(Carbon $endDate)
+    {
+        $this->endDate = $endDate;
+    }
+
+    /**
+     * @param Carbon $startDate
+     */
+    public function setStartDate(Carbon $startDate)
+    {
+        $this->startDate = $startDate;
+    }
+
 }

app/Helpers/Collection/BillLine.php

@@ -12,6 +12,7 @@
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
+use Carbon\Carbon;
 use FireflyIII\Models\Bill as BillModel;
 
 /**
@@ -23,8 +24,6 @@ use FireflyIII\Models\Bill as BillModel;
 class BillLine
 {
 
-    /** @var  bool */
-    protected $active;
     /** @var  string */
     protected $amount;
     /** @var  BillModel */
@@ -35,10 +34,19 @@ class BillLine
     protected $max;
     /** @var  string */
     protected $min;
-
+    /** @var  Carbon */
+    private $lastHitDate;
     /** @var  int */
     private $transactionJournalId;
 
+    /**
+     * BillLine constructor.
+     */
+    public function __construct()
+    {
+        $this->lastHitDate = new Carbon;
+    }
+
     /**
      * @return string
      */
@@ -71,6 +79,22 @@ class BillLine
         $this->bill = $bill;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getLastHitDate(): Carbon
+    {
+        return $this->lastHitDate;
+    }
+
+    /**
+     * @param Carbon $lastHitDate
+     */
+    public function setLastHitDate(Carbon $lastHitDate)
+    {
+        $this->lastHitDate = $lastHitDate;
+    }
+
     /**
      * @return string
      */
@@ -124,15 +148,7 @@ class BillLine
      */
     public function isActive(): bool
     {
-        return $this->active;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive(bool $active)
-    {
-        $this->active = $active;
+        return intval($this->bill->active) === 1;
     }
 
     /**
@@ -151,4 +167,5 @@ class BillLine
         $this->hit = $hit;
     }
 
+
 }

app/Helpers/Collection/Budget.php

@@ -1,197 +0,0 @@
-<?php
-/**
- * Budget.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 Budget
- *
- * @package FireflyIII\Helpers\Collection
- */
-class Budget
-{
-    /** @var  Collection */
-    protected $budgetLines;
-    /** @var string */
-    protected $budgeted = '0';
-    /** @var string */
-    protected $left = '0';
-    /** @var string */
-    protected $overspent = '0';
-    /** @var string */
-    protected $spent = '0';
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->budgetLines = new Collection;
-    }
-
-    /**
-     * @param BudgetLine $budgetLine
-     *
-     * @return Budget
-     */
-    public function addBudgetLine(BudgetLine $budgetLine): Budget
-    {
-        $this->budgetLines->push($budgetLine);
-
-        return $this;
-    }
-
-    /**
-     * @param string $add
-     *
-     * @return Budget
-     */
-    public function addBudgeted(string $add): Budget
-    {
-        $add            = strval(round($add, 2));
-        $this->budgeted = bcadd($this->budgeted, $add);
-
-        return $this;
-    }
-
-    /**
-     * @param string $add
-     *
-     * @return Budget
-     */
-    public function addLeft(string $add): Budget
-    {
-        $add        = strval(round($add, 2));
-        $this->left = bcadd($this->left, $add);
-
-        return $this;
-    }
-
-    /**
-     * @param string $add
-     *
-     * @return Budget
-     */
-    public function addOverspent(string $add): Budget
-    {
-        $add             = strval(round($add, 2));
-        $this->overspent = bcadd($this->overspent, $add);
-
-        return $this;
-    }
-
-    /**
-     * @param string $add
-     *
-     * @return Budget
-     */
-    public function addSpent(string $add): Budget
-    {
-        $add         = strval(round($add, 2));
-        $this->spent = bcadd($this->spent, $add);
-
-        return $this;
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection
-     */
-    public function getBudgetLines(): Collection
-    {
-        return $this->budgetLines;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBudgeted(): string
-    {
-        return $this->budgeted;
-    }
-
-    /**
-     * @param string $budgeted
-     *
-     * @return Budget
-     */
-    public function setBudgeted(string $budgeted): Budget
-    {
-        $this->budgeted = $budgeted;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLeft(): string
-    {
-        return $this->left;
-    }
-
-    /**
-     * @param string $left
-     *
-     * @return Budget
-     */
-    public function setLeft(string $left): Budget
-    {
-        $this->left = $left;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOverspent(): string
-    {
-        return $this->overspent;
-    }
-
-    /**
-     * @param string $overspent
-     *
-     * @return Budget
-     */
-    public function setOverspent(string $overspent): Budget
-    {
-        $this->overspent = strval(round($overspent, 2));
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSpent(): string
-    {
-        return $this->spent;
-    }
-
-    /**
-     * @param string $spent
-     *
-     * @return Budget
-     */
-    public function setSpent(string $spent): Budget
-    {
-        $this->spent = strval(round($spent, 2));
-
-        return $this;
-    }
-
-
-}