From bfc3804a1a1b75bee5a0ea4d14f1e2acbbfa718c Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sun, 3 Aug 2014 11:57:51 +1000
Subject: [PATCH] If a base classes uses a trait, no need to reuse that trait
 because Model boots all traits now

---
 modules/backend/models/UserGroup.php        | 2 --
 modules/backend/traits/ViewMaker.php        | 4 ++--
 modules/system/traits/AssetMaker.php        | 2 +-
 modules/system/traits/ConfigMaker.php       | 2 +-
 modules/system/traits/PropertyContainer.php | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php
index 5ef2e9fff..7465fbf46 100644
--- a/modules/backend/models/UserGroup.php
+++ b/modules/backend/models/UserGroup.php
@@ -10,8 +10,6 @@ use October\Rain\Auth\Models\Group as GroupBase;
  */
 class UserGroup extends GroupBase
 {
-    use \October\Rain\Database\Traits\Validation;
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/backend/traits/ViewMaker.php b/modules/backend/traits/ViewMaker.php
index 64b69e677..9511d2ad3 100644
--- a/modules/backend/traits/ViewMaker.php
+++ b/modules/backend/traits/ViewMaker.php
@@ -24,12 +24,12 @@ trait ViewMaker
     /**
      * @var string Specifies a path to the views directory.
      */
-    private $viewPath;
+    protected $viewPath;
 
     /**
      * @var string Specifies a path to the layout directory.
      */
-    private $layoutPath;
+    protected $layoutPath;
 
     /**
      * @var string Layout to use for the view.
diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index ebfc136c7..6e5be3450 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -21,7 +21,7 @@ trait AssetMaker
     /**
      * @var array Collection of assets to display in the layout.
      */
-    private $assets = ['js'=>[], 'css'=>[], 'rss'=>[]];
+    protected $assets = ['js'=>[], 'css'=>[], 'rss'=>[]];
 
     /**
      * @var string Specifies a path to the asset directory.
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 3e995ea7d..b543f268f 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -22,7 +22,7 @@ trait ConfigMaker
     /**
      * @var string Specifies a path to the config directory.
      */
-    private $configPath;
+    protected $configPath;
 
     /**
      * Reads the contents of the supplied file and applies it to this object.
diff --git a/modules/system/traits/PropertyContainer.php b/modules/system/traits/PropertyContainer.php
index f29b97fde..5e9af376f 100644
--- a/modules/system/traits/PropertyContainer.php
+++ b/modules/system/traits/PropertyContainer.php
@@ -15,7 +15,7 @@ trait PropertyContainer
     /**
      * @var array Contains the object property values.
      */
-    private $properties = [];
+    protected $properties = [];
 
     /**
      * Validates the properties against the defined properties of the class.