Skip to content

Commit 559b391

Browse files
erikn69MortenDHansen
erikn69
and
MortenDHansen
authored
Removed 6.x support, no need for different `assert' locations (#989)
Co-authored-by: Morten D. Hansen <[email protected]>
1 parent 2d5f2b1 commit 559b391

File tree

4 files changed

+34
-46
lines changed

4 files changed

+34
-46
lines changed

‎tests/AuditingTestCase.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,4 @@ protected function getPackageProviders($app)
6666
AuditingServiceProvider::class,
6767
];
6868
}
69-
70-
/**
71-
* Locate the Illuminate testing class. It changed namespace with v7
72-
* @see https://readouble.com/laravel/7.x/en/upgrade.html
73-
* @return class-string<\Illuminate\Foundation\Testing\Assert|\Illuminate\Testing\Assert>
74-
*/
75-
public static function Assert(): string
76-
{
77-
if (class_exists('Illuminate\Foundation\Testing\Assert')) {
78-
return '\Illuminate\Foundation\Testing\Assert';
79-
}
80-
return '\Illuminate\Testing\Assert';
81-
}
8269
}

‎tests/Functional/AuditingTest.php‎

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

55
use Carbon\Carbon;
66
use Illuminate\Database\QueryException;
7-
use Illuminate\Foundation\Testing\Assert;
87
use Illuminate\Foundation\Testing\WithFaker;
98
use Illuminate\Support\Facades\App;
109
use Illuminate\Support\Facades\Event;
10+
use Illuminate\Testing\Assert;
1111
use InvalidArgumentException;
1212
use OwenIt\Auditing\Events\AuditCustom;
1313
use OwenIt\Auditing\Events\Audited;
@@ -156,7 +156,7 @@ public function itWillAuditTheCreatedEvent()
156156

157157
$this->assertEmpty($audit->old_values);
158158

159-
self::Assert()::assertArraySubset([
159+
Assert::assertArraySubset([
160160
'title' => 'How To Audit Eloquent Models',
161161
'content' => 'N/A',
162162
'published_at' => null,
@@ -193,13 +193,13 @@ public function itWillAuditTheUpdatedEvent()
193193

194194
$this->assertNotNull($audit);
195195

196-
self::Assert()::assertArraySubset([
196+
Assert::assertArraySubset([
197197
'content' => 'N/A',
198198
'published_at' => null,
199199
'reviewed' => 0,
200200
], $audit->old_values, true);
201201

202-
self::Assert()::assertArraySubset([
202+
Assert::assertArraySubset([
203203
'content' => Article::contentMutate('First step: install the laravel-auditing package.'),
204204
'published_at' => $now->toDateTimeString(),
205205
'reviewed' => 1,
@@ -228,7 +228,7 @@ public function itWillAuditTheDeletedEvent()
228228

229229
$this->assertNotNull($audit);
230230

231-
self::Assert()::assertArraySubset([
231+
Assert::assertArraySubset([
232232
'title' => 'How To Audit Eloquent Models',
233233
'content' => 'N/A',
234234
'published_at' => null,
@@ -264,7 +264,7 @@ public function itWillAuditTheRestoredEvent()
264264

265265
$this->assertEmpty($audit->old_values);
266266

267-
self::Assert()::assertArraySubset([
267+
Assert::assertArraySubset([
268268
'title' => 'How To Audit Eloquent Models',
269269
'content' => 'N/A',
270270
'published_at' => null,
@@ -373,7 +373,7 @@ public function itWillAuditUsingTheDefaultDriver()
373373

374374
$this->assertEmpty($audit->old_values);
375375

376-
self::Assert()::assertArraySubset([
376+
Assert::assertArraySubset([
377377
'title' => 'How To Audit Using The Fallback Driver',
378378
'content' => 'N/A',
379379
'published_at' => null,

‎tests/Unit/AuditTest.php‎

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

55
use Carbon\Carbon;
66
use DateTimeInterface;
7+
use Illuminate\Testing\Assert;
78
use OwenIt\Auditing\Encoders\Base64Encoder;
89
use OwenIt\Auditing\Models\Audit;
910
use OwenIt\Auditing\Redactors\LeftRedactor;
@@ -36,7 +37,7 @@ public function itResolvesAuditData()
3637
$resolvedData = $audit->resolveData();
3738
$this->assertCount(15, $resolvedData);
3839

39-
self::Assert()::assertArraySubset([
40+
Assert::assertArraySubset([
4041
'audit_id' => 1,
4142
'audit_event' => 'created',
4243
'audit_url' => UrlResolver::resolveCommandLine(),
@@ -85,7 +86,7 @@ public function itResolvesAuditDataIncludingUserAttributes()
8586

8687
$this->assertCount(21, $resolvedData = $audit->resolveData());
8788

88-
self::Assert()::assertArraySubset([
89+
Assert::assertArraySubset([
8990
'audit_id' => 2,
9091
'audit_event' => 'created',
9192
'audit_url' => UrlResolver::resolveCommandLine(),
@@ -203,7 +204,7 @@ public function itReturnsAuditMetadataAsArray()
203204

204205
$this->assertCount(10, $metadata = $audit->getMetadata());
205206

206-
self::Assert()::assertArraySubset([
207+
Assert::assertArraySubset([
207208
'audit_id' => 1,
208209
'audit_event' => 'created',
209210
'audit_url' => UrlResolver::resolveCommandLine(),
@@ -229,7 +230,7 @@ public function itReturnsProperCommandLineInUrlAuditMetadata()
229230

230231
$this->assertNotNull($audit);
231232

232-
self::Assert()::assertEquals($audit->getMetadata()['audit_url'], 'vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver');
233+
Assert::assertEquals($audit->getMetadata()['audit_url'], 'vendor/bin/phpunit tests/Unit/AuditTest.php --group command-line-url-resolver');
233234
}
234235

235236
/**
@@ -253,7 +254,7 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray()
253254

254255
$this->assertCount(16, $metadata = $audit->getMetadata());
255256

256-
self::Assert()::assertArraySubset([
257+
Assert::assertArraySubset([
257258
'audit_id' => 2,
258259
'audit_event' => 'created',
259260
'audit_url' => UrlResolver::resolveCommandLine(),
@@ -369,7 +370,7 @@ public function itReturnsAuditableModifiedAttributesAsArray()
369370

370371
$this->assertCount(5, $modified = $audit->getModified());
371372

372-
self::Assert()::assertArraySubset([
373+
Assert::assertArraySubset([
373374
'title' => [
374375
'new' => 'HOW TO AUDIT ELOQUENT MODELS',
375376
],
@@ -458,7 +459,7 @@ public function itReturnsDecodedAuditableAttributes()
458459

459460
$this->assertCount(3, $modified = $audit->getModified());
460461

461-
self::Assert()::assertArraySubset([
462+
Assert::assertArraySubset([
462463
'title' => [
463464
'new' => 'HOW TO AUDIT ELOQUENT MODELS',
464465
'old' => 'HOW TO AUDIT MODELS',
@@ -490,7 +491,7 @@ public function itReturnsTags()
490491
]);
491492

492493
$this->assertIsArray($audit->getTags());
493-
self::Assert()::assertArraySubset([
494+
Assert::assertArraySubset([
494495
'foo',
495496
'bar',
496497
'baz',

‎tests/Unit/AuditableTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use Carbon\Carbon;
66
use Illuminate\Database\Eloquent\Relations\Relation;
7-
use Illuminate\Foundation\Testing\Assert;
87
use Illuminate\Foundation\Testing\WithFaker;
98
use Illuminate\Support\Facades\App;
109
use Illuminate\Support\Str;
10+
use Illuminate\Testing\Assert;
1111
use OwenIt\Auditing\Contracts\Auditable;
1212
use OwenIt\Auditing\Encoders\Base64Encoder;
1313
use OwenIt\Auditing\Exceptions\AuditableTransitionException;
@@ -175,7 +175,7 @@ public function itReturnsTheDefaultAuditEvents()
175175
{
176176
$model = new Article();
177177

178-
self::Assert()::assertArraySubset([
178+
Assert::assertArraySubset([
179179
'created',
180180
'updated',
181181
'deleted',
@@ -196,7 +196,7 @@ public function itReturnsTheCustomAuditEventsFromAttribute()
196196
'archived',
197197
];
198198

199-
self::Assert()::assertArraySubset([
199+
Assert::assertArraySubset([
200200
'published' => 'getPublishedEventAttributes',
201201
'archived',
202202
], $model->getAuditEvents(), true);
@@ -215,7 +215,7 @@ public function itReturnsTheCustomAuditEventsFromConfig()
215215

216216
$model = new Article();
217217

218-
self::Assert()::assertArraySubset([
218+
Assert::assertArraySubset([
219219
'published' => 'getPublishedEventAttributes',
220220
'archived',
221221
], $model->getAuditEvents(), true);
@@ -460,7 +460,7 @@ public function itReturnsTheAuditData()
460460
$this->assertCount(11, $auditData = $model->toAudit());
461461

462462
$morphPrefix = config('audit.user.morph_prefix', 'user');
463-
self::Assert()::assertArraySubset([
463+
Assert::assertArraySubset([
464464
'old_values' => [],
465465
'new_values' => [
466466
'title' => 'How To Audit Eloquent Models',
@@ -520,7 +520,7 @@ public function itReturnsTheAuditDataIncludingUserAttributes(
520520
$this->assertCount(11, $auditData = $model->toAudit());
521521

522522
$morphPrefix = config('audit.user.morph_prefix', 'user');
523-
self::Assert()::assertArraySubset([
523+
Assert::assertArraySubset([
524524
'old_values' => [],
525525
'new_values' => [
526526
'title' => 'How To Audit Eloquent Models',
@@ -603,7 +603,7 @@ public function itExcludesAttributesFromTheAuditDataWhenInStrictMode()
603603
$this->assertCount(11, $auditData = $model->toAudit());
604604

605605
$morphPrefix = config('audit.user.morph_prefix', 'user');
606-
self::Assert()::assertArraySubset([
606+
Assert::assertArraySubset([
607607
'old_values' => [],
608608
'new_values' => [
609609
'title' => 'How To Audit Eloquent Models',
@@ -673,7 +673,7 @@ public function itModifiesTheAuditAttributesSuccessfully()
673673
'reviewed' => Base64Encoder::class,
674674
];
675675

676-
self::Assert()::assertArraySubset([
676+
Assert::assertArraySubset([
677677
'old_values' => [
678678
'title' => 'Ho#################',
679679
'content' => '##A',
@@ -717,7 +717,7 @@ public function transformAudit(array $data): array
717717

718718
$this->assertCount(11, $auditData = $model->toAudit());
719719

720-
self::Assert()::assertArraySubset([
720+
Assert::assertArraySubset([
721721
'new_values' => [
722722
'title' => 'How To Audit Eloquent Models',
723723
'content' => 'First step: install the laravel-auditing package.',
@@ -736,7 +736,7 @@ public function itReturnsTheDefaultAttributesToBeIncludedInTheAudit()
736736
{
737737
$model = new Article();
738738

739-
self::Assert()::assertArraySubset([], $model->getAuditInclude(), true);
739+
Assert::assertArraySubset([], $model->getAuditInclude(), true);
740740
}
741741

742742
/**
@@ -752,7 +752,7 @@ public function itReturnsTheCustomAttributesToBeIncludedInTheAudit()
752752
'content',
753753
];
754754

755-
self::Assert()::assertArraySubset([
755+
Assert::assertArraySubset([
756756
'title',
757757
'content',
758758
], $model->getAuditInclude(), true);
@@ -766,7 +766,7 @@ public function itReturnsTheDefaultAttributesToBeExcludedFromTheAudit()
766766
{
767767
$model = new Article();
768768

769-
self::Assert()::assertArraySubset([], $model->getAuditExclude(), true);
769+
Assert::assertArraySubset([], $model->getAuditExclude(), true);
770770
}
771771

772772
/**
@@ -781,7 +781,7 @@ public function itReturnsTheCustomAttributesToBeExcludedFromTheAudit()
781781
'published_at',
782782
];
783783

784-
self::Assert()::assertArraySubset([
784+
Assert::assertArraySubset([
785785
'published_at',
786786
], $model->getAuditExclude(), true);
787787
}
@@ -962,7 +962,7 @@ public function itReturnsTheDefaultGeneratedAuditTags()
962962
{
963963
$model = new Article();
964964

965-
self::Assert()::assertArraySubset([], $model->generateTags(), true);
965+
Assert::assertArraySubset([], $model->generateTags(), true);
966966
}
967967

968968
/**
@@ -981,7 +981,7 @@ public function generateTags(): array
981981
}
982982
};
983983

984-
self::Assert()::assertArraySubset([
984+
Assert::assertArraySubset([
985985
'foo',
986986
'bar',
987987
], $model->generateTags(), true);
@@ -1188,7 +1188,7 @@ public function itFailsToTransitionWhenTheAuditableAttributeCompatibilityIsNotMe
11881188
$e->getMessage()
11891189
);
11901190

1191-
self::Assert()::assertArraySubset([
1191+
Assert::assertArraySubset([
11921192
'subject',
11931193
'text',
11941194
], $e->getIncompatibilities(), true);
@@ -1402,7 +1402,7 @@ public function itWorksWhenConfigAllowedArrayValueIsTrue()
14021402
$auditData = $model->toAudit();
14031403

14041404
$morphPrefix = config('audit.user.morph_prefix', 'user');
1405-
self::Assert()::assertArraySubset([
1405+
Assert::assertArraySubset([
14061406
'old_values' => [],
14071407
'new_values' => [
14081408
'title' => 'How To Audit Eloquent Models',
@@ -1447,7 +1447,7 @@ public function itWorksWhenConfigAllowedArrayValueIsFalse()
14471447
$auditData = $model->toAudit();
14481448

14491449
$morphPrefix = config('audit.user.morph_prefix', 'user');
1450-
self::Assert()::assertArraySubset([
1450+
Assert::assertArraySubset([
14511451
'old_values' => [],
14521452
'new_values' => [
14531453
'title' => 'How To Audit Eloquent Models',

0 commit comments

Comments
 (0)