Skip to content

Add typing to HasFactory the Laravel way #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Generators/ModelGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ protected function addTraits(Model $model, $stub): string

sort($traits);

return Str::replaceFirst('use HasFactory', 'use ' . implode(', ', $traits), $stub);
return Str::replaceFirst('use HasFactory;', 'use ' . implode(', ', $traits) . ';', $stub);
}

protected function dateColumns(array $columns)
Expand Down
1 change: 1 addition & 0 deletions stubs/model.class.stub
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ namespace {{ namespace }};

class {{ class }} extends Model
{
/** @use HasFactory<\Database\Factories\{{ class }}Factory> */
use HasFactory;
}
1 change: 1 addition & 0 deletions tests/fixtures/models/alias-relationships.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

class Salesman extends Model
{
/** @use HasFactory<\Database\Factories\SalesmanFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/all-column-types.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class AllType extends Model
{
/** @use HasFactory<\Database\Factories\AllTypeFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/belongs-to-many-alias-customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Customer extends Model
{
/** @use HasFactory<\Database\Factories\CustomerFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/belongs-to-many-alias-pet.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Pet extends Model
{
/** @use HasFactory<\Database\Factories\PetFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/certificate-pascal-case-example.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Certificate extends Model
{
/** @use HasFactory<\Database\Factories\CertificateFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class CertificateType extends Model
{
/** @use HasFactory<\Database\Factories\CertificateTypeFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/comment-global-namespace.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/custom-models-namespace.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Tag extends Model
{
/** @use HasFactory<\Database\Factories\TagFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/custom-pivot-membership.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Membership extends Pivot
{
/** @use HasFactory<\Database\Factories\MembershipFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/custom-pivot-team.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Team extends Model
{
/** @use HasFactory<\Database\Factories\TeamFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/custom-pivot-user.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/disable-auto-columns-phpdoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/
class State extends Model
{
/** @use HasFactory<\Database\Factories\StateFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/disable-auto-columns.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class State extends Model
{
/** @use HasFactory<\Database\Factories\StateFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/foreign-key-shorthand-phpdoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/image-polymorphic-relationship.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Image extends Model
{
/** @use HasFactory<\Database\Factories\ImageFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/infer-belongsto.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Conference extends Model
{
/** @use HasFactory<\Database\Factories\ConferenceFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-configured.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-guarded.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

class Flag extends Model
{
/** @use HasFactory<\Database\Factories\FlagFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

class Recurrency extends Model
{
/** @use HasFactory<\Database\Factories\RecurrencyFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-relationships.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

class Subscription extends Model
{
/** @use HasFactory<\Database\Factories\SubscriptionFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-with-meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class Post extends Pivot
{
/** @use HasFactory<\Database\Factories\PostFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-with-ulid-trait.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory, HasUlids;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/model-with-uuid-trait.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory, HasUuids;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/nested-components.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/nested-models.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class ScreeningQuestion extends Model
{
/** @use HasFactory<\Database\Factories\ScreeningQuestionFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Post extends Model
{
/** @use HasFactory<\Database\Factories\PostFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/post-polymorphic-relationship.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Post extends Model
{
/** @use HasFactory<\Database\Factories\PostFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/readme-example-phpdoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
class Post extends Model
{
/** @use HasFactory<\Database\Factories\PostFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/readme-example.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Post extends Model
{
/** @use HasFactory<\Database\Factories\PostFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/relationships-phpdoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/relationships.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/resource-statements.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/soft-deletes-phpdoc.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/soft-deletes.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

class Comment extends Model
{
/** @use HasFactory<\Database\Factories\CommentFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/tag-custom-models-namespace.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Tag extends Model
{
/** @use HasFactory<\Database\Factories\TagFactory> */
use HasFactory, SoftDeletes;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Tag extends Model
{
/** @use HasFactory<\Database\Factories\TagFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/unconventional.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Team extends Model
{
/** @use HasFactory<\Database\Factories\TeamFactory> */
use HasFactory;

/**
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/models/user-polymorphic-relationship.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class User extends Model
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

class AgeCohort extends Model
{
/** @use HasFactory<\Database\Factories\AgeCohortFactory> */
use HasFactory;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class Video extends Model
{
/** @use HasFactory<\Database\Factories\VideoFactory> */
use HasFactory;

/**
Expand Down