fix test fixtures

Soyhuce · Jul 15, 2020 · 44f15b1 · 44f15b1
1 parent 436b816
commit 44f15b1
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 59 deletions.
diff --git a/tests/Feature/FactoriesCommandTest.php b/tests/Feature/FactoriesCommandTest.php
@@ -2,12 +2,12 @@
 
 namespace Soyhuce\NextIdeHelper\Tests\Feature;
 
+use Soyhuce\NextIdeHelper\Tests\ResetsFixtures;
 use Soyhuce\NextIdeHelper\Tests\TestCase;
-use Soyhuce\NextIdeHelper\Tests\UsesFixtures;
 
 class FactoriesCommandTest extends TestCase
 {
-    use UsesFixtures;
+    use ResetsFixtures;
 
     /**
      * @test

diff --git a/tests/Fixtures/Blog/Post.php b/tests/Fixtures/Blog/Post.php
@@ -7,20 +7,6 @@
 use Illuminate\Support\Str;
 use Soyhuce\NextIdeHelper\Tests\Fixtures\User;
 
-/**
- * @property int $id
- * @property string $title
- * @property string|null $subtitle
- * @property string $content
- * @property int $user_id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read string $slug
- * @property-read \Soyhuce\NextIdeHelper\Tests\Fixtures\User $user
- * @method static \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection all(array|mixed $columns = ['*'])
- * @method static \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery query()
- * @mixin \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery
- */
 class Post extends Model
 {
     public function newEloquentBuilder($query)

diff --git a/tests/Fixtures/Blog/PostQuery.php b/tests/Fixtures/Blog/PostQuery.php
@@ -4,32 +4,6 @@
 
 use Illuminate\Database\Eloquent\Builder;
 
-/**
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereId(int|string $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereTitle(string $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereSubtitle(string|null $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereContent(string $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereUserId(int|string $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereCreatedAt(\Illuminate\Support\Carbon|string|null $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostQuery whereUpdatedAt(\Illuminate\Support\Carbon|string|null $value)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post create(array $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection|\Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post|null find($id, array $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection findMany($id, array $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection|\Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post findOrFail($id, array $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post findOrNew($id, array $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post|null first(array|string $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post firstOrCreate(array $attributes, array $values = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post firstOrFail(array $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post firstOrNew(array $attributes = [], array $values = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post forceCreate(array $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection get(array|string $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post getModel()
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection getModels(array|string $columns = ['*'])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post newModelInstance(array $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post updateOrCreate(array $attributes, array $values = [])
- * @template TModelClass
- * @extends \Illuminate\Database\Eloquent\Builder<\Test\Fixtures\Blog\Post>
- */
 class PostQuery extends Builder
 {
 }
diff --git a/tests/Fixtures/Factories/PostFactory.php b/tests/Fixtures/Factories/PostFactory.php
@@ -5,14 +5,6 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post;
 
-/**
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post createOne($attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post|\Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection create($attributes = [], \Illuminate\Database\Eloquent\Model|null $parent = null)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post makeOne($attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post|\Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\PostCollection make($attributes = [], \Illuminate\Database\Eloquent\Model|null $parent = null)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Blog\Post newModel(array $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Factories\PostFactory forUser($attributes = [])
- */
 class PostFactory extends Factory
 {
     /**

diff --git a/tests/Fixtures/Factories/UserFactory.php b/tests/Fixtures/Factories/UserFactory.php
@@ -7,15 +7,6 @@
 use Soyhuce\NextIdeHelper\Tests\Fixtures\Address;
 use Soyhuce\NextIdeHelper\Tests\Fixtures\User;
 
-/**
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\User createOne($attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\User|\Illuminate\Database\Eloquent\Collection create($attributes = [], \Illuminate\Database\Eloquent\Model|null $parent = null)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\User makeOne($attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\User|\Illuminate\Database\Eloquent\Collection make($attributes = [], \Illuminate\Database\Eloquent\Model|null $parent = null)
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\User newModel(array $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Factories\UserFactory hasLaravelPosts($count = 1, $attributes = [])
- * @method \Soyhuce\NextIdeHelper\Tests\Fixtures\Factories\UserFactory hasPosts($count = 1, $attributes = [])
- */
 class UserFactory extends Factory
 {
     /**