drops suffic for form and table

Author: Manuela Mindroc

.styleci.yml

@@ -5,9 +5,7 @@ preset: laravel
 enabled:
   - strict
   - unalign_double_arrow
-  - phpdoc_order
-  - phpdoc_separation
-
+  
 disabled:
   - short_array_syntax
 

src/Forms/Builders/Type.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace LaravelEnso\Files\Forms\Builders;
+
+use LaravelEnso\Files\Models\Type as Model;
+use LaravelEnso\Forms\Services\Form;
+
+class Type
+{
+    private const TemplatePath = __DIR__.'/../Templates/type.json';
+
+    protected Form $form;
+
+    public function __construct()
+    {
+        $this->form = (new Form($this->templatePath()));
+    }
+
+    public function create()
+    {
+        return $this->form->create();
+    }
+
+    public function edit(Model $type)
+    {
+        return $this->form->edit($type);
+    }
+
+    protected function templatePath(): string
+    {
+        return self::TemplatePath;
+    }
+}

src/Forms/Builders/TypeForm.php

@@ -3,11 +3,11 @@
 namespace LaravelEnso\Files\Http\Controllers\Type;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\Forms\Builders\TypeForm;
+use LaravelEnso\Files\Forms\Builders\Type;
 
 class Create extends Controller
 {
-    public function __invoke(TypeForm $form)
+    public function __invoke(Type $form)
     {
         return ['form' => $form->create()];
     }

src/Http/Controllers/Type/Create.php

@@ -3,12 +3,12 @@
 namespace LaravelEnso\Files\Http\Controllers\Type;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\Forms\Builders\TypeForm;
-use LaravelEnso\Files\Models\Type;
+use LaravelEnso\Files\Forms\Builders\Type;
+use LaravelEnso\Files\Models\Type as Model;
 
 class Edit extends Controller
 {
-    public function __invoke(Type $type, TypeForm $form)
+    public function __invoke(Model $type, Type $form)
     {
         return ['form' => $form->edit($type)];
     }

src/Http/Controllers/Type/Edit.php

@@ -3,12 +3,12 @@
 namespace LaravelEnso\Files\Http\Controllers\Type;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\Tables\Builders\TypeTable;
+use LaravelEnso\Files\Tables\Builders\Type;
 use LaravelEnso\Tables\Traits\Excel;
 
 class ExportExcel extends Controller
 {
     use Excel;
 
-    protected $tableClass = TypeTable::class;
+    protected $tableClass = Type::class;
 }

src/Http/Controllers/Type/ExportExcel.php

@@ -3,12 +3,12 @@
 namespace LaravelEnso\Files\Http\Controllers\Type;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\Tables\Builders\TypeTable;
+use LaravelEnso\Files\Tables\Builders\Type;
 use LaravelEnso\Tables\Traits\Init;
 
 class InitTable extends Controller
 {
     use Init;
 
-    protected string $tableClass = TypeTable::class;
+    protected string $tableClass = Type::class;
 }

src/Http/Controllers/Type/InitTable.php

@@ -3,12 +3,12 @@
 namespace LaravelEnso\Files\Http\Controllers\Type;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\Tables\Builders\TypeTable;
+use LaravelEnso\Files\Tables\Builders\Type;
 use LaravelEnso\Tables\Traits\Data;
 
 class TableData extends Controller
 {
     use Data;
 
-    protected string $tableClass = TypeTable::class;
+    protected string $tableClass = Type::class;
 }

src/Http/Controllers/Type/TableData.php

@@ -3,16 +3,16 @@
 namespace LaravelEnso\Files\Tables\Builders;
 
 use Illuminate\Database\Eloquent\Builder;
-use LaravelEnso\Files\Models\Type;
+use LaravelEnso\Files\Models\Type as Model;
 use LaravelEnso\Tables\Contracts\Table;
 
-class TypeTable implements Table
+class Type implements Table
 {
-    protected const TemplatePath = __DIR__.'/../Templates/types.json';
+    private const TemplatePath = __DIR__ . '/../Templates/types.json';
 
     public function query(): Builder
     {
-        return Type::selectRaw('id, name, icon, folder, model, is_browsable, is_system');
+        return Model::selectRaw('id, name, icon, folder, model, is_browsable, is_system');
     }
 
     public function templatePath(): string