Merge pull request #17 from FrittenKeeZ/migrations-cleanup

Migrations cleanup

README.md

@@ -39,6 +39,10 @@ Publish config using Artisan command:
 ```bash
 php artisan vendor:publish --tag=config --provider="FrittenKeeZ\Vouchers\VouchersServiceProvider"
 ```
+Publish migrations using Artisan command:
+```bash
+php artisan vendor:publish --tag=migrations --provider="FrittenKeeZ\Vouchers\VouchersServiceProvider"
+```
 Don't forget to run migrations:
 ```bash
 php artisan migrate

composer.json

@@ -46,7 +46,7 @@
         ],
         "psr-4": {
             "FrittenKeeZ\\Vouchers\\Tests\\": "tests",
-            "FrittenKeeZ\\Vouchers\\Tests\\Database\\Factories\\": "tests/database/factories"
+            "Database\\Factories\\FrittenKeeZ\\Vouchers\\Tests\\Models\\": "tests/database/factories"
         }
     },
     "scripts": {

migrations/2018_06_12_000000_create_voucher_tables.php → publishes/migrations/2018_06_12_000000_create_voucher_tables.php

@@ -7,7 +7,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateVoucherTables extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
@@ -68,4 +68,4 @@ public function down(): void
         Schema::dropIfExists(Config::table('redeemers'));
         Schema::dropIfExists(Config::table('vouchers'));
     }
-}
+};

src/VouchersServiceProvider.php

@@ -4,7 +4,6 @@
 
 namespace FrittenKeeZ\Vouchers;
 
-use FrittenKeeZ\Vouchers\Console\Commands\MigrateCommand;
 use Illuminate\Support\ServiceProvider;
 
 class VouchersServiceProvider extends ServiceProvider
@@ -22,13 +21,10 @@ class VouchersServiceProvider extends ServiceProvider
     public function boot(): void
     {
         $this->publishes([$this->getPublishConfigPath() => config_path('vouchers.php')], 'config');
-        $this->publishes([$this->getPublishMigrationsPath() => database_path('migrations')], 'migrations');
 
-        $this->loadMigrationsFrom(__DIR__ . '/../migrations');
-
-        if ($this->app->runningInConsole()) {
-            $this->commands([MigrateCommand::class]);
-        }
+        with(method_exists($this, 'publishesMigrations') ? 'publishesMigrations' : 'publishes', function ($method) {
+            $this->{$method}([$this->getPublishMigrationsPath() => database_path('migrations')], 'migrations');
+        });
     }
 
     /**
@@ -38,9 +34,7 @@ public function register(): void
     {
         $this->mergeConfigFrom($this->getPublishConfigPath(), 'vouchers');
 
-        $this->app->bind('vouchers', function () {
-            return new Vouchers();
-        });
+        $this->app->bind('vouchers', fn () => new Vouchers());
     }
 
     /**

tests/ConfigTest.php

@@ -146,11 +146,7 @@ public function testDynamicallyOverriddenOptions(): void
         $this->assertSame($options['separator'], $config->getSeparator());
 
         // Test 'without' calls.
-        $config
-            ->withoutPrefix()
-            ->withoutSuffix()
-            ->withoutSeparator()
-        ;
+        $config->withoutPrefix()->withoutSuffix()->withoutSeparator();
         $this->assertSame('', $config->getPrefix());
         $this->assertSame('', $config->getSuffix());
         $this->assertSame('', $config->getSeparator());
@@ -212,11 +208,11 @@ public function testAdditionalOptions(): void
         );
 
         // Test owner.
-        $owner = $this->factory(User::class)->make();
+        $owner = User::factory()->make();
         $this->assertSame($owner, $config->withOwner($owner)->getOwner());
 
         // Test entities.
-        $entities = $this->factory(Color::class, 3)->make()->all();
+        $entities = Color::factory()->count(3)->make()->all();
         $this->assertSame($entities, $config->withEntities(...$entities)->getEntities());
     }
 

tests/HasVouchersTest.php

@@ -18,7 +18,7 @@ class HasVouchersTest extends TestCase
      */
     public function testCreateVoucher(): void
     {
-        $user = $this->factory(User::class)->create();
+        $user = User::factory()->create();
         $voucher = $user->createVoucher();
 
         // Check user voucher relation.
@@ -31,8 +31,8 @@ public function testCreateVoucher(): void
      */
     public function testCreateVoucherWithCallback(): void
     {
-        $user = $this->factory(User::class)->create();
-        $color = $this->factory(Color::class)->create();
+        $user = User::factory()->create();
+        $color = Color::factory()->create();
         $voucher = $user->createVoucher(function (Vouchers $vouchers) use ($color) {
             $vouchers->withEntities($color);
         });
@@ -48,8 +48,8 @@ public function testCreateVoucherWithCallback(): void
      */
     public function testCreateVoucherWithAssociated(): void
     {
-        $user = $this->factory(User::class)->create();
-        $other = $this->factory(User::class)->create();
+        $user = User::factory()->create();
+        $other = User::factory()->create();
         $voucher = $user->createVoucher(function (Vouchers $vouchers) use ($other) {
             $vouchers->withEntities($other);
         });
@@ -68,7 +68,7 @@ public function testCreateVoucherWithAssociated(): void
      */
     public function testCreateVouchers(): void
     {
-        $user = $this->factory(User::class)->create();
+        $user = User::factory()->create();
         $vouchers = $user->createVouchers(3);
 
         foreach ($vouchers as $index => $voucher) {
@@ -83,8 +83,8 @@ public function testCreateVouchers(): void
      */
     public function testCreateVouchersWithCallback(): void
     {
-        $user = $this->factory(User::class)->create();
-        $color = $this->factory(Color::class)->create();
+        $user = User::factory()->create();
+        $color = Color::factory()->create();
         $vouchers = $user->createVouchers(3, function (Vouchers $vouchers) use ($color) {
             $vouchers->withEntities($color);
         });