Merge branch 'release/3.2.2'

app/config/.gitignore

@@ -1,4 +1,4 @@
 local/
 laptop/
 vagrant/
-production/
+production/

app/config/compile.php

@@ -1,3 +1,3 @@
 <?php
 
-return [];
+return [];

app/config/dev.php

@@ -1,4 +1,4 @@
 <?php
 return [
     'import' => ''
-];
+];

app/config/firefly.php

@@ -3,7 +3,7 @@
 return [
     'index_periods'        => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
     'budget_periods'       => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
-    'piggybank_periods'    => [
+    'piggy_bank_periods'    => [
         'week'    => 'Week',
         'month'   => 'Month',
         'quarter' => 'Quarter',
@@ -46,4 +46,4 @@ return [
         '6M'     => 'half-year',
         'custom' => 'monthly'
     ],
-];
+];

app/config/homestead/app.php

@@ -12,4 +12,4 @@ return [
     */
     'debug' => true,
     'log_level'       => 'debug',
-];
+];

app/config/homestead/database.php

@@ -34,4 +34,4 @@ return [
 
     ],
 
-];
+];

app/config/testing/app.php

@@ -1,2 +1,2 @@
 <?php
-return ['log_level' => 'debug',];
+return ['log_level' => 'debug',];

app/config/testing/database.php

@@ -9,4 +9,4 @@ return [
         ]
 
     ]
-];
+];

app/config/testingInMemory/app.php

@@ -0,0 +1,2 @@
+<?php
+return ['log_level' => 'debug',];

app/config/testingInMemory/auth.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'verify_mail' => false,
+    'verify_reset' => true,
+    'allow_register' => true
+
+];

app/config/testingInMemory/cache.php

@@ -0,0 +1,3 @@
+<?php
+
+return ['driver' => 'array',];

app/config/testingInMemory/database.php

@@ -0,0 +1,12 @@
+<?php
+return [
+    'default' => 'sqlite',
+    'connections' => [
+        'sqlite' => [
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => ''
+        ]
+
+    ]
+];

app/config/testingInMemory/mail.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'driver'     => 'smtp',
+    'host'       => '',
+    'port'       => 587,
+    'from'       => ['address' => '', 'name' => 'Firefly III'],
+    'encryption' => 'tls',
+    'username'   => '',
+    'password'   => '',
+    'sendmail'   => '/usr/sbin/sendmail -bs',
+    'pretend'    => true,
+];

app/config/testingInMemory/session.php

@@ -0,0 +1,3 @@
+<?php
+
+return ['driver' => 'array',];