From 2c1700f4da3f9f320ac4e7232d86fb0e00f9c158 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Mon, 27 Feb 2017 19:47:44 +0000
Subject: [PATCH] Fix validation for component groups

---
 .../ComponentGroup/AddComponentGroupCommand.php        |  2 +-
 .../ComponentGroup/UpdateComponentGroupCommand.php     |  2 +-
 app/Models/ComponentGroup.php                          |  4 ++--
 database/factories/ModelFactory.php                    | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php b/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php
index 601370a0..2a959221 100644
--- a/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php
+++ b/app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php
@@ -54,7 +54,7 @@ final class AddComponentGroupCommand
     public $rules = [
         'name'      => 'required|string',
         'order'     => 'required|int',
-        'collapsed' => 'required|int|between:0,3',
+        'collapsed' => 'required|int|between:0,4',
         'visible'   => 'required|bool',
     ];
 
diff --git a/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php b/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php
index 2565e2cd..1067ef22 100644
--- a/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php
+++ b/app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php
@@ -63,7 +63,7 @@ final class UpdateComponentGroupCommand
     public $rules = [
         'name'      => 'nullable|string',
         'order'     => 'nullable|int',
-        'collapsed' => 'nullable|int|between:0,3',
+        'collapsed' => 'nullable|int|between:0,4',
         'visible'   => 'nullable|bool',
     ];
 
diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php
index b595b990..6aebc82c 100644
--- a/app/Models/ComponentGroup.php
+++ b/app/Models/ComponentGroup.php
@@ -81,8 +81,8 @@ class ComponentGroup extends Model implements HasPresenter
     public $rules = [
         'name'      => 'required|string',
         'order'     => 'required|int',
-        'collapsed' => 'required|int',
-        'visible'   => 'required|int',
+        'collapsed' => 'required|int|between:0,4',
+        'visible'   => 'required|bool',
     ];
 
     /**
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index e5c33dd7..fdcd9fe3 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -28,7 +28,7 @@ $factory->define(Component::class, function ($faker) {
         'name'        => $faker->sentence(),
         'description' => $faker->paragraph(),
         'link'        => $faker->url(),
-        'status'      => random_int(1, 4),
+        'status'      => mt_rand(1, 4),
         'order'       => 0,
     ];
 });
@@ -37,7 +37,7 @@ $factory->define(ComponentGroup::class, function ($faker) {
     return [
         'name'      => $faker->words(2, true),
         'order'     => 0,
-        'collapsed' => random_int(0, 3),
+        'collapsed' => mt_rand(0, 4),
         'visible'   => $faker->boolean(),
     ];
 });
@@ -46,7 +46,7 @@ $factory->define(Incident::class, function ($faker) {
     return [
         'name'     => $faker->sentence(),
         'message'  => $faker->paragraph(),
-        'status'   => random_int(1, 4),
+        'status'   => mt_rand(1, 4),
         'visible'  => 1,
         'stickied' => false,
     ];
@@ -64,7 +64,7 @@ $factory->define(IncidentUpdate::class, function ($faker) {
     return [
         'incident_id' => factory(Incident::class)->create()->id,
         'message'     => $faker->paragraph(),
-        'status'      => random_int(1, 4),
+        'status'      => mt_rand(1, 4),
         'user_id'     => factory(User::class)->create()->id,
     ];
 });
@@ -85,7 +85,7 @@ $factory->define(Metric::class, function ($faker) {
 $factory->define(MetricPoint::class, function ($faker) {
     return [
         'metric_id' => factory(Metric::class)->create()->id,
-        'value'     => random_int(1, 100),
+        'value'     => mt_rand(1, 100),
         'counter'   => 1,
     ];
 });