Skip to content

Commit 7ba43bf

Browse files
Simplify the model requirements (#8)
1 parent a180b12 commit 7ba43bf

6 files changed

Lines changed: 13 additions & 14 deletions

File tree

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,9 @@ namespace App\Models;
8282

8383

8484
use HiFolks\Fusion\Models\FusionBaseModel;
85-
use HiFolks\Fusion\Traits\FusionModelTrait;
8685

8786
class Article extends FusionBaseModel
8887
{
89-
use FusionModelTrait;
90-
9188

9289
public function frontmatterFields(): array
9390
{
@@ -101,7 +98,6 @@ class Article extends FusionBaseModel
10198
```
10299
Consider that:
103100
- the class has to extend the FusionBaseModel with `extends FusionBaseModel`;
104-
- you have to use the trait FusionModelTrait: `use FusionModelTrait;`
105101
- you have to implement the `frontmatterFields()` function for returning the list of the field names used in the frontmatter header.
106102

107103
### Creating automatically the Model

src/Console/Commands/CheckModel.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace HiFolks\Fusion\Console\Commands;
66

77
use HiFolks\Fusion\Models\FusionBaseModel;
8-
use HiFolks\Fusion\Traits\FusionModelTrait;
8+
use HiFolks\Fusion\Traits\SushiModelTrait;
99
use Illuminate\Console\Command;
1010

1111
class CheckModel extends Command
@@ -64,15 +64,15 @@ public function handle(): int
6464
);
6565
}
6666

67-
if (trait_exists(FusionModelTrait::class) && in_array(FusionModelTrait::class, class_uses($model))) {
67+
if (trait_exists(SushiModelTrait::class) && in_array(SushiModelTrait::class, class_uses($model))) {
6868
$this->components->twoColumnDetail(
6969
'<info>' . $model . '</info>',
70-
'<info>Uses correctly the trait ' . FusionModelTrait::class . '</info>',
70+
'<info>Uses correctly the trait ' . SushiModelTrait::class . '</info>',
7171
);
7272
} else {
7373
$this->components->twoColumnDetail(
7474
'<info>' . $model . '</info>',
75-
'<error>Does not use correctly the trait ' . FusionModelTrait::class . '</error>',
75+
'<error>Does not use correctly the trait ' . SushiModelTrait::class . '</error>',
7676
);
7777

7878
}

src/Models/FusionBaseModel.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace HiFolks\Fusion\Models;
66

7+
use HiFolks\Fusion\Traits\SushiModelTrait;
78
use Illuminate\Contracts\Container\BindingResolutionException;
89
use Illuminate\Contracts\Filesystem\FileNotFoundException;
910
use Illuminate\Database\Eloquent\Model;
@@ -24,6 +25,8 @@
2425

2526
abstract class FusionBaseModel extends Model
2627
{
28+
use SushiModelTrait;
29+
2730
public function getResourceFolder(): string
2831
{
2932

src/Models/Page.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
namespace HiFolks\Fusion\Models;
66

7-
use HiFolks\Fusion\Traits\FusionModelTrait;
8-
97
class Page extends FusionBaseModel
108
{
11-
use FusionModelTrait;
12-
139
public function frontmatterFields(): array
1410
{
1511
return [
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Sushi\Sushi;
88

9-
trait FusionModelTrait
9+
trait SushiModelTrait
1010
{
1111
use Sushi;
1212

tests/Commands/CheckModelTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

33
test('Check Model command', function () {
4-
$this->artisan('fusion:check', ['--dir' => __DIR__ . '/../Data/content'])->assertExitCode(0);
4+
$this->artisan(
5+
'fusion:check',
6+
['--dir' => __DIR__ . '/../Data/content'],
7+
)
8+
->assertExitCode(0);
59
});

0 commit comments

Comments
 (0)