Merge tag '5.0.4' into develop

5.0.4

# Conflicts:
#	changelog.md
#	config/firefly.php

changelog.md

@@ -17,6 +17,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - #3042 Rule engine behavior was inconsistent when importing data.
 - #3064 Weird bug in reports.
 
+## [5.0.4 (API 1.0.0)] - 2020-02-01
+
+This release fixes several bugs found in 5.0.0 and earlier releases.
+
+### Fixed
+
+- If unset, `DB_CONNECTION` defaults to "mysql". This is now "pgsql", which is consistent with the documentation and the example configuration
+  file (`.env.example`). 
+
 ## [5.0.3 (API 1.0.0)] - 2020-01-30
 
 This release fixes several bugs found in 5.0.0 and earlier releases.

config/database.php

@@ -44,7 +44,7 @@ if (!(false === $databaseUrl)) {
 
 return [
 
-    'default'     => envNonEmpty('DB_CONNECTION', 'mysql'),
+    'default'     => envNonEmpty('DB_CONNECTION', 'pgsql'),
     'connections' => [
         'sqlite' => [
             'driver'   => 'sqlite',

config/firefly.php

@@ -128,43 +128,44 @@ use FireflyIII\User;
  */
 
 return [
-    'configuration'                => [
+    'configuration' => [
         'single_user_mode' => true,
         'is_demo_site'     => false,
     ],
-    'feature_flags'                => [
+    'feature_flags' => [
         'export' => true,
     ],
-    'encryption'                   => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
-    'version'                      => '5.0.3',
-    'api_version'                  => '1.0.0',
-    'db_version'                   => 12,
-    'maxUploadSize'                => 15242880,
-    'send_error_message'           => env('SEND_ERROR_MESSAGE', true),
-    'site_owner'                   => env('SITE_OWNER', ''),
-    'send_registration_mail'       => env('SEND_REGISTRATION_MAIL', true),
-    'demo_username'                => env('DEMO_USERNAME', ''),
-    'demo_password'                => env('DEMO_PASSWORD', ''),
-    'is_sandstorm'                 => env('IS_SANDSTORM', 'unknown'),
-    'bunq_use_sandbox'             => env('BUNQ_USE_SANDBOX', false),
-    'fixer_api_key'                => env('FIXER_API_KEY', ''),
-    'mapbox_api_key'               => env('MAPBOX_API_KEY', ''),
-    'trusted_proxies'              => env('TRUSTED_PROXIES', ''),
-    'search_result_limit'          => env('SEARCH_RESULT_LIMIT', 50),
-    'send_report_journals'         => envNonEmpty('SEND_REPORT_JOURNALS', true),
-    'tracker_site_id'              => env('TRACKER_SITE_ID', ''),
-    'tracker_url'                  => env('TRACKER_URL', ''),
-    'disable_frame_header'         => env('DISABLE_FRAME_HEADER', false),
-    'disable_csp_header'           => env('DISABLE_CSP_HEADER', false),
-    'login_provider'               => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
-    'cer_provider'                 => envNonEmpty('CER_PROVIDER', 'fixer'),
-    'update_endpoint'              => 'https://version.firefly-iii.org/index.json',
-    'default_location'             => [
+
+    'encryption'             => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
+    'version'                => '5.0.4',
+    'api_version'            => '1.0.0',
+    'db_version'             => 12,
+    'maxUploadSize'          => 15242880,
+    'send_error_message'     => env('SEND_ERROR_MESSAGE', true),
+    'site_owner'             => env('SITE_OWNER', ''),
+    'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true),
+    'demo_username'          => env('DEMO_USERNAME', ''),
+    'demo_password'          => env('DEMO_PASSWORD', ''),
+    'is_sandstorm'           => env('IS_SANDSTORM', 'unknown'),
+    'bunq_use_sandbox'       => env('BUNQ_USE_SANDBOX', false),
+    'fixer_api_key'          => env('FIXER_API_KEY', ''),
+    'mapbox_api_key'         => env('MAPBOX_API_KEY', ''),
+    'trusted_proxies'        => env('TRUSTED_PROXIES', ''),
+    'search_result_limit'    => env('SEARCH_RESULT_LIMIT', 50),
+    'send_report_journals'   => envNonEmpty('SEND_REPORT_JOURNALS', true),
+    'tracker_site_id'        => env('TRACKER_SITE_ID', ''),
+    'tracker_url'            => env('TRACKER_URL', ''),
+    'disable_frame_header'   => env('DISABLE_FRAME_HEADER', false),
+    'disable_csp_header'     => env('DISABLE_CSP_HEADER', false),
+    'login_provider'         => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
+    'cer_provider'           => envNonEmpty('CER_PROVIDER', 'fixer'),
+    'update_endpoint'        => 'https://version.firefly-iii.org/index.json',
+    'default_location'       => [
         'longitude'  => env('MAP_DEFAULT_LONG', '5.916667'),
         'latitude'   => env('MAP_DEFAULT_LAT', '51.983333'),
         'zoom_level' => env('MAP_DEFAULT_ZOOM', '6'),
     ],
-    'allowedMimes'                 => [
+    'allowedMimes'           => [
         /* plain files */
         'text/plain',
 

config/queue.php

@@ -100,7 +100,7 @@ return [
     */
 
     'failed' => [
-        'database' => envNonEmpty('DB_CONNECTION', 'mysql'),
+        'database' => envNonEmpty('DB_CONNECTION', 'pgsql'),
         'table'    => 'failed_jobs',
     ],