Skip to content

Commit caae912

Browse files
committed
🚨 first is actually nullable
1 parent 42e5ed0 commit caae912

File tree

3 files changed

+48
-5
lines changed

3 files changed

+48
-5
lines changed

‎tests/Functional/AuditingTest.php

+21-1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ public function itWillAuditTheRetrievedEvent()
124124

125125
$audit = Audit::first();
126126

127+
$this->assertNotNull($audit);
128+
127129
$this->assertEmpty($audit->old_values);
128130

129131
$this->assertEmpty($audit->new_values);
@@ -147,6 +149,8 @@ public function itWillAuditTheCreatedEvent()
147149

148150
$audit = Audit::first();
149151

152+
$this->assertNotNull($audit);
153+
150154
$this->assertEmpty($audit->old_values);
151155

152156
Assert::assertArraySubset([
@@ -184,6 +188,8 @@ public function itWillAuditTheUpdatedEvent()
184188

185189
$audit = Audit::first();
186190

191+
$this->assertNotNull($audit);
192+
187193
Assert::assertArraySubset([
188194
'content' => 'N/A',
189195
'published_at' => null,
@@ -217,6 +223,8 @@ public function itWillAuditTheDeletedEvent()
217223

218224
$audit = Audit::first();
219225

226+
$this->assertNotNull($audit);
227+
220228
Assert::assertArraySubset([
221229
'title' => 'How To Audit Eloquent Models',
222230
'content' => 'N/A',
@@ -249,6 +257,8 @@ public function itWillAuditTheRestoredEvent()
249257

250258
$audit = Audit::first();
251259

260+
$this->assertNotNull($audit);
261+
252262
$this->assertEmpty($audit->old_values);
253263

254264
Assert::assertArraySubset([
@@ -349,6 +359,8 @@ public function itWillAuditUsingTheDefaultDriver()
349359

350360
$audit = Audit::first();
351361

362+
$this->assertNotNull($audit);
363+
352364
$this->assertEmpty($audit->old_values);
353365

354366
Assert::assertArraySubset([
@@ -444,8 +456,10 @@ public function itHandlesJsonColumnsCorrectly()
444456
$article->config = ['articleIsGood' => false, 'authorsJob' => 'vampire'];
445457
$article->save();
446458

447-
/** @var Audit $audit */
448459
$audit = $article->audits()->skip(1)->first();
460+
461+
$this->assertNotNull($audit);
462+
449463
$this->assertSame(false, $audit->getModified()['config']['new']['articleIsGood']);
450464
$this->assertSame(true, $audit->getModified()['config']['old']['articleIsGood']);
451465
}
@@ -464,6 +478,9 @@ public function canAddAdditionalResolver()
464478

465479
$this->assertTrue(true);
466480
$audit = $article->audits()->first();
481+
482+
$this->assertNotNull($audit);
483+
467484
$this->assertSame(1, (int) $audit->tenant_id);
468485
}
469486

@@ -480,6 +497,9 @@ public function canDisableResolver()
480497
$article = Article::factory()->create();
481498

482499
$audit = $article->audits()->first();
500+
501+
$this->assertNotNull($audit);
502+
483503
$this->assertEmpty($audit->ip_address);
484504
}
485505

‎tests/Unit/AuditTest.php

+21-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ public function itResolvesAuditData()
3232
'published_at' => $now,
3333
]);
3434

35-
/** @var Audit $audit */
3635
$audit = $article->audits()->first();
36+
37+
$this->assertNotNull($audit);
38+
3739
$resolvedData = $audit->resolveData();
3840
$this->assertCount(15, $resolvedData);
3941

@@ -83,6 +85,8 @@ public function itResolvesAuditDataIncludingUserAttributes()
8385

8486
$audit = $article->audits()->first();
8587

88+
$this->assertNotNull($audit);
89+
8690
$this->assertCount(21, $resolvedData = $audit->resolveData());
8791

8892
Assert::assertArraySubset([
@@ -132,6 +136,8 @@ public function itReturnsTheAppropriateAuditableDataValues()
132136
'published_at' => Carbon::now(),
133137
])->audits()->first();
134138

139+
$this->assertNotNull($audit);
140+
135141
// Resolve data, making it available to the getDataValue() method
136142
$this->assertCount(21, $audit->resolveData());
137143

@@ -198,6 +204,8 @@ public function itReturnsAuditMetadataAsArray()
198204
{
199205
$audit = Article::factory()->create()->audits()->first();
200206

207+
$this->assertNotNull($audit);
208+
201209
$this->assertCount(10, $metadata = $audit->getMetadata());
202210

203211
Assert::assertArraySubset([
@@ -225,6 +233,8 @@ public function itReturnsProperCommandLineInUrlAuditMetadata()
225233
{
226234
$audit = factory(Article::class)->create()->audits()->first();
227235

236+
$this->assertNotNull($audit);
237+
228238
self::Assert()::assertEquals($audit->getMetadata()['audit_url'], 'vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver');
229239
}
230240

@@ -244,9 +254,10 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray()
244254

245255
$this->actingAs($user);
246256

247-
/** @var Audit $audit */
248257
$audit = Article::factory()->create()->audits()->first();
249258

259+
$this->assertNotNull($audit);
260+
250261
$this->assertCount(16, $metadata = $audit->getMetadata());
251262

252263
Assert::assertArraySubset([
@@ -278,6 +289,8 @@ public function itReturnsAuditMetadataAsJsonString()
278289
{
279290
$audit = Article::factory()->create()->audits()->first();
280291

292+
$this->assertNotNull($audit);
293+
281294
$metadata = $audit->getMetadata(true, JSON_PRETTY_PRINT);
282295

283296
$created_at = $audit->getSerializedDate($audit->created_at);
@@ -316,6 +329,8 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsJsonString()
316329

317330
$audit = Article::factory()->create()->audits()->first();
318331

332+
$this->assertNotNull($audit);
333+
319334
$metadata = $audit->getMetadata(true, JSON_PRETTY_PRINT);
320335

321336
$created_at = $audit->getSerializedDate($audit->created_at);
@@ -360,6 +375,8 @@ public function itReturnsAuditableModifiedAttributesAsArray()
360375
'published_at' => $now,
361376
])->audits()->first();
362377

378+
$this->assertNotNull($audit);
379+
363380
$this->assertCount(5, $modified = $audit->getModified());
364381

365382
Assert::assertArraySubset([
@@ -390,14 +407,15 @@ public function itReturnsAuditableModifiedAttributesAsJsonString()
390407
{
391408
$now = Carbon::now()->second(0)->microsecond(0);
392409

393-
/** @var Audit $audit */
394410
$audit = Article::factory()->create([
395411
'title' => 'How To Audit Eloquent Models',
396412
'content' => 'First step: install the laravel-auditing package.',
397413
'reviewed' => 1,
398414
'published_at' => $now,
399415
])->audits()->first();
400416

417+
$this->assertNotNull($audit);
418+
401419
$modified = $audit->getModified(true, JSON_PRETTY_PRINT);
402420

403421
$serializedDate = $audit->getSerializedDate($now);

‎tests/Unit/AuditableTest.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -762,8 +762,10 @@ public function itExcludesAttributesFromExclude()
762762
$model->reviewed = 1;
763763
$model->save();
764764

765-
/** @var Audit $audit */
766765
$audit = Audit::all()->first();
766+
767+
$this->assertNotNull($audit);
768+
767769
$this->assertArrayNotHasKey('title', $audit->getModified());
768770
}
769771

@@ -1051,6 +1053,9 @@ public function itFailsToTransitionWhenTheAuditAuditableIdDoesNotMatchTheModelId
10511053

10521054
$firstModel = Article::factory()->create();
10531055
$firstAudit = $firstModel->audits()->first();
1056+
1057+
$this->assertNotNull($firstAudit);
1058+
10541059
$firstAudit->auditable_id = $firstModel->id;
10551060

10561061
$secondModel = Article::factory()->create();

0 commit comments

Comments
 (0)