Refactor obscure service names to be clearer

tests/Unit/Services/Nodes/NodeCreationServiceTest.php

@@ -27,10 +27,10 @@ namespace Tests\Unit\Services\Nodes;
 use Mockery as m;
 use Tests\TestCase;
 use phpmock\phpunit\PHPMock;
-use Pterodactyl\Services\Nodes\CreationService;
+use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 
-class CreationServiceTest extends TestCase
+class NodeCreationServiceTest extends TestCase
 {
     use PHPMock;
 
@@ -40,7 +40,7 @@ class CreationServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Nodes\CreationService
+     * @var \Pterodactyl\Services\Nodes\NodeCreationService
      */
     protected $service;
 
@@ -53,7 +53,7 @@ class CreationServiceTest extends TestCase
 
         $this->repository = m::mock(NodeRepositoryInterface::class);
 
-        $this->service = new CreationService($this->repository);
+        $this->service = new NodeCreationService($this->repository);
     }
 
     /**

tests/Unit/Services/Nodes/NodeDeletionServiceTest.php

@@ -27,12 +27,12 @@ namespace Tests\Unit\Services\Nodes;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Node;
-use Pterodactyl\Services\Nodes\DeletionService;
+use Pterodactyl\Services\Nodes\NodeDeletionService;
 use Illuminate\Contracts\Translation\Translator;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
-class DeletionServiceTest extends TestCase
+class NodeDeletionServiceTest extends TestCase
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
@@ -50,7 +50,7 @@ class DeletionServiceTest extends TestCase
     protected $translator;
 
     /**
-     * @var \Pterodactyl\Services\Nodes\DeletionService
+     * @var \Pterodactyl\Services\Nodes\NodeDeletionService
      */
     protected $service;
 
@@ -65,7 +65,7 @@ class DeletionServiceTest extends TestCase
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
         $this->translator = m::mock(Translator::class);
 
-        $this->service = new DeletionService(
+        $this->service = new NodeDeletionService(
             $this->repository,
             $this->serverRepository,
             $this->translator

tests/Unit/Services/Nodes/NodeUpdateServiceTest.php

@@ -32,12 +32,12 @@ use phpmock\phpunit\PHPMock;
 use Pterodactyl\Models\Node;
 use GuzzleHttp\Exception\RequestException;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Nodes\UpdateService;
-use Pterodactyl\Services\Nodes\CreationService;
+use Pterodactyl\Services\Nodes\NodeUpdateService;
+use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
 
-class UpdateServiceTest extends TestCase
+class NodeUpdateServiceTest extends TestCase
 {
     use PHPMock;
 
@@ -62,7 +62,7 @@ class UpdateServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Nodes\UpdateService
+     * @var \Pterodactyl\Services\Nodes\NodeUpdateService
      */
     protected $service;
 
@@ -85,7 +85,7 @@ class UpdateServiceTest extends TestCase
         $this->repository = m::mock(NodeRepositoryInterface::class);
         $this->writer = m::mock(Writer::class);
 
-        $this->service = new UpdateService(
+        $this->service = new NodeUpdateService(
             $this->configRepository,
             $this->repository,
             $this->writer
@@ -99,7 +99,7 @@ class UpdateServiceTest extends TestCase
     {
         $this->getFunctionMock('\\Pterodactyl\\Services\\Nodes', 'random_bytes')
             ->expects($this->once())->willReturnCallback(function ($bytes) {
-                $this->assertEquals(CreationService::DAEMON_SECRET_LENGTH, $bytes);
+                $this->assertEquals(NodeCreationService::DAEMON_SECRET_LENGTH, $bytes);
 
                 return '\00';
             });

tests/Unit/Services/Servers/ReinstallServerServiceTest.php

@@ -32,11 +32,11 @@ use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Servers\ReinstallService;
+use Pterodactyl\Services\Servers\ReinstallServerService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
-class ReinstallServiceTest extends TestCase
+class ReinstallServerServiceTest extends TestCase
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
@@ -64,7 +64,7 @@ class ReinstallServiceTest extends TestCase
     protected $server;
 
     /**
-     * @var \Pterodactyl\Services\Servers\ReinstallService
+     * @var \Pterodactyl\Services\Servers\ReinstallServerService
      */
     protected $service;
 
@@ -88,7 +88,7 @@ class ReinstallServiceTest extends TestCase
 
         $this->server = factory(Server::class)->make(['node_id' => 1]);
 
-        $this->service = new ReinstallService(
+        $this->service = new ReinstallServerService(
             $this->database,
             $this->daemonServerRepository,
             $this->repository,

tests/Unit/Services/Servers/ServerCreationServiceTest.php

@@ -32,7 +32,7 @@ use phpmock\phpunit\PHPMock;
 use Illuminate\Database\DatabaseManager;
 use GuzzleHttp\Exception\RequestException;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Servers\CreationService;
+use Pterodactyl\Services\Servers\ServerCreationService;
 use Pterodactyl\Services\Servers\VariableValidatorService;
 use Pterodactyl\Services\Servers\UsernameGenerationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
@@ -42,7 +42,7 @@ use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
-class CreationServiceTest extends TestCase
+class ServerCreationServiceTest extends TestCase
 {
     use PHPMock;
 
@@ -106,7 +106,7 @@ class CreationServiceTest extends TestCase
     protected $serverVariableRepository;
 
     /**
-     * @var \Pterodactyl\Services\Servers\CreationService
+     * @var \Pterodactyl\Services\Servers\ServerCreationService
      */
     protected $service;
 
@@ -161,7 +161,7 @@ class CreationServiceTest extends TestCase
         $this->getFunctionMock('\\Ramsey\\Uuid\\Uuid', 'uuid4')
             ->expects($this->any())->willReturn('s');
 
-        $this->service = new CreationService(
+        $this->service = new ServerCreationService(
             $this->allocationRepository,
             $this->daemonServerRepository,
             $this->database,

tests/Unit/Services/Servers/ServerDeletionServiceTest.php

@@ -32,13 +32,13 @@ use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Servers\DeletionService;
+use Pterodactyl\Services\Servers\ServerDeletionService;
 use Pterodactyl\Services\Database\DatabaseManagementService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
-class DeletionServiceTest extends TestCase
+class ServerDeletionServiceTest extends TestCase
 {
     /**
      * @var \Illuminate\Database\ConnectionInterface
@@ -76,7 +76,7 @@ class DeletionServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Servers\DeletionService
+     * @var \Pterodactyl\Services\Servers\ServerDeletionService
      */
     protected $service;
 
@@ -101,7 +101,7 @@ class DeletionServiceTest extends TestCase
         $this->repository = m::mock(ServerRepositoryInterface::class);
         $this->writer = m::mock(Writer::class);
 
-        $this->service = new DeletionService(
+        $this->service = new ServerDeletionService(
             $this->connection,
             $this->daemonServerRepository,
             $this->databaseRepository,
@@ -118,7 +118,7 @@ class DeletionServiceTest extends TestCase
     {
         $response = $this->service->withForce(true);
 
-        $this->assertInstanceOf(DeletionService::class, $response);
+        $this->assertInstanceOf(ServerDeletionService::class, $response);
     }
 
     /**

tests/Unit/Services/Subusers/SubuserCreationServiceTest.php

@@ -33,7 +33,7 @@ use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Users\CreationService;
+use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Subusers\SubuserCreationService;
 use Pterodactyl\Services\Subusers\PermissionCreationService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@@ -78,7 +78,7 @@ class SubuserCreationServiceTest extends TestCase
     protected $service;
 
     /**
-     * @var \Pterodactyl\Services\Users\CreationService
+     * @var \Pterodactyl\Services\Users\UserCreationService
      */
     protected $userCreationService;
 
@@ -106,7 +106,7 @@ class SubuserCreationServiceTest extends TestCase
         $this->permissionService = m::mock(PermissionCreationService::class);
         $this->subuserRepository = m::mock(SubuserRepositoryInterface::class);
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
-        $this->userCreationService = m::mock(CreationService::class);
+        $this->userCreationService = m::mock(UserCreationService::class);
         $this->userRepository = m::mock(UserRepositoryInterface::class);
         $this->writer = m::mock(Writer::class);
 

tests/Unit/Services/Users/UserCreationServiceTest.php

@@ -31,11 +31,11 @@ use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Notifications\ChannelManager;
 use Pterodactyl\Notifications\AccountCreated;
-use Pterodactyl\Services\Users\CreationService;
+use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Helpers\TemporaryPasswordService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
-class CreationServiceTest extends TestCase
+class UserCreationServiceTest extends TestCase
 {
     /**
      * @var \Illuminate\Foundation\Application
@@ -68,7 +68,7 @@ class CreationServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Users\CreationService
+     * @var \Pterodactyl\Services\Users\UserCreationService
      */
     protected $service;
 
@@ -86,7 +86,7 @@ class CreationServiceTest extends TestCase
         $this->passwordService = m::mock(TemporaryPasswordService::class);
         $this->repository = m::mock(UserRepositoryInterface::class);
 
-        $this->service = new CreationService(
+        $this->service = new UserCreationService(
             $this->appMock,
             $this->notification,
             $this->database,

tests/Unit/Services/Users/UserDeletionServiceTest.php

@@ -27,12 +27,12 @@ namespace Tests\Unit\Services\Users;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\User;
-use Pterodactyl\Services\Users\DeletionService;
+use Pterodactyl\Services\Users\UserDeletionService;
 use Illuminate\Contracts\Translation\Translator;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
-class DeletionServiceTest extends TestCase
+class UserDeletionServiceTest extends TestCase
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
@@ -50,7 +50,7 @@ class DeletionServiceTest extends TestCase
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Services\Users\DeletionService
+     * @var \Pterodactyl\Services\Users\UserDeletionService
      */
     protected $service;
 
@@ -71,7 +71,7 @@ class DeletionServiceTest extends TestCase
         $this->translator = m::mock(Translator::class);
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
 
-        $this->service = new DeletionService(
+        $this->service = new UserDeletionService(
             $this->serverRepository,
             $this->translator,
             $this->repository

tests/Unit/Services/Users/UserUpdateServiceTest.php

@@ -27,10 +27,10 @@ namespace Tests\Unit\Services\Users;
 use Mockery as m;
 use Tests\TestCase;
 use Illuminate\Contracts\Hashing\Hasher;
-use Pterodactyl\Services\Users\UpdateService;
+use Pterodactyl\Services\Users\UserUpdateService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
-class UpdateServiceTest extends TestCase
+class UserUpdateServiceTest extends TestCase
 {
     /**
      * @var \Illuminate\Contracts\Hashing\Hasher
@@ -43,7 +43,7 @@ class UpdateServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Users\UpdateService
+     * @var \Pterodactyl\Services\Users\UserUpdateService
      */
     protected $service;
 
@@ -57,7 +57,7 @@ class UpdateServiceTest extends TestCase
         $this->hasher = m::mock(Hasher::class);
         $this->repository = m::mock(UserRepositoryInterface::class);
 
-        $this->service = new UpdateService($this->hasher, $this->repository);
+        $this->service = new UserUpdateService($this->hasher, $this->repository);
     }
 
     /**