Remove legacy factories (#79)

cybercog · Feb 25, 2023 · e40a5d6 · e40a5d6
1 parent 2720f08
commit e40a5d6
Show file tree

Hide file tree

Showing 136 changed files with 1,260 additions and 951 deletions.
diff --git a/composer.json b/composer.json
@@ -54,8 +54,7 @@
     },
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0|^10.0",
-        "laravel/legacy-factories": "^1.3"
+        "illuminate/database": "^9.0|^10.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
@@ -69,7 +68,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Cog\\Tests\\Flag\\": "tests/"
+            "Cog\\Tests\\Laravel\\Flag\\": "tests/",
+            "Cog\\Tests\\Laravel\\Flag\\Database\\Factories\\": "tests/database/factories/"
         }
     },
     "scripts": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,6 @@
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix=".php">tests/</directory>
-            <exclude>tests/database/factories/</exclude>
         </testsuite>
     </testsuites>
     <php>

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedAt.php b/tests/Stubs/Models/Classic/EntityWithAcceptedAt.php
@@ -11,14 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedAt;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithAcceptedAt extends Model
 {
     use HasAcceptedAt;
+    use HasFactory;
 
     /**
      * The table associated with the model.

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedAtApplied.php b/tests/Stubs/Models/Classic/EntityWithAcceptedAtApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedAtUnapplied.php b/tests/Stubs/Models/Classic/EntityWithAcceptedAtUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedFlag.php b/tests/Stubs/Models/Classic/EntityWithAcceptedFlag.php
@@ -11,14 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithAcceptedFlag extends Model
 {
     use HasAcceptedFlag;
+    use HasFactory;
 
     /**
      * The table associated with the model.

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithAcceptedFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithAcceptedFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithAcceptedFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasAcceptedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithActiveFlag.php b/tests/Stubs/Models/Classic/EntityWithActiveFlag.php
@@ -11,14 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasActiveFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithActiveFlag extends Model
 {
     use HasActiveFlag;
+    use HasFactory;
 
     /**
      * The table associated with the model.

diff --git a/tests/Stubs/Models/Classic/EntityWithActiveFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithActiveFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasActiveFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithActiveFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithActiveFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasActiveFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedAt.php b/tests/Stubs/Models/Classic/EntityWithApprovedAt.php
@@ -11,14 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedAt;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithApprovedAt extends Model
 {
     use HasApprovedAt;
+    use HasFactory;
 
     /**
      * The table associated with the model.

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedAtApplied.php b/tests/Stubs/Models/Classic/EntityWithApprovedAtApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedAtUnapplied.php b/tests/Stubs/Models/Classic/EntityWithApprovedAtUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedFlag.php b/tests/Stubs/Models/Classic/EntityWithApprovedFlag.php
@@ -11,14 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithApprovedFlag extends Model
 {
     use HasApprovedFlag;
+    use HasFactory;
 
     /**
      * The table associated with the model.

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithApprovedFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithApprovedFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithApprovedFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasApprovedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedAt.php b/tests/Stubs/Models/Classic/EntityWithInvitedAt.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedAt;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithInvitedAt extends Model
 {
+    use HasFactory;
     use HasInvitedAt;
 
     /**

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedAtApplied.php b/tests/Stubs/Models/Classic/EntityWithInvitedAtApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedAtUnapplied.php b/tests/Stubs/Models/Classic/EntityWithInvitedAtUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedFlag.php b/tests/Stubs/Models/Classic/EntityWithInvitedFlag.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithInvitedFlag extends Model
 {
+    use HasFactory;
     use HasInvitedFlag;
 
     /**

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithInvitedFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithInvitedFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithInvitedFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasInvitedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithKeptFlag.php b/tests/Stubs/Models/Classic/EntityWithKeptFlag.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasKeptFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithKeptFlag extends Model
 {
+    use HasFactory;
     use HasKeptFlag;
 
     /**

diff --git a/tests/Stubs/Models/Classic/EntityWithKeptFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithKeptFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasKeptFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithKeptFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithKeptFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasKeptFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedAt.php b/tests/Stubs/Models/Classic/EntityWithPublishedAt.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedAt;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithPublishedAt extends Model
 {
+    use HasFactory;
     use HasPublishedAt;
 
     /**

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedAtApplied.php b/tests/Stubs/Models/Classic/EntityWithPublishedAtApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedAtUnapplied.php b/tests/Stubs/Models/Classic/EntityWithPublishedAtUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedAt;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedFlag.php b/tests/Stubs/Models/Classic/EntityWithPublishedFlag.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedFlag;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithPublishedFlag extends Model
 {
+    use HasFactory;
     use HasPublishedFlag;
 
     /**

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedFlagApplied.php b/tests/Stubs/Models/Classic/EntityWithPublishedFlagApplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithPublishedFlagUnapplied.php b/tests/Stubs/Models/Classic/EntityWithPublishedFlagUnapplied.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasPublishedFlag;
 use Illuminate\Database\Eloquent\Model;

diff --git a/tests/Stubs/Models/Classic/EntityWithVerifiedAt.php b/tests/Stubs/Models/Classic/EntityWithVerifiedAt.php
@@ -11,13 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Cog\Tests\Flag\Stubs\Models\Classic;
+namespace Cog\Tests\Laravel\Flag\Stubs\Models\Classic;
 
 use Cog\Flag\Traits\Classic\HasVerifiedAt;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 final class EntityWithVerifiedAt extends Model
 {
+    use HasFactory;
     use HasVerifiedAt;
 
     /**