Move to PHPUnit attributes

tests/Commands/ImportAssetsTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Contracts\Assets\AssetContainerRepository as AssetContainerRepositoryContract;
@@ -45,7 +46,7 @@ public function tearDown(): void
         parent::tearDown();
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_asset_containers_and_assets()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();
@@ -72,7 +73,7 @@ public function it_imports_asset_containers_and_assets()
         $this->assertDatabaseHas('assets_meta', ['container' => 'test', 'path' => 'subdirectory/other.txt']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_asset_containers_and_assets_with_force_argument()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();
@@ -97,7 +98,7 @@ public function it_imports_asset_containers_and_assets_with_force_argument()
         $this->assertDatabaseHas('assets_meta', ['container' => 'test', 'path' => 'subdirectory/other.txt']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_asset_containers_with_only_asset_containers_argument()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();
@@ -122,7 +123,7 @@ public function it_imports_asset_containers_with_only_asset_containers_argument(
         $this->assertDatabaseMissing('assets_meta', ['container' => 'test', 'path' => 'subdirectory/other.txt']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_asset_containers_with_console_question()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();
@@ -149,7 +150,7 @@ public function it_imports_asset_containers_with_console_question()
         $this->assertDatabaseMissing('assets_meta', ['container' => 'test', 'path' => 'subdirectory/other.txt']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_assets_with_only_assets_argument()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();
@@ -174,7 +175,7 @@ public function it_imports_assets_with_only_assets_argument()
         $this->assertDatabaseHas('assets_meta', ['container' => 'test', 'path' => 'subdirectory/other.txt']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_assets_with_console_question()
     {
         $container = tap(AssetContainer::make('test')->disk('test'))->save();

tests/Commands/ImportBlueprintsTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Eloquent\Fields\BlueprintModel;
 use Statamic\Eloquent\Fields\FieldsetModel;
 use Statamic\Facades\Blueprint as BlueprintFacade;
@@ -44,7 +45,7 @@ public function setUp(): void
         File::withAbsolutePaths()->getFilesByTypeRecursively(resource_path('fieldsets'), 'yaml')->each(fn ($file) => unlink($file));
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_blueprints_and_fieldsets()
     {
         BlueprintFacade::make('user')->setContents([
@@ -75,7 +76,7 @@ public function it_imports_blueprints_and_fieldsets()
         $this->assertCount(1, FieldsetModel::all());
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_blueprints_with_console_question()
     {
         BlueprintFacade::make('user')->setContents([
@@ -105,7 +106,7 @@ public function it_imports_blueprints_with_console_question()
         $this->assertCount(0, FieldsetModel::all());
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_fieldsets_with_console_question()
     {
         BlueprintFacade::make('user')->setContents([
@@ -135,7 +136,7 @@ public function it_imports_fieldsets_with_console_question()
         $this->assertCount(1, FieldsetModel::all());
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_blueprints_with_only_blueprints_argument()
     {
         BlueprintFacade::make('user')->setContents([
@@ -163,7 +164,7 @@ public function it_imports_blueprints_with_only_blueprints_argument()
         $this->assertCount(0, FieldsetModel::all());
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_fieldsets_with_only_fieldsets_argument()
     {
         BlueprintFacade::make('user')->setContents([
@@ -191,7 +192,7 @@ public function it_imports_fieldsets_with_only_fieldsets_argument()
         $this->assertCount(1, FieldsetModel::all());
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_blueprints_and_fieldsets_with_force_argument()
     {
         BlueprintFacade::make('user')->setContents([

tests/Commands/ImportCollectionsTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Entries\Collection as CollectionContract;
 use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract;
 use Statamic\Contracts\Entries\Entry as EntryContract;
@@ -37,7 +38,7 @@ public function setUp(): void
         app()->bind(EntryContract::class, \Statamic\Entries\Entry::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collections_and_collection_trees()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -67,7 +68,7 @@ public function it_imports_collections_and_collection_trees()
         $this->assertDatabaseHas('trees', ['handle' => 'pages', 'type' => 'collection']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collections_and_collection_trees_with_force_argument()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -95,7 +96,7 @@ public function it_imports_collections_and_collection_trees_with_force_argument(
         $this->assertDatabaseHas('trees', ['handle' => 'pages', 'type' => 'collection']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collections_with_console_question()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -125,7 +126,7 @@ public function it_imports_collections_with_console_question()
         $this->assertDatabaseMissing('trees', ['handle' => 'pages', 'type' => 'collection']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collections_with_only_collections_argument()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -153,7 +154,7 @@ public function it_imports_collections_with_only_collections_argument()
         $this->assertDatabaseMissing('trees', ['handle' => 'pages', 'type' => 'collection']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collection_trees_with_console_question()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -183,7 +184,7 @@ public function it_imports_collection_trees_with_console_question()
         $this->assertDatabaseHas('trees', ['handle' => 'pages', 'type' => 'collection']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_collection_trees_with_only_collections_argument()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();

tests/Commands/ImportEntriesTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Entries\Collection as CollectionContract;
 use Statamic\Contracts\Entries\CollectionRepository as CollectionRepositoryContract;
 use Statamic\Contracts\Entries\Entry as EntryContract;
@@ -38,7 +39,7 @@ public function setUp(): void
         app()->bind(EntryContract::class, \Statamic\Entries\Entry::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_entries()
     {
         $collection = tap(Collection::make('pages')->title('Pages'))->save();
@@ -55,7 +56,7 @@ public function it_imports_entries()
         $this->assertDatabaseHas('entries', ['collection' => 'pages', 'slug' => 'foo', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_localized_entries()
     {
         Site::setSites([

tests/Commands/ImportFormsTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Forms\Form as FormContract;
 use Statamic\Contracts\Forms\FormRepository as FormRepositoryContract;
 use Statamic\Contracts\Forms\Submission as SubmissionContract;
@@ -31,7 +32,7 @@ public function setUp(): void
         app()->bind(\Statamic\Eloquent\Forms\SubmissionQueryBuilder::class, \Statamic\Stache\Query\SubmissionQueryBuilder::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_forms_and_submissions()
     {
         $form = tap(Form::make('contact')->title('Contact')->store(true))->save();
@@ -57,7 +58,7 @@ public function it_imports_forms_and_submissions()
         $this->assertDatabaseHas('form_submissions', ['form' => 'contact', 'data' => '{"name":"Jesse"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_forms_and_submissions_with_force_argument()
     {
         $form = tap(Form::make('contact')->title('Contact')->store(true))->save();
@@ -81,7 +82,7 @@ public function it_imports_forms_and_submissions_with_force_argument()
         $this->assertDatabaseHas('form_submissions', ['form' => 'contact', 'data' => '{"name":"Jesse"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_forms_with_only_forms_argument()
     {
         $form = tap(Form::make('contact')->title('Contact')->store(true))->save();
@@ -105,7 +106,7 @@ public function it_imports_only_forms_with_only_forms_argument()
         $this->assertDatabaseMissing('form_submissions', ['form' => 'contact', 'data' => '{"name":"Jesse"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_forms_with_console_question()
     {
         $form = tap(\Statamic\Facades\Form::make('contact')->title('Contact')->store(true))->save();
@@ -131,7 +132,7 @@ public function it_imports_only_forms_with_console_question()
         $this->assertDatabaseMissing('form_submissions', ['form' => 'contact', 'data' => '{"name":"Jesse"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_submissions_with_only_form_submissions_argument()
     {
         $form = tap(Form::make('contact')->title('Contact')->store(true))->save();
@@ -155,7 +156,7 @@ public function it_imports_only_submissions_with_only_form_submissions_argument(
         $this->assertDatabaseHas('form_submissions', ['form' => 'contact', 'data' => '{"name":"Jesse"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_form_submissions_with_console_question()
     {
         $form = tap(\Statamic\Facades\Form::make('contact')->title('Contact')->store(true))->save();

tests/Commands/ImportGlobalsTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Globals\GlobalRepository as GlobalRepositoryContract;
 use Statamic\Contracts\Globals\GlobalSet as GlobalSetContract;
 use Statamic\Contracts\Globals\GlobalVariablesRepository as GlobalVariablesRepositoryContract;
@@ -30,7 +31,7 @@ public function setUp(): void
         app()->bind(GlobalVariablesRepositoryContract::class, \Statamic\Stache\Repositories\GlobalVariablesRepository::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_global_sets_and_variables()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();
@@ -53,7 +54,7 @@ public function it_imports_global_sets_and_variables()
         $this->assertDatabaseHas('global_set_variables', ['handle' => 'footer', 'locale' => 'en', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_global_sets_and_variables_with_force_argument()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();
@@ -74,7 +75,7 @@ public function it_imports_global_sets_and_variables_with_force_argument()
         $this->assertDatabaseHas('global_set_variables', ['handle' => 'footer', 'locale' => 'en', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_global_sets_with_console_question()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();
@@ -97,7 +98,7 @@ public function it_imports_only_global_sets_with_console_question()
         $this->assertDatabaseMissing('global_set_variables', ['handle' => 'footer', 'locale' => 'en', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_global_sets_with_only_global_sets_argument()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();
@@ -118,7 +119,7 @@ public function it_imports_only_global_sets_with_only_global_sets_argument()
         $this->assertDatabaseMissing('global_set_variables', ['handle' => 'footer', 'locale' => 'en', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_variables_with_console_question()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();
@@ -141,7 +142,7 @@ public function it_imports_only_variables_with_console_question()
         $this->assertDatabaseHas('global_set_variables', ['handle' => 'footer', 'locale' => 'en', 'data' => '{"foo":"bar"}']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_only_variables_with_only_global_variables_argument()
     {
         $globalSet = tap(GlobalSet::make('footer')->title('Footer'))->save();

tests/Commands/ImportNavsTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Commands;
 
 use Illuminate\Support\Facades\Facade;
+use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Structures\Nav as NavContract;
 use Statamic\Contracts\Structures\NavigationRepository as NavigationRepositoryContract;
 use Statamic\Contracts\Structures\NavTree as NavTreeContract;
@@ -30,7 +31,7 @@ public function setUp(): void
         app()->bind(NavTreeRepositoryContract::class, \Statamic\Stache\Repositories\NavTreeRepository::class);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_navs_and_nav_trees()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();
@@ -55,7 +56,7 @@ public function it_imports_navs_and_nav_trees()
         $this->assertDatabaseHas('trees', ['handle' => 'footer', 'type' => 'navigation']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_navs_and_nav_trees_with_force_argument()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();
@@ -78,7 +79,7 @@ public function it_imports_navs_and_nav_trees_with_force_argument()
         $this->assertDatabaseHas('trees', ['handle' => 'footer', 'type' => 'navigation']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_navs_with_console_question()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();
@@ -103,7 +104,7 @@ public function it_imports_navs_with_console_question()
         $this->assertDatabaseMissing('trees', ['handle' => 'footer', 'type' => 'navigation']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_navs_with_only_navs_argument()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();
@@ -126,7 +127,7 @@ public function it_imports_navs_with_only_navs_argument()
         $this->assertDatabaseMissing('trees', ['handle' => 'footer', 'type' => 'navigation']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_nav_trees_with_console_question()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();
@@ -151,7 +152,7 @@ public function it_imports_nav_trees_with_console_question()
         $this->assertDatabaseHas('trees', ['handle' => 'footer', 'type' => 'navigation']);
     }
 
-    /** @test */
+    #[Test]
     public function it_imports_nav_trees_with_only_nav_trees_argument()
     {
         $nav = tap(Nav::make('footer')->title('Footer'))->save();