From 2979a98914eec4c15be94f51343031a932b09a21 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 22 Feb 2025 15:23:32 +0000 Subject: [PATCH 1/3] Adopt PHP attributes in test classes --- tests/Commands/MigrationCreatorTest.php | 5 +++-- tests/Commands/TriggerListCommandTest.php | 3 ++- tests/Commands/TriggerMakeCommandTest.php | 3 ++- tests/DatabaseTriggerTest.php | 13 +++++++------ tests/Facades/SchemaTest.php | 9 +++++---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/Commands/MigrationCreatorTest.php b/tests/Commands/MigrationCreatorTest.php index f21c27e..a96db9b 100644 --- a/tests/Commands/MigrationCreatorTest.php +++ b/tests/Commands/MigrationCreatorTest.php @@ -2,6 +2,7 @@ namespace Esign\DatabaseTrigger\Commands; +use PHPUnit\Framework\Attributes\Test; use Esign\DatabaseTrigger\DatabaseTrigger; use Esign\DatabaseTrigger\Enums\TriggerEvent; use Esign\DatabaseTrigger\Enums\TriggerTiming; @@ -12,7 +13,7 @@ class MigrationCreatorTest extends TestCase { - /** @test */ + #[Test] public function it_can_populate_the_stub_file() { $creator = $this->getCreator(); @@ -44,7 +45,7 @@ public function it_can_populate_the_stub_file() ); } - /** @test */ + #[Test] public function it_can_populate_the_stub_file_providing_a_statement() { $creator = $this->getCreator(); diff --git a/tests/Commands/TriggerListCommandTest.php b/tests/Commands/TriggerListCommandTest.php index ae1e3ae..b3dd673 100644 --- a/tests/Commands/TriggerListCommandTest.php +++ b/tests/Commands/TriggerListCommandTest.php @@ -2,6 +2,7 @@ namespace Esign\DatabaseTrigger\Tests\Commands; +use PHPUnit\Framework\Attributes\Test; use Esign\DatabaseTrigger\Commands\TriggerListCommand; use Esign\DatabaseTrigger\DatabaseTrigger; use Esign\DatabaseTrigger\Enums\TriggerEvent; @@ -11,7 +12,7 @@ class TriggerListCommandTest extends TestCase { - /** @test */ + #[Test] public function it_can_display_a_list_of_triggers() { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { diff --git a/tests/Commands/TriggerMakeCommandTest.php b/tests/Commands/TriggerMakeCommandTest.php index 64a02b4..b9ee5c2 100644 --- a/tests/Commands/TriggerMakeCommandTest.php +++ b/tests/Commands/TriggerMakeCommandTest.php @@ -2,6 +2,7 @@ namespace Esign\DatabaseTrigger\Tests\Commands; +use PHPUnit\Framework\Attributes\Test; use Esign\DatabaseTrigger\Commands\MigrationCreator; use Esign\DatabaseTrigger\Commands\TriggerMakeCommand; use Esign\DatabaseTrigger\Enums\TriggerEvent; @@ -11,7 +12,7 @@ class TriggerMakeCommandTest extends TestCase { - /** @test */ + #[Test] public function it_can_create_the_trigger_migration() { $this->mock(MigrationCreator::class, function ($mock) { diff --git a/tests/DatabaseTriggerTest.php b/tests/DatabaseTriggerTest.php index 0863c84..f0fa3e3 100644 --- a/tests/DatabaseTriggerTest.php +++ b/tests/DatabaseTriggerTest.php @@ -2,13 +2,14 @@ namespace Esign\DatabaseTrigger\Tests; +use PHPUnit\Framework\Attributes\Test; use Esign\DatabaseTrigger\DatabaseTrigger; use Esign\DatabaseTrigger\Enums\TriggerEvent; use Esign\DatabaseTrigger\Enums\TriggerTiming; class DatabaseTriggerTest extends TestCase { - /** @test */ + #[Test] public function it_can_set_the_name() { $trigger = (new DatabaseTrigger())->name('my_trigger'); @@ -16,7 +17,7 @@ public function it_can_set_the_name() $this->assertEquals('my_trigger', $trigger->name); } - /** @test */ + #[Test] public function it_can_set_the_table_name() { $trigger = (new DatabaseTrigger())->on('posts'); @@ -24,7 +25,7 @@ public function it_can_set_the_table_name() $this->assertEquals('posts', $trigger->table); } - /** @test */ + #[Test] public function it_can_set_the_timing() { $trigger = (new DatabaseTrigger())->timing(TriggerTiming::AFTER); @@ -32,7 +33,7 @@ public function it_can_set_the_timing() $this->assertEquals(TriggerTiming::AFTER->value, $trigger->timing); } - /** @test */ + #[Test] public function it_can_set_the_event() { $trigger = (new DatabaseTrigger())->event(TriggerEvent::INSERT); @@ -40,7 +41,7 @@ public function it_can_set_the_event() $this->assertEquals(TriggerEvent::INSERT->value, $trigger->event); } - /** @test */ + #[Test] public function it_can_set_the_statement_as_a_closure() { $trigger = (new DatabaseTrigger())->statement(function () { @@ -50,7 +51,7 @@ public function it_can_set_the_statement_as_a_closure() $this->assertEquals("SET NEW.title = 'Default title';", $trigger->statement); } - /** @test */ + #[Test] public function it_can_set_the_statement_as_a_string() { $trigger = (new DatabaseTrigger())->statement("SET NEW.title = 'Default title';"); diff --git a/tests/Facades/SchemaTest.php b/tests/Facades/SchemaTest.php index 24bc88e..22c2d47 100644 --- a/tests/Facades/SchemaTest.php +++ b/tests/Facades/SchemaTest.php @@ -2,6 +2,7 @@ namespace Esign\DatabaseTrigger\Tests\Facades; +use PHPUnit\Framework\Attributes\Test; use Esign\DatabaseTrigger\DatabaseTrigger; use Esign\DatabaseTrigger\Enums\TriggerEvent; use Esign\DatabaseTrigger\Enums\TriggerTiming; @@ -10,7 +11,7 @@ class SchemaTest extends TestCase { - /** @test */ + #[Test] public function it_can_create_a_trigger() { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { @@ -23,7 +24,7 @@ public function it_can_create_a_trigger() $this->assertTrue(Schema::hasTrigger('my_trigger')); } - /** @test */ + #[Test] public function it_can_drop_a_trigger() { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { @@ -38,7 +39,7 @@ public function it_can_drop_a_trigger() $this->assertFalse(Schema::hasTrigger('my_trigger')); } - /** @test */ + #[Test] public function it_can_drop_a_trigger_if_it_exists() { Schema::dropTriggerIfExists('my_trigger'); @@ -46,7 +47,7 @@ public function it_can_drop_a_trigger_if_it_exists() $this->assertFalse(Schema::hasTrigger('my_trigger')); } - /** @test */ + #[Test] public function it_can_check_if_a_trigger_exists() { $this->assertFalse(Schema::hasTrigger('my_trigger')); From 854d59b0cfd7417a81baa30725f10e9b52c503dd Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 22 Feb 2025 15:23:33 +0000 Subject: [PATCH 2/3] Add return types to test methods --- tests/Commands/MigrationCreatorTest.php | 4 ++-- tests/Commands/TriggerListCommandTest.php | 2 +- tests/Commands/TriggerMakeCommandTest.php | 2 +- tests/DatabaseTriggerTest.php | 12 ++++++------ tests/Facades/SchemaTest.php | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/Commands/MigrationCreatorTest.php b/tests/Commands/MigrationCreatorTest.php index a96db9b..d1a0174 100644 --- a/tests/Commands/MigrationCreatorTest.php +++ b/tests/Commands/MigrationCreatorTest.php @@ -14,7 +14,7 @@ class MigrationCreatorTest extends TestCase { #[Test] - public function it_can_populate_the_stub_file() + public function it_can_populate_the_stub_file(): void { $creator = $this->getCreator(); $creator->expects($this->any())->method('getDatePrefix')->willReturn('foo'); @@ -46,7 +46,7 @@ public function it_can_populate_the_stub_file() } #[Test] - public function it_can_populate_the_stub_file_providing_a_statement() + public function it_can_populate_the_stub_file_providing_a_statement(): void { $creator = $this->getCreator(); $creator->expects($this->any())->method('getDatePrefix')->willReturn('foo'); diff --git a/tests/Commands/TriggerListCommandTest.php b/tests/Commands/TriggerListCommandTest.php index b3dd673..7b6f804 100644 --- a/tests/Commands/TriggerListCommandTest.php +++ b/tests/Commands/TriggerListCommandTest.php @@ -13,7 +13,7 @@ class TriggerListCommandTest extends TestCase { #[Test] - public function it_can_display_a_list_of_triggers() + public function it_can_display_a_list_of_triggers(): void { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { $trigger->on('posts'); diff --git a/tests/Commands/TriggerMakeCommandTest.php b/tests/Commands/TriggerMakeCommandTest.php index b9ee5c2..3e8c5ad 100644 --- a/tests/Commands/TriggerMakeCommandTest.php +++ b/tests/Commands/TriggerMakeCommandTest.php @@ -13,7 +13,7 @@ class TriggerMakeCommandTest extends TestCase { #[Test] - public function it_can_create_the_trigger_migration() + public function it_can_create_the_trigger_migration(): void { $this->mock(MigrationCreator::class, function ($mock) { $mock->shouldReceive('createTrigger')->once(); diff --git a/tests/DatabaseTriggerTest.php b/tests/DatabaseTriggerTest.php index f0fa3e3..f76dd2f 100644 --- a/tests/DatabaseTriggerTest.php +++ b/tests/DatabaseTriggerTest.php @@ -10,7 +10,7 @@ class DatabaseTriggerTest extends TestCase { #[Test] - public function it_can_set_the_name() + public function it_can_set_the_name(): void { $trigger = (new DatabaseTrigger())->name('my_trigger'); @@ -18,7 +18,7 @@ public function it_can_set_the_name() } #[Test] - public function it_can_set_the_table_name() + public function it_can_set_the_table_name(): void { $trigger = (new DatabaseTrigger())->on('posts'); @@ -26,7 +26,7 @@ public function it_can_set_the_table_name() } #[Test] - public function it_can_set_the_timing() + public function it_can_set_the_timing(): void { $trigger = (new DatabaseTrigger())->timing(TriggerTiming::AFTER); @@ -34,7 +34,7 @@ public function it_can_set_the_timing() } #[Test] - public function it_can_set_the_event() + public function it_can_set_the_event(): void { $trigger = (new DatabaseTrigger())->event(TriggerEvent::INSERT); @@ -42,7 +42,7 @@ public function it_can_set_the_event() } #[Test] - public function it_can_set_the_statement_as_a_closure() + public function it_can_set_the_statement_as_a_closure(): void { $trigger = (new DatabaseTrigger())->statement(function () { return "SET NEW.title = 'Default title';"; @@ -52,7 +52,7 @@ public function it_can_set_the_statement_as_a_closure() } #[Test] - public function it_can_set_the_statement_as_a_string() + public function it_can_set_the_statement_as_a_string(): void { $trigger = (new DatabaseTrigger())->statement("SET NEW.title = 'Default title';"); diff --git a/tests/Facades/SchemaTest.php b/tests/Facades/SchemaTest.php index 22c2d47..d817280 100644 --- a/tests/Facades/SchemaTest.php +++ b/tests/Facades/SchemaTest.php @@ -12,7 +12,7 @@ class SchemaTest extends TestCase { #[Test] - public function it_can_create_a_trigger() + public function it_can_create_a_trigger(): void { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { $trigger->on('posts'); @@ -25,7 +25,7 @@ public function it_can_create_a_trigger() } #[Test] - public function it_can_drop_a_trigger() + public function it_can_drop_a_trigger(): void { Schema::createTrigger('my_trigger', function (DatabaseTrigger $trigger) { $trigger->on('posts'); @@ -40,7 +40,7 @@ public function it_can_drop_a_trigger() } #[Test] - public function it_can_drop_a_trigger_if_it_exists() + public function it_can_drop_a_trigger_if_it_exists(): void { Schema::dropTriggerIfExists('my_trigger'); @@ -48,7 +48,7 @@ public function it_can_drop_a_trigger_if_it_exists() } #[Test] - public function it_can_check_if_a_trigger_exists() + public function it_can_check_if_a_trigger_exists(): void { $this->assertFalse(Schema::hasTrigger('my_trigger')); From c352236aa8131891b54f51fcef3105fa3ba636e7 Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 22 Feb 2025 15:23:33 +0000 Subject: [PATCH 3/3] Define test classes as `final` --- tests/Commands/MigrationCreatorTest.php | 2 +- tests/Commands/TriggerListCommandTest.php | 2 +- tests/Commands/TriggerMakeCommandTest.php | 2 +- tests/DatabaseTriggerTest.php | 2 +- tests/Facades/SchemaTest.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Commands/MigrationCreatorTest.php b/tests/Commands/MigrationCreatorTest.php index d1a0174..cce20e1 100644 --- a/tests/Commands/MigrationCreatorTest.php +++ b/tests/Commands/MigrationCreatorTest.php @@ -11,7 +11,7 @@ use Mockery; use PHPUnit\Framework\MockObject\MockObject; -class MigrationCreatorTest extends TestCase +final class MigrationCreatorTest extends TestCase { #[Test] public function it_can_populate_the_stub_file(): void diff --git a/tests/Commands/TriggerListCommandTest.php b/tests/Commands/TriggerListCommandTest.php index 7b6f804..3278a99 100644 --- a/tests/Commands/TriggerListCommandTest.php +++ b/tests/Commands/TriggerListCommandTest.php @@ -10,7 +10,7 @@ use Esign\DatabaseTrigger\Facades\Schema; use Esign\DatabaseTrigger\Tests\TestCase; -class TriggerListCommandTest extends TestCase +final class TriggerListCommandTest extends TestCase { #[Test] public function it_can_display_a_list_of_triggers(): void diff --git a/tests/Commands/TriggerMakeCommandTest.php b/tests/Commands/TriggerMakeCommandTest.php index 3e8c5ad..4addc2b 100644 --- a/tests/Commands/TriggerMakeCommandTest.php +++ b/tests/Commands/TriggerMakeCommandTest.php @@ -10,7 +10,7 @@ use Esign\DatabaseTrigger\Tests\TestCase; use Illuminate\Support\Composer; -class TriggerMakeCommandTest extends TestCase +final class TriggerMakeCommandTest extends TestCase { #[Test] public function it_can_create_the_trigger_migration(): void diff --git a/tests/DatabaseTriggerTest.php b/tests/DatabaseTriggerTest.php index f76dd2f..de7f57d 100644 --- a/tests/DatabaseTriggerTest.php +++ b/tests/DatabaseTriggerTest.php @@ -7,7 +7,7 @@ use Esign\DatabaseTrigger\Enums\TriggerEvent; use Esign\DatabaseTrigger\Enums\TriggerTiming; -class DatabaseTriggerTest extends TestCase +final class DatabaseTriggerTest extends TestCase { #[Test] public function it_can_set_the_name(): void diff --git a/tests/Facades/SchemaTest.php b/tests/Facades/SchemaTest.php index d817280..6cf12cd 100644 --- a/tests/Facades/SchemaTest.php +++ b/tests/Facades/SchemaTest.php @@ -9,7 +9,7 @@ use Esign\DatabaseTrigger\Facades\Schema; use Esign\DatabaseTrigger\Tests\TestCase; -class SchemaTest extends TestCase +final class SchemaTest extends TestCase { #[Test] public function it_can_create_a_trigger(): void