Merge branch '50-templates-improvements' into 'master'

Resolve "Оптимизировать шаблоны"

See merge request components/laravel-entity-generator!67

Author: DenTray

stubs/migration.blade.php

@@ -1,7 +1,6 @@
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use RonasIT\Support\Traits\MigrationTrait;
 
 class {{$class}}CreateTable extends Migration
@@ -10,7 +9,17 @@ class {{$class}}CreateTable extends Migration
 
     public function up()
     {
+@if(!empty($relations['belongsToMany']) || !empty($relations['belongsTo']) || !empty($relations['hasOne']) || !empty($relations['hasMany']))
         $this->createTable();
+@else
+        Schema::create('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}', function (Blueprint $table) {
+            $table->increments('id');
+@foreach ($table as $row )
+            {!!$row!!}
+@endforeach
+            $table->timestamps();
+        });
+@endif
 @foreach($relations['belongsToMany'] as $relation)
 
         $this->createBridgeTable('{{$entity}}', '{{$relation}}');
@@ -43,17 +52,19 @@ public function down()
         $this->dropBridgeTable('{{$entity}}', '{{$relation}}');
 
 @endforeach
-        Schema::drop('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}');
+        Schema::dropIfExists('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}');
     }
+@if(!empty($relations['belongsToMany']) || !empty($relations['belongsTo']) || !empty($relations['hasOne']) || !empty($relations['hasMany']))
 
     public function createTable()
     {
         Schema::create('{{\Illuminate\Support\Str::plural(\Illuminate\Support\Str::snake($entity))}}', function (Blueprint $table) {
             $table->increments('id');
-            $table->timestamps();
 @foreach ($table as $row )
             {!!$row!!}
 @endforeach
+            $table->timestamps();
         });
     }
+@endif
 }

stubs/repository.blade.php

@@ -1,8 +1,10 @@
 namespace App\Repositories;
 
+use App\Models\{{$entity}};
+@if(!empty($fields['json']))
 use Illuminate\Support\Arr;
+@endif
 use RonasIT\Support\Repositories\BaseRepository;
-use App\Models\{{$entity}};
 {{--
     Laravel inserts two spaces between @property and type, so we are forced
     to use hack here to preserve one space