Merge branch 'release/4.6.13'

create .htaccess file

.env.example

@@ -3,7 +3,7 @@ APP_DEBUG=false
 APP_NAME=FireflyIII
 APP_KEY=SomeRandomStringOf32CharsExactly
 APP_LOG=daily
-APP_LOG_LEVEL=warning
+APP_LOG_LEVEL=notice
 APP_URL=http://localhost
 TRUSTED_PROXIES=
 

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

@@ -8,4 +8,4 @@ I am running Firefly III version x.x.x
 
 #### Other important details (log files, system info):
 
-Please visit the /debug page to get extra debug information.
+Please click the version number in the right corner of any Firefly III page to get debug information. 

.github/SUPPORT.md

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

.htaccess

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

.sandstorm/changelog.md

@@ -1,5 +1,42 @@
-# 4.6.1.1
+# 4.6.13
+- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
+- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
+- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
+- Support for Turkish.
+- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
+- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
+- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
+- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
+- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
+- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
+- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
+- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
+- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
+- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
 
+# 4.6.12
+- Support for Indonesian.
+- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
+- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
+- Greatly improved Docker support and documentation.
+- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
+- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner) 
+- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reporterd by a user on Tweakers.net
+- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion) 
+- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
+- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
+- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
+- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
+- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
+
+# 4.6.1.1
 - Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
 - Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu) 
 - [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)

.sandstorm/sandstorm-pkgdef.capnp

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

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 php:
   - 7.1
+  - 7.2
 
 cache:
     directories:
@@ -22,7 +23,7 @@ script:
   - phpunit -c phpunit.coverage.xml
 
 after_success:
-  - travis_retry php vendor/bin/coveralls -x storage/build/clover-all.xml
+  - travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
 
 # safelist
 branches:

CHANGELOG.md

@@ -2,6 +2,53 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.6.13] - 2018-01-06
+### Added
+- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
+- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
+- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
+- Support for Turkish.
+- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
+- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
+- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
+
+### Fixed
+- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
+- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
+- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
+- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
+- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
+- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
+- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
+
+## [4.6.12] - 2017-12-31
+### Added
+- Support for Indonesian.
+- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
+- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
+
+### Changed
+- Greatly improved Docker support and documentation.
+
+### Fixed
+- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
+- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner) 
+- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reported by a user on Tweakers.net
+- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion) 
+- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
+- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
+- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
+- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
+- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
+
+
 ## [4.6.11.1] - 2017-12-08
 ### Added
 - Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
@@ -28,7 +75,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
 
 ### Changed
-- Extended currency list, as suggested by @emuhendis in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
+- Extended currency list, as suggested by [emuhendis](https://github.com/emuhendis) in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
 - [Issue 996](https://github.com/firefly-iii/firefly-iii/issues/996) as suggested by [dp87](https://github.com/dp87)
 
 ### Removed
@@ -53,7 +100,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
 
 
-## [4.6.10] - 2017-11-xx
+## [4.6.10] - 2017-11-03
 ### Added
 - Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619)
 - [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu)
@@ -328,8 +375,8 @@ This will be the last release to support PHP 7.0.
 - Can now make rules for attachments, see [issue 608](https://github.com/firefly-iii/firefly-iii/issues/608), as suggested by [dzaikos](https://github.com/dzaikos).
 
 ### Fixed
-- Fixed [issue 629](https://github.com/firefly-iii/firefly-iii/issues/629), reported by @forcaeluz
-- Fixed [issue 630](https://github.com/firefly-iii/firefly-iii/issues/630), reported by @welbert
+- Fixed [issue 629](https://github.com/firefly-iii/firefly-iii/issues/629), reported by [forcaeluz](https://github.com/forcaeluz)
+- Fixed [issue 630](https://github.com/firefly-iii/firefly-iii/issues/630), reported by [welbert](https://github.com/welbert)
 - And more various bug fixes.
 
 ## [4.3.8] - 2017-04-08

Dockerfile

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

README.md

@@ -2,9 +2,11 @@
 
 [![Requires PHP7.1](https://img.shields.io/badge/php-7.1-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-GPL-lightgrey.svg)](https://www.gnu.org/licenses/gpl.html) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
 
-[![The index of Firefly III](https://i.nder.be/ccynyxy0/400)](https://i.nder.be/h327vx3y) [![The account overview of Firefly III](https://i.nder.be/g8v86y2g/400)](https://i.nder.be/hkpynqr9)
+[![The index of Firefly III](https://firefly-iii.org/static/screenshots/4.6.12/tiny/index.png)](https://firefly-iii.org/static/screenshots/4.6.12/index.png) [![The account overview of Firefly III](https://firefly-iii.org/static/screenshots/4.6.12/tiny/account.png)](https://firefly-iii.org/static/screenshots/4.6.12/account.png)
 
-[![The useful financial reports of Firefly III](https://i.nder.be/cs3qx4f3/400)](https://i.nder.be/cwznmryd) [![Saving money is easy!](https://i.nder.be/gpq6ykym/400)](https://i.nder.be/gum2qf8z)
+[![Overview of all budgets](https://firefly-iii.org/static/screenshots/4.6.12/tiny/budget.png)](https://firefly-iii.org/static/screenshots/4.6.12/budget.png) [![Overview of a category](https://firefly-iii.org/static/screenshots/4.6.12/tiny/category.png)](https://firefly-iii.org/static/screenshots/4.6.12/category.png)
+
+[![View of a report](https://firefly-iii.org/static/screenshots/4.6.12/tiny/report1.png)](https://firefly-iii.org/static/screenshots/4.6.12/report1.png) [![View of another report](https://firefly-iii.org/static/screenshots/4.6.12/tiny/report2.png)](https://firefly-iii.org/static/screenshots/4.6.12/report2.png)
 
 "Firefly III" is a financial manager for your personal finances. It can help you keep track of your expenses and income.
 Firefly III supports the use of budgets. You can categorize and tag your transactions.
@@ -13,17 +15,17 @@ There are many financial reports available.
 
 ## Want to try Firefly III?
 
-There is a **[demo site](https://firefly-iii.nder.be)** with an example financial administration already present. You can use Docker, Heroku or Sandstorm.io (see below) to quickly setup your own instance.
+There is a **[demo site](https://demo.firefly-iii.org)** with an example financial administration already present. You can use Docker, Heroku or Sandstorm.io (see below) to quickly setup your own instance.
 
 ## Install Firefly III
 
 ### Using docker
 
-You can use docker-compose to [set up your personal secure](https://firefly-iii.github.io/using-docker.html) Firefly III environment. Advanced users can use the Dockerfile directly. 
+You can use docker-compose to [set up your personal secure](https://firefly-iii.org/using-docker.html) Firefly III environment. Advanced users can use the Dockerfile directly. 
 
 ### Using vagrant (or other VMs)
 
-You can install Firefly III on any Linux or Windows machine. You'll need a web server (preferrably on Linux) and access to the command line. Please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
+You can install Firefly III on any Linux or Windows machine. You'll need a web server (preferrably on Linux) and access to the command line. Please read the [installation guide](https://firefly-iii.org/using-installing.html).
 
 ### Using Heroku
 
@@ -31,12 +33,14 @@ You can install Firefly III on any Linux or Windows machine. You'll need a web s
 
 Register for a free Heroku account and instantly run Firefly III on your very own cloud instance.
 
-_My Heroku configuration is currently broken, but I'm trying to fix it._
-
 ### Using Sandstorm.io
 
 You can find Firefly III in [the Sandstorm.io marketplace](https://apps.sandstorm.io/app/uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70). You can run it on your own installation or on Oasis.
 
+### Other options
+
+Firefly III is also available as a package on [https://softaculous.com/](Softaculous) and [AMPPS](https://www.ampps.com/).
+
 ## More about Firefly III
 
 Personal financial management is pretty difficult, and everybody has their own approach to it.
@@ -53,7 +57,7 @@ Firefly works on the principle that if you know where you're money is going, you
 - If you feel you're missing something you can just ask me and I'll add it!
 
 Firefly III has become pretty awesome over the years! (but please excuse me for bragging, it's just that I'm proud of it).
-[You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/).
+[You can read more about Firefly III, and its features, on the website](https://firefly-iii.org/).
 
 ### Contributing
 
@@ -74,8 +78,12 @@ This work [is licensed](https://github.com/firefly-iii/firefly-iii/blob/master/L
 
 ### Other stuff
 
-If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
+If you like Firefly III 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).
 
+### Alternatives
+
+If you are looking for alternatives, check out [Kickball's Awesome-Selfhosted list](https://github.com/Kickball/awesome-selfhosted) which features not only Firefly III but also noteworthy alternatives such as [Silverstrike](https://github.com/agstrike/silverstrike).
+
 [![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/firefly-iii/firefly-iii/badge.svg?branch=master)](https://coveralls.io/github/firefly-iii/firefly-iii?branch=master)

app.json

@@ -2,7 +2,7 @@
   "name": "Firefly III",
   "description": "A free and open source personal finances manager",
   "repository": "https://github.com/firefly-iii/firefly-iii",
-  "website": "https://firefly-iii.github.io/",
+  "website": "https://firefly-iii.org/",
   "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
   "keywords": [
     "finance",

app/Console/Commands/CreateExport.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Console/Commands/CreateImport.php

@@ -16,15 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
 use Artisan;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
+use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
@@ -54,7 +55,7 @@ class CreateImport extends Command
     protected $signature
         = 'firefly:create-import
                             {file : The file to import.}
-                            {configuration : The configuration file to use for the import/}
+                            {configuration : The configuration file to use for the import.}
                             {--type=csv : The file type of the import.}
                             {--user= : The user ID that the import should import for.}
                             {--token= : The user\'s access token.}
@@ -73,6 +74,8 @@ class CreateImport extends Command
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
+     *
+     * @throws FireflyException
      */
     public function handle()
     {
@@ -93,7 +96,7 @@ class CreateImport extends Command
             return;
         }
 
-        $configurationData = json_decode(file_get_contents($configuration));
+        $configurationData = json_decode(file_get_contents($configuration), true);
         if (null === $configurationData) {
             $this->error(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
 
@@ -114,9 +117,8 @@ class CreateImport extends Command
         Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
         $this->line('Stored import data...');
 
-        $job->configuration = $configurationData;
-        $job->status        = 'configured';
-        $job->save();
+        $jobRepository->setConfiguration($job, $configurationData);
+        $jobRepository->updateStatus($job, 'configured');
         $this->line('Stored configuration...');
 
         if (true === $this->option('start')) {
@@ -131,18 +133,26 @@ class CreateImport extends Command
             $monolog->pushHandler($handler);
 
             // start the actual routine:
-            /** @var ImportRoutine $routine */
-            $routine = app(ImportRoutine::class);
+            $type      = 'csv' === $job->file_type ? 'file' : $job->file_type;
+            $key       = sprintf('import.routine.%s', $type);
+            $className = config($key);
+            if (null === $className || !class_exists($className)) {
+                throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
+            }
+            /** @var RoutineInterface $routine */
+            $routine = app($className);
             $routine->setJob($job);
             $routine->run();
 
             // give feedback.
             /** @var MessageBag $error */
-            foreach ($routine->errors as $index => $error) {
+            foreach ($routine->getErrors() as $index => $error) {
                 $this->error(sprintf('Error importing line #%d: %s', $index, $error));
             }
             $this->line(
-                sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines)
+                sprintf(
+                    'The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines()
+                )
             );
         }
 
@@ -166,7 +176,7 @@ class CreateImport extends Command
         $configuration  = $this->argument('configuration');
         $user           = $userRepository->find(intval($this->option('user')));
         $cwd            = getcwd();
-        $validTypes     = array_keys(config('firefly.import_formats'));
+        $validTypes     = config('import.options.file.import_formats');
         $type           = strtolower($this->option('type'));
         if (null === $user->id) {
             $this->error(sprintf('There is no user with ID %d.', $this->option('user')));

app/Console/Commands/DecryptAttachment.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Console/Commands/EncryptFile.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Console/Commands/Import.php

@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
+use FireflyIII\Import\Routine\RoutineInterface;
 use FireflyIII\Models\ImportJob;
 use Illuminate\Console\Command;
 use Illuminate\Support\MessageBag;
@@ -58,6 +59,8 @@ class Import extends Command
 
     /**
      * Run the import routine.
+     *
+     * @throws FireflyException
      */
     public function handle()
     {
@@ -81,17 +84,27 @@ class Import extends Command
         $handler = new CommandHandler($this);
         $monolog->pushHandler($handler);
 
-        /** @var ImportRoutine $routine */
-        $routine = app(ImportRoutine::class);
+        // actually start job:
+        $type = 'csv' === $job->file_type ? 'file' : $job->file_type;
+        $key = sprintf('import.routine.%s', $type);
+        $className = config($key);
+        if (null === $className || !class_exists($className)) {
+            throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
+        }
+
+        /** @var RoutineInterface $routine */
+        $routine = app($className);
         $routine->setJob($job);
         $routine->run();
 
         /** @var MessageBag $error */
-        foreach ($routine->errors as $index => $error) {
+        foreach ($routine->getErrors() as $index => $error) {
             $this->error(sprintf('Error importing line #%d: %s', $index, $error));
         }
 
-        $this->line(sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->journals->count(), $routine->lines));
+        $this->line(
+            sprintf('The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines())
+        );
 
         return;
     }

app/Console/Commands/ScanAttachments.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Console/Commands/UpgradeDatabase.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -26,8 +26,6 @@ use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
@@ -75,6 +73,8 @@ class UpgradeDatabase extends Command
 
     /**
      * Execute the console command.
+     *
+     * @throws \Exception
      */
     public function handle()
     {
@@ -146,6 +146,7 @@ class UpgradeDatabase extends Command
 
                 // both 0? set to default currency:
                 if (0 === $accountCurrency && 0 === $obCurrency) {
+                    AccountMeta::where('account_id', $account->id)->where('name', 'currency_id')->forceDelete();
                     AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
                     $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
 
@@ -218,7 +219,7 @@ class UpgradeDatabase extends Command
                         }
 
                         // when mismatch in transaction:
-                        if ($transaction->transaction_currency_id !== $currency->id) {
+                        if (!(intval($transaction->transaction_currency_id) === intval($currency->id))) {
                             $transaction->foreign_currency_id     = $transaction->transaction_currency_id;
                             $transaction->foreign_amount          = $transaction->amount;
                             $transaction->transaction_currency_id = $currency->id;
@@ -282,6 +283,8 @@ class UpgradeDatabase extends Command
 
     /**
      * Move all the journal_meta notes to their note object counter parts.
+     *
+     * @throws \Exception
      */
     private function migrateNotes(): void
     {
@@ -399,24 +402,26 @@ class UpgradeDatabase extends Command
 
         // has no currency ID? Must have, so fill in using account preference:
         if (null === $transaction->transaction_currency_id) {
-            $transaction->transaction_currency_id = $currency->id;
+            $transaction->transaction_currency_id = intval($currency->id);
             Log::debug(sprintf('Transaction #%d has no currency setting, now set to %s', $transaction->id, $currency->code));
             $transaction->save();
         }
 
         // does not match the source account (see above)? Can be fixed
         // when mismatch in transaction and NO foreign amount is set:
-        if ($transaction->transaction_currency_id !== $currency->id && null === $transaction->foreign_amount) {
+        if (!(intval($transaction->transaction_currency_id) === intval($currency->id)) && null === $transaction->foreign_amount) {
             Log::debug(
                 sprintf(
-                    'Transaction #%d has a currency setting (#%d) that should be #%d. Amount remains %s, currency is changed.',
+                    'Transaction #%d has a currency setting (#%d) (%s) that should be #%d (%s). Amount remains %s, currency is changed.',
                     $transaction->id,
                     $transaction->transaction_currency_id,
+                    $this->var_dump_ret(intval($transaction->transaction_currency_id)),
                     $currency->id,
+                    $this->var_dump_ret(intval($currency->id)),
                     $transaction->amount
                 )
             );
-            $transaction->transaction_currency_id = $currency->id;
+            $transaction->transaction_currency_id = intval($currency->id);
             $transaction->save();
         }
 
@@ -434,7 +439,7 @@ class UpgradeDatabase extends Command
         }
 
         // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
-        if ($opposingCurrency->id === $currency->id) {
+        if (intval($opposingCurrency->id) === intval($currency->id)) {
             // update both transactions to match:
             $transaction->foreign_amount       = null;
             $transaction->foreign_currency_id  = null;
@@ -448,7 +453,7 @@ class UpgradeDatabase extends Command
             return;
         }
         // if destination account currency is different, both transactions must have this currency as foreign currency id.
-        if ($opposingCurrency->id !== $currency->id) {
+        if (!(intval($opposingCurrency->id) === intval($currency->id))) {
             $transaction->foreign_currency_id = $opposingCurrency->id;
             $opposing->foreign_currency_id    = $opposingCurrency->id;
             $transaction->save();
@@ -498,4 +503,20 @@ class UpgradeDatabase extends Command
 
         return;
     }
+
+    /**
+     * @param null $mixed
+     *
+     * @return string
+     */
+    private function var_dump_ret($mixed = null): string
+    {
+        ob_start();
+        var_dump($mixed);
+        $content = ob_get_contents();
+        ob_end_clean();
+
+        return trim($content);
+    }
+
 }

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Console/Commands/UseEncryption.php

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

app/Console/Commands/VerifiesAccessToken.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -68,6 +68,7 @@ trait VerifiesAccessToken
         }
         if (!($accessToken->data === $token)) {
             Log::error(sprintf('Invalid access token for user #%d.', $userId));
+            Log::error(sprintf('Token given is "%s", expected "%s".', $token, $accessToken->data));
 
             return false;
         }

app/Console/Commands/VerifyDatabase.php

@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
 use Crypt;
+use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
@@ -93,6 +94,7 @@ class VerifyDatabase extends Command
         $this->repairPiggyBanks();
         $this->createLinkTypes();
         $this->createAccessTokens();
+        $this->fixDoubleAmounts();
     }
 
     /**
@@ -100,6 +102,7 @@ class VerifyDatabase extends Command
      */
     private function createAccessTokens()
     {
+        $count = 0;
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
@@ -108,8 +111,12 @@ class VerifyDatabase extends Command
                 $token = $user->generateAccessToken();
                 Preferences::setForUser($user, 'access_token', $token);
                 $this->line(sprintf('Generated access token for user %s', $user->email));
+                ++$count;
             }
         }
+        if (0 === $count) {
+            $this->info('All access tokens OK!');
+        }
     }
 
     /**
@@ -117,7 +124,8 @@ class VerifyDatabase extends Command
      */
     private function createLinkTypes()
     {
-        $set = [
+        $count = 0;
+        $set   = [
             'Related'       => ['relates to', 'relates to'],
             'Refund'        => ['(partially) refunds', 'is (partially) refunded by'],
             'Paid'          => ['(partially) pays for', 'is (partially) paid for by'],
@@ -130,10 +138,64 @@ class VerifyDatabase extends Command
                 $link->name    = $name;
                 $link->outward = $values[0];
                 $link->inward  = $values[1];
+                ++$count;
             }
             $link->editable = false;
             $link->save();
         }
+        if (0 === $count) {
+            $this->info('All link types OK!');
+        }
+    }
+
+    private function fixDoubleAmounts()
+    {
+        $count = 0;
+        // get invalid journals
+        $errored  = [];
+        $journals = DB::table('transactions')
+                      ->groupBy('transaction_journal_id')
+                      ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
+        /** @var stdClass $entry */
+        foreach ($journals as $entry) {
+            if (0 !== bccomp(strval($entry->the_sum), '0')) {
+                $errored[] = $entry->transaction_journal_id;
+            }
+        }
+        foreach ($errored as $journalId) {
+            // select and update:
+            $res = Transaction::whereNull('deleted_at')->where('transaction_journal_id', $journalId)->groupBy('amount')->get([DB::raw('MIN(id) as first_id')]);
+            $ids = $res->pluck('first_id')->toArray();
+            DB::table('transactions')->whereIn('id', $ids)->update(['amount' => DB::raw('amount * -1')]);
+            ++$count;
+            // report about it
+            /** @var TransactionJournal $journal */
+            $journal = TransactionJournal::find($journalId);
+            if (is_null($journal)) {
+                continue;
+            }
+            if (TransactionType::OPENING_BALANCE === $journal->transactionType->type) {
+                $this->error(
+                    sprintf(
+                        'Transaction #%d was stored incorrectly. One of your asset accounts may show the wrong balance. Please visit /transactions/show/%d to verify the opening balance.',
+                        $journalId, $journalId
+                    )
+                );
+            }
+            if (TransactionType::OPENING_BALANCE !== $journal->transactionType->type) {
+                $this->error(
+                    sprintf(
+                        'Transaction #%d was stored incorrectly. Could be that the transaction shows the wrong amount. Please visit /transactions/show/%d to verify the opening balance.',
+                        $journalId, $journalId
+                    )
+                );
+            }
+        }
+        if (0 === $count) {
+            $this->info('Amount integrity OK!');
+        }
+
+        return;
     }
 
     /**
@@ -290,24 +352,29 @@ 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',]
-                                 );
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                   ->whereNull('transactions.deleted_at')
+                                   ->whereNotNull('transactions.id')
+                                   ->get(
+                                       [
+                                           'transaction_journals.id as journal_id',
+                                           'transaction_journals.description',
+                                           'transaction_journals.deleted_at as journal_deleted',
+                                           'transactions.id as transaction_id',
+                                           'transactions.deleted_at as transaction_deleted_at',]
+                                   );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
                 'Error: Transaction #' . $entry->transaction_id . ' should have been deleted, but has not.' .
                 ' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned transactions!');
         }
     }
 
@@ -316,15 +383,20 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->groupBy('transaction_journals.id')
-                                 ->whereNull('transactions.transaction_journal_id')
-                                 ->get(['transaction_journals.id']);
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->groupBy('transaction_journals.id')
+                                   ->whereNull('transactions.transaction_journal_id')
+                                   ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
                 'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned journals!');
         }
     }
 
@@ -379,6 +451,8 @@ class VerifyDatabase extends Command
             $sum = strval($user->transactions()->sum('amount'));
             if (0 !== bccomp($sum, '0')) {
                 $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
+            } else {
+                $this->info(sprintf('Amount integrity OK for user #%d', $user->id));
             }
         }
     }

app/Console/Kernel.php

@@ -16,19 +16,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
-/**
- * Kernel.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
 namespace FireflyIII\Console;
 
 use Illuminate\Console\Scheduling\Schedule;

app/Events/AdminRequestedTestMessage.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -33,7 +33,13 @@ class AdminRequestedTestMessage extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var User
+     */
     public $user;
 
     /**

app/Events/Event.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Events/RegisteredUser.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -32,7 +32,13 @@ class RegisteredUser extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var User
+     */
     public $user;
 
     /**

app/Events/RequestedNewPassword.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -32,8 +32,17 @@ class RequestedNewPassword extends Event
 {
     use SerializesModels;
 
+    /**
+     * @var string
+     */
     public $ipAddress;
+    /**
+     * @var string
+     */
     public $token;
+    /**
+     * @var User
+     */
     public $user;
 
     /**

app/Events/RequestedVersionCheckStatus.php

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

app/Events/StoredTransactionJournal.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Events/UpdatedTransactionJournal.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Events/UserChangedEmail.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Exceptions/FireflyException.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Exceptions/Handler.php

@@ -16,19 +16,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
-/**
- * Handler.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
 namespace FireflyIII\Exceptions;
 
 use ErrorException;
@@ -37,6 +28,9 @@ use FireflyIII\Jobs\MailError;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Request;
 
+/**
+ * Class Handler
+ */
 class Handler extends ExceptionHandler
 {
     /**
@@ -87,6 +81,8 @@ class Handler extends ExceptionHandler
      * @param \Exception $exception
      *
      * @return mixed|void
+     *
+     * @throws Exception
      */
     public function report(Exception $exception)
     {

app/Exceptions/NotImplementedException.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Exceptions/ValidationException.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Collector/AttachmentCollector.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Collector/BasicCollector.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Collector/CollectorInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Collector/UploadCollector.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Entry/Entry.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -45,44 +45,131 @@ use FireflyIII\Models\Transaction;
 final class Entry
 {
     // @formatter:off
+    /**
+     * @var int
+     */
     public $journal_id;
+    /**
+     * @var int
+     */
     public $transaction_id = 0;
 
+    /**
+     * @var string
+     */
     public $date;
+    /**
+     * @var string
+     */
     public $description;
 
+    /**
+     * @var string
+     */
     public $currency_code;
+    /**
+     * @var string
+     */
     public $amount;
+    /**
+     * @var string
+     */
     public $foreign_currency_code = '';
-    public $foreign_amount        = '0';
+    /**
+     * @var string
+     */
+    public $foreign_amount = '0';
 
+    /**
+     * @var string
+     */
     public $transaction_type;
 
+    /**
+     * @var string
+     */
     public $asset_account_id;
+    /**
+     * @var string
+     */
     public $asset_account_name;
+    /**
+     * @var string
+     */
     public $asset_account_iban;
+    /**
+     * @var string
+     */
     public $asset_account_bic;
+    /**
+     * @var string
+     */
     public $asset_account_number;
+    /**
+     * @var string
+     */
     public $asset_currency_code;
 
+    /**
+     * @var string
+     */
     public $opposing_account_id;
+    /**
+     * @var string
+     */
     public $opposing_account_name;
+    /**
+     * @var string
+     */
     public $opposing_account_iban;
+    /**
+     * @var string
+     */
     public $opposing_account_bic;
+    /**
+     * @var string
+     */
     public $opposing_account_number;
+    /**
+     * @var string
+     */
     public $opposing_currency_code;
 
+    /**
+     * @var string
+     */
     public $budget_id;
+    /**
+     * @var string
+     */
     public $budget_name;
 
+    /**
+     * @var string
+     */
     public $category_id;
+    /**
+     * @var string
+     */
     public $category_name;
 
+    /**
+     * @var string
+     */
     public $bill_id;
+    /**
+     * @var string
+     */
     public $bill_name;
 
+    /**
+     * @var string
+     */
     public $notes;
 
+    /**
+     * @var string
+     */
     public $tags;
 
 
@@ -116,7 +203,7 @@ final class Entry
             $entry->description = $transaction->transaction_description . '(' . $transaction->description . ')';
         }
         $entry->currency_code = $transaction->transactionCurrency->code;
-        $entry->amount        = round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places);
+        $entry->amount        = strval(round($transaction->transaction_amount, $transaction->transactionCurrency->decimal_places));
 
         $entry->foreign_currency_code = null === $transaction->foreign_currency_id ? null : $transaction->foreignCurrency->code;
         $entry->foreign_amount        = null === $transaction->foreign_currency_id
@@ -129,14 +216,14 @@ final class Entry
             );
 
         $entry->transaction_type     = $transaction->transaction_type_type;
-        $entry->asset_account_id     = $transaction->account_id;
+        $entry->asset_account_id     = strval($transaction->account_id);
         $entry->asset_account_name   = app('steam')->tryDecrypt($transaction->account_name);
         $entry->asset_account_iban   = $transaction->account_iban;
         $entry->asset_account_number = $transaction->account_number;
         $entry->asset_account_bic    = $transaction->account_bic;
         $entry->asset_currency_code  = $transaction->account_currency_code;
 
-        $entry->opposing_account_id     = $transaction->opposing_account_id;
+        $entry->opposing_account_id     = strval($transaction->opposing_account_id);
         $entry->opposing_account_name   = app('steam')->tryDecrypt($transaction->opposing_account_name);
         $entry->opposing_account_iban   = $transaction->opposing_account_iban;
         $entry->opposing_account_number = $transaction->opposing_account_number;
@@ -144,7 +231,7 @@ final class Entry
         $entry->opposing_currency_code  = $transaction->opposing_currency_code;
 
         // budget
-        $entry->budget_id   = $transaction->transaction_budget_id;
+        $entry->budget_id   = strval($transaction->transaction_budget_id);
         $entry->budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name);
         if (null === $transaction->transaction_budget_id) {
             $entry->budget_id   = $transaction->transaction_journal_budget_id;
@@ -152,7 +239,7 @@ final class Entry
         }
 
         // category
-        $entry->category_id   = $transaction->transaction_category_id;
+        $entry->category_id   = strval($transaction->transaction_category_id);
         $entry->category_name = app('steam')->tryDecrypt($transaction->transaction_category_name);
         if (null === $transaction->transaction_category_id) {
             $entry->category_id   = $transaction->transaction_journal_category_id;
@@ -160,7 +247,7 @@ final class Entry
         }
 
         // budget
-        $entry->bill_id   = $transaction->bill_id;
+        $entry->bill_id   = strval($transaction->bill_id);
         $entry->bill_name = app('steam')->tryDecrypt($transaction->bill_name);
 
         $entry->tags  = $transaction->tags;

app/Export/ExpandedProcessor.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -32,8 +32,8 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
@@ -114,7 +114,7 @@ class ExpandedProcessor implements ProcessorInterface
         $notes       = $this->getNotes($ids);
         $tags        = $this->getTags($ids);
         /** @var array $ibans */
-        $ibans      = $this->getIbans($assetIds) + $this->getIbans($opposingIds);
+        $ibans      = array_merge($this->getIbans($assetIds), $this->getIbans($opposingIds));
         $currencies = $this->getAccountCurrencies($ibans);
         $transactions->each(
             function (Transaction $transaction) use ($notes, $tags, $ibans, $currencies) {
@@ -173,6 +173,7 @@ class ExpandedProcessor implements ProcessorInterface
      * @return bool
      *
      * @throws FireflyException
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function createZipFile(): bool
     {
@@ -309,17 +310,16 @@ class ExpandedProcessor implements ProcessorInterface
     private function getNotes(array $array): array
     {
         $array  = array_unique($array);
-        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
-                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
-                                        ->where('transaction_journals.user_id', $this->job->user_id)
-                                        ->where('journal_meta.name', 'notes')->get(
-                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
-            );
+        $notes  = Note::where('notes.noteable_type', 'FireflyIII\\Models\\TransactionJournal')
+                      ->whereIn('notes.noteable_id', $array)
+                      ->get(['notes.*']);
         $return = [];
-        /** @var TransactionJournalMeta $meta */
-        foreach ($set as $meta) {
-            $id          = intval($meta->transaction_journal_id);
-            $return[$id] = $meta->data;
+        /** @var Note $note */
+        foreach ($notes as $note) {
+            if (strlen(trim(strval($note->text))) > 0) {
+                $id          = intval($note->noteable_id);
+                $return[$id] = $note->text;
+            }
         }
 
         return $return;

app/Export/Exporter/BasicExporter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/Exporter/CsvExporter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -24,7 +24,7 @@ namespace FireflyIII\Export\Exporter;
 
 use FireflyIII\Export\Entry\Entry;
 use League\Csv\Writer;
-use SplFileObject;
+use Storage;
 
 /**
  * Class CsvExporter.
@@ -52,6 +52,8 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
     /**
      * @return bool
+     *
+     * @throws \TypeError
      */
     public function run(): bool
     {
@@ -60,8 +62,11 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
         // necessary for CSV writer:
         $fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->fileName;
-        $writer   = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
-        $rows     = [];
+
+
+        //we create the CSV into memory
+        $writer = Writer::createFromPath($fullPath);
+        $rows   = [];
 
         // get field names for header row:
         $first   = $this->getEntries()->first();
@@ -88,5 +93,8 @@ class CsvExporter extends BasicExporter implements ExporterInterface
     private function tempFile()
     {
         $this->fileName = $this->job->key . '-records.csv';
+        // touch file in export directory:
+        $disk = Storage::disk('export');
+        $disk->put($this->fileName, '');
     }
 }

app/Export/Exporter/ExporterInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Export/ProcessorInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Account/MonthReportGenerator.php

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

app/Generator/Report/Account/MultiYearReportGenerator.php

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

app/Generator/Report/Account/YearReportGenerator.php

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

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -119,6 +119,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Audit/MultiYearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Audit/YearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -128,6 +128,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Budget/MultiYearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Budget/YearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Category/MonthReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -146,6 +146,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Category/YearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/ReportGeneratorFactory.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/ReportGeneratorInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -63,6 +63,13 @@ interface ReportGeneratorInterface
      */
     public function setEndDate(Carbon $date): ReportGeneratorInterface;
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface;
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -41,6 +41,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -101,6 +103,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -40,6 +40,8 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -98,6 +100,16 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Standard/YearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -40,6 +40,8 @@ class YearReportGenerator implements ReportGeneratorInterface
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -98,6 +100,16 @@ class YearReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Support.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -65,6 +65,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
 
     /**
      * @return string
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -141,6 +142,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Tag/MultiYearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Generator/Report/Tag/YearReportGenerator.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Handlers/Events/AdminEventHandler.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Handlers/Events/StoredJournalEventHandler.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Handlers/Events/UpdatedJournalEventHandler.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Handlers/Events/UserEventHandler.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -76,6 +76,7 @@ class UserEventHandler
     {
         Log::debug('In checkSingleUserIsAdmin');
 
+        /** @var User $user */
         $user  = $event->user;
         $count = User::count();
 
@@ -86,7 +87,7 @@ class UserEventHandler
             return true;
         }
         // user is only user but has admin role
-        if ($count === 1 && $user->hasRole('owner')) {
+        if (1 === $count && $user->hasRole('owner')) {
             Log::debug(sprintf('User #%d is only user but has role owner so all is well.', $user->id));
 
             return true;

app/Handlers/Events/VersionCheckEventHandler.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * VersionCheckEventHandler.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyConfig;
+use FireflyIII\Events\RequestedVersionCheckStatus;
+use FireflyIII\User;
+use Log;
+
+/**
+ * Class VersionCheckEventHandler
+ */
+class VersionCheckEventHandler
+{
+
+    /**
+     * @param RequestedVersionCheckStatus $event
+     */
+    public function checkForUpdates(RequestedVersionCheckStatus $event)
+    {
+        // in Sandstorm, cannot check for updates:
+        $sandstorm = 1 === intval(getenv('SANDSTORM'));
+        if ($sandstorm === true) {
+            return;
+        }
+
+        /** @var User $user */
+        $user = $event->user;
+        if (!$user->hasRole('owner')) {
+            return;
+        }
+
+        $permission    = FireflyConfig::get('permission_update_check', -1);
+        $lastCheckTime = FireflyConfig::get('last_update_check', time());
+        $now           = time();
+        if ($now - $lastCheckTime->data < 604800) {
+            Log::debug('Checked for updates less than a week ago.');
+
+            return;
+
+        }
+        // last check time was more than a week ago.
+        Log::debug('Have not checked for a new version in a week!');
+
+        // have actual permission?
+        if ($permission->data === -1) {
+            // never asked before.
+            session()->flash('info', strval(trans('firefly.check_for_updates_permission', ['link' => route('admin.update-check')])));
+
+            return;
+        }
+
+        // actually check for update and inform the user.
+
+    }
+
+}

app/Helpers/Attachments/AttachmentHelper.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Chart/MetaPieChart.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Chart/MetaPieChartInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collection/Balance.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collection/BalanceEntry.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collection/BalanceHeader.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collection/BalanceLine.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -32,9 +32,18 @@ use Illuminate\Support\Collection;
  */
 class BalanceLine
 {
+    /**
+     *
+     */
     const ROLE_DEFAULTROLE = 1;
-    const ROLE_TAGROLE     = 2;
-    const ROLE_DIFFROLE    = 3;
+    /**
+     *
+     */
+    const ROLE_TAGROLE = 2;
+    /**
+     *
+     */
+    const ROLE_DIFFROLE = 3;
 
     /** @var Collection */
     protected $balanceEntries;

app/Helpers/Collection/Bill.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collection/BillLine.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -41,40 +41,14 @@ class BillLine
     /** @var string */
     protected $min;
     /** @var Carbon */
+    private $endOfPayDate;
+    /** @var Carbon */
     private $lastHitDate;
     /** @var Carbon */
     private $payDate;
-    /** @var Carbon */
-    private $endOfPayDate;
     /** @var int */
     private $transactionJournalId;
 
-    /**
-     * @return Carbon
-     */
-    public function getPayDate(): Carbon
-    {
-        return $this->payDate;
-    }
-
-    /**
-     * @return Carbon
-     */
-    public function getEndOfPayDate(): Carbon
-    {
-        return $this->endOfPayDate;
-    }
-
-    /**
-     * @param Carbon $endOfPayDate
-     */
-    public function setEndOfPayDate(Carbon $endOfPayDate): void
-    {
-        $this->endOfPayDate = $endOfPayDate;
-    }
-
-
-
     /**
      * BillLine constructor.
      */
@@ -115,6 +89,22 @@ class BillLine
         $this->bill = $bill;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getEndOfPayDate(): Carbon
+    {
+        return $this->endOfPayDate;
+    }
+
+    /**
+     * @param Carbon $endOfPayDate
+     */
+    public function setEndOfPayDate(Carbon $endOfPayDate): void
+    {
+        $this->endOfPayDate = $endOfPayDate;
+    }
+
     /**
      * @return Carbon
      */
@@ -163,6 +153,22 @@ class BillLine
         $this->min = $min;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getPayDate(): Carbon
+    {
+        return $this->payDate;
+    }
+
+    /**
+     * @param Carbon $payDate
+     */
+    public function setPayDate(Carbon $payDate): void
+    {
+        $this->payDate = $payDate;
+    }
+
     /**
      * @return int
      */
@@ -202,12 +208,4 @@ class BillLine
     {
         $this->hit = $hit;
     }
-
-    /**
-     * @param Carbon $payDate
-     */
-    public function setPayDate(Carbon $payDate): void
-    {
-        $this->payDate = $payDate;
-    }
 }

app/Helpers/Collection/Category.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Collector/JournalCollector.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -497,6 +497,20 @@ class JournalCollector implements JournalCollectorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $accounts
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface
+    {
+        $this->withOpposingAccount();
+
+        $this->query->whereIn('opposing.account_id', $accounts->pluck('id')->toArray());
+
+        return $this;
+    }
+
     /**
      * @param int $page
      *
@@ -759,7 +773,8 @@ class JournalCollector implements JournalCollectorInterface
 
             $this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
             $this->query->leftJoin('categories as transaction_categories', 'transaction_categories.id', '=', 'category_transaction.category_id');
-
+            $this->query->whereNull('transaction_journal_categories.deleted_at');
+            $this->query->whereNull('transaction_categories.deleted_at');
             $this->fields[] = 'category_transaction_journal.category_id as transaction_journal_category_id';
             $this->fields[] = 'transaction_journal_categories.encrypted as transaction_journal_category_encrypted';
             $this->fields[] = 'transaction_journal_categories.name as transaction_journal_category_name';

app/Helpers/Collector/JournalCollectorInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -160,6 +160,13 @@ interface JournalCollectorInterface
      */
     public function setOffset(int $offset): JournalCollectorInterface;
 
+    /**
+     * @param Collection $accounts
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface;
+
     /**
      * @param int $page
      *
@@ -196,6 +203,11 @@ interface JournalCollectorInterface
      */
     public function setTypes(array $types): JournalCollectorInterface;
 
+    /**
+     * @param User $user
+     *
+     * @return mixed
+     */
     public function setUser(User $user);
 
     /**

app/Helpers/Filter/AmountFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -37,6 +37,11 @@ class AmountFilter implements FilterInterface
     /** @var int */
     private $modifier = 0;
 
+    /**
+     * AmountFilter constructor.
+     *
+     * @param int $modifier
+     */
     public function __construct(int $modifier)
     {
         $this->modifier = $modifier;

app/Helpers/Filter/EmptyFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Filter/FilterInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -24,6 +24,9 @@ namespace FireflyIII\Helpers\Filter;
 
 use Illuminate\Support\Collection;
 
+/**
+ * Interface FilterInterface
+ */
 interface FilterInterface
 {
     /**

app/Helpers/Filter/InternalTransferFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Filter/NegativeAmountFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Filter/OpposingAccountFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Filter/PositiveAmountFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Filter/TransferFilter.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/FiscalHelper.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/FiscalHelperInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 

app/Helpers/Help/Help.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);
 
@@ -34,6 +34,9 @@ use Route;
  */
 class Help implements HelpInterface
 {
+    /**
+     *
+     */
     const CACHEKEY = 'help_%s_%s';
     /** @var string */
     protected $userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36';

app/Helpers/Help/HelpInterface.php

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 declare(strict_types=1);