From ca1a74fb3e7de09cbd56d274a9a53f365c0475ec Mon Sep 17 00:00:00 2001 From: Manuela Mindroc Date: Thu, 24 Feb 2022 17:54:54 +0200 Subject: [PATCH] drops suffic for form and table --- .styleci.yml | 4 +-- src/Forms/Builders/Type.php | 33 +++++++++++++++++++ src/Forms/Builders/TypeForm.php | 28 ---------------- src/Http/Controllers/Type/Create.php | 4 +-- src/Http/Controllers/Type/Edit.php | 6 ++-- src/Http/Controllers/Type/ExportExcel.php | 4 +-- src/Http/Controllers/Type/InitTable.php | 4 +-- src/Http/Controllers/Type/TableData.php | 4 +-- .../Builders/{TypeTable.php => Type.php} | 8 ++--- 9 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 src/Forms/Builders/Type.php delete mode 100644 src/Forms/Builders/TypeForm.php rename src/Tables/Builders/{TypeTable.php => Type.php} (56%) diff --git a/.styleci.yml b/.styleci.yml index 98eac9f..802dc83 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -5,9 +5,7 @@ preset: laravel enabled: - strict - unalign_double_arrow - - phpdoc_order - - phpdoc_separation - + disabled: - short_array_syntax diff --git a/src/Forms/Builders/Type.php b/src/Forms/Builders/Type.php new file mode 100644 index 0000000..e513fcf --- /dev/null +++ b/src/Forms/Builders/Type.php @@ -0,0 +1,33 @@ +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; + } +} diff --git a/src/Forms/Builders/TypeForm.php b/src/Forms/Builders/TypeForm.php deleted file mode 100644 index 255eaa4..0000000 --- a/src/Forms/Builders/TypeForm.php +++ /dev/null @@ -1,28 +0,0 @@ -form = (new Form(static::FormPath)); - } - - public function create() - { - return $this->form->create(); - } - - public function edit(Type $type) - { - return $this->form->edit($type); - } -} diff --git a/src/Http/Controllers/Type/Create.php b/src/Http/Controllers/Type/Create.php index e5d518a..a58ce78 100644 --- a/src/Http/Controllers/Type/Create.php +++ b/src/Http/Controllers/Type/Create.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()]; } diff --git a/src/Http/Controllers/Type/Edit.php b/src/Http/Controllers/Type/Edit.php index 55fb248..7451a25 100644 --- a/src/Http/Controllers/Type/Edit.php +++ b/src/Http/Controllers/Type/Edit.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)]; } diff --git a/src/Http/Controllers/Type/ExportExcel.php b/src/Http/Controllers/Type/ExportExcel.php index c0a69fb..c70943f 100644 --- a/src/Http/Controllers/Type/ExportExcel.php +++ b/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\Excel; class ExportExcel extends Controller { use Excel; - protected $tableClass = TypeTable::class; + protected $tableClass = Type::class; } diff --git a/src/Http/Controllers/Type/InitTable.php b/src/Http/Controllers/Type/InitTable.php index 4a00ad4..691c919 100644 --- a/src/Http/Controllers/Type/InitTable.php +++ b/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\Init; class InitTable extends Controller { use Init; - protected string $tableClass = TypeTable::class; + protected string $tableClass = Type::class; } diff --git a/src/Http/Controllers/Type/TableData.php b/src/Http/Controllers/Type/TableData.php index 95057b7..c5e7db9 100644 --- a/src/Http/Controllers/Type/TableData.php +++ b/src/Http/Controllers/Type/TableData.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; } diff --git a/src/Tables/Builders/TypeTable.php b/src/Tables/Builders/Type.php similarity index 56% rename from src/Tables/Builders/TypeTable.php rename to src/Tables/Builders/Type.php index 9a990d6..a64afd2 100644 --- a/src/Tables/Builders/TypeTable.php +++ b/src/Tables/Builders/Type.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