Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

Renamed Filable trait to HasFiles #2

Merged
merged 1 commit into from
May 10, 2021
Merged
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
4 changes: 2 additions & 2 deletions src/Concerns/Fileable.php → src/Concerns/HasFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
*
* @mixin Model
*/
trait Fileable
trait HasFiles
{
public static function bootFileable(): void
public static function bootHasFiles(): void
{
static::deleting(static function (self $model): ?bool {
if (array_key_exists(SoftDeletes::class, class_uses_recursive($model))) {
Expand Down
9 changes: 4 additions & 5 deletions src/Models/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

namespace Astrotomic\Fileable\Models;

use Astrotomic\Fileable\Concerns\Fileable;
use Astrotomic\Fileable\Contracts\File as FileContract;
use Astrotomic\Fileable\Contracts\Fileable as FileableContract;
use Astrotomic\Fileable\Contracts\Fileable;
use Astrotomic\LaravelEloquentUuid\Eloquent\Concerns\UsesUUID;
use Closure;
use Illuminate\Contracts\Filesystem\Filesystem;
Expand Down Expand Up @@ -44,7 +43,7 @@
* @method static Builder|File query()
* @method static Builder|MorphMany|File whereCreatedAt($value)
* @method static Builder|MorphMany|File whereDisk($value)
* @method static Builder|MorphMany|File whereFileable(FileableContract $fileable)
* @method static Builder|MorphMany|File whereFileable(Fileable $fileable)
* @method static Builder|MorphMany|File whereFileableId($value)
* @method static Builder|MorphMany|File whereFileableType($value)
* @method static Builder|MorphMany|File whereFilename($value)
Expand Down Expand Up @@ -106,11 +105,11 @@ public function fileable(): MorphTo

/**
* @param Builder $query
* @param FileableContract|Model $fileable
* @param Fileable|Model $fileable
*
* @return Builder
*/
public function scopeWhereFileable(Builder $query, FileableContract $fileable): Builder
public function scopeWhereFileable(Builder $query, Fileable $fileable): Builder
{
return $query->where(
fn (Builder $q) => $q
Expand Down
8 changes: 4 additions & 4 deletions tests/Models/Post.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Astrotomic\Fileable\Tests\Models;

use Astrotomic\Fileable\Concerns\Fileable;
use Astrotomic\Fileable\Contracts\Fileable as FileableContract;
use Astrotomic\Fileable\Concerns\HasFiles;
use Astrotomic\Fileable\Contracts\Fileable;
use Illuminate\Database\Eloquent\Model;

class Post extends Model implements FileableContract
class Post extends Model implements Fileable
{
use Fileable;
use HasFiles;
}