StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor obscure service names to be clearer

Browse source
This commit is contained in:
Dane Everitt 2017-08-27 15:10:51 -05:00
parent a91d84ecfe
commit 67ac36f5ce
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
25 changed files with 96 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/Admin/NodesController.php
View file

@ -29,9 +29,9 @@ use Illuminate\Http\Request;
use Pterodactyl\Models\Node;
use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Nodes\UpdateService;
use Pterodactyl\Services\Nodes\CreationService;
use Pterodactyl\Services\Nodes\DeletionService;
use Pterodactyl\Services\Nodes\NodeUpdateService;
use Pterodactyl\Services\Nodes\NodeCreationService;
use Pterodactyl\Services\Nodes\NodeDeletionService;
use Illuminate\Cache\Repository as CacheRepository;
use Pterodactyl\Services\Allocations\AssignmentService;
use Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest;
@ -64,12 +64,12 @@ class NodesController extends Controller
protected $cache;
/**
* @var \Pterodactyl\Services\Nodes\CreationService
* @var \Pterodactyl\Services\Nodes\NodeCreationService
*/
protected $creationService;
/**
* @var \Pterodactyl\Services\Nodes\DeletionService
* @var \Pterodactyl\Services\Nodes\NodeDeletionService
*/
protected $deletionService;
@ -84,7 +84,7 @@ class NodesController extends Controller
protected $repository;
/**
* @var \Pterodactyl\Services\Nodes\UpdateService
* @var \Pterodactyl\Services\Nodes\NodeUpdateService
*/
protected $updateService;
@ -95,22 +95,22 @@ class NodesController extends Controller
* @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
* @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService
* @param \Illuminate\Cache\Repository $cache
* @param \Pterodactyl\Services\Nodes\CreationService $creationService
* @param \Pterodactyl\Services\Nodes\DeletionService $deletionService
* @param \Pterodactyl\Services\Nodes\NodeCreationService $creationService
* @param \Pterodactyl\Services\Nodes\NodeDeletionService $deletionService
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository
* @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository
* @param \Pterodactyl\Services\Nodes\UpdateService $updateService
* @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService
*/
public function __construct(
AlertsMessageBag $alert,
AllocationRepositoryInterface $allocationRepository,
AssignmentService $assignmentService,
CacheRepository $cache,
CreationService $creationService,
DeletionService $deletionService,
NodeCreationService $creationService,
NodeDeletionService $deletionService,
LocationRepositoryInterface $locationRepository,
NodeRepositoryInterface $repository,
UpdateService $updateService
NodeUpdateService $updateService
) {
$this->alert = $alert;
$this->allocationRepository = $allocationRepository;

24
app/Http/Controllers/Admin/ServersController.php
View file

@ -30,9 +30,9 @@ use Pterodactyl\Models\Server;
use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Servers\CreationService;
use Pterodactyl\Services\Servers\DeletionService;
use Pterodactyl\Services\Servers\ReinstallService;
use Pterodactyl\Services\Servers\ServerCreationService;
use Pterodactyl\Services\Servers\ServerDeletionService;
use Pterodactyl\Services\Servers\ReinstallServerService;
use Pterodactyl\Services\Servers\SuspensionService;
use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
use Pterodactyl\Services\Servers\ContainerRebuildService;
@ -92,7 +92,7 @@ class ServersController extends Controller
protected $databaseHostRepository;
/**
* @var \Pterodactyl\Services\Servers\DeletionService
* @var \Pterodactyl\Services\Servers\ServerDeletionService
*/
protected $deletionService;
@ -112,7 +112,7 @@ class ServersController extends Controller
protected $nodeRepository;
/**
* @var \Pterodactyl\Services\Servers\ReinstallService
* @var \Pterodactyl\Services\Servers\ReinstallServerService
*/
protected $reinstallService;
@ -122,7 +122,7 @@ class ServersController extends Controller
protected $repository;
/**
* @var \Pterodactyl\Services\Servers\CreationService
* @var \Pterodactyl\Services\Servers\ServerCreationService
*/
protected $service;
@ -149,15 +149,15 @@ class ServersController extends Controller
* @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService
* @param \Illuminate\Contracts\Config\Repository $config
* @param \Pterodactyl\Services\Servers\ContainerRebuildService $containerRebuildService
* @param \Pterodactyl\Services\Servers\CreationService $service
* @param \Pterodactyl\Services\Servers\ServerCreationService $service
* @param \Pterodactyl\Services\Database\DatabaseManagementService $databaseManagementService
* @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository
* @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository $databaseHostRepository
* @param \Pterodactyl\Services\Servers\DeletionService $deletionService
* @param \Pterodactyl\Services\Servers\ServerDeletionService $deletionService
* @param \Pterodactyl\Services\Servers\DetailsModificationService $detailsModificationService
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository
* @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $nodeRepository
* @param \Pterodactyl\Services\Servers\ReinstallService $reinstallService
* @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallService
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
* @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $serviceRepository
* @param \Pterodactyl\Services\Servers\StartupModificationService $startupModificationService
@ -169,15 +169,15 @@ class ServersController extends Controller
BuildModificationService $buildModificationService,
ConfigRepository $config,
ContainerRebuildService $containerRebuildService,
CreationService $service,
ServerCreationService $service,
DatabaseManagementService $databaseManagementService,
DatabaseRepositoryInterface $databaseRepository,
DatabaseHostRepository $databaseHostRepository,
DeletionService $deletionService,
ServerDeletionService $deletionService,
DetailsModificationService $detailsModificationService,
LocationRepositoryInterface $locationRepository,
NodeRepositoryInterface $nodeRepository,
ReinstallService $reinstallService,
ReinstallServerService $reinstallService,
ServerRepositoryInterface $repository,
ServiceRepositoryInterface $serviceRepository,
StartupModificationService $startupModificationService,

24
app/Http/Controllers/Admin/UserController.php
View file

@ -29,9 +29,9 @@ use Pterodactyl\Models\User;
use Prologue\Alerts\AlertsMessageBag;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\Users\UpdateService;
use Pterodactyl\Services\Users\CreationService;
use Pterodactyl\Services\Users\DeletionService;
use Pterodactyl\Services\Users\UserUpdateService;
use Pterodactyl\Services\Users\UserCreationService;
use Pterodactyl\Services\Users\UserDeletionService;
use Illuminate\Contracts\Translation\Translator;
use Pterodactyl\Http\Requests\Admin\UserFormRequest;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@ -44,12 +44,12 @@ class UserController extends Controller
protected $alert;
/**
* @var \Pterodactyl\Services\Users\CreationService
* @var \Pterodactyl\Services\Users\UserCreationService
*/
protected $creationService;
/**
* @var \Pterodactyl\Services\Users\DeletionService
* @var \Pterodactyl\Services\Users\UserDeletionService
*/
protected $deletionService;
@ -64,7 +64,7 @@ class UserController extends Controller
protected $translator;
/**
* @var \Pterodactyl\Services\Users\UpdateService
* @var \Pterodactyl\Services\Users\UserUpdateService
*/
protected $updateService;
@ -72,18 +72,18 @@ class UserController extends Controller
* UserController constructor.
*
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Services\Users\CreationService $creationService
* @param \Pterodactyl\Services\Users\DeletionService $deletionService
* @param \Pterodactyl\Services\Users\UserCreationService $creationService
* @param \Pterodactyl\Services\Users\UserDeletionService $deletionService
* @param \Illuminate\Contracts\Translation\Translator $translator
* @param \Pterodactyl\Services\Users\UpdateService $updateService
* @param \Pterodactyl\Services\Users\UserUpdateService $updateService
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
*/
public function __construct(
AlertsMessageBag $alert,
CreationService $creationService,
DeletionService $deletionService,
UserCreationService $creationService,
UserDeletionService $deletionService,
Translator $translator,
UpdateService $updateService,
UserUpdateService $updateService,
UserRepositoryInterface $repository
) {
$this->alert = $alert;

5
app/Http/Controllers/Base/AccountController.php
View file

@ -30,11 +30,14 @@ use Alert;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\oldUserRepository;
use Pterodactyl\Exceptions\DisplayValidationException;
class AccountController extends Controller
{
public function __construct()
{
}
/**
* Display base account information page.
*