Skip to content
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.

Sign up for GitHub

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

fix: model-generation fix 3 errors #1058

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: model-generation fix 3 errors #1058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions views/model/model.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@
namespace {{ $config->namespaces->model }};

use Illuminate\Database\Eloquent\Model;
@if($config->options->softDelete) {{ 'use Illuminate\Database\Eloquent\SoftDeletes;' }}@endif
@if($config->options->tests or $config->options->factory) {{ 'use Illuminate\Database\Eloquent\Factories\HasFactory;' }}@endif

@if(isset($swaggerDocs)){!! $swaggerDocs !!}@endif
@if($config->options->softDelete)
{{ 'use Illuminate\Database\Eloquent\SoftDeletes;' }}
@endif
Comment on lines +8 to +10
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Remove space right before {{ which manifests in an out-of-place space in the generated file.
  2. Expand statement to 3 lines instead of 1 to prevent error of showing 2 statements in 1 line in the generated file.

@if($config->options->tests or $config->options->factory)
{{ 'use Illuminate\Database\Eloquent\Factories\HasFactory;' }}
@endif
Comment on lines +11 to +13
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Remove space right before {{ which manifests in an out-of-place space in the generated file.
  2. Expand statement to 3 lines instead of 1 to prevent error of showing 2 statements in 1 line in the generated file.

@if(isset($swaggerDocs))
{!! $swaggerDocs !!}
Comment on lines +14 to +15
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the presence of a new line between docs start and the last statement above.

@else@nls(2)@endif
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure separation between class declaration and above use statements when there is no swagger docs.

class {{ $config->modelNames->name }} extends Model
{
@if($config->options->softDelete) {{ infy_tab().'use SoftDeletes;' }}@endif
@if($config->options->tests or $config->options->factory){{ infy_tab().'use HasFactory;' }}@endif
public $table = '{{ $config->tableName }}';
@if($config->options->softDelete && ($config->options->tests or $config->options->factory))@tab()use SoftDeletes, HasFactory;@nls(2)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Combine SoftDeletes and HasFactory in a single use statements if there are both set to true in config. and replace incorrect space with a regular tab.

@elseif($config->options->softDelete)@tab()use SoftDeletes;@nls(2)
@elseif($config->options->tests or $config->options->factory)@tab()use HasFactory;@nls(2)@endif
Comment on lines +20 to +21
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace white space with a regular tab when inserting SoftDeletes or HasFactory traits.

@tab()public $table = '{{ $config->tableName }}';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use @tab() instead of editor specific tab.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use @tab() instead of editor specific tab.


@if($customPrimaryKey)@tab()protected $primaryKey = '{{ $customPrimaryKey }}';@nls(2)@endif
@if($config->connection)@tab()protected $connection = '{{ $config->connection }}';@nls(2)@endif
Expand All @@ -32,6 +38,5 @@ class {{ $config->modelNames->name }} extends Model
public static array $rules = [
{!! $rules !!}
];

{!! $relations !!}
}