From 1ae5f073ee79de1873a5d6596ade25cf1a923358 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 20 Nov 2024 16:29:22 +0000
Subject: [PATCH 1/2] Fix incorrect namespaces in tests

---
 tests/Antlers/Runtime/ArithmeticTest.php                     | 2 ++
 tests/Console/Commands/MakeDictionaryTest.php                | 3 +--
 tests/Extend/AddonTest.php                                   | 2 +-
 tests/Feature/GraphQL/Fieldtypes/DictionaryFieldtypeTest.php | 3 +--
 tests/Feature/SlugTest.php                                   | 2 +-
 tests/Feature/Taxonomies/UpdateTermTest.php                  | 2 ++
 tests/Feature/Users/UpdateUserTest.php                       | 2 ++
 tests/Fieldtypes/ArrayTest.php                               | 2 +-
 tests/Modifiers/ToJsonTest.php                               | 2 +-
 tests/Modifiers/ToQsTest.php                                 | 2 +-
 tests/Modifiers/WhereInTest.php                              | 2 +-
 tests/Routing/RouteBindingTest.php                           | 2 ++
 tests/Validation/UniqueEntryValueTest.php                    | 2 ++
 tests/Validation/UniqueTermValueTest.php                     | 2 ++
 tests/Validation/UniqueUserValueTest.php                     | 2 ++
 15 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tests/Antlers/Runtime/ArithmeticTest.php b/tests/Antlers/Runtime/ArithmeticTest.php
index dfcd102d80f..811582c0ca0 100644
--- a/tests/Antlers/Runtime/ArithmeticTest.php
+++ b/tests/Antlers/Runtime/ArithmeticTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Antlers\Runtime;
+
 use Tests\Antlers\ParserTestCase;
 
 class ArithmeticTest extends ParserTestCase
diff --git a/tests/Console/Commands/MakeDictionaryTest.php b/tests/Console/Commands/MakeDictionaryTest.php
index 48c9a61832e..b68b196e9a4 100644
--- a/tests/Console/Commands/MakeDictionaryTest.php
+++ b/tests/Console/Commands/MakeDictionaryTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Console\Commands;
+namespace Tests\Console\Commands;
 
 use Facades\Statamic\Console\Processes\Composer;
 use Illuminate\Filesystem\Filesystem;
 use PHPUnit\Framework\Attributes\Test;
-use Tests\Console\Commands\Concerns;
 use Tests\TestCase;
 
 class MakeDictionaryTest extends TestCase
diff --git a/tests/Extend/AddonTest.php b/tests/Extend/AddonTest.php
index e18820f8f72..5e5001a40f0 100644
--- a/tests/Extend/AddonTest.php
+++ b/tests/Extend/AddonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Statamic\Testing\Extend;
+namespace Tests\Extend;
 
 use Facades\Statamic\Licensing\LicenseManager;
 use Foo\Bar\TestAddonServiceProvider;
diff --git a/tests/Feature/GraphQL/Fieldtypes/DictionaryFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/DictionaryFieldtypeTest.php
index 6ec56a0fa72..afc92d7d32d 100644
--- a/tests/Feature/GraphQL/Fieldtypes/DictionaryFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/DictionaryFieldtypeTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Feature\GraphQL\Fieldtypes;
+namespace Tests\Feature\GraphQL\Fieldtypes;
 
 use Illuminate\Support\Carbon;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
-use Tests\Feature\GraphQL\Fieldtypes\FieldtypeTestCase;
 
 #[Group('graphql')]
 class DictionaryFieldtypeTest extends FieldtypeTestCase
diff --git a/tests/Feature/SlugTest.php b/tests/Feature/SlugTest.php
index a5b8bac75fb..d9a017e628e 100644
--- a/tests/Feature/SlugTest.php
+++ b/tests/Feature/SlugTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Feature;
+namespace Tests\Feature;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/tests/Feature/Taxonomies/UpdateTermTest.php b/tests/Feature/Taxonomies/UpdateTermTest.php
index 5e009febaff..c5fafaa9ac3 100644
--- a/tests/Feature/Taxonomies/UpdateTermTest.php
+++ b/tests/Feature/Taxonomies/UpdateTermTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Feature\Taxonomies;
+
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Term;
diff --git a/tests/Feature/Users/UpdateUserTest.php b/tests/Feature/Users/UpdateUserTest.php
index 5f21a5994d7..9d2e9df60c6 100644
--- a/tests/Feature/Users/UpdateUserTest.php
+++ b/tests/Feature/Users/UpdateUserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Feature\Users;
+
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
diff --git a/tests/Fieldtypes/ArrayTest.php b/tests/Fieldtypes/ArrayTest.php
index b94dd0bf294..b8867715179 100644
--- a/tests/Fieldtypes/ArrayTest.php
+++ b/tests/Fieldtypes/ArrayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Fieldtypes;
+namespace Tests\Fieldtypes;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/tests/Modifiers/ToJsonTest.php b/tests/Modifiers/ToJsonTest.php
index ed5097ddf38..a1632e941df 100644
--- a/tests/Modifiers/ToJsonTest.php
+++ b/tests/Modifiers/ToJsonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Tests\Modifiers;
 
 use Facades\Tests\Factories\EntryFactory;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/tests/Modifiers/ToQsTest.php b/tests/Modifiers/ToQsTest.php
index 871752e1389..93a18acbff7 100644
--- a/tests/Modifiers/ToQsTest.php
+++ b/tests/Modifiers/ToQsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Tests\Modifiers;
 
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Modifiers\Modify;
diff --git a/tests/Modifiers/WhereInTest.php b/tests/Modifiers/WhereInTest.php
index c5ff317b601..ec635fbf1c4 100644
--- a/tests/Modifiers/WhereInTest.php
+++ b/tests/Modifiers/WhereInTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modifiers;
+namespace Tests\Modifiers;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
index 1b808e6ac2f..51cdb2bc131 100644
--- a/tests/Routing/RouteBindingTest.php
+++ b/tests/Routing/RouteBindingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Routing;
+
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Contracts\Routing\BindingRegistrar;
 use Illuminate\Routing\Middleware\SubstituteBindings;
diff --git a/tests/Validation/UniqueEntryValueTest.php b/tests/Validation/UniqueEntryValueTest.php
index 6d77e1672df..15a21921b80 100644
--- a/tests/Validation/UniqueEntryValueTest.php
+++ b/tests/Validation/UniqueEntryValueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Validation;
+
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Facades\Validator;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/tests/Validation/UniqueTermValueTest.php b/tests/Validation/UniqueTermValueTest.php
index ec36339e732..024adca9bf5 100644
--- a/tests/Validation/UniqueTermValueTest.php
+++ b/tests/Validation/UniqueTermValueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Validation;
+
 use Illuminate\Support\Facades\Validator;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\Taxonomy;
diff --git a/tests/Validation/UniqueUserValueTest.php b/tests/Validation/UniqueUserValueTest.php
index fbfff0e09b0..8255aef1227 100644
--- a/tests/Validation/UniqueUserValueTest.php
+++ b/tests/Validation/UniqueUserValueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Validation;
+
 use Illuminate\Support\Facades\Validator;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\User;

From b5b4e4e37c1d1c1b118dd04384b6fbe0ad8c905e Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 20 Nov 2024 16:56:23 +0000
Subject: [PATCH 2/2] Fix route binding tests.

---
 tests/Routing/RouteBindingTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
index 51cdb2bc131..0d1b8dbd958 100644
--- a/tests/Routing/RouteBindingTest.php
+++ b/tests/Routing/RouteBindingTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Routing;
 
+use Closure;
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Contracts\Routing\BindingRegistrar;
 use Illuminate\Routing\Middleware\SubstituteBindings;