Skip to content

Commit 572c540

Browse files
authored
Remove legacy factories (#30)
1 parent 569d0dd commit 572c540

23 files changed

+395
-290
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"illuminate/support": "^9.0|^10.0"
4646
},
4747
"require-dev": {
48-
"laravel/legacy-factories": "^1.3",
4948
"mockery/mockery": "^1.0",
5049
"orchestra/testbench": "^7.0|^8.0",
5150
"phpunit/phpunit": "^9.6"
@@ -58,7 +57,8 @@
5857
},
5958
"autoload-dev": {
6059
"psr-4": {
61-
"Cog\\Tests\\Laravel\\Ownership\\": "tests/"
60+
"Cog\\Tests\\Laravel\\Ownership\\": "tests/",
61+
"Cog\\Tests\\Laravel\\Ownership\\Database\\Factories\\": "tests/database/factories/"
6262
}
6363
},
6464
"scripts": {

tests/Stubs/Models/Character.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
namespace Cog\Tests\Laravel\Ownership\Stubs\Models;
1313

1414
use Cog\Contracts\Ownership\CanBeOwner as CanBeOwnerContract;
15+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1516
use Illuminate\Database\Eloquent\Model;
1617

17-
/**
18-
* Class Character.
19-
*
20-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
21-
*/
2218
class Character extends Model implements CanBeOwnerContract
2319
{
20+
use HasFactory;
21+
2422
/**
2523
* The table associated with the model.
2624
*

tests/Stubs/Models/EntityWithCustomizedOwner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718
use Illuminate\Support\Facades\Auth;
1819

19-
/**
20-
* Class EntityWithCustomizedOwner.
21-
*
22-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
23-
*/
2420
class EntityWithCustomizedOwner extends Model implements OwnableContract
2521
{
22+
use HasFactory;
2623
use HasOwner;
2724

2825
/**

tests/Stubs/Models/EntityWithDefaultCustomizedOwner.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718

18-
/**
19-
* Class EntityWithDefaultCustomizedOwner.
20-
*
21-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
22-
*/
2319
class EntityWithDefaultCustomizedOwner extends Model implements OwnableContract
2420
{
21+
use HasFactory;
2522
use HasOwner;
2623

2724
protected $withDefaultOwnerOnCreate = true;
@@ -70,7 +67,7 @@ class EntityWithDefaultCustomizedOwner extends Model implements OwnableContract
7067
*/
7168
public function resolveDefaultOwner()
7269
{
73-
return factory(Group::class)->create([
70+
return Group::factory()->create([
7471
'name' => 'default-group-owner',
7572
]);
7673
}

tests/Stubs/Models/EntityWithDefaultMorphOwner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasMorphOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718

18-
/**
19-
* Class EntityWithDefaultMorphOwner.
20-
*
21-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
22-
*/
2319
class EntityWithDefaultMorphOwner extends Model implements OwnableContract
2420
{
21+
use HasFactory;
2522
use HasMorphOwner;
2623

2724
protected $withDefaultOwnerOnCreate = true;

tests/Stubs/Models/EntityWithDefaultOwner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718

18-
/**
19-
* Class EntityWithDefaultOwner.
20-
*
21-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
22-
*/
2319
class EntityWithDefaultOwner extends Model implements OwnableContract
2420
{
21+
use HasFactory;
2522
use HasOwner;
2623

2724
protected $withDefaultOwnerOnCreate = true;

tests/Stubs/Models/EntityWithMorphOwner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasMorphOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718

18-
/**
19-
* Class EntityWithMorphOwner.
20-
*
21-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
22-
*/
2319
class EntityWithMorphOwner extends Model implements OwnableContract
2420
{
21+
use HasFactory;
2522
use HasMorphOwner;
2623

2724
/**

tests/Stubs/Models/EntityWithOwner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use Cog\Contracts\Ownership\Ownable as OwnableContract;
1515
use Cog\Laravel\Ownership\Traits\HasOwner;
16+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1617
use Illuminate\Database\Eloquent\Model;
1718

18-
/**
19-
* Class EntityWithOwner.
20-
*
21-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
22-
*/
2319
class EntityWithOwner extends Model implements OwnableContract
2420
{
21+
use HasFactory;
2522
use HasOwner;
2623

2724
/**

tests/Stubs/Models/Group.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
namespace Cog\Tests\Laravel\Ownership\Stubs\Models;
1313

1414
use Cog\Contracts\Ownership\CanBeOwner as CanBeOwnerContract;
15+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1516
use Illuminate\Database\Eloquent\Model;
1617

17-
/**
18-
* Class Group.
19-
*
20-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
21-
*/
2218
class Group extends Model implements CanBeOwnerContract
2319
{
20+
use HasFactory;
21+
2422
/**
2523
* The primary key for the model.
2624
*

tests/Stubs/Models/User.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
namespace Cog\Tests\Laravel\Ownership\Stubs\Models;
1313

1414
use Cog\Contracts\Ownership\CanBeOwner as CanBeOwnerContract;
15+
use Illuminate\Database\Eloquent\Factories\HasFactory;
1516
use Illuminate\Foundation\Auth\User as Authenticatable;
1617

17-
/**
18-
* Class User.
19-
*
20-
* @package Cog\Tests\Laravel\Ownership\Stubs\Models
21-
*/
2218
class User extends Authenticatable implements CanBeOwnerContract
2319
{
20+
use HasFactory;
21+
2422
/**
2523
* The table associated with the model.
2624
*

tests/TestCase.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Cog\Laravel\Ownership\Providers\OwnershipServiceProvider;
1515
use Cog\Tests\Laravel\Ownership\Stubs\Models\Character;
1616
use Cog\Tests\Laravel\Ownership\Stubs\Models\User;
17+
use Illuminate\Database\Eloquent\Factories\Factory;
1718
use Illuminate\Database\Eloquent\Relations\Relation;
1819
use Illuminate\Foundation\Application;
1920
use Orchestra\Testbench\TestCase as Orchestra;
@@ -79,7 +80,9 @@ protected function migrateUnitTestTables(): void
7980
*/
8081
private function registerPackageFactories(): void
8182
{
82-
$this->withFactories(__DIR__ . '/database/factories');
83+
Factory::guessFactoryNamesUsing(function (string $modelName) {
84+
return 'Cog\\Tests\\Laravel\\Ownership\\Database\\Factories\\' . class_basename($modelName) . 'Factory';
85+
});
8386
}
8487

8588
/**

0 commit comments

Comments
 (0)