From 85502656da86271ed757ee8490fe9b108c76ad59 Mon Sep 17 00:00:00 2001
From: Benedikt Franke <benedikt.franke@mll.com>
Date: Tue, 24 Sep 2024 08:09:09 +0200
Subject: [PATCH] Fix test class namespaces (#933)

* Fix test class namespaces

* fix stub

* fix namespace

* fix namespace
---
 test/Sentry/Console/AboutCommandIntegrationTest.php       | 2 +-
 test/Sentry/EventHandler/AuthEventsTest.php               | 2 +-
 test/Sentry/Features/ConsoleIntegrationTest.php           | 2 +-
 test/Sentry/Features/ConsoleSchedulingIntegrationTest.php | 2 +-
 test/Sentry/Features/DatabaseIntegrationTest.php          | 2 +-
 test/Sentry/Features/FolioPackageIntegrationTest.php      | 8 ++++----
 test/Sentry/Features/LogIntegrationTest.php               | 2 +-
 test/Sentry/Features/NotificationsIntegrationTest.php     | 2 +-
 test/Sentry/Features/QueueIntegrationTest.php             | 2 +-
 test/Sentry/Features/RouteIntegrationTest.php             | 2 +-
 test/Sentry/Http/LaravelRequestFetcherTest.php            | 2 +-
 test/Sentry/Integration/LaravelContextIntegrationTest.php | 2 +-
 test/Sentry/Integration/ModelViolationReportersTest.php   | 2 +-
 .../ServiceProviderWithEnvironmentFromConfigTest.php      | 4 +---
 ....Features.FolioPackageIntegrationUserModel].blade.php} | 0
 15 files changed, 17 insertions(+), 19 deletions(-)
 rename test/stubs/folio/user/{[.Sentry.Features.FolioPackageIntegrationUserModel].blade.php => [.Sentry.Laravel.Tests.Features.FolioPackageIntegrationUserModel].blade.php} (100%)

diff --git a/test/Sentry/Console/AboutCommandIntegrationTest.php b/test/Sentry/Console/AboutCommandIntegrationTest.php
index 64419a56..e47cc172 100644
--- a/test/Sentry/Console/AboutCommandIntegrationTest.php
+++ b/test/Sentry/Console/AboutCommandIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Console;
+namespace Sentry\Laravel\Tests\Console;
 
 use Illuminate\Foundation\Console\AboutCommand;
 use Illuminate\Support\Facades\Artisan;
diff --git a/test/Sentry/EventHandler/AuthEventsTest.php b/test/Sentry/EventHandler/AuthEventsTest.php
index 1f5769d2..6921f53f 100644
--- a/test/Sentry/EventHandler/AuthEventsTest.php
+++ b/test/Sentry/EventHandler/AuthEventsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\EventHandler;
+namespace Sentry\Laravel\Tests\EventHandler;
 
 use Illuminate\Auth\Events\Authenticated;
 use Illuminate\Contracts\Auth\Authenticatable;
diff --git a/test/Sentry/Features/ConsoleIntegrationTest.php b/test/Sentry/Features/ConsoleIntegrationTest.php
index 1f265479..02308823 100644
--- a/test/Sentry/Features/ConsoleIntegrationTest.php
+++ b/test/Sentry/Features/ConsoleIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Laravel\Tests\EventHandler;
+namespace Sentry\Laravel\Tests\Features;
 
 use Illuminate\Console\Events\CommandStarting;
 use Sentry\Laravel\Tests\TestCase;
diff --git a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php
index f1c7bc15..b7794298 100644
--- a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php
+++ b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use DateTimeZone;
 use Illuminate\Console\Scheduling\Schedule;
diff --git a/test/Sentry/Features/DatabaseIntegrationTest.php b/test/Sentry/Features/DatabaseIntegrationTest.php
index 9b445d2d..3f5c986f 100644
--- a/test/Sentry/Features/DatabaseIntegrationTest.php
+++ b/test/Sentry/Features/DatabaseIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\Facades\DB;
diff --git a/test/Sentry/Features/FolioPackageIntegrationTest.php b/test/Sentry/Features/FolioPackageIntegrationTest.php
index 02be8ede..3f476cb4 100644
--- a/test/Sentry/Features/FolioPackageIntegrationTest.php
+++ b/test/Sentry/Features/FolioPackageIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use Laravel\Folio\Folio;
 use Sentry\EventType;
@@ -165,9 +165,9 @@ public function testFolioTransactionNameForRouteWithRouteModelBoundSegmentParame
 
         $this->get("/folio/user/{$user->id}")->assertOk();
 
-        // This looks a little odd, but that is because we want to make the route model binding work in our tests
-        // normally this would look like `/folio/user/{User}` instead, see: https://laravel.com/docs/10.x/folio#route-model-binding.
-        $this->assertEquals('/folio/user/{.Sentry.Features.FolioPackageIntegrationUserModel}', Integration::getTransaction());
+        // This looks a little odd, but that is because we want to make the route model binding work in our tests.
+        // Normally this would look like `/folio/user/{User}` instead, see: https://laravel.com/docs/10.x/folio#route-model-binding.
+        $this->assertEquals('/folio/user/{.Sentry.Laravel.Tests.Features.FolioPackageIntegrationUserModel}', Integration::getTransaction());
     }
 }
 
diff --git a/test/Sentry/Features/LogIntegrationTest.php b/test/Sentry/Features/LogIntegrationTest.php
index 8c026fca..7d0aec81 100644
--- a/test/Sentry/Features/LogIntegrationTest.php
+++ b/test/Sentry/Features/LogIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use Illuminate\Config\Repository;
 use Illuminate\Support\Facades\Log;
diff --git a/test/Sentry/Features/NotificationsIntegrationTest.php b/test/Sentry/Features/NotificationsIntegrationTest.php
index dfee35d5..4284a4b0 100644
--- a/test/Sentry/Features/NotificationsIntegrationTest.php
+++ b/test/Sentry/Features/NotificationsIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
diff --git a/test/Sentry/Features/QueueIntegrationTest.php b/test/Sentry/Features/QueueIntegrationTest.php
index 9feb327a..215885b4 100644
--- a/test/Sentry/Features/QueueIntegrationTest.php
+++ b/test/Sentry/Features/QueueIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Laravel\Tests\EventHandler;
+namespace Sentry\Laravel\Tests\Features;
 
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/test/Sentry/Features/RouteIntegrationTest.php b/test/Sentry/Features/RouteIntegrationTest.php
index e4b99860..ae2fa95a 100644
--- a/test/Sentry/Features/RouteIntegrationTest.php
+++ b/test/Sentry/Features/RouteIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Features;
+namespace Sentry\Laravel\Tests\Features;
 
 use Illuminate\Routing\Router;
 use Sentry\Laravel\Tests\TestCase;
diff --git a/test/Sentry/Http/LaravelRequestFetcherTest.php b/test/Sentry/Http/LaravelRequestFetcherTest.php
index a115d545..e4058411 100644
--- a/test/Sentry/Http/LaravelRequestFetcherTest.php
+++ b/test/Sentry/Http/LaravelRequestFetcherTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Http;
+namespace Sentry\Laravel\Tests\Http;
 
 use Nyholm\Psr7\ServerRequest;
 use Sentry\Laravel\Http\LaravelRequestFetcher;
diff --git a/test/Sentry/Integration/LaravelContextIntegrationTest.php b/test/Sentry/Integration/LaravelContextIntegrationTest.php
index 042f3b0d..65c1795c 100644
--- a/test/Sentry/Integration/LaravelContextIntegrationTest.php
+++ b/test/Sentry/Integration/LaravelContextIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Integration;
+namespace Sentry\Laravel\Tests\Integration;
 
 use Exception;
 use Illuminate\Support\Facades\Context;
diff --git a/test/Sentry/Integration/ModelViolationReportersTest.php b/test/Sentry/Integration/ModelViolationReportersTest.php
index 39002384..6c23ca35 100644
--- a/test/Sentry/Integration/ModelViolationReportersTest.php
+++ b/test/Sentry/Integration/ModelViolationReportersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sentry\Integration;
+namespace Sentry\Laravel\Tests\Integration;
 
 use Illuminate\Database\Eloquent\MissingAttributeException;
 use Illuminate\Database\Eloquent\Model;
diff --git a/test/Sentry/ServiceProviderWithEnvironmentFromConfigTest.php b/test/Sentry/ServiceProviderWithEnvironmentFromConfigTest.php
index 2f4c9651..98cefe35 100644
--- a/test/Sentry/ServiceProviderWithEnvironmentFromConfigTest.php
+++ b/test/Sentry/ServiceProviderWithEnvironmentFromConfigTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Sentry;
-
-use Sentry\Laravel\Tests\TestCase;
+namespace Sentry\Laravel\Tests;
 
 class ServiceProviderWithEnvironmentFromConfigTest extends TestCase
 {
diff --git a/test/stubs/folio/user/[.Sentry.Features.FolioPackageIntegrationUserModel].blade.php b/test/stubs/folio/user/[.Sentry.Laravel.Tests.Features.FolioPackageIntegrationUserModel].blade.php
similarity index 100%
rename from test/stubs/folio/user/[.Sentry.Features.FolioPackageIntegrationUserModel].blade.php
rename to test/stubs/folio/user/[.Sentry.Laravel.Tests.Features.FolioPackageIntegrationUserModel].blade.php