Revert "I maybe just broke it more?"

This reverts commit 5e0da74.

tests/Assertions/AssertsActivityLogged.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Pyrodactyl\Tests\Assertions;
+namespace Pterodactyl\Tests\Assertions;
 
 use PHPUnit\Framework\Assert;
 use Illuminate\Support\Facades\Event;
-use Pyrodactyl\Events\ActivityLogged;
+use Pterodactyl\Events\ActivityLogged;
 use Illuminate\Database\Eloquent\Model;
-use Pyrodactyl\Models\ActivityLogSubject;
+use Pterodactyl\Models\ActivityLogSubject;
 
 trait AssertsActivityLogged
 {

tests/Assertions/MiddlewareAttributeAssertionsTrait.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pyrodactyl\Tests\Assertions;
+namespace Pterodactyl\Tests\Assertions;
 
 use PHPUnit\Framework\Assert;
 

tests/Integration/Api/Application/ApplicationApiIntegrationTestCase.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application;
+namespace Pterodactyl\Tests\Integration\Api\Application;
 
 use Illuminate\Http\Request;
-use Pyrodactyl\Models\User;
+use Pterodactyl\Models\User;
 use PHPUnit\Framework\Assert;
-use Pyrodactyl\Models\ApiKey;
-use Pyrodactyl\Services\Acl\Api\AdminAcl;
-use Pyrodactyl\Tests\Integration\IntegrationTestCase;
+use Pterodactyl\Models\ApiKey;
+use Pterodactyl\Services\Acl\Api\AdminAcl;
+use Pterodactyl\Tests\Integration\IntegrationTestCase;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Pyrodactyl\Tests\Traits\Integration\CreatesTestModels;
-use Pyrodactyl\Transformers\Api\Application\BaseTransformer;
-use Pyrodactyl\Transformers\Api\Client\BaseClientTransformer;
-use Pyrodactyl\Tests\Traits\Http\IntegrationJsonRequestAssertions;
+use Pterodactyl\Tests\Traits\Integration\CreatesTestModels;
+use Pterodactyl\Transformers\Api\Application\BaseTransformer;
+use Pterodactyl\Transformers\Api\Client\BaseClientTransformer;
+use Pterodactyl\Tests\Traits\Http\IntegrationJsonRequestAssertions;
 
 abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
 {
@@ -36,7 +36,7 @@ public function setUp(): void
         $this->key = $this->createApiKey($this->user);
 
         $this
-            ->withHeader('Accept', 'application/vnd.pyrodactyl.v1+json')
+            ->withHeader('Accept', 'application/vnd.pterodactyl.v1+json')
             ->withHeader('Authorization', 'Bearer ' . $this->key->identifier . decrypt($this->key->token));
     }
 

tests/Integration/Api/Application/Location/LocationControllerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application\Location;
+namespace Pterodactyl\Tests\Integration\Api\Application\Location;
 
-use Pyrodactyl\Models\Node;
+use Pterodactyl\Models\Node;
 use Illuminate\Http\Response;
-use Pyrodactyl\Models\Location;
-use Pyrodactyl\Transformers\Api\Application\NodeTransformer;
-use Pyrodactyl\Transformers\Api\Application\ServerTransformer;
-use Pyrodactyl\Transformers\Api\Application\LocationTransformer;
-use Pyrodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
+use Pterodactyl\Models\Location;
+use Pterodactyl\Transformers\Api\Application\NodeTransformer;
+use Pterodactyl\Transformers\Api\Application\ServerTransformer;
+use Pterodactyl\Transformers\Api\Application\LocationTransformer;
+use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class LocationControllerTest extends ApplicationApiIntegrationTestCase
 {

tests/Integration/Api/Application/Nests/EggControllerTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application\Nests;
+namespace Pterodactyl\Tests\Integration\Api\Application\Nests;
 
 use Illuminate\Support\Arr;
-use Pyrodactyl\Models\Egg;
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\Response;
-use Pyrodactyl\Transformers\Api\Application\EggTransformer;
-use Pyrodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
+use Pterodactyl\Transformers\Api\Application\EggTransformer;
+use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class EggControllerTest extends ApplicationApiIntegrationTestCase
 {

tests/Integration/Api/Application/Nests/NestControllerTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application\Nests;
+namespace Pterodactyl\Tests\Integration\Api\Application\Nests;
 
 use Illuminate\Http\Response;
-use Pyrodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pyrodactyl\Transformers\Api\Application\NestTransformer;
-use Pyrodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Transformers\Api\Application\NestTransformer;
+use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class NestControllerTest extends ApplicationApiIntegrationTestCase
 {
@@ -26,7 +26,7 @@ public function setUp(): void
      */
     public function testNestResponse()
     {
-        /** @var \Pyrodactyl\Models\Nest[] $nests */
+        /** @var \Pterodactyl\Models\Nest[] $nests */
         $nests = $this->repository->all();
 
         $response = $this->getJson('/api/application/nests');

tests/Integration/Api/Application/Users/ExternalUserControllerTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application\Users;
+namespace Pterodactyl\Tests\Integration\Api\Application\Users;
 
 use Illuminate\Support\Str;
-use Pyrodactyl\Models\User;
+use Pterodactyl\Models\User;
 use Illuminate\Http\Response;
-use Pyrodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
+use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class ExternalUserControllerTest extends ApplicationApiIntegrationTestCase
 {

tests/Integration/Api/Application/Users/UserControllerTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Application\Users;
+namespace Pterodactyl\Tests\Integration\Api\Application\Users;
 
-use Pyrodactyl\Models\User;
+use Pterodactyl\Models\User;
 use Illuminate\Http\Response;
-use Pyrodactyl\Services\Acl\Api\AdminAcl;
-use Pyrodactyl\Transformers\Api\Application\UserTransformer;
-use Pyrodactyl\Transformers\Api\Application\ServerTransformer;
-use Pyrodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
+use Pterodactyl\Services\Acl\Api\AdminAcl;
+use Pterodactyl\Transformers\Api\Application\UserTransformer;
+use Pterodactyl\Transformers\Api\Application\ServerTransformer;
+use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class UserControllerTest extends ApplicationApiIntegrationTestCase
 {

tests/Integration/Api/Client/AccountControllerTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client;
+namespace Pterodactyl\Tests\Integration\Api\Client;
 
 use Illuminate\Support\Str;
-use Pyrodactyl\Models\User;
+use Pterodactyl\Models\User;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Hash;
 

tests/Integration/Api/Client/ApiKeyControllerTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client;
+namespace Pterodactyl\Tests\Integration\Api\Client;
 
-use Pyrodactyl\Models\User;
+use Pterodactyl\Models\User;
 use Illuminate\Http\Response;
-use Pyrodactyl\Models\ApiKey;
+use Pterodactyl\Models\ApiKey;
 use Illuminate\Support\Facades\Event;
-use Pyrodactyl\Events\ActivityLogged;
+use Pterodactyl\Events\ActivityLogged;
 
 class ApiKeyControllerTest extends ClientApiIntegrationTestCase
 {
@@ -98,8 +98,8 @@ public function testApiKeyCannotSpecifyMoreThanFiftyIps()
      * Test that no more than 25 API keys can exist at any one time for an account. This prevents
      * a DoS attack vector against the panel.
      *
-     * @see https://github.com/pyrodactyl/panel/security/advisories/GHSA-pjmh-7xfm-r4x9
-     * @see https://github.com/pyrodactyl/panel/issues/4394
+     * @see https://github.com/pterodactyl/panel/security/advisories/GHSA-pjmh-7xfm-r4x9
+     * @see https://github.com/pterodactyl/panel/issues/4394
      */
     public function testApiKeyLimitIsApplied()
     {
@@ -121,7 +121,7 @@ public function testApiKeyLimitIsApplied()
     /**
      * Test that a bad request results in a validation error being returned by the API.
      *
-     * @see https://github.com/pyrodactyl/panel/issues/2457
+     * @see https://github.com/pterodactyl/panel/issues/2457
      */
     public function testValidationErrorIsReturnedForBadRequests()
     {

tests/Integration/Api/Client/ClientApiIntegrationTestCase.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client;
+namespace Pterodactyl\Tests\Integration\Api\Client;
 
-use Pyrodactyl\Models\Node;
-use Pyrodactyl\Models\Task;
-use Pyrodactyl\Models\User;
-use Pyrodactyl\Models\Model;
-use Pyrodactyl\Models\Backup;
-use Pyrodactyl\Models\Server;
-use Pyrodactyl\Models\Database;
-use Pyrodactyl\Models\Location;
-use Pyrodactyl\Models\Schedule;
+use Pterodactyl\Models\Node;
+use Pterodactyl\Models\Task;
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\Model;
+use Pterodactyl\Models\Backup;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Models\Database;
+use Pterodactyl\Models\Location;
+use Pterodactyl\Models\Schedule;
 use Illuminate\Support\Collection;
-use Pyrodactyl\Models\Allocation;
-use Pyrodactyl\Models\DatabaseHost;
-use Pyrodactyl\Tests\Integration\TestResponse;
-use Pyrodactyl\Tests\Integration\IntegrationTestCase;
+use Pterodactyl\Models\Allocation;
+use Pterodactyl\Models\DatabaseHost;
+use Pterodactyl\Tests\Integration\TestResponse;
+use Pterodactyl\Tests\Integration\IntegrationTestCase;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
-use Pyrodactyl\Transformers\Api\Client\BaseClientTransformer;
+use Pterodactyl\Transformers\Api\Client\BaseClientTransformer;
 
 abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
 {
@@ -87,7 +87,7 @@ protected function link(mixed $model, ?string $append = null): string
     protected function assertJsonTransformedWith(array $data, Model|EloquentModel $model)
     {
         $reflect = new \ReflectionClass($model);
-        $transformer = sprintf('\\Pyrodactyl\\Transformers\\Api\\Client\\%sTransformer', $reflect->getShortName());
+        $transformer = sprintf('\\Pterodactyl\\Transformers\\Api\\Client\\%sTransformer', $reflect->getShortName());
 
         $transformer = new $transformer();
         $this->assertInstanceOf(BaseClientTransformer::class, $transformer);

tests/Integration/Api/Client/ClientControllerTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client;
+namespace Pterodactyl\Tests\Integration\Api\Client;
 
-use Pyrodactyl\Models\User;
-use Pyrodactyl\Models\Server;
-use Pyrodactyl\Models\Subuser;
-use Pyrodactyl\Models\Allocation;
-use Pyrodactyl\Models\Permission;
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Models\Subuser;
+use Pterodactyl\Models\Allocation;
+use Pterodactyl\Models\Permission;
 
 class ClientControllerTest extends ClientApiIntegrationTestCase
 {
@@ -18,10 +18,10 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
      */
     public function testOnlyLoggedInUsersServersAreReturned()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(3)->create();
 
-        /** @var \Pyrodactyl\Models\Server[] $servers */
+        /** @var \Pterodactyl\Models\Server[] $servers */
         $servers = [
             $this->createServerModel(['user_id' => $users[0]->id]),
             $this->createServerModel(['user_id' => $users[1]->id]),
@@ -45,11 +45,11 @@ public function testOnlyLoggedInUsersServersAreReturned()
      */
     public function testServersAreFilteredUsingNameAndUuidInformation()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(2)->create();
         $users[0]->update(['root_admin' => true]);
 
-        /** @var \Pyrodactyl\Models\Server[] $servers */
+        /** @var \Pterodactyl\Models\Server[] $servers */
         $servers = [
             $this->createServerModel(['user_id' => $users[0]->id, 'name' => 'Julia']),
             $this->createServerModel(['user_id' => $users[1]->id, 'uuidShort' => '12121212', 'name' => 'Janice']),
@@ -143,7 +143,7 @@ public function testServersAreFilteredUsingAllocationInformation()
      */
     public function testServersUserIsASubuserOfAreReturned()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(3)->create();
         $servers = [
             $this->createServerModel(['user_id' => $users[0]->id]),
@@ -174,7 +174,7 @@ public function testServersUserIsASubuserOfAreReturned()
      */
     public function testFilterOnlyOwnerServers()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(3)->create();
         $servers = [
             $this->createServerModel(['user_id' => $users[0]->id]),
@@ -223,7 +223,7 @@ public function testPermissionsAreReturned()
      */
     public function testOnlyAdminLevelServersAreReturned()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(4)->create();
         $users[0]->update(['root_admin' => true]);
 
@@ -258,7 +258,7 @@ public function testOnlyAdminLevelServersAreReturned()
      */
     public function testAllServersAreReturnedToAdmin()
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(4)->create();
         $users[0]->update(['root_admin' => true]);
 
@@ -289,7 +289,7 @@ public function testAllServersAreReturnedToAdmin()
     #[\PHPUnit\Framework\Attributes\DataProvider('filterTypeDataProvider')]
     public function testNoServersAreReturnedIfAdminFilterIsPassedByRegularUser(string $type)
     {
-        /** @var \Pyrodactyl\Models\User[] $users */
+        /** @var \Pterodactyl\Models\User[] $users */
         $users = User::factory()->times(3)->create();
 
         $this->createServerModel(['user_id' => $users[0]->id]);

tests/Integration/Api/Client/SSHKeyControllerTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client;
+namespace Pterodactyl\Tests\Integration\Api\Client;
 
 use phpseclib3\Crypt\EC;
-use Pyrodactyl\Models\User;
-use Pyrodactyl\Models\UserSSHKey;
+use Pterodactyl\Models\User;
+use Pterodactyl\Models\UserSSHKey;
 
 class SSHKeyControllerTest extends ClientApiIntegrationTestCase
 {

tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pyrodactyl\Tests\Integration\Api\Client\Server\Allocation;
+namespace Pterodactyl\Tests\Integration\Api\Client\Server\Allocation;
 
-use Pyrodactyl\Models\Subuser;
-use Pyrodactyl\Models\Allocation;
-use Pyrodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
+use Pterodactyl\Models\Subuser;
+use Pterodactyl\Models\Allocation;
+use Pterodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
 
 class AllocationAuthorizationTest extends ClientApiIntegrationTestCase
 {