pint

recca0120 · Jan 18, 2023 · bfc1a90 · bfc1a90
1 parent f2d02d6
commit bfc1a90
Show file tree

Hide file tree

Showing 41 changed files with 150 additions and 156 deletions.
diff --git a/database/migrations/2022_11_17_000001_create_cars_table.php b/database/migrations/2022_11_17_000001_create_cars_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_11_17_000001_create_phones_table.php b/database/migrations/2022_11_17_000001_create_phones_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_11_17_000002_create_mechanics_table.php b/database/migrations/2022_11_17_000002_create_mechanics_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_11_17_000003_create_owners_table.php b/database/migrations/2022_11_17_000003_create_owners_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_12_07_000004_add_teams_fields.php b/database/migrations/2022_12_07_000004_add_teams_fields.php
@@ -6,7 +6,8 @@
 use Illuminate\Support\Facades\Schema;
 use Spatie\Permission\PermissionRegistrar;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -18,7 +19,7 @@ public function up()
         $tableNames = config('permission.table_names');
         $columnNames = config('permission.column_names');
 
-        if (!$teams) {
+        if (! $teams) {
             return;
         }
         if (empty($tableNames)) {
@@ -28,7 +29,7 @@ public function up()
             throw new \Exception('Error: team_foreign_key on config/permission.php not loaded. Run [php artisan config:clear] and try again.');
         }
 
-        if (!Schema::hasColumn($tableNames['roles'], $columnNames['team_foreign_key'])) {
+        if (! Schema::hasColumn($tableNames['roles'], $columnNames['team_foreign_key'])) {
             Schema::table($tableNames['roles'], function (Blueprint $table) use ($columnNames) {
                 $table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable()->after('id');
                 $table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index');
@@ -38,7 +39,7 @@ public function up()
             });
         }
 
-        if (!Schema::hasColumn($tableNames['model_has_permissions'], $columnNames['team_foreign_key'])) {
+        if (! Schema::hasColumn($tableNames['model_has_permissions'], $columnNames['team_foreign_key'])) {
             Schema::table($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
                 $table->unsignedBigInteger($columnNames['team_foreign_key'])->default('1');
                 $table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index');
@@ -57,9 +58,9 @@ public function up()
             });
         }
 
-        if (!Schema::hasColumn($tableNames['model_has_roles'], $columnNames['team_foreign_key'])) {
+        if (! Schema::hasColumn($tableNames['model_has_roles'], $columnNames['team_foreign_key'])) {
             Schema::table($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
-                $table->unsignedBigInteger($columnNames['team_foreign_key'])->default('1');;
+                $table->unsignedBigInteger($columnNames['team_foreign_key'])->default('1');
                 $table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index');
 
                 if (DB::getDriverName() !== 'sqlite') {
@@ -88,6 +89,5 @@ public function up()
      */
     public function down()
     {
-
     }
 };
diff --git a/database/migrations/2022_12_07_000005_create_permission_tables.php b/database/migrations/2022_12_07_000005_create_permission_tables.php
@@ -5,7 +5,8 @@
 use Illuminate\Support\Facades\Schema;
 use Spatie\Permission\PermissionRegistrar;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -70,7 +71,6 @@ public function up()
                 $table->primary([PermissionRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
                     'model_has_permissions_permission_model_type_primary');
             }
-
         });
 
         Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) {
@@ -137,4 +137,4 @@ public function down()
         Schema::drop($tableNames['roles']);
         Schema::drop($tableNames['permissions']);
     }
-};
+};
diff --git a/database/migrations/2022_12_09_000006_create_posts_table.php b/database/migrations/2022_12_09_000006_create_posts_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_12_09_000007_create_comments_table.php b/database/migrations/2022_12_09_000007_create_comments_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/database/migrations/2022_12_09_000007_create_images_table.php b/database/migrations/2022_12_09_000007_create_images_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      *

diff --git a/routes/web.php b/routes/web.php
@@ -3,7 +3,7 @@
 use Illuminate\Support\Facades\Route;
 use Recca0120\LaravelErd\Http\Controllers\LaravelErdController;
 
-Route::get(config('laravel-erd.uri') . '/{file?}', [LaravelErdController::class, 'index'])
+Route::get(config('laravel-erd.uri').'/{file?}', [LaravelErdController::class, 'index'])
     ->name('laravel-erd.show')
     ->middleware(config('laravel-erd.middleware'))
-    ->where('file', '.*');
+    ->where('file', '.*');
diff --git a/src/Console/Commands/LaravelErdCommand.php b/src/Console/Commands/LaravelErdCommand.php
@@ -52,10 +52,10 @@ private function setConnection(string $connection): void
     {
         config(
             collect(Arr::dot(config()->all()))
-                ->filter(fn($value, $key) => $value && Str::endsWith($key, 'database.connection'))
-                ->map(fn() => $connection)
+                ->filter(fn ($value, $key) => $value && Str::endsWith($key, 'database.connection'))
+                ->map(fn () => $connection)
                 ->merge(['database.default' => $connection])
                 ->toArray()
         );
     }
-}
+}
diff --git a/src/Console/Commands/LaravelErdInitCommand.php b/src/Console/Commands/LaravelErdInitCommand.php
@@ -27,7 +27,6 @@ public function handle(): int
 
             return self::FAILURE;
         }
-
     }
 
     /**
@@ -49,7 +48,6 @@ private function downloadDot(string $os, string $arch, string $path): void
         $this->download($url, $path);
     }
 
-
     /**
      * @throws RequestException
      */
@@ -59,17 +57,17 @@ private function download(string $url, string $path): void
             return;
         }
 
-        $this->line('download: ' . $url);
+        $this->line('download: '.$url);
         File::ensureDirectoryExists(dirname($path));
         File::put($path, Http::timeout(300)->get($url)->throw()->body());
         File::chmod($path, 0777);
     }
 
     private function arch(): string
     {
-        $name = php_uname("m");
+        $name = php_uname('m');
 
-        if (false !== stripos($name, "aarch64") || false !== stripos($name, "arm64")) {
+        if (false !== stripos($name, 'aarch64') || false !== stripos($name, 'arm64')) {
             return 'arm';
         }
 
@@ -93,5 +91,4 @@ private function os(): string
 
         return 'linux';
     }
-
-}
+}
diff --git a/src/ErdFinder.php b/src/ErdFinder.php
@@ -8,16 +8,18 @@
 class ErdFinder
 {
     private AbstractSchemaManager $schemaManager;
+
     private ModelFinder $modelFinder;
+
     private RelationFinder $relationFinder;
+
     private string $directory;
 
     public function __construct(
         AbstractSchemaManager $schemaManager,
-        ModelFinder           $modelFinder,
-        RelationFinder        $relationFinder
-    )
-    {
+        ModelFinder $modelFinder,
+        RelationFinder $relationFinder
+    ) {
         $this->schemaManager = $schemaManager;
         $this->modelFinder = $modelFinder;
         $this->relationFinder = $relationFinder;
@@ -31,8 +33,8 @@ public function in(string $directory): ErdFinder
     }
 
     /**
-     * @param string|string[] $patterns
-     * @param string[] $excludes
+     * @param  string|string[]  $patterns
+     * @param  string[]  $excludes
      * @return Collection<int|string, Table>
      */
     public function find($patterns = '*.php', array $excludes = []): Collection
@@ -43,8 +45,8 @@ public function find($patterns = '*.php', array $excludes = []): Collection
     }
 
     /**
-     * @param string|string[] $file
-     * @param string[] $excludes
+     * @param  string|string[]  $file
+     * @param  string[]  $excludes
      * @return Collection<int|string, Table>
      */
     public function findByFile($file, array $excludes = []): Collection
@@ -55,8 +57,8 @@ public function findByFile($file, array $excludes = []): Collection
     }
 
     /**
-     * @param string $className
-     * @param string[] $excludes
+     * @param  string  $className
+     * @param  string[]  $excludes
      * @return Collection<int|string, Table>
      */
     public function findByModel(string $className, array $excludes = []): Collection
@@ -65,38 +67,38 @@ public function findByModel(string $className, array $excludes = []): Collection
     }
 
     /**
-     * @param Collection $models
-     * @param string[] $excludes
+     * @param  Collection  $models
+     * @param  string[]  $excludes
      * @return Collection<int|string, Table>
      */
     private function findByModels(Collection $models, array $excludes = []): Collection
     {
         $missing = $models
-            ->flatMap(fn(string $model) => $this->relationFinder->generate($model)->collapse())
-            ->map(fn(Relation $relation) => $relation->related())
+            ->flatMap(fn (string $model) => $this->relationFinder->generate($model)->collapse())
+            ->map(fn (Relation $relation) => $relation->related())
             ->filter()
             ->diff($models);
 
         return $models
             ->merge($missing)
-            ->flatMap(fn(string $model) => $this->relationFinder->generate($model)->collapse())
-            ->flatMap(fn(Relation $relation) => [$relation, $relation->relatedRelation()])
-            ->reject(fn(Relation $relation) => $relation->includes($excludes))
-            ->sortBy(fn(Relation $relation) => $this->uniqueRelation($relation))
-            ->unique(fn(Relation $relation) => $this->uniqueRelation($relation))
-            ->groupBy(fn(Relation $relation) => $relation->table())
-            ->sortBy(fn(Collection $relations, string $table) => $table)
+            ->flatMap(fn (string $model) => $this->relationFinder->generate($model)->collapse())
+            ->flatMap(fn (Relation $relation) => [$relation, $relation->relatedRelation()])
+            ->reject(fn (Relation $relation) => $relation->includes($excludes))
+            ->sortBy(fn (Relation $relation) => $this->uniqueRelation($relation))
+            ->unique(fn (Relation $relation) => $this->uniqueRelation($relation))
+            ->groupBy(fn (Relation $relation) => $relation->table())
+            ->sortBy(fn (Collection $relations, string $table) => $table)
             ->map(function (Collection $relations, $table) {
                 return new Table($this->schemaManager->introspectTable($table), $relations);
             });
     }
 
     /**
-     * @param Relation $relation
+     * @param  Relation  $relation
      * @return string[]
      */
     private function uniqueRelation(Relation $relation): array
     {
         return [$relation->type(), $relation->localKey(), $relation->foreignKey()];
     }
-}
+}
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -28,5 +28,4 @@ public static function getColumnType(Column $column): string
             return 'unknown';
         }
     }
-
-}
+}
diff --git a/src/Http/Controllers/LaravelErdController.php b/src/Http/Controllers/LaravelErdController.php
@@ -12,12 +12,12 @@ public function index(string $file = 'laravel-erd.sql'): View
     {
         $storagePath = config('laravel-erd.storage_path');
         $extension = substr($file, strrpos($file, '.') + 1);
-        $path = $storagePath . '/' . $file;
+        $path = $storagePath.'/'.$file;
 
         abort_unless(File::exists($path), 404);
 
         $view = $extension === 'svg' ? 'svg' : 'vuerd';
 
-        return view('laravel-erd::' . $view, ['path' => $path]);
+        return view('laravel-erd::'.$view, ['path' => $path]);
     }
-}
+}
diff --git a/src/LaravelErdServiceProvider.php b/src/LaravelErdServiceProvider.php
@@ -45,4 +45,4 @@ public function register()
             LaravelErdCommand::class,
         ]);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,5 +28,4 @@ public static function getColumnType(Column $column): string @@
                 return 'unknown';
             }
         }
-    }
+    }