Merge branch 'hotfix/3.7.2.2'

app/Http/Controllers/RuleController.php

@@ -341,6 +341,7 @@ class RuleController extends Controller
             $data = [
                 'rule_group_id'       => $repository->getFirstRuleGroup()->id,
                 'stop_processing'     => 0,
+                'user_id'             => Auth::user()->id,
                 'title'               => trans('firefly.default_rule_name'),
                 'description'         => trans('firefly.default_rule_description'),
                 'trigger'             => 'store-journal',
@@ -373,7 +374,7 @@ class RuleController extends Controller
 
         if ($repository->count() === 0) {
             $data = [
-                'user'        => Auth::user()->id,
+                'user_id'        => Auth::user()->id,
                 'title'       => trans('firefly.default_rule_group_name'),
                 'description' => trans('firefly.default_rule_group_description'),
             ];

app/Http/Controllers/RuleGroupController.php

@@ -139,7 +139,7 @@ class RuleGroupController extends Controller
         $data = [
             'title'       => $request->input('title'),
             'description' => $request->input('description'),
-            'user'        => Auth::user()->id,
+            'user_id'     => Auth::user()->id,
         ];
 
         $ruleGroup = $repository->store($data);

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -170,7 +170,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
 
         $newRuleGroup = new RuleGroup(
             [
-                'user_id'     => $data['user'],
+                'user_id'     => $data['user_id'],
                 'title'       => $data['title'],
                 'description' => $data['description'],
                 'order'       => ($order + 1),

config/firefly.php

@@ -2,7 +2,7 @@
 
 return [
     'chart'              => 'chartjs',
-    'version'            => '3.7.0',
+    'version'            => '3.7.2.2',
     'index_periods'      => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
     'budget_periods'     => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
     'csv_import_enabled' => true,

config/upgrade.php

@@ -10,6 +10,15 @@
 
 return [
     'text' => [
-        '3.7.0' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+        '3.7.0'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
-                   'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0'],
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.1'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2.1' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2.2' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+    ],
 ];