v3

Author: bastinald

readme.md

@@ -13,8 +13,6 @@ This package works fine alongside traditional Laravel migration files, for the c
     - [Running Migrations](#running-migrations)
 - [Migration Order](#migration-order)
 - [Publishing Stubs](#publishing-stubs)
-- [Traits](#traits)
-    - [HasHashes](#hashashes)
 
 ## Installation
 
@@ -110,23 +108,3 @@ Update the `stub_path` in `config/laravel-automatic-migrations.php`:
 ```
 
 Now edit the stub files inside `resources/stubs/vendor/laravel-automatic-migrations`. Commands will now use these stub files to make models and factories.
-
-## Traits
-
-### HasHashes
-
-This trait will automatically hash attributes specified via a `$hashes` property in your model. It will only do so if the values are not already hashed, so it does not slow down seeders.
-
-```php
-namespace App\Models;
-
-use Bastinald\LaravelAutomaticMigrations\Traits\HasHashes;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-
-class User extends Authenticatable
-{
-    use HasHashes;
-
-    protected $hashes = ['password'];
-}
-```

resources/stubs/Model.php

@@ -24,8 +24,8 @@ public function migration(Blueprint $table)
     public function definition(Generator $faker)
     {
         return [
-            'name' => $faker->name,
-            'created_at' => $faker->dateTimeThisMonth,
+            'name' => $faker->name(),
+            'created_at' => $faker->dateTimeThisMonth(),
         ];
     }
 }

resources/stubs/UserModel.php

@@ -2,7 +2,6 @@
 
 namespace DummyModelNamespace;
 
-use Bastinald\LaravelAutomaticMigrations\Traits\HasHashes;
 use Faker\Generator;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Schema\Blueprint;
@@ -12,10 +11,9 @@
 
 class DummyModelClass extends Authenticatable
 {
-    use HasFactory, HasHashes, Notifiable;
+    use HasFactory, Notifiable;
 
     protected $guarded = [];
-    protected $hashes = ['password'];
     protected $hidden = ['password', 'remember_token'];
     protected $casts = ['email_verified_at' => 'datetime'];
 
@@ -24,23 +22,22 @@ public function migration(Blueprint $table)
         $table->id();
         $table->string('name');
         $table->string('email')->unique();
+        $table->timestamp('email_verified_at')->nullable();
         $table->string('password');
         $table->rememberToken();
-        $table->string('timezone')->nullable();
-        $table->timestamp('email_verified_at')->nullable();
         $table->timestamp('created_at')->nullable();
         $table->timestamp('updated_at')->nullable();
     }
 
     public function definition(Generator $faker)
     {
         return [
-            'name' => $faker->firstName,
-            'email' => $faker->unique()->safeEmail,
+            'name' => $faker->name(),
+            'email' => $faker->unique()->safeEmail(),
+            'email_verified_at' => now(),
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi',
             'remember_token' => Str::random(10),
-            'timezone' => $faker->timezone,
-            'created_at' => $faker->dateTimeThisMonth,
+            'created_at' => $faker->dateTimeThisMonth(),
         ];
     }
 }

src/Commands/MakeAModelCommand.php

@@ -19,7 +19,7 @@ public function handle()
         $this->filesystem = new Filesystem;
 
         $this->modelParser = new ComponentParser(
-            is_dir(app_path('Models')) ? 'App\\Models' : 'App',
+            'App\\Models',
             config('livewire.view_path'),
             $this->argument('class')
         );
@@ -37,37 +37,36 @@ public function handle()
             return;
         }
 
-        $this->deleteUserMigrations();
+        $this->deleteUserMigration();
         $this->makeStubs();
 
         $this->line('<info>Model created:</info> ' . $this->modelParser->relativeClassPath());
         $this->line('<info>Factory created:</info> ' . $this->factoryPath('relativeClassPath'));
     }
 
-    private function deleteUserMigrations()
+    private function deleteUserMigration()
     {
-        if ($this->modelParser->className() == 'User') {
-            $names = ['create_users_table', 'add_timezone_column_to_users_table'];
+        if ($this->modelParser->className() != 'User') {
+            return;
+        }
 
-            foreach ($this->filesystem->allFiles(database_path('migrations')) as $file) {
-                if (Str::contains($file, $names)) {
-                    $path = 'database/migrations/' . $file->getRelativePathname();
+        $path = 'database/migrations/2014_10_12_000000_create_users_table.php';
+        $file = base_path($path);
 
-                    $this->filesystem->delete($file);
+        if ($this->filesystem->exists($file)) {
+            $this->filesystem->delete($file);
 
-                    $this->line('<info>Migration deleted:</info> ' . $path);
-                }
-            }
+            $this->line('<info>Migration deleted:</info> ' . $path);
         }
     }
 
     private function makeStubs()
     {
+        $prefix = $this->modelParser->className() == 'User' ? 'User' : null;
+
         $stubs = [
-            $this->modelParser->classPath() =>
-                $this->modelParser->className() == 'User' ? 'UserModel.php' : 'Model.php',
-            $this->factoryPath('classPath') =>
-                $this->modelParser->className() == 'User' ? 'UserFactory.php' : 'Factory.php',
+            $this->modelParser->classPath() => $prefix . 'Model.php',
+            $this->factoryPath('classPath') => $prefix . 'Factory.php',
         ];
 
         $replaces = [

src/Commands/MigrateAutoCommand.php

@@ -22,14 +22,14 @@ public function handle()
             return;
         }
 
-        $this->runTraditionalMigrations();
-        $this->runAutomaticMigrations();
+        $this->handleTraditionalMigrations();
+        $this->handleAutomaticMigrations();
         $this->seed();
 
         $this->info('Automatic migration completed successfully.');
     }
 
-    private function runTraditionalMigrations()
+    private function handleTraditionalMigrations()
     {
         $command = 'migrate';
 
@@ -44,9 +44,9 @@ private function runTraditionalMigrations()
         Artisan::call($command, [], $this->getOutput());
     }
 
-    private function runAutomaticMigrations()
+    private function handleAutomaticMigrations()
     {
-        $path = is_dir(app_path('Models')) ? app_path('Models') : app_path();
+        $path = app_path('Models');
         $namespace = app()->getNamespace();
         $models = collect();