Skip to content

Commit 9db25cd

Browse files
scottgraysonscottgrayson
authored
Merge pull request #22 from TappNetwork/authenicable
Authenicable and Baseline Updates
2 parents e05fbd8 + 26d9a06 commit 9db25cd

7 files changed

+121
-59
lines changed

‎database/factories/DocumentFactory.php

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ class DocumentFactory extends Factory
99
{
1010
protected $model = Document::class;
1111

12-
/**
13-
* Define the model's default state.
14-
*
15-
* @return array<string, mixed>
16-
*/
1712
public function definition(): array
1813
{
1914
return [

‎database/factories/LinkFactory.php

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ class LinkFactory extends Factory
99
{
1010
protected $model = Link::class;
1111

12-
/**
13-
* Define the model's default state.
14-
*
15-
* @return array<string, mixed>
16-
*/
1712
public function definition(): array
1813
{
1914
return [

‎phpstan-baseline.neon

+112-45
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,253 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: "#^PHPDoc type string of property Tapp\\\\FilamentLms\\\\Database\\\\Factories\\\\LessonFactory\\:\\:\\$model is not covariant with PHPDoc type class\\-string\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\> of overridden property Illuminate\\\\Database\\\\Eloquent\\\\Factories\\\\Factory\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\:\\:\\$model\\.$#"
4+
message: '#^PHPDoc type string of property Tapp\\FilamentLms\\Database\\Factories\\LessonFactory\:\:\$model is not covariant with PHPDoc type class\-string\<Illuminate\\Database\\Eloquent\\Model\> of overridden property Illuminate\\Database\\Eloquent\\Factories\\Factory\<Illuminate\\Database\\Eloquent\\Model\>\:\:\$model\.$#'
5+
identifier: property.phpDocType
56
count: 1
67
path: database/factories/LessonFactory.php
78

89
-
9-
message: "#^PHPDoc type string of property Tapp\\\\FilamentLms\\\\Database\\\\Factories\\\\StepFactory\\:\\:\\$model is not covariant with PHPDoc type class\\-string\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\> of overridden property Illuminate\\\\Database\\\\Eloquent\\\\Factories\\\\Factory\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\:\\:\\$model\\.$#"
10+
message: '#^PHPDoc type string of property Tapp\\FilamentLms\\Database\\Factories\\StepFactory\:\:\$model is not covariant with PHPDoc type class\-string\<Illuminate\\Database\\Eloquent\\Model\> of overridden property Illuminate\\Database\\Eloquent\\Factories\\Factory\<Illuminate\\Database\\Eloquent\\Model\>\:\:\$model\.$#'
11+
identifier: property.phpDocType
1012
count: 1
1113
path: database/factories/StepFactory.php
1214

1315
-
14-
message: "#^PHPDoc type string of property Tapp\\\\FilamentLms\\\\Database\\\\Factories\\\\VideoFactory\\:\\:\\$model is not covariant with PHPDoc type class\\-string\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\> of overridden property Illuminate\\\\Database\\\\Eloquent\\\\Factories\\\\Factory\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\:\\:\\$model\\.$#"
16+
message: '#^PHPDoc type string of property Tapp\\FilamentLms\\Database\\Factories\\VideoFactory\:\:\$model is not covariant with PHPDoc type class\-string\<Illuminate\\Database\\Eloquent\\Model\> of overridden property Illuminate\\Database\\Eloquent\\Factories\\Factory\<Illuminate\\Database\\Eloquent\\Model\>\:\:\$model\.$#'
17+
identifier: property.phpDocType
1518
count: 1
1619
path: database/factories/VideoFactory.php
1720

1821
-
19-
message: "#^Access to an undefined property Illuminate\\\\Foundation\\\\Auth\\\\User\\:\\:\\$name\\.$#"
22+
message: '#^Access to an undefined property Illuminate\\Foundation\\Auth\\User\:\:\$name\.$#'
23+
identifier: property.notFound
2024
count: 1
2125
path: src/Http/Controllers/CertificateController.php
2226

2327
-
24-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$name\\.$#"
28+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Course\:\:\$name\.$#'
29+
identifier: property.notFound
2530
count: 1
2631
path: src/Http/Controllers/CertificateController.php
2732

2833
-
29-
message: "#^Call to an undefined method Illuminate\\\\Foundation\\\\Auth\\\\User\\:\\:hasRole\\(\\)\\.$#"
34+
message: '#^Call to an undefined method Illuminate\\Foundation\\Auth\\User\:\:hasRole\(\)\.$#'
35+
identifier: method.notFound
3036
count: 2
3137
path: src/Http/Controllers/CertificateController.php
3238

3339
-
34-
message: "#^Call to static method find\\(\\) on an unknown class App\\\\Models\\\\User\\.$#"
40+
message: '#^Call to static method find\(\) on an unknown class App\\Models\\User\.$#'
41+
identifier: class.notFound
3542
count: 1
3643
path: src/Http/Controllers/CertificateController.php
3744

3845
-
39-
message: "#^Call to static method url\\(\\) on an unknown class Spatie\\\\Browsershot\\\\Browsershot\\.$#"
46+
message: '#^Call to static method url\(\) on an unknown class Spatie\\Browsershot\\Browsershot\.$#'
47+
identifier: class.notFound
4048
count: 1
4149
path: src/Http/Controllers/CertificateController.php
4250

4351
-
44-
message: "#^Method Tapp\\\\FilamentLms\\\\Http\\\\Controllers\\\\CertificateController\\:\\:download\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\StreamedResponse but returns Illuminate\\\\Http\\\\RedirectResponse\\.$#"
52+
message: '#^Method Tapp\\FilamentLms\\Http\\Controllers\\CertificateController\:\:download\(\) should return Symfony\\Component\\HttpFoundation\\StreamedResponse but returns Illuminate\\Http\\RedirectResponse\.$#'
53+
identifier: return.type
4554
count: 1
4655
path: src/Http/Controllers/CertificateController.php
4756

4857
-
49-
message: "#^Method Tapp\\\\FilamentLms\\\\Lms\\:\\:get\\(\\) should return static\\(Tapp\\\\FilamentLms\\\\Lms\\) but returns Filament\\\\Contracts\\\\Plugin\\|Filament\\\\FilamentManager\\.$#"
58+
message: '#^Method Tapp\\FilamentLms\\Lms\:\:get\(\) should return static\(Tapp\\FilamentLms\\Lms\) but returns Filament\\Contracts\\Plugin\|Filament\\FilamentManager\.$#'
59+
identifier: return.type
5060
count: 1
5161
path: src/Lms.php
5262

5363
-
54-
message: "#^Unsafe usage of new static\\(\\)\\.$#"
64+
message: '#^Unsafe usage of new static\(\)\.$#'
65+
identifier: new.static
5566
count: 1
5667
path: src/Lms.php
5768

5869
-
59-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$slug\\.$#"
70+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Course\:\:\$slug\.$#'
71+
identifier: property.notFound
6072
count: 1
6173
path: src/LmsPanelProvider.php
6274

6375
-
64-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$name\\.$#"
76+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Lesson\:\:\$name\.$#'
77+
identifier: property.notFound
6578
count: 1
6679
path: src/LmsPanelProvider.php
6780

6881
-
69-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$name\\.$#"
82+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Step\:\:\$name\.$#'
83+
identifier: property.notFound
7084
count: 1
7185
path: src/LmsPanelProvider.php
7286

7387
-
74-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$image\\.$#"
88+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$course\.$#'
89+
identifier: property.notFound
7590
count: 1
7691
path: src/Models/Course.php
7792

7893
-
79-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$slug\\.$#"
94+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$id\.$#'
95+
identifier: property.notFound
96+
count: 1
97+
path: src/Models/Course.php
98+
99+
-
100+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$slug\.$#'
101+
identifier: property.notFound
102+
count: 1
103+
path: src/Models/Course.php
104+
105+
-
106+
message: '#^Access to an undefined property Illuminate\\Support\\HigherOrderCollectionProxy\<string, Illuminate\\Database\\Eloquent\\Model, Illuminate\\Database\\Eloquent\\Collection\<int, Illuminate\\Database\\Eloquent\\Model\>\>\:\:\$completed_at\.$#'
107+
identifier: property.notFound
80108
count: 2
81109
path: src/Models/Course.php
82110

83111
-
84-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$slug\\.$#"
112+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Course\:\:\$image\.$#'
113+
identifier: property.notFound
85114
count: 1
86115
path: src/Models/Course.php
87116

88117
-
89-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$slug\\.$#"
118+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Course\:\:\$slug\.$#'
119+
identifier: property.notFound
90120
count: 1
91121
path: src/Models/Course.php
92122

93123
-
94-
message: "#^Access to property \\$id on an unknown class App\\\\Models\\\\User\\.$#"
124+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Step\:\:\$slug\.$#'
125+
identifier: property.notFound
95126
count: 1
96127
path: src/Models/Course.php
97128

98129
-
99-
message: "#^Parameter \\#1 \\$column of method Illuminate\\\\Database\\\\Eloquent\\\\Builder\\<Tapp\\\\FilamentLms\\\\Models\\\\StepUser\\>\\:\\:where\\(\\) expects array\\<int\\|model property of Tapp\\\\FilamentLms\\\\Models\\\\StepUser, mixed\\>\\|\\(Closure\\(Illuminate\\\\Database\\\\Eloquent\\\\Builder\\<Tapp\\\\FilamentLms\\\\Models\\\\StepUser\\>\\)\\: mixed\\)\\|Illuminate\\\\Contracts\\\\Database\\\\Query\\\\Expression\\|model property of Tapp\\\\FilamentLms\\\\Models\\\\StepUser, 'lms_step_user\\.user…' given\\.$#"
100-
count: 2
130+
message: '#^Call to an undefined method Illuminate\\Database\\Eloquent\\Model\:\:steps\(\)\.$#'
131+
identifier: method.notFound
132+
count: 1
101133
path: src/Models/Course.php
102134

103135
-
104-
message: "#^Parameter \\$user of method Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:currentStep\\(\\) has invalid type App\\\\Models\\\\User\\.$#"
136+
message: '#^Method Tapp\\FilamentLms\\Models\\Course\:\:currentStep\(\) should return Tapp\\FilamentLms\\Models\\Step\|null but returns Illuminate\\Database\\Eloquent\\Model\|null\.$#'
137+
identifier: return.type
105138
count: 1
106139
path: src/Models/Course.php
107140

108141
-
109-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$slug\\.$#"
142+
message: '#^Access to an undefined property Illuminate\\Support\\HigherOrderCollectionProxy\<string, Illuminate\\Database\\Eloquent\\Model, Illuminate\\Database\\Eloquent\\Collection\<int, Illuminate\\Database\\Eloquent\\Model\>\>\:\:\$completed_at\.$#'
143+
identifier: property.notFound
110144
count: 1
111145
path: src/Models/Lesson.php
112146

113147
-
114-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$slug\\.$#"
148+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Lesson\:\:\$slug\.$#'
149+
identifier: property.notFound
115150
count: 1
151+
path: src/Models/Lesson.php
152+
153+
-
154+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$completed_at\.$#'
155+
identifier: property.notFound
156+
count: 1
157+
path: src/Models/Step.php
158+
159+
-
160+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$course\.$#'
161+
identifier: property.notFound
162+
count: 7
116163
path: src/Models/Step.php
117164

118165
-
119-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$order\\.$#"
166+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$order\.$#'
167+
identifier: property.notFound
120168
count: 1
121169
path: src/Models/Step.php
122170

123171
-
124-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$slug\\.$#"
172+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$slug\.$#'
173+
identifier: property.notFound
125174
count: 1
126175
path: src/Models/Step.php
127176

128177
-
129-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$order\\.$#"
130-
count: 3
178+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$steps\.$#'
179+
identifier: property.notFound
180+
count: 2
181+
path: src/Models/Step.php
182+
183+
-
184+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Step\:\:\$order\.$#'
185+
identifier: property.notFound
186+
count: 2
131187
path: src/Models/Step.php
132188

133189
-
134-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$slug\\.$#"
190+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Step\:\:\$slug\.$#'
191+
identifier: property.notFound
135192
count: 1
136193
path: src/Models/Step.php
137194

138195
-
139-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\StepUser\\:\\:\\$completed_at\\.$#"
140-
count: 2
196+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\StepUser\:\:\$completed_at\.$#'
197+
identifier: property.notFound
198+
count: 1
141199
path: src/Models/Step.php
142200

143201
-
144-
message: "#^Class Tapp\\\\FilamentLms\\\\Models\\\\User not found\\.$#"
202+
message: '#^Call to an undefined method Illuminate\\Database\\Eloquent\\Model\:\:steps\(\)\.$#'
203+
identifier: method.notFound
145204
count: 1
146-
path: src/Models/StepUser.php
205+
path: src/Models/Step.php
147206

148207
-
149-
message: "#^Parameter \\#1 \\$related of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:belongsTo\\(\\) expects class\\-string\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>, string given\\.$#"
208+
message: '#^Using nullsafe property access "\?\-\>seconds" on left side of \?\? is unnecessary\. Use \-\> instead\.$#'
209+
identifier: nullsafe.neverNull
150210
count: 1
151-
path: src/Models/StepUser.php
211+
path: src/Models/Step.php
152212

153213
-
154-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Video\\:\\:\\$url\\.$#"
214+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Video\:\:\$url\.$#'
215+
identifier: property.notFound
155216
count: 1
156217
path: src/Models/Video.php
157218

158219
-
159-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Course\\:\\:\\$slug\\.$#"
160-
count: 2
220+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$course\.$#'
221+
identifier: property.notFound
222+
count: 1
161223
path: src/Pages/Step.php
162224

163225
-
164-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Lesson\\:\\:\\$slug\\.$#"
226+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$slug\.$#'
227+
identifier: property.notFound
165228
count: 1
166229
path: src/Pages/Step.php
167230

168231
-
169-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$name\\.$#"
232+
message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$steps\.$#'
233+
identifier: property.notFound
170234
count: 1
171235
path: src/Pages/Step.php
172236

173237
-
174-
message: "#^Access to an undefined property Tapp\\\\FilamentLms\\\\Models\\\\Step\\:\\:\\$slug\\.$#"
238+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Course\:\:\$slug\.$#'
239+
identifier: property.notFound
175240
count: 1
176241
path: src/Pages/Step.php
177242

178243
-
179-
message: "#^Parameter \\#1 \\$parameters of static method Filament\\\\Resources\\\\Pages\\\\Page\\:\\:getUrl\\(\\) expects array\\<string, mixed\\>, array\\<int, mixed\\> given\\.$#"
244+
message: '#^Access to an undefined property Tapp\\FilamentLms\\Models\\Step\:\:\$slug\.$#'
245+
identifier: property.notFound
180246
count: 1
181-
path: src/Resources/CourseResource/RelationManagers/LessonsRelationManager.php
247+
path: src/Pages/Step.php
182248

183249
-
184-
message: "#^Parameter \\#1 \\$parameters of static method Filament\\\\Resources\\\\Pages\\\\Page\\:\\:getUrl\\(\\) expects array\\<string, mixed\\>, array\\<int, mixed\\> given\\.$#"
250+
message: '#^Property Tapp\\FilamentLms\\Pages\\Step\:\:\$lesson \(Tapp\\FilamentLms\\Models\\Lesson\) does not accept Illuminate\\Database\\Eloquent\\Model\.$#'
251+
identifier: assign.propertyType
185252
count: 1
186-
path: src/Resources/LessonResource/RelationManagers/StepsRelationManager.php
253+
path: src/Pages/Step.php

‎phpstan.neon.dist

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ includes:
22
- phpstan-baseline.neon
33

44
parameters:
5-
level: 5
5+
level: 4
66
paths:
77
- src
88
- config
99
- database
1010
tmpDir: build/phpstan
1111
checkOctaneCompatibility: true
1212
checkModelProperties: true
13+
ignoreErrors:
14+
- '#Static property .* \(view-string\) does not accept#'

‎src/LmsPanelProvider.php

+2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,13 @@ public function navigationItems(NavigationBuilder $builder): NavigationBuilder
110110
$course = Course::where('slug', Route::current()->parameter('courseSlug'))->firstOrFail();
111111

112112
$navigationGroups = $course->lessons->map(function ($lesson) {
113+
/** @var \Tapp\FilamentLms\Models\Lesson $lesson */
113114
return NavigationGroup::make($lesson->name)
114115
// TODO collapsed is not working
115116
// ->collapsed(fn (): bool => ! $lesson->isActive())
116117
// ->collapsible(true)
117118
->items($lesson->steps->map(function ($step) {
119+
/** @var \Tapp\FilamentLms\Models\Step $step */
118120
return NavigationItem::make($step->name)
119121
->icon(fn (): string => $step->completed_at ? 'heroicon-o-check-circle' : '')
120122
->isActiveWhen(fn (): bool => $step->isActive())

‎src/Models/Course.php

+2-2
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

+2-1
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)