Merge branch 'release/5.1.0-alpha.1'

5.0.5

# Conflicts:
#	changelog.md

.deploy/heroku/.env.heroku

@@ -110,7 +110,8 @@ CER_PROVIDER=fixer
 FIXER_API_KEY=
 
 # If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
+TRACKER_SITE_ID=
+TRACKER_URL=
 
 # Most parts of the database are encrypted by default, but you can turn this off if you want to.
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.

.deploy/heroku/.locales

@@ -13,3 +13,6 @@ ru_RU
 hu_HU
 el_GR
 sv_SE
+zh-hans_CN
+zh-hant_CN
+fi_FI

.env.example

@@ -5,14 +5,23 @@ APP_ENV=local
 # Set to true if you want to see debug information in error screens.
 APP_DEBUG=false
 
-# This should be your email address
+# This should be your email address.
+# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
 # If you generate a new one existing data must be considered LOST.
-# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
+# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
+# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+#
+# Firefly III will launch using this language (for new users and unauthenticated visitors)
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/master/resources/lang
+#
+# If text is still in English, remember that not everything may have been translated.
+DEFAULT_LANGUAGE=en_US
+
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
 TZ=Europe/Amsterdam
@@ -32,7 +41,9 @@ TRUSTED_PROXIES=
 
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
-LOG_CHANNEL=stdout
+# A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
+LOG_CHANNEL=stack
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
@@ -42,6 +53,8 @@ APP_LOG_LEVEL=notice
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
+# Use "mysql" for MySQL and MariaDB. Use "sqlite" for SQLite.
 DB_CONNECTION=pgsql
 DB_HOST=firefly_iii_db
 DB_PORT=5432
@@ -50,6 +63,7 @@ DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
 
 # PostgreSQL supports SSL. You can configure it here.
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 PGSQL_SSL_MODE=prefer
 PGSQL_SSL_ROOT_CERT=null
 PGSQL_SSL_CERT=null
@@ -61,19 +75,25 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 
 # If you set either of these to 'redis', you might want to update these settings too
+# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
+# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
-REDIS_DB="0" # always use quotes
+# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
+REDIS_DB="0"
 REDIS_CACHE_DB="1"
 
 # Cookie settings. Should not be necessary to change these.
+# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
+# the value from a file instead of from an environment variable
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
 # If you want Firefly III to mail you, update these settings
 # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAIL_DRIVER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
@@ -83,13 +103,20 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 # Other mail drivers:
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=
 MAILGUN_SECRET=
+
+
 # If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAILGUN_ENDPOINT=api.mailgun.net
+
+# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
+
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
@@ -98,6 +125,7 @@ SEND_ERROR_MESSAGE=true
 SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 MAPBOX_API_KEY=
 
 # The map will default to this location:
@@ -115,23 +143,25 @@ CER_PROVIDER=ratesapi
 # set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
 # Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 FIXER_API_KEY=
 
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
-
 # Firefly III has two options for user authentication. "eloquent" is the default,
 # and "ldap" for LDAP servers.
 # For full instructions on these settings please visit:
 # https://docs.firefly-iii.org/advanced-installation/authentication
+# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
+# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
 ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
+# You can set the following variables from a file by appending them with _FILE:
+# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
 ADLDAP_CONTROLLERS=
 ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
@@ -140,12 +170,15 @@ ADLDAP_FOLLOW_REFFERALS=false
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ADMIN_USERNAME=
 ADLDAP_ADMIN_PASSWORD=
 
+# You can set the following variables from a file by appending them with _FILE:
 ADLDAP_ACCOUNT_PREFIX=
 ADLDAP_ACCOUNT_SUFFIX=
 
+
 # LDAP authentication settings.
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
@@ -154,16 +187,38 @@ ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
 # Will allow SSO if your server provides an AUTH_USER field.
+# You can set the following variables from a file by appending them with _FILE:
 WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
+# You can set the following variable from a file by appending it with _FILE:
 ADLDAP_SYNC_FIELD=userprincipalname
 
-# You can disable the X-Frame-Options header if it interfears with tools like
-# Organizr. This is at your own risk.
+# You can disable the X-Frame-Options header if it interferes with tools like
+# Organizr. This is at your own risk. Applications running in frames run the risk
+# of leaking information to their parent frame.
 DISABLE_FRAME_HEADER=false
 
+# You can disable the Content Security Policy header when you're using an ancient browser
+# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
+# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
+# This is at your own risk.
+DISABLE_CSP_HEADER=false
+
+# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
+# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
+# Do not prepend the TRACKER_URL with http:// or https://
+# The only tracker supported is Matomo.
+# You can set the following variables from a file by appending them with _FILE:
+TRACKER_SITE_ID=
+TRACKER_URL=
+
+#
+# Firefly III could (in the future) collect telemetry on how you use Firefly III.
+# In order to allow this, change the following variable to true:
+SEND_TELEMETRY=false
+
 # You can fine tune the start-up of a Docker container by editing these environment variables.
 # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.
@@ -191,7 +246,7 @@ DKR_RUN_REPORT=true
 
 # Generate OAuth2 keys.
 # When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
-# you had previously generated keys already and they're stored in your database for restauration.
+# you had previously generated keys already and they're stored in your database for restoration.
 DKR_RUN_PASSPORT_INSTALL=true
 
 # Leave the following configuration vars as is.

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,11 +16,10 @@ I am running Firefly III version x.x.x, and my problem is:
 <!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
 
 **Bonus points**
-<!-- Earn bonus points by:
+<!-- Earn bonus points by checking the boxes -->
 
-- Post a stacktrace from your log files
-- Add a screenshot
-- Make a drawing
-- Donate money (just kidding ;)
-- Replicate the problem on the demo site https://demo.firefly-iii.org/
--->
+- [ ] Nobody reported this bug before
+- [ ] I have added a stack trace from my log files.
+- [ ] I have added a screenshot.
+- [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/
+<!-- - [ ] I donated money (this is a joke :wink:)-->

.github/lock.yml

@@ -0,0 +1,35 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 90
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

app/Api/V1/Controllers/AboutController.php

@@ -2,7 +2,7 @@
 
 /**
  * AboutController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/AccountController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/AttachmentController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/BillController.php

@@ -2,7 +2,7 @@
 
 /**
  * BillController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/BudgetController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/BudgetLimitController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/CategoryController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Chart/AccountController.php

@@ -2,7 +2,7 @@
 
 /**
  * AccountController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Chart/AvailableBudgetController.php

@@ -2,7 +2,7 @@
 
 /**
  * AvailableBudgetController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -2,7 +2,7 @@
 
 /**
  * CategoryController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -90,12 +90,12 @@ class CategoryController extends Controller
         $tempData      = [];
         $spentWith     = $this->opsRepository->listExpenses($start, $end);
         $earnedWith    = $this->opsRepository->listIncome($start, $end);
-        $spentWithout  = $this->noCatRepository->listExpenses($start, $end);
-        $earnedWithout = $this->noCatRepository->listIncome($start, $end);
+        $spentWithout  = $this->noCatRepository->listExpenses($start, $end); // refactored
+        $earnedWithout = $this->noCatRepository->listIncome($start, $end); // refactored
         $categories    = [];
 
 
-        foreach ([$spentWith, $earnedWith] as $set) {
+        foreach ([$spentWith, $earnedWith, $spentWithout, $earnedWithout] as $set) {
             foreach ($set as $currency) {
                 foreach ($currency['categories'] as $category) {
                     $categories[] = $category['name'];
@@ -141,48 +141,48 @@ class CategoryController extends Controller
             }
         }
 
-        foreach ([$spentWithout, $earnedWithout] as $set) {
-            foreach ($set as $currency) {
-                $inKey        = sprintf('%d-i', $currency['currency_id']);
-                $outKey       = sprintf('%d-e', $currency['currency_id']);
-                $categories[] = (string)trans('firefly.no_category');
-                // make data arrays if not yet present.
-                $tempData[$inKey]  = $tempData[$inKey] ?? [
-                        'currency_id'             => $currency['currency_id'],
-                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
-                        'currency_code'           => $currency['currency_code'],
-                        'currency_symbol'         => $currency['currency_symbol'],
-                        'currency_decimal_places' => $currency['currency_decimal_places'],
-                        'type'                    => 'bar', // line, area or bar
-                        'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [
-                            // per category:
-                            // "category" => 5,
-                        ],
-                    ];
-                $tempData[$outKey] = $tempData[$outKey] ?? [
-                        'currency_id'             => $currency['currency_id'],
-                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
-                        'currency_code'           => $currency['currency_code'],
-                        'currency_symbol'         => $currency['currency_symbol'],
-                        'currency_decimal_places' => $currency['currency_decimal_places'],
-                        'type'                    => 'bar', // line, area or bar
-                        'yAxisID'                 => 0, // 0, 1, 2
-                        'entries'                 => [
-                            // per category:
-                            // "category" => 5,
-                        ],
-                    ];
-                foreach ($currency['transaction_journals'] as $journal) {
-                    // is it expense or income?
-                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
-                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
-                    $name                                    = (string)trans('firefly.no_category');
-                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
-                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
-                }
-            }
-        }
+//        foreach ([] as $set) {
+//            foreach ($set as $currency) {
+//                $inKey        = sprintf('%d-i', $currency['currency_id']);
+//                $outKey       = sprintf('%d-e', $currency['currency_id']);
+//                $categories[] = (string)trans('firefly.no_category');
+//                // make data arrays if not yet present.
+//                $tempData[$inKey]  = $tempData[$inKey] ?? [
+//                        'currency_id'             => $currency['currency_id'],
+//                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
+//                        'currency_code'           => $currency['currency_code'],
+//                        'currency_symbol'         => $currency['currency_symbol'],
+//                        'currency_decimal_places' => $currency['currency_decimal_places'],
+//                        'type'                    => 'bar', // line, area or bar
+//                        'yAxisID'                 => 0, // 0, 1, 2
+//                        'entries'                 => [
+//                            // per category:
+//                            // "category" => 5,
+//                        ],
+//                    ];
+//                $tempData[$outKey] = $tempData[$outKey] ?? [
+//                        'currency_id'             => $currency['currency_id'],
+//                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]),
+//                        'currency_code'           => $currency['currency_code'],
+//                        'currency_symbol'         => $currency['currency_symbol'],
+//                        'currency_decimal_places' => $currency['currency_decimal_places'],
+//                        'type'                    => 'bar', // line, area or bar
+//                        'yAxisID'                 => 0, // 0, 1, 2
+//                        'entries'                 => [
+//                            // per category:
+//                            // "category" => 5,
+//                        ],
+//                    ];
+//                foreach ($currency['transaction_journals'] as $journal) {
+//                    // is it expense or income?
+//                    $letter                                  = -1 === bccomp($journal['amount'], '0') ? 'e' : 'i';
+//                    $currentKey                              = sprintf('%d-%s', $currency['currency_id'], $letter);
+//                    $name                                    = (string)trans('firefly.no_category');
+//                    $tempData[$currentKey]['entries'][$name] = $tempData[$currentKey]['entries'][$name] ?? '0';
+//                    $tempData[$currentKey]['entries'][$name] = bcadd($tempData[$currentKey]['entries'][$name], $journal['amount']);
+//                }
+//            }
+//        }
 
         // re-sort every spent array and add 0 for missing entries.
         foreach ($tempData as $index => $set) {

app/Api/V1/Controllers/ConfigurationController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ConfigurationController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 /**
  * Controller.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/CurrencyController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -318,6 +318,10 @@ class CurrencyController extends Controller
         if ($this->repository->currencyInUse($currency)) {
             throw new FireflyException('200006: Currency in use.'); // @codeCoverageIgnore
         }
+        if ($this->repository->isFallbackCurrency($currency)) {
+            throw new FireflyException('200026: Currency is fallback.'); // @codeCoverageIgnore
+        }
+
         $this->repository->destroy($currency);
 
         return response()->json([], 204);

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyExchangeRateController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/ImportController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ImportController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/LinkTypeController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkTypeController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/PiggyBankController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/PreferenceController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PreferenceController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/RecurrenceController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/RuleController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/RuleGroupController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleGroupController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Search/AccountController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Search/TransactionController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/Search/TransferController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransferController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/SummaryController.php

@@ -2,7 +2,7 @@
 
 /**
  * SummaryController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/TagController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TagController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/TransactionController.php

@@ -2,7 +2,7 @@
 
 /**
  * TransactionController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/TransactionLinkController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionLinkController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Controllers/UserController.php

@@ -2,7 +2,7 @@
 
 /**
  * UserController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/AccountStoreRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * AccountStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/AccountUpdateRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * AccountUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/AttachmentStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -57,8 +57,8 @@ class AttachmentStoreRequest extends Request
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
             'notes'    => $this->nlString('notes'),
-            'model'    => $this->string('model'),
-            'model_id' => $this->integer('model_id'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
         ];
     }
 
@@ -77,14 +77,14 @@ class AttachmentStoreRequest extends Request
                 str_replace('FireflyIII\\Models\\', '', TransactionJournal::class),
             ]
         );
-        $model  = $this->string('model');
+        $model  = $this->string('attachable_type');
 
         return [
-            'filename' => 'required|between:1,255',
-            'title'    => 'between:1,255',
-            'notes'    => 'between:1,65000',
-            'model'    => sprintf('required|in:%s', $models),
-            'model_id' => ['required', 'numeric', new IsValidAttachmentModel($model)],
+            'filename'        => 'required|between:1,255',
+            'title'           => 'between:1,255',
+            'notes'           => 'between:1,65000',
+            'attachable_type' => sprintf('required|in:%s', $models),
+            'attachable_id'   => ['required', 'numeric', new IsValidAttachmentModel($model)],
         ];
     }
 }

app/Api/V1/Requests/AttachmentUpdateRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AttachmentUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -52,8 +52,8 @@ class AttachmentUpdateRequest extends Request
             'filename' => $this->string('filename'),
             'title'    => $this->string('title'),
             'notes'    => $this->nlString('notes'),
-            'model'    => $this->string('model'),
-            'model_id' => $this->integer('model_id'),
+            'model'    => $this->string('attachable_type'),
+            'model_id' => $this->integer('attachable_id'),
         ];
     }
 

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AvailableBudgetRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/BillRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * BillRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/BudgetRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/CategoryRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CategoryRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/ConfigurationRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * ConfigurationRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/CurrencyRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CurrencyRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/DateRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * DateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/LinkTypeRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * LinkTypeRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/PiggyBankRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PiggyBankRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/PreferenceRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * PreferenceRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RecurrenceStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RecurrenceUpdateRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RecurrenceUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/Request.php

@@ -2,7 +2,7 @@
 
 /**
  * Request.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleGroupRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleGroupRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleGroupTestRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * RuleGroupTestRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleGroupTriggerRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * RuleGroupTriggerRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleTestRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * RuleTestRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleTriggerRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * RuleTriggerRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/RuleUpdateRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RuleUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/Search/TransferRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransferRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/TagStoreRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TagStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/TagUpdateRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * TagUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/TransactionLinkRequest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransactionLinkRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/TransactionStoreRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * TransactionStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/TransactionUpdateRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * TransactionUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/UserStoreRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * UserStoreRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Api/V1/Requests/UserUpdateRequest.php

@@ -2,7 +2,7 @@
 
 /**
  * UserUpdateRequest.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/CorrectDatabase.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CorrectDatabase.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CorrectOpeningBalanceCurrencies.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/CreateAccessTokens.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateAccessTokens.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/CreateLinkTypes.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateLinkTypes.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/DeleteEmptyGroups.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteEmptyGroups.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/DeleteEmptyJournals.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteEmptyJournals.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/DeleteOrphanedTransactions.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteOrphanedTransactions.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/DeleteZeroAmount.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * DeleteZeroAmount.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/EnableCurrencies.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * EnableCurrencies.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/FixAccountTypes.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FixAccountTypes.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/FixLongDescriptions.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FixLongDescriptions.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/FixPiggies.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FixPiggies.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/FixRecurringTransactions.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FixRecurringTransactions.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/FixUnevenAmount.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * FixUnevenAmount.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -90,11 +90,40 @@ class FixUnevenAmount extends Command
         }
         /** @var Transaction $source */
         $source = $journal->transactions()->where('amount', '<', 0)->first();
+
+        if (null === $source) {
+            $this->error(
+                sprintf(
+                    'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
+                    $journal->description ?? ''
+                )
+            );
+            Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
+            TransactionJournal::where('id', $journal->description ?? 0)->forceDelete();
+
+            return;
+        }
+
         $amount = bcmul('-1', (string)$source->amount);
 
         // fix amount of destination:
         /** @var Transaction $destination */
-        $destination         = $journal->transactions()->where('amount', '>', 0)->first();
+        $destination = $journal->transactions()->where('amount', '>', 0)->first();
+
+        if (null === $destination) {
+            $this->error(
+                sprintf(
+                    'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
+                    $journal->description ?? ''
+                )
+            );
+
+            Transaction::where('transaction_journal_id', $journal->id ?? 0)->forceDelete();
+            TransactionJournal::where('id', $journal->description ?? 0)->forceDelete();
+
+            return;
+        }
+
         $destination->amount = $amount;
         $destination->save();
 

app/Console/Commands/Correction/RemoveBills.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RemoveBills.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/RenameMetaFields.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RenameMetaFields.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Correction/TransferBudgets.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * TransferBudgets.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/CreateDatabase.php

@@ -1,5 +1,26 @@
 <?php
 
+
+/**
+ * CreateDatabase.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -33,10 +54,12 @@ class CreateDatabase extends Command
     public function handle()
     {
         if ('mysql' !== env('DB_CONNECTION')) {
-            $this->info('This command currently applies to MySQL connections only.');
+            $this->info(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
+
+            return 0;
         }
         // try to set up a raw connection:
-        $dsn     = sprintf('mysql:host=%s;charset=utf8mb4', env('DB_HOST'));
+        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
         $options = [
             PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,

app/Console/Commands/DecryptDatabase.php

@@ -2,7 +2,7 @@
 
 /**
  * DecryptDatabase.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Export/ExportData.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ExportData.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -41,14 +41,6 @@ class ExportData extends Command
 {
     use VerifiesAccessToken;
 
-    /** @var JournalRepositoryInterface */
-    private $journalRepository;
-
-    /** @var AccountRepositoryInterface */
-    private $accountRepository;
-
-    /** @var User */
-    private $user;
     /**
      * The console command description.
      *
@@ -77,7 +69,12 @@ class ExportData extends Command
     {--export-bills : Create a file with all your bills and some meta data.}
     {--export-piggies : Create a file with all your piggy banks and some meta data.}
     {--force : Force overwriting of previous exports if found.}';
-
+    /** @var AccountRepositoryInterface */
+    private $accountRepository;
+    /** @var JournalRepositoryInterface */
+    private $journalRepository;
+    /** @var User */
+    private $user;
 
     /**
      * Create a new command instance.
@@ -99,7 +96,7 @@ class ExportData extends Command
     {
         // verify access token
         if (!$this->verifyAccessToken()) {
-            $this->error('Invalid access token.');
+            $this->error('Invalid access token. Check /profile.');
 
             return 1;
         }
@@ -138,7 +135,7 @@ class ExportData extends Command
         if (0 === count($data)) {
             $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
 
-            return 1; 
+            return 1;
         }
 
         try {
@@ -212,29 +209,32 @@ class ExportData extends Command
      */
     private function getDateParameter(string $field): Carbon
     {
-        $date = null;
+        $date = Carbon::now()->subYear();
         if (null !== $this->option($field)) {
             try {
                 $date = Carbon::createFromFormat('Y-m-d', $this->option($field));
             } catch (InvalidArgumentException $e) {
                 Log::error($e->getMessage());
-                throw new FireflyException(sprintf('%s date "%s" must be formatted YYYY-MM-DD', $field, $this->option('start')));
+                $this->error(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
             }
+
+            return $date;
         }
-        if (null === $date && 'start' === $field) {
+        if ('start' === $field) {
             $journal = $this->journalRepository->firstNull();
-            $date    = null === $journal ? Carbon::now()->subYear() : $date;
-        }
-        if (null === $date && 'end' === $field) {
-            $date = new Carbon;
-        }
-        if ('start' === $date) {
+            $date    = null === $journal ? Carbon::now()->subYear() : $journal->date;
             $date->startOfDay();
+
+            return $date;
         }
-        if ('end' === $date) {
+        if ('end' === $field) {
+            $date = new Carbon;
             $date->endOfDay();
+
+            return $date;
         }
 
+        // fallback
         return $date;
     }
 

app/Console/Commands/Import/CreateCSVImport.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * CreateCSVImport.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Integrity/ReportEmptyObjects.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportEmptyObjects.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Integrity/ReportIntegrity.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportIntegrity.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Integrity/ReportSum.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ReportSum.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * RestoreOAuthKeys.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/ScanAttachments.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ScanAttachments.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/SetLatestVersion.php

@@ -1,5 +1,26 @@
 <?php
 
+
+/**
+ * SetLatestVersion.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 namespace FireflyIII\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -11,7 +32,7 @@ class SetLatestVersion extends Command
      *
      * @var string
      */
-    protected $description = 'Command description';
+    protected $description = 'Set latest version in DB.';
     /**
      * The name and signature of the console command.
      *

app/Console/Commands/Tools/ApplyRules.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * ApplyRules.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Tools/Cron.php

@@ -2,7 +2,7 @@
 
 /**
  * Cron.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Upgrade/AccountCurrencies.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * AccountCurrencies.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Upgrade/BackToJournals.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BackToJournals.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *

app/Console/Commands/Upgrade/BudgetLimitCurrency.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * BudgetLimitCurrency.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *