Skip to content

Commit e630d2c

Browse files
committed
Merge branch 'current-step-fixes' into authenicable
2 parents e05fbd8 + 19225e8 commit e630d2c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Models/Course.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace Tapp\FilamentLms\Models;
44

5-
use App\Models\User;
65
use Illuminate\Database\Eloquent\Builder;
76
use Illuminate\Database\Eloquent\Factories\HasFactory;
87
use Illuminate\Database\Eloquent\Model;
98
use Illuminate\Database\Eloquent\Relations\HasMany;
109
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
10+
use Illuminate\Foundation\Auth\User as Authenticatable;
1111
use Tapp\FilamentLms\Database\Factories\CourseFactory;
1212
use Tapp\FilamentLms\Pages\CourseCompleted;
1313
use Tapp\FilamentLms\Pages\Step as StepPage;
@@ -57,7 +57,7 @@ public function linkToCurrentStep(): string
5757
return $step ? StepPage::getUrl([$step->lesson->course->slug, $step->lesson->slug, $step->slug]) : '';
5858
}
5959

60-
public function currentStep(?User $user = null): ?Step
60+
public function currentStep(?Authenticatable $user = null): ?Step
6161
{
6262
$user = $user ?: auth()->user();
6363

src/Models/StepUser.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Database\Eloquent\Factories\HasFactory;
66
use Illuminate\Database\Eloquent\Relations\BelongsTo;
77
use Illuminate\Database\Eloquent\Relations\Pivot;
8+
use Illuminate\Foundation\Auth\User as Authenticatable;
89

910
class StepUser extends Pivot
1011
{
@@ -31,6 +32,6 @@ public function step(): BelongsTo
3132

3233
public function user(): BelongsTo
3334
{
34-
return $this->belongsTo(User::class);
35+
return $this->belongsTo(config('auth.providers.users.model', Authenticatable::class));
3536
}
3637
}

0 commit comments

Comments
 (0)