Merge branch 'release/4.6.13'

create .htaccess file

.env.docker

@@ -5,6 +5,7 @@ APP_KEY=${FF_APP_KEY}
 APP_LOG=daily
 APP_LOG_LEVEL=warning
 APP_URL=http://localhost
+TRUSTED_PROXIES=
 
 DB_CONNECTION=mysql
 DB_HOST=${FF_DB_HOST}
@@ -36,7 +37,6 @@ MAIL_ENCRYPTION=null
 
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
@@ -55,3 +55,6 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
+IS_DOCKER=true
+IS_SANDSTORM=false
+IS_HEROKU=false

.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=
 
@@ -37,7 +37,6 @@ MAIL_ENCRYPTION=null
 
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
@@ -56,3 +55,6 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false

.env.heroku

@@ -0,0 +1,60 @@
+APP_ENV=heroku
+APP_DEBUG=true
+APP_NAME=FireflyIII
+APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
+APP_LOG=errorlog
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost
+TRUSTED_PROXIES=*
+
+DB_CONNECTION=pgsql
+
+
+
+
+
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+COOKIE_PATH="/"
+COOKIE_DOMAIN=
+COOKIE_SECURE=false
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_FROM=changeme@example.com
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=true
+
+CACHE_PREFIX=firefly
+
+SEARCH_RESULT_LIMIT=50
+EXCHANGE_RATE_SERVICE=fixerio
+
+MAPBOX_API_KEY=
+ANALYTICS_ID=
+SITE_OWNER=heroku@example.com
+USE_ENCRYPTION=true
+
+PUSHER_KEY=
+PUSHER_SECRET=
+PUSHER_ID=
+
+DEMO_USERNAME=
+DEMO_PASSWORD=
+
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=true

.env.sandstorm

@@ -5,6 +5,7 @@ APP_KEY=SomeRandomStringOf32CharsExactly
 APP_LOG=syslog
 APP_LOG_LEVEL=info
 APP_URL=http://localhost
+TRUSTED_PROXIES=
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -36,7 +37,6 @@ MAIL_ENCRYPTION=null
 
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
@@ -54,3 +54,7 @@ PUSHER_ID=
 
 DEMO_USERNAME=
 DEMO_PASSWORD=
+
+IS_DOCKER=false
+IS_SANDSTORM=true
+IS_HEROKU=false

.env.testing

@@ -5,10 +5,12 @@ APP_KEY=TestTestTestTestTestTestTestTest
 APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
+TRUSTED_PROXIES=
 
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
+#DB_DATABASE=firefly
 DB_USERNAME=homestead
 DB_PASSWORD=
 
@@ -35,13 +37,13 @@ MAIL_ENCRYPTION=null
 
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
-SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
+SEARCH_RESULT_LIMIT=50
 EXCHANGE_RATE_SERVICE=fixerio
 
-GOOGLE_MAPS_API_KEY=
+MAPBOX_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com
 USE_ENCRYPTION=true
@@ -53,3 +55,6 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
+IS_DOCKER=false
+IS_SANDSTORM=false
+IS_HEROKU=false

.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

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

.github/SUPPORT.md

@@ -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,3 +1,79 @@
+# 4.6.13
+- [Issue 1074](https://github.com/firefly-iii/firefly-iii/issues/1074), suggested by [MacPaille](https://github.com/MacPaille)
+- [Issue 1077](https://github.com/firefly-iii/firefly-iii/issues/1077), suggested by [wtercato](https://github.com/wtercato)
+- Bulk edit of transactions thanks to [vicmosin](https://github.com/vicmosin) ([issue 1078](https://github.com/firefly-iii/firefly-iii/issues/1078))
+- Support for Turkish.
+- [Issue 1090](https://github.com/firefly-iii/firefly-iii/issues/1090), suggested by [Findus23](https://github.com/Findus23)
+- [Issue 1097](https://github.com/firefly-iii/firefly-iii/issues/1097), suggested by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1093](https://github.com/firefly-iii/firefly-iii/issues/1093), suggested by [jinformatique](https://github.com/jinformatique)
+- [Issue 1098](https://github.com/firefly-iii/firefly-iii/issues/1098), suggested by [Nik-vr](https://github.com/Nik-vr)
+- [Issue 972](https://github.com/firefly-iii/firefly-iii/issues/972), reported by [pjotrvdh](https://github.com/pjotrvdh)
+- [Issue 1079](https://github.com/firefly-iii/firefly-iii/issues/1079), reported by [gavu](https://github.com/gavu)
+- [Issue 1080](https://github.com/firefly-iii/firefly-iii/issues/1080), reported by [zjean](https://github.com/zjean)
+- [Issue 1083](https://github.com/firefly-iii/firefly-iii/issues/1083), reported by [skuzzle](https://github.com/skuzzle)
+- [Issue 1085](https://github.com/firefly-iii/firefly-iii/issues/1085), reported by [nicoschreiner](https://github.com/nicoschreiner)
+- [Issue 1087](https://github.com/firefly-iii/firefly-iii/issues/1087), reported by [4oo4](https://github.com/4oo4)
+- [Issue 1089](https://github.com/firefly-iii/firefly-iii/issues/1089), reported by [robin5210](https://github.com/robin5210)
+- [Issue 1092](https://github.com/firefly-iii/firefly-iii/issues/1092), reported by [kelvinhammond](https://github.com/kelvinhammond)
+- [Issue 1096](https://github.com/firefly-iii/firefly-iii/issues/1096), reported by [wtercato](https://github.com/wtercato)
+
+# 4.6.12
+- Support for Indonesian.
+- New report, see [issue 384](https://github.com/firefly-iii/firefly-iii/issues/384)
+- [Issue 964](https://github.com/firefly-iii/firefly-iii/issues/964) as suggested by [gavu](https://github.com/gavu)
+- Greatly improved Docker support and documentation.
+- [Issue 1046](https://github.com/firefly-iii/firefly-iii/issues/1046), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1047](https://github.com/firefly-iii/firefly-iii/issues/1047), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1048](https://github.com/firefly-iii/firefly-iii/issues/1048), as reported by [webence](https://github.com/webence)
+- [Issue 1049](https://github.com/firefly-iii/firefly-iii/issues/1049), as reported by [nicoschreiner](https://github.com/nicoschreiner) 
+- [Issue 1015](https://github.com/firefly-iii/firefly-iii/issues/1015), as reporterd by a user on Tweakers.net
+- [Issue 1056](https://github.com/firefly-iii/firefly-iii/issues/1056), as reported by [repercussion](https://github.com/repercussion) 
+- [Issue 1061](https://github.com/firefly-iii/firefly-iii/issues/1061), as reported by [Meizikyn](https://github.com/Meizikyn)
+- [Issue 1045](https://github.com/firefly-iii/firefly-iii/issues/1045), as reported by [gavu](https://github.com/gavu)
+- First code for [issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) ([simonsmiley](https://github.com/simonsmiley))
+- [Issue 1059](https://github.com/firefly-iii/firefly-iii/issues/1059), as reported by [4oo4](https://github.com/4oo4)
+- [Issue 1063](https://github.com/firefly-iii/firefly-iii/issues/1063), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1064](https://github.com/firefly-iii/firefly-iii/issues/1064), as reported by [pkoziol](https://github.com/pkoziol)
+- [Issue 1066](https://github.com/firefly-iii/firefly-iii/issues/1066), reported by [wtercato](https://github.com/wtercato)
+
+# 4.6.1.1
+- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
+- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu) 
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
+- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
+- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
+- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
+- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
+- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
+- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
+- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
+
+# 4.6.11
+- A debug page at `/debug` for easier debug.
+- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)
+- Even more strings are translatable (and translated), thanks to [pkoziol](https://github.com/pkoziol) (see [issue 979](https://github.com/firefly-iii/firefly-iii/issues/979))
+- Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
+- Extended currency list, as suggested by @emuhendis in [issue 994](https://github.com/firefly-iii/firefly-iii/issues/994)
+- [Issue 996](https://github.com/firefly-iii/firefly-iii/issues/996) as suggested by [dp87](https://github.com/dp87)
+- Disabled Heroku support until I get it working again.
+- [Issue 980](https://github.com/firefly-iii/firefly-iii/issues/980), reported by [Tim-Frensch](https://github.com/Tim-Frensch)
+- [Issue 987](https://github.com/firefly-iii/firefly-iii/issues/987), reported by [gavu](https://github.com/gavu)
+- [Issue 988](https://github.com/firefly-iii/firefly-iii/issues/988), reported by [gavu](https://github.com/gavu)
+- [Issue 992](https://github.com/firefly-iii/firefly-iii/issues/992), reported by [ncicovic](https://github.com/ncicovic)
+- [Issue 993](https://github.com/firefly-iii/firefly-iii/issues/993), reported by [gavu](https://github.com/gavu)
+- [Issue 997](https://github.com/firefly-iii/firefly-iii/issues/997), reported by [gavu](https://github.com/gavu)
+- [Issue 1000](https://github.com/firefly-iii/firefly-iii/issues/1000), reported by [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 1001](https://github.com/firefly-iii/firefly-iii/issues/1001), reported by [gavu](https://github.com/gavu)
+- [Issue 1002](https://github.com/firefly-iii/firefly-iii/issues/1002), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1003](https://github.com/firefly-iii/firefly-iii/issues/1003), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1004](https://github.com/firefly-iii/firefly-iii/issues/1004), reported by [Aquariu](https://github.com/Aquariu)
+- [Issue 1010](https://github.com/firefly-iii/firefly-iii/issues/1010)
+- [Issue 1014](https://github.com/firefly-iii/firefly-iii/issues/1014), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1016](https://github.com/firefly-iii/firefly-iii/issues/1016)
+- [Issue 1024](https://github.com/firefly-iii/firefly-iii/issues/1024), reported by [gavu](https://github.com/gavu)
+- [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
+
 # 4.6.10
 - Greatly expanded Docker support thanks to [alazare619](https://github.com/alazare619)
 - [Issue 967](https://github.com/firefly-iii/firefly-iii/issues/967), thanks to [Aquariu](https://github.com/Aquariu)

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 2,
-    appMarketingVersion = (defaultText = "4.6.10"),
+    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

.sandstorm/setup.sh

@@ -12,10 +12,10 @@ apt-get update
 apt-get install -y python-software-properties software-properties-common
 
 # install all languages
-sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
 dpkg-reconfigure --frontend=noninteractive locales
 
 

.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,7 +2,105 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [4.6.10] - 2017-11-xx
+## [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)
+
+### Changed
+- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu) 
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
+- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
+- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
+
+### Fixed
+- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
+- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
+- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
+- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
+- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
+- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
+
+## [4.6.11] - 2017-11-30
+### Added
+- A debug page at `/debug` for easier debug.
+- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)
+- Even more strings are translatable (and translated), thanks to [pkoziol](https://github.com/pkoziol) (see [issue 979](https://github.com/firefly-iii/firefly-iii/issues/979))
+- Reconciliation of accounts ([issue 736](https://github.com/firefly-iii/firefly-iii/issues/736)), as requested by [kristophr](https://github.com/kristophr) and several others
+
+### Changed
+- 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
+- Disabled Heroku support until I get it working again.
+
+### Fixed
+- [Issue 980](https://github.com/firefly-iii/firefly-iii/issues/980), reported by [Tim-Frensch](https://github.com/Tim-Frensch)
+- [Issue 987](https://github.com/firefly-iii/firefly-iii/issues/987), reported by [gavu](https://github.com/gavu)
+- [Issue 988](https://github.com/firefly-iii/firefly-iii/issues/988), reported by [gavu](https://github.com/gavu)
+- [Issue 992](https://github.com/firefly-iii/firefly-iii/issues/992), reported by [ncicovic](https://github.com/ncicovic)
+- [Issue 993](https://github.com/firefly-iii/firefly-iii/issues/993), reported by [gavu](https://github.com/gavu)
+- [Issue 997](https://github.com/firefly-iii/firefly-iii/issues/997), reported by [gavu](https://github.com/gavu)
+- [Issue 1000](https://github.com/firefly-iii/firefly-iii/issues/1000), reported by [xpfgsyb](https://github.com/xpfgsyb)
+- [Issue 1001](https://github.com/firefly-iii/firefly-iii/issues/1001), reported by [gavu](https://github.com/gavu)
+- [Issue 1002](https://github.com/firefly-iii/firefly-iii/issues/1002), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1003](https://github.com/firefly-iii/firefly-iii/issues/1003), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1004](https://github.com/firefly-iii/firefly-iii/issues/1004), reported by [Aquariu](https://github.com/Aquariu)
+- [Issue 1010](https://github.com/firefly-iii/firefly-iii/issues/1010)
+- [Issue 1014](https://github.com/firefly-iii/firefly-iii/issues/1014), reported by [ursweiss](https://github.com/ursweiss)
+- [Issue 1016](https://github.com/firefly-iii/firefly-iii/issues/1016)
+- [Issue 1024](https://github.com/firefly-iii/firefly-iii/issues/1024), reported by [gavu](https://github.com/gavu)
+- [Issue 1025](https://github.com/firefly-iii/firefly-iii/issues/1025), reported by [gavu](https://github.com/gavu)
+
+
+## [4.6.10] - 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)
@@ -277,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,12 +1,18 @@
-FROM php:7-apache
+# use PHP 7.1 and Apache as a base.
+FROM php:7.1-apache
 
+# set working dir
+ENV FIREFLY_PATH /var/www/firefly-iii
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# install packages
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends libcurl4-openssl-dev \
                                                zlib1g-dev \
                                                libjpeg62-turbo-dev \
                                                libpng12-dev \
                                                libicu-dev \
-                                               libmcrypt-dev \
                                                libedit-dev \
                                                libtidy-dev \
                                                libxml2-dev \
@@ -15,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/*
 
-RUN docker-php-ext-install -j$(nproc) curl gd intl json mcrypt readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
+# Install PHP exentions.
+RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
 
-# Generate locales supported by firefly
-RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
+# Generate locales supported by Firefly III
+RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
 
+# copy Apache config to correct spot.
 COPY ./docker/apache2.conf /etc/apache2/apache2.conf
 
 # Enable apache mod rewrite..
@@ -31,23 +39,23 @@ RUN a2enmod rewrite
 # Enable apache mod ssl..
 RUN a2enmod ssl
 
+# Create volumes for several directories:
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
 # Setup the Composer installer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Copy Apache Configs
+# 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
 
@@ -35,6 +37,10 @@ Register for a free Heroku account and instantly run Firefly III on your very ow
 
 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.
@@ -51,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
 
@@ -72,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,6 +2,7 @@
   "name": "Firefly III",
   "description": "A free and open source personal finances manager",
   "repository": "https://github.com/firefly-iii/firefly-iii",
+  "website": "https://firefly-iii.org/",
   "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
   "keywords": [
     "finance",
@@ -36,14 +37,16 @@
     "transfers",
     "management"
   ],
-  "website": "https://firefly-iii.github.io/",
   "addons": [
     {
-      "plan": "heroku-postgresql"
+      "plan": "heroku-postgresql",
+      "options": {
+        "version": "9.5"
+      }
     }
   ],
   "scripts": {
-    "postdeploy": "export APP_KEY=$(php artisan --no-ansi key:generate --show)"
+    "postdeploy": "php artisan migrate:refresh --seed;php artisan firefly:instructions install"
   },
   "buildpacks": [
     {

app/Console/Commands/CreateExport.php

@@ -16,12 +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);
 
-
 namespace FireflyIII\Console\Commands;
 
 use Carbon\Carbon;
@@ -34,13 +32,10 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Storage;
 
-
 /**
- * Class CreateExport
+ * Class CreateExport.
  *
  * Generates export from the command line.
- *
- * @package FireflyIII\Console\Commands
  */
 class CreateExport extends Command
 {
@@ -66,7 +61,6 @@ class CreateExport extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {
@@ -74,7 +68,6 @@ class CreateExport extends Command
     }
 
     /**
-     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      *
@@ -109,7 +102,7 @@ class CreateExport extends Command
         // first date
         $firstJournal = $journalRepository->first();
         $first        = new Carbon;
-        if (!is_null($firstJournal->id)) {
+        if (null !== $firstJournal->id) {
             $first = $firstJournal->date;
         }
 
@@ -125,7 +118,6 @@ class CreateExport extends Command
             'job'                => $job,
         ];
 
-
         /** @var ProcessorInterface $processor */
         $processor = app(ProcessorInterface::class);
         $processor->setSettings($settings);

app/Console/Commands/CreateImport.php

@@ -16,16 +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;
@@ -35,9 +35,7 @@ use Monolog\Formatter\LineFormatter;
 use Preferences;
 
 /**
- * Class CreateImport
- *
- * @package FireflyIII\Console\Commands
+ * Class CreateImport.
  */
 class CreateImport extends Command
 {
@@ -57,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.}
@@ -65,7 +63,6 @@ class CreateImport extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {
@@ -77,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()
     {
@@ -97,8 +96,8 @@ class CreateImport extends Command
             return;
         }
 
-        $configurationData = json_decode(file_get_contents($configuration));
-        if (is_null($configurationData)) {
+        $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));
 
             return;
@@ -109,25 +108,20 @@ class CreateImport extends Command
         $this->line(sprintf('Import into user: #%d (%s)', $user->id, $user->email));
         $this->line(sprintf('Type of import: %s', $type));
 
-
         /** @var ImportJobRepositoryInterface $jobRepository */
         $jobRepository = app(ImportJobRepositoryInterface::class);
         $jobRepository->setUser($user);
         $job = $jobRepository->create($type);
         $this->line(sprintf('Created job "%s"', $job->key));
 
-
         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 ($this->option('start') === true) {
+        if (true === $this->option('start')) {
             $this->line('The import will start in a moment. This process is not visible...');
             Log::debug('Go for import!');
 
@@ -138,20 +132,27 @@ class CreateImport extends Command
             $handler->setFormatter($formatter);
             $monolog->pushHandler($handler);
 
-
             // start the actual routine:
-            /** @var ImportRoutine $routine */
-            $routine = app(ImportRoutine::class);
+            $type      = 'csv' === $job->file_type ? 'file' : $job->file_type;
+            $key       = sprintf('import.routine.%s', $type);
+            $className = config($key);
+            if (null === $className || !class_exists($className)) {
+                throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore
+            }
+            /** @var RoutineInterface $routine */
+            $routine = app($className);
             $routine->setJob($job);
             $routine->run();
 
             // give feedback.
             /** @var MessageBag $error */
-            foreach ($routine->errors as $index => $error) {
+            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()
+                )
             );
         }
 
@@ -175,9 +176,9 @@ 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 (is_null($user->id)) {
+        if (null === $user->id) {
             $this->error(sprintf('There is no user with ID %d.', $this->option('user')));
 
             return false;

app/Console/Commands/DecryptAttachment.php

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

app/Console/Commands/EncryptFile.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
@@ -27,9 +26,7 @@ use Crypt;
 use Illuminate\Console\Command;
 
 /**
- * Class EncryptFile
- *
- * @package FireflyIII\Console\Commands
+ * Class EncryptFile.
  */
 class EncryptFile extends Command
 {
@@ -49,7 +46,6 @@ class EncryptFile extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {

app/Console/Commands/Import.php

@@ -16,24 +16,22 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\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;
 use Log;
 
 /**
- * Class Import
- *
- * @package FireflyIII\Console\Commands
+ * Class Import.
  */
 class Import extends Command
 {
@@ -53,7 +51,6 @@ class Import extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {
@@ -62,13 +59,15 @@ class Import extends Command
 
     /**
      * Run the import routine.
+     *
+     * @throws FireflyException
      */
     public function handle()
     {
         Log::debug('Start start-import command');
         $jobKey = $this->argument('key');
         $job    = ImportJob::where('key', $jobKey)->first();
-        if (is_null($job)) {
+        if (null === $job) {
             $this->error(sprintf('No job found with key "%s"', $jobKey));
 
             return;
@@ -85,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;
     }
@@ -109,14 +118,14 @@ class Import extends Command
      */
     private function isValid(ImportJob $job): bool
     {
-        if (is_null($job)) {
+        if (null === $job) {
             Log::error('This job does not seem to exist.');
             $this->error('This job does not seem to exist.');
 
             return false;
         }
 
-        if ($job->status !== 'configured') {
+        if ('configured' !== $job->status) {
             Log::error(sprintf('This job is not ready to be imported (status is %s).', $job->status));
             $this->error('This job is not ready to be imported.');
 

app/Console/Commands/ScanAttachments.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
@@ -31,9 +30,7 @@ use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Storage;
 
 /**
- * Class ScanAttachments
- *
- * @package FireflyIII\Console\Commands
+ * Class ScanAttachments.
  */
 class ScanAttachments extends Command
 {
@@ -53,7 +50,6 @@ class ScanAttachments extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {

app/Console/Commands/UpgradeDatabase.php

@@ -16,20 +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 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;
@@ -45,17 +41,15 @@ use Preferences;
 use Schema;
 
 /**
- * Class UpgradeDatabase
+ * Class UpgradeDatabase.
  *
  * Upgrade user database.
  *
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // it just touches a lot of things.
- * @package FireflyIII\Console\Commands
  */
 class UpgradeDatabase extends Command
 {
-
     /**
      * The console command description.
      *
@@ -79,12 +73,14 @@ class UpgradeDatabase extends Command
 
     /**
      * Execute the console command.
+     *
+     * @throws \Exception
      */
     public function handle()
     {
         $this->setTransactionIdentifier();
-        $this->migrateRepetitions();
         $this->updateAccountCurrencies();
+        $this->createNewTypes();
         $this->line('Updating currency information..');
         $this->updateTransferCurrencies();
         $this->updateOtherCurrencies();
@@ -93,30 +89,6 @@ class UpgradeDatabase extends Command
         $this->info('Firefly III database is up to date.');
 
         return;
-
-
-    }
-
-    /**
-     * Migrate budget repetitions to new format where the end date is in the budget limit as well,
-     * making the limit_repetition table obsolete.
-     */
-    public function migrateRepetitions(): void
-    {
-        $set = BudgetLimit::whereNull('end_date')->get();
-        /** @var BudgetLimit $budgetLimit */
-        foreach ($set as $budgetLimit) {
-            /** @var LimitRepetition $repetition */
-            $repetition = $budgetLimit->limitrepetitions()->first();
-            if (!is_null($repetition)) {
-                $budgetLimit->end_date = $repetition->enddate;
-                $budgetLimit->save();
-                $this->line(sprintf('Updated budget limit #%d', $budgetLimit->id));
-                $repetition->delete();
-            }
-        }
-
-        return;
     }
 
     /**
@@ -173,7 +145,8 @@ class UpgradeDatabase extends Command
                 $obCurrency          = intval($openingBalance->transaction_currency_id);
 
                 // both 0? set to default currency:
-                if ($accountCurrency === 0 && $obCurrency === 0) {
+                if (0 === $accountCurrency && 0 === $obCurrency) {
+                    AccountMeta::where('account_id', $account->id)->where('name', 'currency_id')->forceDelete();
                     AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
                     $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
 
@@ -181,7 +154,7 @@ class UpgradeDatabase extends Command
                 }
 
                 // account is set to 0, opening balance is not?
-                if ($accountCurrency === 0 && $obCurrency > 0) {
+                if (0 === $accountCurrency && $obCurrency > 0) {
                     AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]);
                     $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
 
@@ -231,7 +204,7 @@ class UpgradeDatabase extends Command
                                        ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                                        ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
                                        ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->first(['transactions.*']);
-                if (is_null($transaction)) {
+                if (null === $transaction) {
                     return;
                 }
                 /** @var Account $account */
@@ -240,13 +213,13 @@ class UpgradeDatabase extends Command
                 $transactions = $journal->transactions()->get();
                 $transactions->each(
                     function (Transaction $transaction) use ($currency) {
-                        if (is_null($transaction->transaction_currency_id)) {
+                        if (null === $transaction->transaction_currency_id) {
                             $transaction->transaction_currency_id = $currency->id;
                             $transaction->save();
                         }
 
                         // when mismatch in transaction:
-                        if ($transaction->transaction_currency_id !== $currency->id) {
+                        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;
@@ -295,8 +268,23 @@ class UpgradeDatabase extends Command
         );
     }
 
+    private function createNewTypes(): void
+    {
+        // create transaction type "Reconciliation".
+        $type = TransactionType::where('type', TransactionType::RECONCILIATION)->first();
+        if (is_null($type)) {
+            TransactionType::create(['type' => TransactionType::RECONCILIATION]);
+        }
+        $account = AccountType::where('type', AccountType::RECONCILIATION)->first();
+        if (is_null($account)) {
+            AccountType::create(['type' => AccountType::RECONCILIATION]);
+        }
+    }
+
     /**
      * Move all the journal_meta notes to their note object counter parts.
+     *
+     * @throws \Exception
      */
     private function migrateNotes(): void
     {
@@ -305,8 +293,8 @@ class UpgradeDatabase extends Command
         foreach ($set as $meta) {
             $journal = $meta->transactionJournal;
             $note    = $journal->notes()->first();
-            if (is_null($note)) {
-                $note = new Note;
+            if (null === $note) {
+                $note = new Note();
                 $note->noteable()->associate($journal);
             }
 
@@ -314,11 +302,9 @@ class UpgradeDatabase extends Command
             $note->save();
             Log::debug(sprintf('Migrated meta note #%d to Note #%d', $meta->id, $note->id));
             $meta->delete();
-
         }
     }
 
-
     /**
      * This method makes sure that the transaction journal uses the currency given in the transaction.
      *
@@ -334,7 +320,10 @@ class UpgradeDatabase extends Command
         if (!(intval($currency->id) === intval($journal->transaction_currency_id))) {
             $this->line(
                 sprintf(
-                    'Transfer #%d ("%s") has been updated to use %s instead of %s.', $journal->id, $journal->description, $currency->code,
+                    'Transfer #%d ("%s") has been updated to use %s instead of %s.',
+                    $journal->id,
+                    $journal->description,
+                    $currency->code,
                     $journal->transactionCurrency->code
                 )
             );
@@ -376,7 +365,7 @@ class UpgradeDatabase extends Command
 
                 return;
             }
-            if (!is_null($opposing)) {
+            if (null !== $opposing) {
                 // give both a new identifier:
                 $transaction->identifier = $identifier;
                 $opposing->identifier    = $identifier;
@@ -385,7 +374,7 @@ class UpgradeDatabase extends Command
                 $processed[] = $transaction->id;
                 $processed[] = $opposing->id;
             }
-            $identifier++;
+            ++$identifier;
         }
 
         return;
@@ -412,22 +401,27 @@ class UpgradeDatabase extends Command
         $currency   = $repository->find(intval($transaction->account->getMeta('currency_id')));
 
         // has no currency ID? Must have, so fill in using account preference:
-        if (is_null($transaction->transaction_currency_id)) {
-            $transaction->transaction_currency_id = $currency->id;
+        if (null === $transaction->transaction_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 && is_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->id,
-                    $transaction->transaction_currency_id, $currency->id, $transaction->amount
+                    '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();
         }
 
@@ -438,14 +432,14 @@ class UpgradeDatabase extends Command
         $opposing         = $journal->transactions()->where('amount', '>', 0)->where('identifier', $transaction->identifier)->first();
         $opposingCurrency = $repository->find(intval($opposing->account->getMeta('currency_id')));
 
-        if (is_null($opposingCurrency->id)) {
+        if (null === $opposingCurrency->id) {
             Log::error(sprintf('Account #%d ("%s") must have currency preference but has none.', $opposing->account->id, $opposing->account->name));
 
             return;
         }
 
         // if the destination account currency is the same, both foreign_amount and foreign_currency_id must be NULL for both transactions:
-        if ($opposingCurrency->id === $currency->id) {
+        if (intval($opposingCurrency->id) === intval($currency->id)) {
             // update both transactions to match:
             $transaction->foreign_amount       = null;
             $transaction->foreign_currency_id  = null;
@@ -459,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();
@@ -468,24 +462,23 @@ class UpgradeDatabase extends Command
         }
 
         // if foreign amount of one is null and the other is not, use this to restore:
-        if (is_null($transaction->foreign_amount) && !is_null($opposing->foreign_amount)) {
+        if (null === $transaction->foreign_amount && null !== $opposing->foreign_amount) {
             $transaction->foreign_amount = bcmul(strval($opposing->foreign_amount), '-1');
             $transaction->save();
             Log::debug(sprintf('Restored foreign amount of transaction (1) #%d to %s', $transaction->id, $transaction->foreign_amount));
         }
 
         // if foreign amount of one is null and the other is not, use this to restore (other way around)
-        if (is_null($opposing->foreign_amount) && !is_null($transaction->foreign_amount)) {
+        if (null === $opposing->foreign_amount && null !== $transaction->foreign_amount) {
             $opposing->foreign_amount = bcmul(strval($transaction->foreign_amount), '-1');
             $opposing->save();
             Log::debug(sprintf('Restored foreign amount of transaction (2) #%d to %s', $opposing->id, $opposing->foreign_amount));
         }
 
         // when both are zero, try to grab it from journal:
-        if (is_null($opposing->foreign_amount) && is_null($transaction->foreign_amount)) {
-
+        if (null === $opposing->foreign_amount && null === $transaction->foreign_amount) {
             $foreignAmount = $journal->getMeta('foreign_amount');
-            if (is_null($foreignAmount)) {
+            if (null === $foreignAmount) {
                 Log::debug(sprintf('Journal #%d has missing foreign currency data, forced to do 1:1 conversion :(.', $transaction->transaction_journal_id));
                 $transaction->foreign_amount = bcmul(strval($transaction->amount), '-1');
                 $opposing->foreign_amount    = bcmul(strval($opposing->amount), '-1');
@@ -497,7 +490,9 @@ class UpgradeDatabase extends Command
             $foreignPositive = app('steam')->positive(strval($foreignAmount));
             Log::debug(
                 sprintf(
-                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").', $transaction->transaction_journal_id, $foreignAmount
+                    'Journal #%d has missing foreign currency info, try to restore from meta-data ("%s").',
+                    $transaction->transaction_journal_id,
+                    $foreignAmount
                 )
             );
             $transaction->foreign_amount = bcmul($foreignPositive, '-1');
@@ -506,7 +501,22 @@ class UpgradeDatabase extends Command
             $opposing->save();
         }
 
-
         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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
@@ -26,9 +25,7 @@ namespace FireflyIII\Console\Commands;
 use Illuminate\Console\Command;
 
 /**
- * Class UpgradeFireflyInstructions
- *
- * @package FireflyIII\Console\Commands
+ * Class UpgradeFireflyInstructions.
  */
 class UpgradeFireflyInstructions extends Command
 {
@@ -47,7 +44,6 @@ class UpgradeFireflyInstructions extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {
@@ -59,17 +55,16 @@ class UpgradeFireflyInstructions extends Command
      */
     public function handle()
     {
-
-        if ($this->argument('task') === 'update') {
+        if ('update' === $this->argument('task')) {
             $this->updateInstructions();
         }
-        if ($this->argument('task') === 'install') {
+        if ('install' === $this->argument('task')) {
             $this->installInstructions();
         }
     }
 
     /**
-     * Show a nice box
+     * Show a nice box.
      *
      * @param string $text
      */
@@ -82,7 +77,7 @@ class UpgradeFireflyInstructions extends Command
     }
 
     /**
-     * Show a nice info box
+     * Show a nice info box.
      *
      * @param string $text
      */
@@ -109,12 +104,10 @@ class UpgradeFireflyInstructions extends Command
             if (substr($version, 0, $len) === $compare) {
                 $text = $config[$compare];
             }
-
         }
         $this->showLine();
         $this->boxed('');
-        if (is_null($text)) {
-
+        if (null === $text) {
             $this->boxed(sprintf('Thank you for installing Firefly III, v%s!', $version));
             $this->boxedInfo('There are no extra installation instructions.');
             $this->boxed('Firefly III should be ready for use.');
@@ -131,17 +124,16 @@ class UpgradeFireflyInstructions extends Command
     }
 
     /**
-     * Show a line
+     * Show a line.
      */
     private function showLine()
     {
         $line = '+';
-        for ($i = 0; $i < 78; $i++) {
+        for ($i = 0; $i < 78; ++$i) {
             $line .= '-';
         }
         $line .= '+';
         $this->line($line);
-
     }
 
     /**
@@ -159,12 +151,10 @@ class UpgradeFireflyInstructions extends Command
             if (substr($version, 0, $len) === $compare) {
                 $text = $config[$compare];
             }
-
         }
         $this->showLine();
         $this->boxed('');
-        if (is_null($text)) {
-
+        if (null === $text) {
             $this->boxed(sprintf('Thank you for updating to Firefly III, v%s', $version));
             $this->boxedInfo('There are no extra upgrade instructions.');
             $this->boxed('Firefly III should be ready for use.');

app/Console/Commands/UseEncryption.php

@@ -17,28 +17,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
-/**
- * UseEncryption.php
- * Copyright (c) 2017 thegrumpydictator@gmail.com
- * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
 /**
- * Class UseEncryption
- *
- * @package FireflyIII\Console\Commands
+ * Class UseEncryption.
  */
 class UseEncryption extends Command
 {
@@ -57,7 +46,6 @@ class UseEncryption extends Command
 
     /**
      * Create a new command instance.
-     *
      */
     public function __construct()
     {
@@ -69,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');
@@ -88,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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
@@ -28,11 +27,9 @@ use Log;
 use Preferences;
 
 /**
- * Trait VerifiesAccessToken
+ * Trait VerifiesAccessToken.
  *
  * Verifies user access token for sensitive commands.
- *
- * @package FireflyIII\Console\Commands
  */
 trait VerifiesAccessToken
 {
@@ -58,24 +55,24 @@ trait VerifiesAccessToken
         $repository = app(UserRepositoryInterface::class);
         $user       = $repository->find($userId);
 
-        if (is_null($user->id)) {
+        if (null === $user->id) {
             Log::error(sprintf('verifyAccessToken(): no such user for input "%d"', $userId));
 
             return false;
         }
         $accessToken = Preferences::getForUser($user, 'access_token', null);
-        if (is_null($accessToken)) {
+        if (null === $accessToken) {
             Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
 
             return false;
         }
         if (!($accessToken->data === $token)) {
             Log::error(sprintf('Invalid access token for user #%d.', $userId));
+            Log::error(sprintf('Token given is "%s", expected "%s".', $token, $accessToken->data));
 
             return false;
         }
 
         return true;
     }
-
-}
+}

app/Console/Commands/VerifyDatabase.php

@@ -16,14 +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;
@@ -42,11 +42,9 @@ use Schema;
 use stdClass;
 
 /**
- * Class VerifyDatabase
+ * Class VerifyDatabase.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- *
- * @package FireflyIII\Console\Commands
  */
 class VerifyDatabase extends Command
 {
@@ -96,7 +94,7 @@ class VerifyDatabase extends Command
         $this->repairPiggyBanks();
         $this->createLinkTypes();
         $this->createAccessTokens();
-
+        $this->fixDoubleAmounts();
     }
 
     /**
@@ -104,16 +102,21 @@ class VerifyDatabase extends Command
      */
     private function createAccessTokens()
     {
+        $count = 0;
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
             $pref = Preferences::getForUser($user, 'access_token', null);
-            if (is_null($pref)) {
+            if (null === $pref) {
                 $token = $user->generateAccessToken();
                 Preferences::setForUser($user, 'access_token', $token);
                 $this->line(sprintf('Generated access token for user %s', $user->email));
+                ++$count;
             }
         }
+        if (0 === $count) {
+            $this->info('All access tokens OK!');
+        }
     }
 
     /**
@@ -121,7 +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'],
@@ -129,15 +133,69 @@ class VerifyDatabase extends Command
         ];
         foreach ($set as $name => $values) {
             $link = LinkType::where('name', $name)->where('outward', $values[0])->where('inward', $values[1])->first();
-            if (is_null($link)) {
+            if (null === $link) {
                 $link          = new LinkType;
                 $link->name    = $name;
                 $link->outward = $values[0];
                 $link->inward  = $values[1];
+                ++$count;
             }
             $link->editable = false;
             $link->save();
         }
+        if (0 === $count) {
+            $this->info('All link types OK!');
+        }
+    }
+
+    private function fixDoubleAmounts()
+    {
+        $count = 0;
+        // get invalid journals
+        $errored  = [];
+        $journals = DB::table('transactions')
+                      ->groupBy('transaction_journal_id')
+                      ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
+        /** @var stdClass $entry */
+        foreach ($journals as $entry) {
+            if (0 !== bccomp(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;
     }
 
     /**
@@ -148,17 +206,17 @@ class VerifyDatabase extends Command
         $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
         $set->each(
             function (PiggyBankEvent $event) {
-                if (is_null($event->transaction_journal_id)) {
+                if (null === $event->transaction_journal_id) {
                     return true;
                 }
                 /** @var TransactionJournal $journal */
                 $journal = $event->transactionJournal()->first();
-                if (is_null($journal)) {
+                if (null === $journal) {
                     return true;
                 }
 
                 $type = $journal->transactionType->type;
-                if ($type !== TransactionType::TRANSFER) {
+                if (TransactionType::TRANSFER !== $type) {
                     $event->transaction_journal_id = null;
                     $event->save();
                     $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
@@ -208,7 +266,10 @@ class VerifyDatabase extends Command
         foreach ($set as $entry) {
             $line = sprintf(
                 'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
-                $entry->user_id, $entry->email, $entry->id, $entry->name
+                $entry->user_id,
+                $entry->email,
+                $entry->id,
+                $entry->name
             );
             $this->line($line);
         }
@@ -232,11 +293,11 @@ class VerifyDatabase extends Command
                       ->get(
                           ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
                            'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                           'transaction_journals.deleted_at as journal_deleted_at']
+                           'transaction_journals.deleted_at as journal_deleted_at',]
                       );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
-            $date = is_null($entry->transaction_deleted_at) ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
+            $date = null === $entry->transaction_deleted_at ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
             $this->error(
                 'Error: Account #' . $entry->account_id . ' should have been deleted, but has not.' .
                 ' Find it in the table called "accounts" and change the "deleted_at" field to: "' . $date . '"'
@@ -268,7 +329,7 @@ class VerifyDatabase extends Command
                                      ->whereNull('transaction_journals.deleted_at')
                                      ->get(
                                          ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
-                                          'transaction_types.type']
+                                          'transaction_types.type',]
                                      );
             foreach ($set as $entry) {
                 $this->error(
@@ -287,28 +348,33 @@ class VerifyDatabase extends Command
     }
 
     /**
-     * Any deleted transaction journals that have transactions that are NOT deleted:
+     * Any deleted transaction journals that have transactions that are NOT deleted:.
      */
     private function reportJournals()
     {
-        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-                                 ->whereNull('transactions.deleted_at')
-                                 ->whereNotNull('transactions.id')
-                                 ->get(
-                                     [
-                                         'transaction_journals.id as journal_id',
-                                         'transaction_journals.description',
-                                         'transaction_journals.deleted_at as journal_deleted',
-                                         'transactions.id as transaction_id',
-                                         'transactions.deleted_at as transaction_deleted_at']
-                                 );
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                   ->whereNull('transactions.deleted_at')
+                                   ->whereNotNull('transactions.id')
+                                   ->get(
+                                       [
+                                           'transaction_journals.id as journal_id',
+                                           'transaction_journals.description',
+                                           'transaction_journals.deleted_at as journal_deleted',
+                                           'transactions.id as transaction_id',
+                                           'transactions.deleted_at as transaction_deleted_at',]
+                                   );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
                 'Error: Transaction #' . $entry->transaction_id . ' should have been deleted, but has not.' .
                 ' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned transactions!');
         }
     }
 
@@ -317,17 +383,21 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                                 ->groupBy('transaction_journals.id')
-                                 ->whereNull('transactions.transaction_journal_id')
-                                 ->get(['transaction_journals.id']);
+        $count = 0;
+        $set   = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                   ->groupBy('transaction_journals.id')
+                                   ->whereNull('transactions.transaction_journal_id')
+                                   ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
                 'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
             );
+            ++$count;
+        }
+        if (0 === $count) {
+            $this->info('No orphaned journals!');
         }
-
     }
 
     /**
@@ -339,7 +409,7 @@ class VerifyDatabase extends Command
     {
         $plural = str_plural($name);
         $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
-        $field  = $name === 'tag' ? 'tag' : 'name';
+        $field  = 'tag' === $name ? 'tag' : 'name';
         $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
                         ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
                         ->distinct()
@@ -349,7 +419,6 @@ class VerifyDatabase extends Command
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
-
             $objName = $entry->name;
             try {
                 $objName = Crypt::decrypt($objName);
@@ -359,7 +428,11 @@ class VerifyDatabase extends Command
 
             $line = sprintf(
                 'User #%d (%s) has %s #%d ("%s") which has no transactions.',
-                $entry->user_id, $entry->email, $name, $entry->id, $objName
+                $entry->user_id,
+                $entry->email,
+                $name,
+                $entry->id,
+                $objName
             );
             $this->line($line);
         }
@@ -376,8 +449,10 @@ class VerifyDatabase extends Command
         /** @var User $user */
         foreach ($userRepository->all() as $user) {
             $sum = strval($user->transactions()->sum('amount'));
-            if (bccomp($sum, '0') !== 0) {
+            if (0 !== bccomp($sum, '0')) {
                 $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
+            } else {
+                $this->info(sprintf('Amount integrity OK for user #%d', $user->id));
             }
         }
     }
@@ -392,7 +467,7 @@ class VerifyDatabase extends Command
                           ->whereNull('transaction_journals.deleted_at')
                           ->get(
                               ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                               'transaction_journals.deleted_at']
+                               'transaction_journals.deleted_at',]
                           );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -419,11 +494,10 @@ class VerifyDatabase extends Command
             $this->error(
                 sprintf(
                     'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.',
-                    $entry->id, $entry->transactionType->type
+                    $entry->id,
+                    $entry->transactionType->type
                 )
             );
         }
-
-
     }
 }

app/Console/Kernel.php

@@ -16,21 +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;
@@ -48,13 +37,10 @@ class Kernel extends ConsoleKernel
      */
     protected $commands
         = [
-            //
         ];
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
     protected function commands()
     {
@@ -66,9 +52,8 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
-     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function schedule(Schedule $schedule)

app/Events/AdminRequestedTestMessage.php

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

app/Events/Event.php

@@ -16,19 +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\Events;
 
 /**
- * Class Event
- *
- * @package FireflyIII\Events
+ * Class Event.
  */
 abstract class Event
 {
-    //
 }

app/Events/RegisteredUser.php

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

app/Events/RequestedNewPassword.php

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

app/Events/RequestedVersionCheckStatus.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * 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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Events;
@@ -27,13 +26,10 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class StoredTransactionJournal
- *
- * @package FireflyIII\Events
+ * Class StoredTransactionJournal.
  */
 class StoredTransactionJournal extends Event
 {
-
     use SerializesModels;
 
     /** @var TransactionJournal */
@@ -49,10 +45,7 @@ class StoredTransactionJournal extends Event
      */
     public function __construct(TransactionJournal $journal, int $piggyBankId)
     {
-        //
         $this->journal     = $journal;
         $this->piggyBankId = $piggyBankId;
-
     }
-
 }

app/Events/UpdatedTransactionJournal.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Events;
@@ -27,13 +26,10 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
 
 /**
- * Class UpdatedTransactionJournal
- *
- * @package FireflyIII\Events
+ * Class UpdatedTransactionJournal.
  */
 class UpdatedTransactionJournal extends Event
 {
-
     use SerializesModels;
 
     /** @var TransactionJournal */
@@ -46,8 +42,6 @@ class UpdatedTransactionJournal extends Event
      */
     public function __construct(TransactionJournal $journal)
     {
-        //
         $this->journal = $journal;
     }
-
 }

app/Events/UserChangedEmail.php

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

app/Exceptions/FireflyException.php

@@ -16,20 +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\Exceptions;
 
-
 /**
- * Class FireflyException
- *
- * @package FireflyIII\Exceptions
+ * Class FireflyException.
  */
 class FireflyException extends \Exception
 {
-
-} 
+}

app/Exceptions/Handler.php

@@ -16,21 +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;
@@ -39,7 +28,9 @@ use FireflyIII\Jobs\MailError;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Request;
 
-
+/**
+ * Class Handler
+ */
 class Handler extends ExceptionHandler
 {
     /**
@@ -59,21 +50,19 @@ class Handler extends ExceptionHandler
      */
     protected $dontReport
         = [
-            //
         ];
 
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Exception               $exception
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $exception
      *
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $exception)
     {
         if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
-
             $isDebug = env('APP_DEBUG', false);
 
             return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
@@ -88,9 +77,12 @@ class Handler extends ExceptionHandler
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five its fine.
-     * @param  \Exception $exception
      *
-     * @return void
+     * @param \Exception $exception
+     *
+     * @return mixed|void
+     *
+     * @throws Exception
      */
     public function report(Exception $exception)
     {
@@ -121,7 +113,6 @@ class Handler extends ExceptionHandler
             dispatch($job);
         }
 
-
         parent::report($exception);
     }
 }

app/Exceptions/NotImplementedException.php

@@ -16,20 +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\Exceptions;
 
-
 /**
- * Class NotImplementedException
- *
- * @package FireflyIII\Exceptions
+ * Class NotImplementedException.
  */
 class NotImplementedException extends \Exception
 {
-
-} 
+}

app/Exceptions/ValidationException.php

@@ -16,19 +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\Exceptions;
 
 /**
- * Class ValidationExceptions
- *
- * @package FireflyIII\Exception
+ * Class ValidationExceptions.
  */
 class ValidationException extends \Exception
 {
-
-} 
+}

app/Export/Collector/AttachmentCollector.php

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

app/Export/Collector/BasicCollector.php

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

app/Export/Collector/CollectorInterface.php

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

app/Export/Collector/UploadCollector.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Export\Collector;
@@ -30,9 +29,7 @@ use Log;
 use Storage;
 
 /**
- * Class UploadCollector
- *
- * @package FireflyIII\Export\Collector
+ * Class UploadCollector.
  */
 class UploadCollector extends BasicCollector implements CollectorInterface
 {
@@ -94,7 +91,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     {
         // find job associated with import file:
         $job = $this->job->user->importJobs()->where('key', $key)->first();
-        if (is_null($job)) {
+        if (null === $job) {
             return false;
         }
 
@@ -116,5 +113,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface
 
         return true;
     }
-
 }

app/Export/Entry/Entry.php

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

app/Export/ExpandedProcessor.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Export;
 
-
 use Crypt;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
@@ -34,8 +32,8 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\ExportJob;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
@@ -43,32 +41,29 @@ use Storage;
 use ZipArchive;
 
 /**
- * Class ExpandedProcessor
+ * Class ExpandedProcessor.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) // its doing a lot.
- *
- * @package FireflyIII\Export
  */
 class ExpandedProcessor implements ProcessorInterface
 {
-
     /** @var Collection */
     public $accounts;
-    /** @var  string */
+    /** @var string */
     public $exportFormat;
-    /** @var  bool */
+    /** @var bool */
     public $includeAttachments;
-    /** @var  bool */
+    /** @var bool */
     public $includeOldUploads;
-    /** @var  ExportJob */
+    /** @var ExportJob */
     public $job;
     /** @var array */
     public $settings;
-    /** @var  Collection */
+    /** @var Collection */
     private $exportEntries;
-    /** @var  Collection */
+    /** @var Collection */
     private $files;
-    /** @var  Collection */
+    /** @var Collection */
     private $journals;
 
     /**
@@ -119,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) {
@@ -136,7 +131,6 @@ class ExpandedProcessor implements ProcessorInterface
                 $transaction->opposing_account_number = $ibans[$opposingId]['accountNumber'] ?? '';
                 $transaction->opposing_account_bic    = $ibans[$opposingId]['BIC'] ?? '';
                 $transaction->opposing_currency_code  = $currencies[$opposingCurrencyId] ?? '';
-
             }
         );
 
@@ -177,7 +171,9 @@ class ExpandedProcessor implements ProcessorInterface
 
     /**
      * @return bool
+     *
      * @throws FireflyException
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function createZipFile(): bool
     {
@@ -185,7 +181,7 @@ class ExpandedProcessor implements ProcessorInterface
         $file     = $this->job->key . '.zip';
         $fullPath = storage_path('export') . '/' . $file;
 
-        if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
+        if (true !== $zip->open($fullPath, ZipArchive::CREATE)) {
             throw new FireflyException('Cannot store zip file.');
         }
         // for each file in the collection, add it to the zip file.
@@ -280,7 +276,7 @@ class ExpandedProcessor implements ProcessorInterface
     }
 
     /**
-     * Get all IBAN / SWIFT / account numbers
+     * Get all IBAN / SWIFT / account numbers.
      *
      * @param array $array
      *
@@ -314,17 +310,16 @@ class ExpandedProcessor implements ProcessorInterface
     private function getNotes(array $array): array
     {
         $array  = array_unique($array);
-        $set    = TransactionJournalMeta::whereIn('journal_meta.transaction_journal_id', $array)
-                                        ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
-                                        ->where('transaction_journals.user_id', $this->job->user_id)
-                                        ->where('journal_meta.name', 'notes')->get(
-                ['journal_meta.transaction_journal_id', 'journal_meta.data', 'journal_meta.id']
-            );
+        $notes  = Note::where('notes.noteable_type', 'FireflyIII\\Models\\TransactionJournal')
+                      ->whereIn('notes.noteable_id', $array)
+                      ->get(['notes.*']);
         $return = [];
-        /** @var TransactionJournalMeta $meta */
-        foreach ($set as $meta) {
-            $id          = intval($meta->transaction_journal_id);
-            $return[$id] = $meta->data;
+        /** @var Note $note */
+        foreach ($notes as $note) {
+            if (strlen(trim(strval($note->text))) > 0) {
+                $id          = intval($note->noteable_id);
+                $return[$id] = $note->text;
+            }
         }
 
         return $return;

app/Export/Exporter/BasicExporter.php

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

app/Export/Exporter/CsvExporter.php

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

app/Export/Exporter/ExporterInterface.php

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

app/Export/ProcessorInterface.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Export;
@@ -26,13 +25,10 @@ namespace FireflyIII\Export;
 use Illuminate\Support\Collection;
 
 /**
- * Interface ProcessorInterface
- *
- * @package FireflyIII\Export
+ * Interface ProcessorInterface.
  */
 interface ProcessorInterface
 {
-
     /**
      * Processor constructor.
      */

app/Generator/Chart/Basic/ChartJsGenerator.php

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

app/Generator/Chart/Basic/GeneratorInterface.php

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

app/Generator/Report/Account/MonthReportGenerator.php

@@ -0,0 +1,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,35 +16,30 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Audit;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
 use Steam;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Audit
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
@@ -52,8 +47,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     public function generate(): string
     {
-
-
         $auditData = [];
         $dayBefore = clone $this->start;
         $dayBefore->subDay();
@@ -77,11 +70,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'create_date', 'update_date',
         ];
 
-
         return view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
             ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
             ->render();
-
     }
 
     /**
@@ -128,6 +119,16 @@ class MonthReportGenerator implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *
@@ -157,7 +158,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
      * @return array
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // not that long
-     *
      */
     private function getAuditReport(Account $account, Carbon $date): array
     {
@@ -173,7 +173,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $startBalance     = $dayBeforeBalance;
         $currency         = $currencyRepos->find(intval($account->getMeta('currency_id')));
 
-        /** @var Transaction $journal */
+        // @var Transaction $journal
         foreach ($journals as $transaction) {
             $transaction->before = $startBalance;
             $transactionAmount   = $transaction->transaction_amount;

app/Generator/Report/Audit/MultiYearReportGenerator.php

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

app/Generator/Report/Audit/YearReportGenerator.php

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

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Budget;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
@@ -37,23 +35,21 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Budget
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Collection */
+    /** @var Collection */
     private $budgets;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
     /** @var Collection */
     private $expenses;
     /** @var Collection */
     private $income;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
@@ -132,6 +128,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $expense
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setExpense(Collection $expense): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
     /**
      * @param Carbon $date
      *

app/Generator/Report/Budget/MultiYearReportGenerator.php

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

app/Generator/Report/Budget/YearReportGenerator.php

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

app/Generator/Report/Category/MonthReportGenerator.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Category;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
@@ -38,23 +36,21 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Category
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Collection */
+    /** @var Collection */
     private $categories;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
     /** @var Collection */
     private $expenses;
     /** @var Collection */
     private $income;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
@@ -83,12 +79,19 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $topExpenses     = $this->getTopExpenses();
         $topIncome       = $this->getTopIncome();
 
-
         // render!
         return view(
             'reports.category.month',
             compact(
-                'accountIds', 'categoryIds', 'topIncome', 'reportType', 'accountSummary', 'categorySummary', 'averageExpenses', 'averageIncome', 'topExpenses'
+                'accountIds',
+                'categoryIds',
+                'topIncome',
+                'reportType',
+                'accountSummary',
+                'categorySummary',
+                'averageExpenses',
+                'averageIncome',
+                'topExpenses'
             )
         )
             ->with('start', $this->start)->with('end', $this->end)
@@ -143,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,22 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Category;
 
-
 /**
- * Class MultiYearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Category
+ * Class MultiYearReportGenerator.
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }

app/Generator/Report/Category/YearReportGenerator.php

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

app/Generator/Report/ReportGeneratorFactory.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report;
@@ -27,19 +26,17 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 
 /**
- * Class ReportGeneratorFactory
- *
- * @package FireflyIII\Generator\Report
+ * Class ReportGeneratorFactory.
  */
 class ReportGeneratorFactory
 {
-
     /**
      * @param string $type
      * @param Carbon $start
      * @param Carbon $end
      *
      * @return ReportGeneratorInterface
+     *
      * @throws FireflyException
      */
     public static function reportGenerator(string $type, Carbon $start, Carbon $end): ReportGeneratorInterface
@@ -55,7 +52,6 @@ class ReportGeneratorFactory
             $period = 'MultiYear';
         }
 
-
         $class = sprintf('FireflyIII\Generator\Report\%s\%sReportGenerator', $type, $period);
         if (class_exists($class)) {
             /** @var ReportGeneratorInterface $obj */

app/Generator/Report/ReportGeneratorInterface.php

@@ -16,21 +16,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report;
 
-
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 /**
- * Interface ReportGeneratorInterface
- *
- * @package FireflyIII\Generator\Report
+ * Interface ReportGeneratorInterface.
  */
 interface ReportGeneratorInterface
 {
@@ -67,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
      *
@@ -80,5 +83,4 @@ interface ReportGeneratorInterface
      * @return ReportGeneratorInterface
      */
     public function setTags(Collection $tags): ReportGeneratorInterface;
-
 }

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -16,35 +16,33 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Standard;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use Illuminate\Support\Collection;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Standard
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -105,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,34 +16,32 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Standard;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use Illuminate\Support\Collection;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Standard
+ * Class MonthReportGenerator.
  */
 class MultiYearReportGenerator implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -102,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,34 +16,32 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Standard;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use Illuminate\Support\Collection;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Standard
+ * Class MonthReportGenerator.
  */
 class YearReportGenerator implements ReportGeneratorInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
 
     /**
      * @return string
+     *
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -102,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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report;
@@ -26,11 +25,8 @@ namespace FireflyIII\Generator\Report;
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
 
-
 /**
- * Class Support
- *
- * @package FireflyIII\Generator\Report\Category
+ * Class Support.
  */
 class Support
 {
@@ -80,7 +76,7 @@ class Support
                 ];
                 continue;
             }
-            $result[$opposingId]['count']++;
+            ++$result[$opposingId]['count'];
             $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
             $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
         }
@@ -98,6 +94,7 @@ class Support
 
     /**
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     *
      * @param array $spent
      * @param array $earned
      *
@@ -108,7 +105,7 @@ class Support
         $return = [];
 
         /**
-         * @var int    $accountId
+         * @var int
          * @var string $entry
          */
         foreach ($spent as $objectId => $entry) {
@@ -121,7 +118,7 @@ class Support
         unset($entry);
 
         /**
-         * @var int    $accountId
+         * @var int
          * @var string $entry
          */
         foreach ($earned as $objectId => $entry) {
@@ -132,7 +129,6 @@ class Support
             $return[$objectId]['earned'] = $entry;
         }
 
-
         return $return;
     }
 
@@ -153,5 +149,4 @@ class Support
 
         return $result;
     }
-
 }

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Tag;
 
-
 use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
@@ -39,22 +37,19 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class MonthReportGenerator
- *
- * @package FireflyIII\Generator\Report\Tag
+ * Class MonthReportGenerator.
  */
 class MonthReportGenerator extends Support implements ReportGeneratorInterface
 {
-
     /** @var Collection */
     private $accounts;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $end;
     /** @var Collection */
     private $expenses;
     /** @var Collection */
     private $income;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $start;
     /** @var Collection */
     private $tags;
@@ -70,6 +65,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
 
     /**
      * @return string
+     * @throws \Throwable
      */
     public function generate(): string
     {
@@ -85,13 +81,20 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $topExpenses     = $this->getTopExpenses();
         $topIncome       = $this->getTopIncome();
 
-
         // render!
         return view(
-            'reports.tag.month', compact(
-                                   'accountIds', 'tagTags', 'reportType', 'accountSummary', 'tagSummary', 'averageExpenses', 'averageIncome', 'topIncome',
-                                   'topExpenses'
-                               )
+            'reports.tag.month',
+            compact(
+                'accountIds',
+                'tagTags',
+                'reportType',
+                'accountSummary',
+                'tagSummary',
+                'averageExpenses',
+                'averageIncome',
+                'topIncome',
+                'topExpenses'
+            )
         )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
     }
 
@@ -139,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,22 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Generator\Report\Tag;
 
-
 /**
- * Class MultiYearReportGenerator
- *
- * @package FireflyIII\Generator\Report\Tag
+ * Class MultiYearReportGenerator.
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {
-    /**
-     * Doesn't do anything different.
-     */
+    // Doesn't do anything different.
 }

app/Generator/Report/Tag/YearReportGenerator.php

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

app/Handlers/Events/AdminEventHandler.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
@@ -31,20 +30,19 @@ use Session;
 use Swift_TransportException;
 
 /**
- * Class AdminEventHandler
- *
- * @package FireflyIII\Handlers\Events
+ * Class AdminEventHandler.
  */
 class AdminEventHandler
 {
     /**
+     * Sends a test message to an administrator.
+     *
      * @param AdminRequestedTestMessage $event
      *
      * @return bool
      */
     public function sendTestMessage(AdminRequestedTestMessage $event): bool
     {
-
         $email     = $event->user->email;
         $ipAddress = $event->ipAddress;
 
@@ -64,4 +62,4 @@ class AdminEventHandler
         // @codeCoverageIgnoreEnd
         return true;
     }
-}
+}

app/Handlers/Events/StoredJournalEventHandler.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
@@ -37,17 +36,15 @@ use Log;
  * @codeCoverageIgnore
  *
  * Class StoredJournalEventHandler
- *
- * @package FireflyIII\Handlers\Events
  */
 class StoredJournalEventHandler
 {
-    /** @var  JRI */
+    /** @var JRI */
     public $journalRepository;
-    /** @var  PRI */
+    /** @var PRI */
     public $repository;
 
-    /** @var  RGRI */
+    /** @var RGRI */
     public $ruleGroupRepository;
 
     /**
@@ -88,7 +85,7 @@ class StoredJournalEventHandler
         }
 
         // piggy exists?
-        if (is_null($piggyBank->id)) {
+        if (null === $piggyBank->id) {
             Log::error(sprintf('There is no piggy bank with ID #%d', $piggyBankId));
 
             return true;
@@ -96,7 +93,7 @@ class StoredJournalEventHandler
 
         // repetition exists?
         $repetition = $this->repository->getRepetition($piggyBank, $journal->date);
-        if (is_null($repetition->id)) {
+        if (null === $repetition->id) {
             Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
 
             return true;
@@ -104,7 +101,7 @@ class StoredJournalEventHandler
 
         // get the amount
         $amount = $this->repository->getExactAmount($piggyBank, $repetition, $journal);
-        if (bccomp($amount, '0') === 0) {
+        if (0 === bccomp($amount, '0')) {
             Log::debug('Amount is zero, will not create event.');
 
             return true;
@@ -137,7 +134,6 @@ class StoredJournalEventHandler
             $rules = $this->ruleGroupRepository->getActiveStoreRules($group);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
-
                 $processor = Processor::make($rule);
                 $processor->handleTransactionJournal($journal);
 

app/Handlers/Events/UpdatedJournalEventHandler.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
 
-
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
@@ -35,12 +33,10 @@ use FireflyIII\TransactionRules\Processor;
  * @codeCoverageIgnore
  *
  * Class UpdatedJournalEventHandler
- *
- * @package FireflyIII\Handlers\Events
  */
 class UpdatedJournalEventHandler
 {
-    /** @var  RuleGroupRepositoryInterface */
+    /** @var RuleGroupRepositoryInterface */
     public $repository;
 
     /**
@@ -77,7 +73,6 @@ class UpdatedJournalEventHandler
                 if ($rule->stop_processing) {
                     break;
                 }
-
             }
         }
 

app/Handlers/Events/UserEventHandler.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
@@ -30,24 +29,24 @@ use FireflyIII\Mail\ConfirmEmailChangeMail;
 use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
 use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
 use FireflyIII\Mail\UndoEmailChangeMail;
+use FireflyIII\Models\Role;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Auth\Events\Login;
 use Log;
 use Mail;
 use Preferences;
 use Swift_TransportException;
 
 /**
- * Class UserEventHandler
+ * Class UserEventHandler.
  *
  * This class responds to any events that have anything to do with the User object.
  *
  * The method name reflects what is being done. This is in the present tense.
- *
- * @package FireflyIII\Handlers\Events
  */
 class UserEventHandler
 {
-
     /**
      * This method will bestow upon a user the "owner" role if he is the first user in the system.
      *
@@ -61,13 +60,54 @@ class UserEventHandler
         $repository = app(UserRepositoryInterface::class);
 
         // first user ever?
-        if ($repository->count() === 1) {
+        if (1 === $repository->count()) {
             $repository->attachRole($event->user, 'owner');
         }
 
         return true;
     }
 
+    /**
+     * @param Login $event
+     *
+     * @return bool
+     */
+    public function checkSingleUserIsAdmin(Login $event): bool
+    {
+        Log::debug('In checkSingleUserIsAdmin');
+
+        /** @var User $user */
+        $user  = $event->user;
+        $count = User::count();
+
+        if ($count > 1) {
+            // if more than one user, do nothing.
+            Log::debug(sprintf('System has %d users, will not change users roles.', $count));
+
+            return true;
+        }
+        // user is only user but has admin role
+        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;
+        }
+        // user is the only user but does not have role "owner".
+        $role = Role::where('name', 'owner')->first();
+        if (is_null($role)) {
+            // create role, does not exist. Very strange situation so let's raise a big fuss about it.
+            $role = Role::create(['name' => 'owner', 'display_name' => 'Site Owner', 'description' => 'User runs this instance of FF3']);
+            Log::error('Could not find role "owner". This is weird.');
+        }
+
+        Log::info(sprintf('Gave user #%d role #%d ("%s")', $user->id, $role->id, $role->name));
+        // give user the role
+        $user->attachRole($role);
+        $user->save();
+
+        return true;
+    }
+
     /**
      * @param UserChangedEmail $event
      *
@@ -152,7 +192,6 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event)
     {
-
         $sendMail = env('SEND_REGISTRATION_MAIL', true);
         if (!$sendMail) {
             return true; // @codeCoverageIgnore

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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Attachments;
@@ -33,14 +32,11 @@ use Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
- * Class AttachmentHelper
- *
- * @package FireflyIII\Helpers\Attachments
+ * Class AttachmentHelper.
  */
 class AttachmentHelper implements AttachmentHelperInterface
 {
-
-    /** @var  Collection */
+    /** @var Collection */
     public $attachments;
     /** @var MessageBag */
     public $errors;
@@ -111,10 +107,12 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function saveAttachmentsForModel(Model $model, ?array $files): bool
     {
+        Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', get_class($model)));
         if (is_array($files)) {
+            Log::debug('$files is an array.');
             /** @var UploadedFile $entry */
             foreach ($files as $entry) {
-                if (!is_null($entry)) {
+                if (null !== $entry) {
                     $this->processFile($entry, $model);
                 }
             }
@@ -152,7 +150,6 @@ class AttachmentHelper implements AttachmentHelperInterface
     }
 
     /**
-     *
      * @param UploadedFile $file
      * @param Model        $model
      *
@@ -160,8 +157,9 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     protected function processFile(UploadedFile $file, Model $model): Attachment
     {
+        Log::debug('Now in processFile()');
         $validation = $this->validateUpload($file, $model);
-        if ($validation === false) {
+        if (false === $validation) {
             return new Attachment;
         }
 
@@ -204,8 +202,11 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     protected function validMime(UploadedFile $file): bool
     {
+        Log::debug('Now in validMime()');
         $mime = e($file->getMimeType());
         $name = e($file->getClientOriginalName());
+        Log::debug(sprintf('Name is %, and mime is %s', $name, $mime));
+        Log::debug('Valid mimes are', $this->allowedMimes);
 
         if (!in_array($mime, $this->allowedMimes)) {
             $msg = (string)trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
@@ -248,6 +249,7 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     protected function validateUpload(UploadedFile $file, Model $model): bool
     {
+        Log::debug('Now in validateUpload()');
         if (!$this->validMime($file)) {
             return false;
         }

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Attachments;
@@ -29,13 +28,10 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 
 /**
- * Interface AttachmentHelperInterface
- *
- * @package FireflyIII\Helpers\Attachments
+ * Interface AttachmentHelperInterface.
  */
 interface AttachmentHelperInterface
 {
-
     /**
      * @param Attachment $attachment
      *
@@ -60,11 +56,9 @@ interface AttachmentHelperInterface
 
     /**
      * @param Model      $model
-     *
      * @param null|array $files
      *
      * @return bool
      */
     public function saveAttachmentsForModel(Model $model, ?array $files): bool;
-
 }

app/Helpers/Chart/MetaPieChart.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Chart;
@@ -41,23 +40,19 @@ use Illuminate\Support\Collection;
 use Steam;
 
 /**
- * Class MetaPieChart
- *
- * @package FireflyIII\Helpers\Chart
- *
- *
+ * Class MetaPieChart.
  */
 class MetaPieChart implements MetaPieChartInterface
 {
-    /** @var  Collection */
+    /** @var Collection */
     protected $accounts;
-    /** @var  Collection */
+    /** @var Collection */
     protected $budgets;
-    /** @var  Collection */
+    /** @var Collection */
     protected $categories;
     /** @var bool */
     protected $collectOtherObjects = false;
-    /** @var  Carbon */
+    /** @var Carbon */
     protected $end;
     /** @var array */
     protected $grouping
@@ -75,13 +70,13 @@ class MetaPieChart implements MetaPieChartInterface
             'category' => CategoryRepositoryInterface::class,
             'tag'      => TagRepositoryInterface::class,
         ];
-    /** @var  Carbon */
+    /** @var Carbon */
     protected $start;
-    /** @var  Collection */
+    /** @var Collection */
     protected $tags;
-    /** @var  string */
+    /** @var string */
     protected $total = '0';
-    /** @var  User */
+    /** @var User */
     protected $user;
 
     public function __construct()
@@ -108,7 +103,7 @@ class MetaPieChart implements MetaPieChartInterface
         $key          = strval(trans('firefly.everything_else'));
 
         // also collect all other transactions
-        if ($this->collectOtherObjects && $direction === 'expense') {
+        if ($this->collectOtherObjects && 'expense' === $direction) {
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
             $collector->setUser($this->user);
@@ -121,7 +116,7 @@ class MetaPieChart implements MetaPieChartInterface
             $chartData[$key] = $sum;
         }
 
-        if ($this->collectOtherObjects && $direction === 'income') {
+        if ($this->collectOtherObjects && 'income' === $direction) {
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
             $collector->setUser($this->user);
@@ -133,7 +128,6 @@ class MetaPieChart implements MetaPieChartInterface
         }
 
         return $chartData;
-
     }
 
     /**
@@ -259,7 +253,7 @@ class MetaPieChart implements MetaPieChartInterface
         $collector = app(JournalCollectorInterface::class);
         $types     = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
         $collector->addFilter(NegativeAmountFilter::class);
-        if ($direction === 'expense') {
+        if ('expense' === $direction) {
             $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
             $collector->addFilter(PositiveAmountFilter::class);
             $collector->removeFilter(NegativeAmountFilter::class);
@@ -272,7 +266,7 @@ class MetaPieChart implements MetaPieChartInterface
         $collector->withOpposingAccount();
         $collector->addFilter(OpposingAccountFilter::class);
 
-        if ($direction === 'income') {
+        if ('income' === $direction) {
             $collector->removeFilter(TransferFilter::class);
         }
 
@@ -295,11 +289,10 @@ class MetaPieChart implements MetaPieChartInterface
      * @return array
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     *
      */
     protected function groupByFields(Collection $set, array $fields): array
     {
-        if (count($fields) === 0 && $this->tags->count() > 0) {
+        if (0 === count($fields) && $this->tags->count() > 0) {
             // do a special group on tags:
             return $this->groupByTag($set);
         }
@@ -342,7 +335,6 @@ class MetaPieChart implements MetaPieChartInterface
         }
 
         return $chartData;
-
     }
 
     /**

app/Helpers/Chart/MetaPieChartInterface.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Chart;
@@ -28,9 +27,7 @@ use FireflyIII\User;
 use Illuminate\Support\Collection;
 
 /**
- * Interface MetaPieChartInterface
- *
- * @package FireflyIII\Helpers\Chart
+ * Interface MetaPieChartInterface.
  */
 interface MetaPieChartInterface
 {
@@ -97,5 +94,4 @@ interface MetaPieChartInterface
      * @return MetaPieChartInterface
      */
     public function setUser(User $user): MetaPieChartInterface;
-
 }

app/Helpers/Collection/Balance.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -26,18 +25,14 @@ namespace FireflyIII\Helpers\Collection;
 use Illuminate\Support\Collection;
 
 /**
- *
- * Class Balance
- *
- * @package FireflyIII\Helpers\Collection
+ * Class Balance.
  */
 class Balance
 {
-
-    /** @var  BalanceHeader */
+    /** @var BalanceHeader */
     protected $balanceHeader;
 
-    /** @var  Collection */
+    /** @var Collection */
     protected $balanceLines;
 
     /**
@@ -87,6 +82,4 @@ class Balance
     {
         $this->balanceLines = $balanceLines;
     }
-
-
 }

app/Helpers/Collection/BalanceEntry.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -26,16 +25,11 @@ namespace FireflyIII\Helpers\Collection;
 use FireflyIII\Models\Account as AccountModel;
 
 /**
- *
- * Class BalanceEntry
- *
- * @package FireflyIII\Helpers\Collection
+ * Class BalanceEntry.
  */
 class BalanceEntry
 {
-
-
-    /** @var  AccountModel */
+    /** @var AccountModel */
     protected $account;
     /** @var string */
     protected $left = '0';
@@ -89,6 +83,4 @@ class BalanceEntry
     {
         $this->spent = $spent;
     }
-
-
 }

app/Helpers/Collection/BalanceHeader.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -27,15 +26,11 @@ use FireflyIII\Models\Account as AccountModel;
 use Illuminate\Support\Collection;
 
 /**
- *
- * Class BalanceHeader
- *
- * @package FireflyIII\Helpers\Collection
+ * Class BalanceHeader.
  */
 class BalanceHeader
 {
-
-    /** @var  Collection */
+    /** @var Collection */
     protected $accounts;
 
     /**
@@ -61,6 +56,4 @@ class BalanceHeader
     {
         return $this->accounts;
     }
-
-
 }

app/Helpers/Collection/BalanceLine.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -29,24 +28,29 @@ use FireflyIII\Models\BudgetLimit;
 use Illuminate\Support\Collection;
 
 /**
- *
- * Class BalanceLine
- *
- * @package FireflyIII\Helpers\Collection
+ * Class BalanceLine.
  */
 class BalanceLine
 {
-
+    /**
+     *
+     */
     const ROLE_DEFAULTROLE = 1;
-    const ROLE_TAGROLE     = 2;
-    const ROLE_DIFFROLE    = 3;
+    /**
+     *
+     */
+    const ROLE_TAGROLE = 2;
+    /**
+     *
+     */
+    const ROLE_DIFFROLE = 3;
 
-    /** @var  Collection */
+    /** @var Collection */
     protected $balanceEntries;
 
     /** @var BudgetModel */
     protected $budget;
-    /** @var  BudgetLimit */
+    /** @var BudgetLimit */
     protected $budgetLimit;
     /** @var int */
     protected $role = self::ROLE_DEFAULTROLE;
@@ -57,7 +61,6 @@ class BalanceLine
     public function __construct()
     {
         $this->balanceEntries = new Collection;
-
     }
 
     /**
@@ -150,20 +153,21 @@ class BalanceLine
 
     /**
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     *
      * @return string
      */
     public function getTitle(): string
     {
-        if ($this->getBudget() instanceof BudgetModel && !is_null($this->getBudget()->id)) {
+        if ($this->getBudget() instanceof BudgetModel && null !== $this->getBudget()->id) {
             return $this->getBudget()->name;
         }
-        if ($this->getRole() === self::ROLE_DEFAULTROLE) {
+        if (self::ROLE_DEFAULTROLE === $this->getRole()) {
             return strval(trans('firefly.no_budget'));
         }
-        if ($this->getRole() === self::ROLE_TAGROLE) {
+        if (self::ROLE_TAGROLE === $this->getRole()) {
             return strval(trans('firefly.coveredWithTags'));
         }
-        if ($this->getRole() === self::ROLE_DIFFROLE) {
+        if (self::ROLE_DIFFROLE === $this->getRole()) {
             return strval(trans('firefly.leftUnbalanced'));
         }
 
@@ -174,7 +178,7 @@ class BalanceLine
      * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
      * should have a "spent" value, which is the amount of money that has been spent
      * on the given budget/repetition. If you subtract all those amounts from the budget/repetition's
-     * total amount, this is returned:
+     * total amount, this is returned:.
      *
      * @return string
      */

app/Helpers/Collection/Bill.php

@@ -16,34 +16,29 @@
  * 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\Helpers\Collection;
 
-
 use Carbon\Carbon;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class Bill
- *
- * @package FireflyIII\Helpers\Collection
+ * Class Bill.
  */
 class Bill
 {
-
     /**
      * @var Collection
      */
     private $bills;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $endDate;
-    /** @var  Carbon */
+    /** @var Carbon */
     private $startDate;
 
     /**
@@ -106,14 +101,13 @@ class Bill
     {
         $set = $this->bills->sortBy(
             function (BillLine $bill) {
-                $active = intval($bill->getBill()->active) === 0 ? 1 : 0;
+                $active = 0 === intval($bill->getBill()->active) ? 1 : 0;
                 $name   = $bill->getBill()->name;
 
                 return $active . $name;
             }
         );
 
-
         return $set;
     }
 
@@ -132,5 +126,4 @@ class Bill
     {
         $this->startDate = $startDate;
     }
-
 }

app/Helpers/Collection/BillLine.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -27,27 +26,27 @@ use Carbon\Carbon;
 use FireflyIII\Models\Bill as BillModel;
 
 /**
- *
- * Class BillLine
- *
- * @package FireflyIII\Helpers\Collection
+ * Class BillLine.
  */
 class BillLine
 {
-
-    /** @var  string */
+    /** @var string */
     protected $amount;
-    /** @var  BillModel */
+    /** @var BillModel */
     protected $bill;
-    /** @var  bool */
+    /** @var bool */
     protected $hit;
-    /** @var  string */
+    /** @var string */
     protected $max;
-    /** @var  string */
+    /** @var string */
     protected $min;
-    /** @var  Carbon */
+    /** @var Carbon */
+    private $endOfPayDate;
+    /** @var Carbon */
     private $lastHitDate;
-    /** @var  int */
+    /** @var Carbon */
+    private $payDate;
+    /** @var int */
     private $transactionJournalId;
 
     /**
@@ -90,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
      */
@@ -138,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
      */
@@ -159,7 +190,7 @@ class BillLine
      */
     public function isActive(): bool
     {
-        return intval($this->bill->active) === 1;
+        return 1 === intval($this->bill->active);
     }
 
     /**
@@ -177,6 +208,4 @@ class BillLine
     {
         $this->hit = $hit;
     }
-
-
 }

app/Helpers/Collection/Category.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collection;
@@ -26,17 +25,12 @@ namespace FireflyIII\Helpers\Collection;
 use FireflyIII\Models\Category as CategoryModel;
 use Illuminate\Support\Collection;
 
-
 /**
- *
- * Class Category
- *
- * @package FireflyIII\Helpers\Collection
+ * Class Category.
  */
 class Category
 {
-
-    /** @var  Collection */
+    /** @var Collection */
     protected $categories;
     /** @var string */
     protected $total = '0';
@@ -80,7 +74,6 @@ class Category
             }
         );
 
-
         return $set;
     }
 
@@ -91,6 +84,4 @@ class Category
     {
         return $this->total;
     }
-
-
 }

app/Helpers/Collector/JournalCollector.php

@@ -16,14 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collector;
 
-
 use Carbon\Carbon;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
@@ -52,17 +50,16 @@ use Steam;
  *
  * Class JournalCollector
  *
- * @package FireflyIII\Helpers\Collector
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
 class JournalCollector implements JournalCollectorInterface
 {
-
     /** @var array */
     private $accountIds = [];
-    /** @var  int */
+    /** @var int */
     private $count = 0;
     /** @var array */
     private $fields
@@ -73,12 +70,14 @@ class JournalCollector implements JournalCollectorInterface
             'transaction_journals.encrypted',
             'transaction_types.type as transaction_type_type',
             'transaction_journals.bill_id',
+            'transaction_journals.updated_at',
             'bills.name as bill_name',
             'bills.name_encrypted as bill_name_encrypted',
 
             'transactions.id as id',
             'transactions.description as transaction_description',
             'transactions.account_id',
+            'transactions.reconciled',
             'transactions.identifier',
             'transactions.transaction_journal_id',
             'transactions.amount as transaction_amount',
@@ -99,22 +98,21 @@ class JournalCollector implements JournalCollectorInterface
             'accounts.encrypted as account_encrypted',
             'accounts.iban as account_iban',
             'account_types.type as account_type',
-
         ];
     /** @var array */
     private $filters = [InternalTransferFilter::class];
 
-    /** @var  bool */
+    /** @var bool */
     private $joinedBudget = false;
-    /** @var  bool */
+    /** @var bool */
     private $joinedCategory = false;
     /** @var bool */
     private $joinedOpposing = false;
     /** @var bool */
     private $joinedTag = false;
-    /** @var  int */
+    /** @var int */
     private $limit;
-    /** @var  int */
+    /** @var int */
     private $offset;
     /** @var int */
     private $page = 1;
@@ -170,8 +168,8 @@ class JournalCollector implements JournalCollectorInterface
                 $q1->where(
                     function (EloquentBuilder $q2) use ($amount) {
                         // amount < 0 and .amount > -$amount
-                        $amount = bcmul($amount,'-1');
-                        $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '>', $amount);
+                        $invertedAmount = bcmul($amount, '-1');
+                        $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '>', $invertedAmount);
                     }
                 )
                    ->orWhere(
@@ -198,8 +196,8 @@ class JournalCollector implements JournalCollectorInterface
                 $q1->where(
                     function (EloquentBuilder $q2) use ($amount) {
                         // amount < 0 and .amount < -$amount
-                        $amount = bcmul($amount,'-1');
-                        $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '<', $amount);
+                        $invertedAmount = bcmul($amount, '-1');
+                        $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '<', $invertedAmount);
                     }
                 )
                    ->orWhere(
@@ -210,16 +208,18 @@ class JournalCollector implements JournalCollectorInterface
                    );
             }
         );
+
         return $this;
     }
 
     /**
      * @return int
+     *
      * @throws FireflyException
      */
     public function count(): int
     {
-        if ($this->run === true) {
+        if (true === $this->run) {
             throw new FireflyException('Cannot count after run in JournalCollector.');
         }
 
@@ -255,14 +255,12 @@ class JournalCollector implements JournalCollectorInterface
                 $transaction->date        = new Carbon($transaction->date);
                 $transaction->description = Steam::decrypt(intval($transaction->encrypted), $transaction->description);
 
-                if (!is_null($transaction->bill_name)) {
+                if (null !== $transaction->bill_name) {
                     $transaction->bill_name = Steam::decrypt(intval($transaction->bill_name_encrypted), $transaction->bill_name);
                 }
                 $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name);
                 $transaction->account_iban          = app('steam')->tryDecrypt($transaction->account_iban);
                 $transaction->opposing_account_iban = app('steam')->tryDecrypt($transaction->opposing_account_iban);
-
-
             }
         );
 
@@ -271,11 +269,12 @@ class JournalCollector implements JournalCollectorInterface
 
     /**
      * @return LengthAwarePaginator
+     *
      * @throws FireflyException
      */
     public function getPaginatedJournals(): LengthAwarePaginator
     {
-        if ($this->run === true) {
+        if (true === $this->run) {
             throw new FireflyException('Cannot getPaginatedJournals after run in JournalCollector.');
         }
         $this->count();
@@ -293,7 +292,7 @@ class JournalCollector implements JournalCollectorInterface
     public function removeFilter(string $filter): JournalCollectorInterface
     {
         $key = array_search($filter, $this->filters, true);
-        if (!($key === false)) {
+        if (!(false === $key)) {
             Log::debug(sprintf('Removed filter %s', $filter));
             unset($this->filters[$key]);
         }
@@ -319,7 +318,6 @@ class JournalCollector implements JournalCollectorInterface
             $this->addFilter(TransferFilter::class);
         }
 
-
         return $this;
     }
 
@@ -386,7 +384,6 @@ class JournalCollector implements JournalCollectorInterface
         }
 
         return $this;
-
     }
 
     /**
@@ -416,7 +413,7 @@ class JournalCollector implements JournalCollectorInterface
     public function setBudgets(Collection $budgets): JournalCollectorInterface
     {
         $budgetIds = $budgets->pluck('id')->toArray();
-        if (count($budgetIds) === 0) {
+        if (0 === count($budgetIds)) {
             return $this;
         }
         $this->joinBudgetTables();
@@ -440,7 +437,7 @@ class JournalCollector implements JournalCollectorInterface
     public function setCategories(Collection $categories): JournalCollectorInterface
     {
         $categoryIds = $categories->pluck('id')->toArray();
-        if (count($categoryIds) === 0) {
+        if (0 === count($categoryIds)) {
             return $this;
         }
         $this->joinCategoryTables();
@@ -500,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
      *
@@ -514,11 +525,11 @@ class JournalCollector implements JournalCollectorInterface
         $this->page = $page;
 
         if ($page > 0) {
-            $page--;
+            --$page;
         }
         Log::debug(sprintf('Page is %d', $page));
 
-        if (!is_null($this->limit)) {
+        if (null !== $this->limit) {
             $offset       = ($this->limit * $page);
             $this->offset = $offset;
             $this->query->skip($offset);
@@ -626,7 +637,6 @@ class JournalCollector implements JournalCollectorInterface
                             ->orderBy('transactions.amount', 'DESC');
 
         $this->query = $query;
-
     }
 
     /**
@@ -644,7 +654,6 @@ class JournalCollector implements JournalCollectorInterface
      */
     public function withCategoryInformation(): JournalCollectorInterface
     {
-
         $this->joinCategoryTables();
 
         return $this;
@@ -756,12 +765,16 @@ class JournalCollector implements JournalCollectorInterface
             $this->joinedCategory = true;
             $this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
             $this->query->leftJoin(
-                'categories as transaction_journal_categories', 'transaction_journal_categories.id', '=', 'category_transaction_journal.category_id'
+                'categories as transaction_journal_categories',
+                'transaction_journal_categories.id',
+                '=',
+                'category_transaction_journal.category_id'
             );
 
             $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';
@@ -781,11 +794,12 @@ class JournalCollector implements JournalCollectorInterface
             Log::debug('joinedOpposing is false');
             // join opposing transaction (hard):
             $this->query->leftJoin(
-                'transactions as opposing', function (JoinClause $join) {
-                $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
-                     ->where('opposing.identifier', '=', DB::raw('transactions.identifier'))
-                     ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'));
-            }
+                'transactions as opposing',
+                function (JoinClause $join) {
+                    $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                         ->where('opposing.identifier', '=', DB::raw('transactions.identifier'))
+                         ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'));
+                }
             );
             $this->query->leftJoin('accounts as opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id');
             $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');

app/Helpers/Collector/JournalCollectorInterface.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Collector;
@@ -32,9 +31,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
 /**
- * Interface JournalCollectorInterface
- *
- * @package FireflyIII\Helpers\Collector
+ * Interface JournalCollectorInterface.
  */
 interface JournalCollectorInterface
 {
@@ -50,7 +47,7 @@ interface JournalCollectorInterface
      *
      * @return JournalCollectorInterface
      */
-    public function amountMore(string $amount): JournalCollectorInterface;
+    public function amountIs(string $amount): JournalCollectorInterface;
 
     /**
      * @param string $amount
@@ -64,7 +61,7 @@ interface JournalCollectorInterface
      *
      * @return JournalCollectorInterface
      */
-    public function amountIs(string $amount): JournalCollectorInterface;
+    public function amountMore(string $amount): JournalCollectorInterface;
 
     /**
      * @return int
@@ -163,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
      *
@@ -199,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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
@@ -28,18 +27,21 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class AmountFilter
+ * Class AmountFilter.
  *
  * This filter removes transactions with either a positive amount ($parameters = 1) or a negative amount
  * ($parameter = -1). This is helpful when a Collection has you with both transactions in a journal.
- *
- * @package FireflyIII\Helpers\Filter
  */
 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,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
@@ -26,14 +25,10 @@ namespace FireflyIII\Helpers\Filter;
 use Illuminate\Support\Collection;
 
 /**
- * Class EmptyFilter
- *
- * @package FireflyIII\Helpers\Filter
+ * Class EmptyFilter.
  */
 class EmptyFilter implements FilterInterface
 {
-
-
     /**
      * @param Collection $set
      *

app/Helpers/Filter/FilterInterface.php

@@ -16,16 +16,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
 
-
 use Illuminate\Support\Collection;
 
+/**
+ * Interface FilterInterface
+ */
 interface FilterInterface
 {
     /**
@@ -34,5 +35,4 @@ interface FilterInterface
      * @return Collection
      */
     public function filter(Collection $set): Collection;
-
 }

app/Helpers/Filter/InternalTransferFilter.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
@@ -28,13 +27,11 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class InternalTransferFilter
+ * Class InternalTransferFilter.
  *
  * This filter removes any filters that are from A to B or from B to A given a set of
  * account id's (in $parameters) where A and B are mentioned. So transfers between the mentioned
  * accounts will be removed.
- *
- * @package FireflyIII\Helpers\Filter
  */
 class InternalTransferFilter implements FilterInterface
 {
@@ -60,7 +57,7 @@ class InternalTransferFilter implements FilterInterface
     {
         return $set->filter(
             function (Transaction $transaction) {
-                if (is_null($transaction->opposing_account_id)) {
+                if (null === $transaction->opposing_account_id) {
                     return $transaction;
                 }
                 // both id's in $parameters?
@@ -68,18 +65,18 @@ class InternalTransferFilter implements FilterInterface
                     Log::debug(
                         sprintf(
                             'Transaction #%d has #%d and #%d in set, so removed',
-                            $transaction->id, $transaction->account_id, $transaction->opposing_account_id
-                        ), $this->accounts
+                            $transaction->id,
+                            $transaction->account_id,
+                            $transaction->opposing_account_id
+                        ),
+                        $this->accounts
                     );
 
                     return false;
                 }
 
                 return $transaction;
-
             }
         );
-
-
     }
 }

app/Helpers/Filter/NegativeAmountFilter.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
@@ -28,11 +27,9 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class NegativeAmountFilter
+ * Class NegativeAmountFilter.
  *
  * This filter removes entries with a negative amount (the original modifier is -1).
- *
- * @package FireflyIII\Helpers\Filter
  */
 class NegativeAmountFilter implements FilterInterface
 {

app/Helpers/Filter/OpposingAccountFilter.php

@@ -16,25 +16,21 @@
  * 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\Helpers\Filter;
 
-
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class OpposingAccountFilter
+ * Class OpposingAccountFilter.
  *
  * This filter is similar to the internal transfer filter but only removes transactions when the opposing account is
  * amongst $parameters (list of account ID's).
- *
- * @package FireflyIII\Helpers\Filter
  */
 class OpposingAccountFilter implements FilterInterface
 {

app/Helpers/Filter/PositiveAmountFilter.php

@@ -16,9 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Firefly III.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
-
 declare(strict_types=1);
 
 namespace FireflyIII\Helpers\Filter;
@@ -28,14 +27,12 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
- * Class PositiveAmountFilter
+ * Class PositiveAmountFilter.
  *
  * This filter removes entries with a negative amount (the original modifier is -1).
  *
  * This filter removes transactions with either a positive amount ($parameters = 1) or a negative amount
  * ($parameter = -1). This is helpful when a Collection has you with both transactions in a journal.
- *
- * @package FireflyIII\Helpers\Filter
  */
 class PositiveAmountFilter implements FilterInterface
 {
@@ -49,7 +46,7 @@ class PositiveAmountFilter implements FilterInterface
         return $set->filter(
             function (Transaction $transaction) {
                 // remove by amount
-                if (bccomp($transaction->transaction_amount, '0') === 1) {
+                if (1 === bccomp($transaction->transaction_amount, '0')) {
                     Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
 
                     return null;