fix: model-generation fix 3 errors#1058
Open
Mosaab-Emam wants to merge 1 commit into
Open
Conversation
Mosaab-Emam
commented
Jan 8, 2023
Mosaab-Emam
left a comment
Mosaab-Emam
left a comment
Contributor
Author
There was a problem hiding this comment.
Explaining my changes
Comment on lines
+8
to
+10
| @if($config->options->softDelete) | ||
| {{ 'use Illuminate\Database\Eloquent\SoftDeletes;' }} | ||
| @endif |
Contributor
Author
There was a problem hiding this comment.
- Remove space right before
{{which manifests in an out-of-place space in the generated file. - Expand statement to 3 lines instead of 1 to prevent error of showing 2 statements in 1 line in the generated file.
Comment on lines
+11
to
+13
| @if($config->options->tests or $config->options->factory) | ||
| {{ 'use Illuminate\Database\Eloquent\Factories\HasFactory;' }} | ||
| @endif |
Contributor
Author
There was a problem hiding this comment.
- Remove space right before
{{which manifests in an out-of-place space in the generated file. - Expand statement to 3 lines instead of 1 to prevent error of showing 2 statements in 1 line in the generated file.
Comment on lines
+14
to
+15
| @if(isset($swaggerDocs)) | ||
| {!! $swaggerDocs !!} |
Contributor
Author
There was a problem hiding this comment.
Ensure the presence of a new line between docs start and the last statement above.
| @endif | ||
| @if(isset($swaggerDocs)) | ||
| {!! $swaggerDocs !!} | ||
| @else@nls(2)@endif |
Contributor
Author
There was a problem hiding this comment.
Ensure separation between class declaration and above use statements when there is no swagger docs.
| @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) |
Contributor
Author
There was a problem hiding this comment.
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.
Comment on lines
+20
to
+21
| @elseif($config->options->softDelete)@tab()use SoftDeletes;@nls(2) | ||
| @elseif($config->options->tests or $config->options->factory)@tab()use HasFactory;@nls(2)@endif |
Contributor
Author
There was a problem hiding this comment.
Replace white space with a regular tab when inserting SoftDeletes or HasFactory traits.
| @if($config->options->softDelete && ($config->options->tests or $config->options->factory))@tab()use SoftDeletes, HasFactory;@nls(2) | ||
| @elseif($config->options->softDelete)@tab()use SoftDeletes;@nls(2) | ||
| @elseif($config->options->tests or $config->options->factory)@tab()use HasFactory;@nls(2)@endif | ||
| @tab()public $table = '{{ $config->tableName }}'; |
Contributor
Author
There was a problem hiding this comment.
Use @tab() instead of editor specific tab.
| @if($config->options->softDelete && ($config->options->tests or $config->options->factory))@tab()use SoftDeletes, HasFactory;@nls(2) | ||
| @elseif($config->options->softDelete)@tab()use SoftDeletes;@nls(2) | ||
| @elseif($config->options->tests or $config->options->factory)@tab()use HasFactory;@nls(2)@endif | ||
| @tab()public $table = '{{ $config->tableName }}'; |
Contributor
Author
There was a problem hiding this comment.
Use @tab() instead of editor specific tab.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1055