From ed231d0e6b98b707d58f03fd4918ded6f00b8ecd Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 24 May 2019 15:37:48 +0200
Subject: [PATCH] #2783

---
 src/app/Magic/CubistCrud.php                             | 8 ++++----
 src/app/Magic/Fields/{CubistMagicField.php => Field.php} | 4 ++--
 src/app/Magic/Models/CubistMagicModelAbstract.php        | 8 ++++----
 src/app/Magic/Requests/CubistMagicStoreRequest.php       | 2 --
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename src/app/Magic/Fields/{CubistMagicField.php => Field.php} (97%)

diff --git a/src/app/Magic/CubistCrud.php b/src/app/Magic/CubistCrud.php
index 08564ca..a175a32 100644
--- a/src/app/Magic/CubistCrud.php
+++ b/src/app/Magic/CubistCrud.php
@@ -4,22 +4,22 @@
 namespace Cubist\Backpack\app\Magic;
 
 use Backpack\CRUD\CrudTrait;
-use Cubist\Backpack\app\Magic\Fields\CubistMagicField;
+use Cubist\Backpack\app\Magic\Fields\Field;
 
 trait CubistCrud
 {
     use CrudTrait;
 
     /**
-     * @param $field CubistMagicField|array
+     * @param $field Field|array
      * @throws \Exception
      */
     public function addField($field)
     {
         if (is_array($field)) {
-            $field = CubistMagicField::getInstance($field);
+            $field = Field::getInstance($field);
         }
-        /** @var $field CubistMagicField */
+        /** @var $field Field */
 
         if ($field->isDisplayColumn()) {
             $this->crud->addColumn($field->getColumnData());
diff --git a/src/app/Magic/Fields/CubistMagicField.php b/src/app/Magic/Fields/Field.php
similarity index 97%
rename from src/app/Magic/Fields/CubistMagicField.php
rename to src/app/Magic/Fields/Field.php
index c5d1fb8..481ada2 100644
--- a/src/app/Magic/Fields/CubistMagicField.php
+++ b/src/app/Magic/Fields/Field.php
@@ -6,7 +6,7 @@ namespace Cubist\Backpack\app\Magic\Fields;
 use Cubist\Backpack\app\Magic\CubistMagicAttribute;
 use Exception;
 
-class CubistMagicField
+class Field
 {
     use CubistMagicAttribute;
     protected $_attributes;
@@ -14,7 +14,7 @@ class CubistMagicField
 
     /**
      * @param $attributes
-     * @return CubistMagicField
+     * @return Field
      * @throws Exception
      */
     public static function getInstance($attributes)
diff --git a/src/app/Magic/Models/CubistMagicModelAbstract.php b/src/app/Magic/Models/CubistMagicModelAbstract.php
index 291a4d5..e1341fc 100644
--- a/src/app/Magic/Models/CubistMagicModelAbstract.php
+++ b/src/app/Magic/Models/CubistMagicModelAbstract.php
@@ -4,7 +4,7 @@
 namespace Cubist\Backpack\app\Magic\Models;
 
 use Backpack\CRUD\CrudTrait;
-use Cubist\Backpack\app\Magic\Fields\CubistMagicField;
+use Cubist\Backpack\app\Magic\Fields\Field;
 use Cubist\Backpack\app\Magic\Util;
 use Illuminate\Database\Eloquent\Model;
 use Cubist\Backpack\app\Magic\CubistMagicAttribute;
@@ -17,7 +17,7 @@ class CubistMagicModelAbstract extends Model
     use CrudTrait;
 
     /**
-     * @var CubistMagicField[]
+     * @var Field[]
      */
     protected $_fields = [];
 
@@ -50,8 +50,8 @@ class CubistMagicModelAbstract extends Model
      */
     public function addField($attributes)
     {
-        /** @var CubistMagicField $field */
-        $field = CubistMagicField::getInstance($attributes);
+        /** @var Field $field */
+        $field = Field::getInstance($attributes);
         $name = $field->getAttribute('name');
         $this->_fields[$name] = $field;
         $this->fillable[] = $name;
diff --git a/src/app/Magic/Requests/CubistMagicStoreRequest.php b/src/app/Magic/Requests/CubistMagicStoreRequest.php
index adf513c..d1e8ccc 100644
--- a/src/app/Magic/Requests/CubistMagicStoreRequest.php
+++ b/src/app/Magic/Requests/CubistMagicStoreRequest.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Cubist\Backpack\app\Magic\Requests;
 
-
 use app\Magic\Requests\CubistMagicRequest;
 
 class CubistMagicStoreRequest extends CubistMagicRequest
-- 
2.39.5