Merge pull request #4 from webfactor/2.0

[RF] refactor

Author: tswonke

src/Contracts/FieldTypeInterface.php

@@ -2,28 +2,30 @@
 
 namespace Webfactor\Laravel\Generators\Contracts;
 
-abstract class MigrationFieldAbstract implements FieldTypeInterface
-{
-    private $name;
+use Webfactor\Laravel\Generators\Traits\CrudColumn;
+use Webfactor\Laravel\Generators\Traits\CrudField;
+use Webfactor\Laravel\Generators\Traits\ValidationRule;
 
-    private $nullable = false;
+abstract class MigrationFieldAbstract implements MigrationFieldTypeInterface
+{
+    use CrudColumn, CrudField, ValidationRule;
 
-    private $unique = false;
+    private $name;
 
-    private $default = null;
+    private $nullable;
 
-    private $foreign = null;
+    private $unique;
 
     public function __construct(string $name, array $options = [])
     {
         $this->name = $name;
 
         foreach ($options as $option) {
-            $this->fillObject($option);
+            $this->parseOptions($option);
         }
     }
 
-    private function fillObject(string $param)
+    private function parseOptions(string $param)
     {
         if ($param == 'nullable') {
             return $this->nullable = true;
@@ -33,10 +35,6 @@ private function fillObject(string $param)
             return $this->unique = true;
         }
 
-        if ($param == 'foreign') {
-            return $this->foreign = true;
-        }
-
         if (starts_with($param, 'default(')) {
             preg_match('/\((.*)\)/', $param, $match);
 
@@ -52,22 +50,6 @@ public function getName()
         return $this->name;
     }
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
     /**
      * @return bool
      */
@@ -83,10 +65,4 @@ public function isUnique(): bool
     {
         return $this->unique;
     }
-
-    abstract public function getRule(): string;
-
-    abstract public function getColumn(): array;
-
-    abstract public function getField(): array;
 }

src/Contracts/MigrationFieldAbstract.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Webfactor\Laravel\Generators\Contracts;
+
+use Webfactor\Laravel\Generators\Traits\CrudColumn;
+use Webfactor\Laravel\Generators\Schemas\CrudField;
+use Webfactor\Laravel\Generators\Schemas\RequestValidationRule;
+
+interface MigrationFieldTypeInterface
+{
+    public function getValidationRule(): string;
+
+    public function getCrudColumn(): array;
+
+    public function getCrudField(): array;
+}

src/Contracts/MigrationFieldTypeInterface.php

@@ -6,24 +6,9 @@
 
 class BooleanType extends MigrationFieldAbstract
 {
-    public function getRule(): string
-    {
-        return 'required';
-    }
+    protected $validationRuleType = 'boolean';
 
-    public function getColumn(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudColumnType = 'boolean';
 
-    public function getField(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudFieldType = 'boolean';
 }

src/Schemas/FieldTypes/BooleanType.php

@@ -6,24 +6,9 @@
 
 class DateType extends MigrationFieldAbstract
 {
-    public function getRule(): string
-    {
-        return 'required';
-    }
+    protected $validationRuleType = 'date';
 
-    public function getColumn(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudColumnType = 'date';
 
-    public function getField(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudFieldType = 'date';
 }

src/Schemas/FieldTypes/DateType.php

@@ -6,24 +6,9 @@
 
 class IntegerType extends MigrationFieldAbstract
 {
-    public function getRule(): string
-    {
-        return 'required';
-    }
+    protected $validationRuleType = 'integer';
 
-    public function getColumn(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudColumnType = 'number';
 
-    public function getField(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudFieldType = 'number';
 }

src/Schemas/FieldTypes/IntegerType.php

@@ -6,24 +6,9 @@
 
 class StringType extends MigrationFieldAbstract
 {
-    public function getRule(): string
-    {
-        return 'required';
-    }
+    protected $validationRuleType = 'string';
 
-    public function getColumn(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudColumnType = 'text';
 
-    public function getField(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudFieldType = 'text';
 }

src/Schemas/FieldTypes/StringType.php

@@ -6,24 +6,9 @@
 
 class TextType extends MigrationFieldAbstract
 {
-    public function getRule(): string
-    {
-        return 'required';
-    }
+    protected $validationRuleType = 'text';
 
-    public function getColumn(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudColumnType = 'text';
 
-    public function getField(): array
-    {
-        return [
-            'name' => $this->getName(),
-            'label' => $this->getName(),
-        ];
-    }
+    protected $crudFieldType = 'summernote';
 }

src/Schemas/FieldTypes/TextType.php

@@ -3,7 +3,7 @@
 namespace Webfactor\Laravel\Generators\Schemas;
 
 use Illuminate\Support\Collection;
-use Webfactor\Laravel\Generators\Contracts\FieldTypeInterface;
+use Webfactor\Laravel\Generators\Contracts\MigrationFieldTypeInterface;
 
 class MigrationSchema
 {
@@ -25,23 +25,23 @@ private function setMigrationField($field)
         $name = array_shift($options);
         $type = array_shift($options);
 
-        if ($fieldType = $this->getFieldType($type, $name, $options)) {
-            $this->structure->push($fieldType);
+        if ($migrationFieldType = $this->getMigrationFieldType($type, $name, $options)) {
+            $this->structure->push($migrationFieldType);
         }
     }
 
-    protected function getFieldType($type, $name, $options)
+    protected function getMigrationFieldType($type, $name, $options)
     {
         $typeClass = 'Webfactor\\Laravel\\Generators\\Schemas\\FieldTypes\\' . ucfirst($type) . 'Type';
 
         if (class_exists($typeClass)) {
-            return $this->loadFieldType(new $typeClass($name, $options));
+            return $this->loadMigrationFieldType(new $typeClass($name, $options));
         }
 
         return null;
     }
 
-    private function loadFieldType(FieldTypeInterface $fieldType)
+    private function loadMigrationFieldType(MigrationFieldTypeInterface $fieldType)
     {
         return $fieldType;
     }

src/Schemas/MigrationSchema.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webfactor\Laravel\Generators\Schemas;
+
+class RequestValidationRule
+{
+}