Replace laravel/legacy-factories with updated factory syntax

Author: andrew-miller-rakuten

composer.json

@@ -15,8 +15,7 @@
     "require-dev": {
         "squizlabs/php_codesniffer": "^2.8",
         "wamania/php-stemmer": "^3.0",
-        "orchestra/testbench": "^6.23|^7.0",
-        "laravel/legacy-factories": "^1.1"
+        "orchestra/testbench": "^6.23|^7.0"
     },
     "autoload": {
         "files": [

tests/Factories/CommentFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Baril\Sqlout\Tests\Factories;
+
+use Baril\Sqlout\Tests\Models\Comment;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class CommentFactory extends Factory
+{
+    protected $model = Comment::class;
+
+    public function definition(): array
+    {
+        return [
+            'author' => $this->faker->name(),
+            'text' => $this->faker->text(50),
+        ];
+    }
+}

tests/Factories/PostFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Baril\Sqlout\Tests\Factories;
+
+use Baril\Sqlout\Tests\Models\Post;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class PostFactory extends Factory
+{
+    protected $model = Post::class;
+
+    public function definition(): array
+    {
+        return [
+            'title' => $this->faker->sentence(3),
+            'body' => $this->faker->text(50),
+        ];
+    }
+}

tests/Models/Comment.php

@@ -2,12 +2,14 @@
 
 namespace Baril\Sqlout\Tests\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Baril\Sqlout\Searchable;
+use Baril\Sqlout\Tests\Factories\CommentFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class Comment extends Model
 {
-    use Searchable;
+    use HasFactory, Searchable;
 
     public function post()
     {
@@ -26,4 +28,9 @@ public function scopeAuthor($query, $author)
     {
         $query->where('author', $author);
     }
+
+    protected static function newFactory()
+    {
+        return CommentFactory::new();
+    }
 }

tests/Models/Post.php

@@ -2,13 +2,15 @@
 
 namespace Baril\Sqlout\Tests\Models;
 
+use Baril\Sqlout\Searchable;
+use Baril\Sqlout\Tests\Factories\PostFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Baril\Sqlout\Searchable;
 
 class Post extends Model
 {
-    use SoftDeletes, Searchable;
+    use HasFactory, SoftDeletes, Searchable;
 
     protected $weights = [
         'title' => 4,
@@ -21,4 +23,9 @@ public function toSearchableArray()
             'body' => $this->body,
         ];
     }
+
+    protected static function newFactory()
+    {
+        return PostFactory::new();
+    }
 }

tests/SearchTest.php

@@ -16,8 +16,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        factory(Post::class, 5)->create();
-        factory(Comment::class, 5)->create();
+        Post::factory()->count(5)->create();
+        Comment::factory()->count(5)->create();
     }
 
     protected function newSearchQuery()

tests/TestCase.php

@@ -45,7 +45,6 @@ protected function setUp() : void
     {
         parent::setUp();
         $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
-        $this->withFactories(__DIR__ . '/database/factories');
         \DB::enableQueryLog();
     }