Merge branch 'release/4.7.1.4'

.env.docker

@@ -88,3 +88,4 @@ DEMO_PASSWORD=
 IS_DOCKER=true
 IS_SANDSTORM=false
 IS_HEROKU=false
+TZ=${TZ}

.env.example

@@ -13,6 +13,10 @@ SITE_OWNER=mail@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.heroku

@@ -13,6 +13,10 @@ SITE_OWNER=heroku@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.sandstorm

@@ -13,6 +13,10 @@ SITE_OWNER=sandstorm@example.com
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=SomeRandomStringOf32CharsExactly
 
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=UTC
+
 # APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
 APP_URL=http://localhost
 TRUSTED_PROXIES=

.env.testing

@@ -6,6 +6,7 @@ APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 TRUSTED_PROXIES=
+TZ=Europe/Amsterdam
 
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1

app/Http/Middleware/Authenticate.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Authenticate.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com

app/Rules/BelongsUser.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

app/Rules/ValidTransactions.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

app/Support/Preferences.php

@@ -156,6 +156,9 @@ class Preferences
         if (null !== $preference) {
             $lastActivity = $preference->data;
         }
+        if (is_array($lastActivity)) {
+            $lastActivity = implode(',', $lastActivity);
+        }
 
         return md5($lastActivity);
     }

config/app.php

@@ -27,7 +27,7 @@ return [
     'env'             => env('APP_ENV', 'production'),
     'debug'           => env('APP_DEBUG', false),
     'url'             => env('APP_URL', 'http://localhost'),
-    'timezone'        => 'UTC',
+    'timezone'        => env('TZ', 'UTC'),
     'locale'          => 'en_US',
     'fallback_locale' => 'en_US',
     'key'             => env('APP_KEY'),

config/breadcrumbs.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

config/firefly.php

@@ -33,7 +33,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'     => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'        => '4.7.1.3',
+    'version'        => '4.7.1.4',
     'api_version'    => '0.1',
     'maxUploadSize'  => 15242880,
     'allowedMimes'   => [

config/google2fa.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000004_create_oauth_clients_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 
 
 /**

resources/views/reports/partials/categories.twig

@@ -21,7 +21,7 @@
         <td>
             <a href="{{ route('categories.show', category.id) }}">{{ category.name }}</a>
         </td>
-        <td style="text-align: right;">{{ 0|formatAmount }}</td>
+        <td style="text-align: right;">{{ category.earned|formatAmount }}</td>
         <td style="text-align: right;">{{ category.spent|formatAmount }}</td>
         <td style="width:20px;">
             <i class="fa fa-fw fa-info-circle text-muted firefly-info-button"