diff --git a/.php_cs b/.php_cs index c854af47c..1e37fcb13 100644 --- a/.php_cs +++ b/.php_cs @@ -39,7 +39,7 @@ return PhpCsFixer\Config::create() 'ordered_imports' => [ 'sortAlgorithm' => 'length', ], - 'phpdoc_align' => ['tags' => ['param']], + 'phpdoc_align' => false, 'phpdoc_separation' => false, 'protected_to_private' => false, 'psr0' => ['dir' => 'app'], diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php index 038e206f6..60254a9ef 100644 --- a/app/Console/Commands/Environment/AppSettingsCommand.php +++ b/app/Console/Commands/Environment/AppSettingsCommand.php @@ -79,7 +79,7 @@ class AppSettingsCommand extends Command * AppSettingsCommand constructor. * * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Console\Kernel $command + * @param \Illuminate\Contracts\Console\Kernel $command */ public function __construct(ConfigRepository $config, Kernel $command) { @@ -102,41 +102,41 @@ class AppSettingsCommand extends Command $this->output->comment(trans('command/messages.environment.app.author_help')); $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask( - trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'unknown@unknown.com') - ); + trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'unknown@unknown.com') + ); $this->output->comment(trans('command/messages.environment.app.app_url_help')); $this->variables['APP_URL'] = $this->option('url') ?? $this->ask( - trans('command/messages.environment.app.app_url'), $this->config->get('app.url', 'http://example.org') - ); + trans('command/messages.environment.app.app_url'), $this->config->get('app.url', 'http://example.org') + ); $this->output->comment(trans('command/messages.environment.app.timezone_help')); $this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate( - trans('command/messages.environment.app.timezone'), - DateTimeZone::listIdentifiers(DateTimeZone::ALL), - $this->config->get('app.timezone') - ); + trans('command/messages.environment.app.timezone'), + DateTimeZone::listIdentifiers(DateTimeZone::ALL), + $this->config->get('app.timezone') + ); $selected = $this->config->get('cache.default', 'redis'); $this->variables['CACHE_DRIVER'] = $this->option('cache') ?? $this->choice( - trans('command/messages.environment.app.cache_driver'), - self::ALLOWED_CACHE_DRIVERS, - array_key_exists($selected, self::ALLOWED_CACHE_DRIVERS) ? $selected : null - ); + trans('command/messages.environment.app.cache_driver'), + self::ALLOWED_CACHE_DRIVERS, + array_key_exists($selected, self::ALLOWED_CACHE_DRIVERS) ? $selected : null + ); $selected = $this->config->get('session.driver', 'redis'); $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice( - trans('command/messages.environment.app.session_driver'), - self::ALLOWED_SESSION_DRIVERS, - array_key_exists($selected, self::ALLOWED_SESSION_DRIVERS) ? $selected : null - ); + trans('command/messages.environment.app.session_driver'), + self::ALLOWED_SESSION_DRIVERS, + array_key_exists($selected, self::ALLOWED_SESSION_DRIVERS) ? $selected : null + ); $selected = $this->config->get('queue.default', 'redis'); $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice( - trans('command/messages.environment.app.queue_driver'), - self::ALLOWED_QUEUE_DRIVERS, - array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null - ); + trans('command/messages.environment.app.queue_driver'), + self::ALLOWED_QUEUE_DRIVERS, + array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null + ); if (! is_null($this->option('settings-ui'))) { $this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true'; @@ -166,8 +166,8 @@ class AppSettingsCommand extends Command $this->output->note(trans('command/messages.environment.app.using_redis')); $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask( - trans('command/messages.environment.app.redis_host'), $this->config->get('database.redis.default.host') - ); + trans('command/messages.environment.app.redis_host'), $this->config->get('database.redis.default.host') + ); $askForRedisPassword = true; if (! empty($this->config->get('database.redis.default.password'))) { @@ -178,8 +178,8 @@ class AppSettingsCommand extends Command if ($askForRedisPassword) { $this->output->comment(trans('command/messages.environment.app.redis_pass_help')); $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden( - trans('command/messages.environment.app.redis_password') - ); + trans('command/messages.environment.app.redis_password') + ); } if (empty($this->variables['REDIS_PASSWORD'])) { @@ -187,7 +187,7 @@ class AppSettingsCommand extends Command } $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask( - trans('command/messages.environment.app.redis_port'), $this->config->get('database.redis.default.port') - ); + trans('command/messages.environment.app.redis_port'), $this->config->get('database.redis.default.port') + ); } } diff --git a/app/Console/Commands/Environment/DatabaseSettingsCommand.php b/app/Console/Commands/Environment/DatabaseSettingsCommand.php index 02396142c..0a0e56b28 100644 --- a/app/Console/Commands/Environment/DatabaseSettingsCommand.php +++ b/app/Console/Commands/Environment/DatabaseSettingsCommand.php @@ -59,8 +59,8 @@ class DatabaseSettingsCommand extends Command * DatabaseSettingsCommand constructor. * * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Database\DatabaseManager $database - * @param \Illuminate\Contracts\Console\Kernel $console + * @param \Illuminate\Database\DatabaseManager $database + * @param \Illuminate\Contracts\Console\Kernel $console */ public function __construct(ConfigRepository $config, DatabaseManager $database, Kernel $console) { @@ -82,21 +82,21 @@ class DatabaseSettingsCommand extends Command { $this->output->note(trans('command/messages.environment.database.host_warning')); $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask( - trans('command/messages.environment.database.host'), $this->config->get('database.connections.mysql.host', '127.0.0.1') - ); + trans('command/messages.environment.database.host'), $this->config->get('database.connections.mysql.host', '127.0.0.1') + ); $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask( - trans('command/messages.environment.database.port'), $this->config->get('database.connections.mysql.port', 3306) - ); + trans('command/messages.environment.database.port'), $this->config->get('database.connections.mysql.port', 3306) + ); $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask( - trans('command/messages.environment.database.database'), $this->config->get('database.connections.mysql.database', 'panel') - ); + trans('command/messages.environment.database.database'), $this->config->get('database.connections.mysql.database', 'panel') + ); $this->output->note(trans('command/messages.environment.database.username_warning')); $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask( - trans('command/messages.environment.database.username'), $this->config->get('database.connections.mysql.username', 'pterodactyl') - ); + trans('command/messages.environment.database.username'), $this->config->get('database.connections.mysql.username', 'pterodactyl') + ); $askForMySQLPassword = true; if (! empty($this->config->get('database.connections.mysql.password')) && $this->input->isInteractive()) { @@ -136,15 +136,15 @@ class DatabaseSettingsCommand extends Command private function testMySQLConnection() { $this->config->set('database.connections._pterodactyl_command_test', [ - 'driver' => 'mysql', - 'host' => $this->variables['DB_HOST'], - 'port' => $this->variables['DB_PORT'], - 'database' => $this->variables['DB_DATABASE'], - 'username' => $this->variables['DB_USERNAME'], - 'password' => $this->variables['DB_PASSWORD'], - 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', - 'strict' => true, + 'driver' => 'mysql', + 'host' => $this->variables['DB_HOST'], + 'port' => $this->variables['DB_PORT'], + 'database' => $this->variables['DB_DATABASE'], + 'username' => $this->variables['DB_USERNAME'], + 'password' => $this->variables['DB_PASSWORD'], + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'strict' => true, ]); $this->database->connection('_pterodactyl_command_test')->getPdo(); diff --git a/app/Console/Commands/Environment/EmailSettingsCommand.php b/app/Console/Commands/Environment/EmailSettingsCommand.php index 0a29f2da2..b8604757f 100644 --- a/app/Console/Commands/Environment/EmailSettingsCommand.php +++ b/app/Console/Commands/Environment/EmailSettingsCommand.php @@ -59,19 +59,20 @@ class EmailSettingsCommand extends Command /** * Handle command execution. + * * @throws \Pterodactyl\Exceptions\PterodactylException */ public function handle() { $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice( - trans('command/messages.environment.mail.ask_driver'), [ + trans('command/messages.environment.mail.ask_driver'), [ 'smtp' => 'SMTP Server', 'mail' => 'PHP\'s Internal Mail Function', 'mailgun' => 'Mailgun Transactional Email', 'mandrill' => 'Mandrill Transactional Email', 'postmark' => 'Postmarkapp Transactional Email', ], $this->config->get('mail.driver', 'smtp') - ); + ); $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables'; if (method_exists($this, $method)) { @@ -79,16 +80,16 @@ class EmailSettingsCommand extends Command } $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask( - trans('command/messages.environment.mail.ask_mail_from'), $this->config->get('mail.from.address') - ); + trans('command/messages.environment.mail.ask_mail_from'), $this->config->get('mail.from.address') + ); $this->variables['MAIL_FROM_NAME'] = $this->option('from') ?? $this->ask( - trans('command/messages.environment.mail.ask_mail_name'), $this->config->get('mail.from.name') - ); + trans('command/messages.environment.mail.ask_mail_name'), $this->config->get('mail.from.name') + ); $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice( - trans('command/messages.environment.mail.ask_encryption'), ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'], $this->config->get('mail.encryption', 'tls') - ); + trans('command/messages.environment.mail.ask_encryption'), ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'], $this->config->get('mail.encryption', 'tls') + ); $this->writeToEnvironment($this->variables); @@ -102,20 +103,20 @@ class EmailSettingsCommand extends Command private function setupSmtpDriverVariables() { $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask( - trans('command/messages.environment.mail.ask_smtp_host'), $this->config->get('mail.host') - ); + trans('command/messages.environment.mail.ask_smtp_host'), $this->config->get('mail.host') + ); $this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask( - trans('command/messages.environment.mail.ask_smtp_port'), $this->config->get('mail.port') - ); + trans('command/messages.environment.mail.ask_smtp_port'), $this->config->get('mail.port') + ); $this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask( - trans('command/messages.environment.mail.ask_smtp_username'), $this->config->get('mail.username') - ); + trans('command/messages.environment.mail.ask_smtp_username'), $this->config->get('mail.username') + ); $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret( - trans('command/messages.environment.mail.ask_smtp_password') - ); + trans('command/messages.environment.mail.ask_smtp_password') + ); } /** @@ -124,12 +125,12 @@ class EmailSettingsCommand extends Command private function setupMailgunDriverVariables() { $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask( - trans('command/messages.environment.mail.ask_mailgun_domain'), $this->config->get('services.mailgun.domain') - ); + trans('command/messages.environment.mail.ask_mailgun_domain'), $this->config->get('services.mailgun.domain') + ); $this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask( - trans('command/messages.environment.mail.ask_mailgun_secret'), $this->config->get('services.mailgun.secret') - ); + trans('command/messages.environment.mail.ask_mailgun_secret'), $this->config->get('services.mailgun.secret') + ); } /** @@ -138,8 +139,8 @@ class EmailSettingsCommand extends Command private function setupMandrillDriverVariables() { $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask( - trans('command/messages.environment.mail.ask_mandrill_secret'), $this->config->get('services.mandrill.secret') - ); + trans('command/messages.environment.mail.ask_mandrill_secret'), $this->config->get('services.mandrill.secret') + ); } /** @@ -151,7 +152,7 @@ class EmailSettingsCommand extends Command $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com'; $this->variables['MAIL_PORT'] = 587; $this->variables['MAIL_USERNAME'] = $this->variables['MAIL_PASSWORD'] = $this->option('username') ?? $this->ask( - trans('command/messages.environment.mail.ask_postmark_username'), $this->config->get('mail.username') - ); + trans('command/messages.environment.mail.ask_postmark_username'), $this->config->get('mail.username') + ); } } diff --git a/app/Console/Commands/InfoCommand.php b/app/Console/Commands/InfoCommand.php index d8544477f..7ee140a1f 100644 --- a/app/Console/Commands/InfoCommand.php +++ b/app/Console/Commands/InfoCommand.php @@ -38,7 +38,7 @@ class InfoCommand extends Command /** * VersionCommand constructor. * - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService */ public function __construct(ConfigRepository $config, SoftwareVersionService $versionService) diff --git a/app/Console/Commands/Location/DeleteLocationCommand.php b/app/Console/Commands/Location/DeleteLocationCommand.php index 77e5606a3..b6782207e 100644 --- a/app/Console/Commands/Location/DeleteLocationCommand.php +++ b/app/Console/Commands/Location/DeleteLocationCommand.php @@ -44,7 +44,7 @@ class DeleteLocationCommand extends Command * DeleteLocationCommand constructor. * * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository - * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService + * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService */ public function __construct( LocationDeletionService $deletionService, @@ -66,8 +66,8 @@ class DeleteLocationCommand extends Command { $this->locations = $this->locations ?? $this->repository->all(); $short = $this->option('short') ?? $this->anticipate( - trans('command/messages.location.ask_short'), $this->locations->pluck('short')->toArray() - ); + trans('command/messages.location.ask_short'), $this->locations->pluck('short')->toArray() + ); $location = $this->locations->where('short', $short)->first(); if (is_null($location)) { diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php index e5a40fb43..67654708c 100644 --- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php +++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php @@ -40,7 +40,7 @@ class ProcessRunnableCommand extends Command /** * ProcessRunnableCommand constructor. * - * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService + * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository */ public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository) diff --git a/app/Console/Commands/Server/BulkPowerActionCommand.php b/app/Console/Commands/Server/BulkPowerActionCommand.php index f6aa798b6..58188c6d4 100644 --- a/app/Console/Commands/Server/BulkPowerActionCommand.php +++ b/app/Console/Commands/Server/BulkPowerActionCommand.php @@ -43,8 +43,8 @@ class BulkPowerActionCommand extends Command * BulkPowerActionCommand constructor. * * @param \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface $powerRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Illuminate\Validation\Factory $validator + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Illuminate\Validation\Factory $validator */ public function __construct( PowerRepositoryInterface $powerRepository, diff --git a/app/Console/Commands/Server/BulkReinstallActionCommand.php b/app/Console/Commands/Server/BulkReinstallActionCommand.php index deb33a5b1..bcafbb95b 100644 --- a/app/Console/Commands/Server/BulkReinstallActionCommand.php +++ b/app/Console/Commands/Server/BulkReinstallActionCommand.php @@ -48,9 +48,9 @@ class BulkReinstallActionCommand extends Command /** * BulkReinstallActionCommand constructor. * - * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository + * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( DaemonServerRepository $daemonRepository, diff --git a/app/Console/Commands/Server/RebuildServerCommand.php b/app/Console/Commands/Server/RebuildServerCommand.php index d86c4402b..cf20f9df3 100644 --- a/app/Console/Commands/Server/RebuildServerCommand.php +++ b/app/Console/Commands/Server/RebuildServerCommand.php @@ -48,9 +48,9 @@ class RebuildServerCommand extends Command /** * RebuildServerCommand constructor. * - * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository + * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( DaemonServerRepository $daemonRepository, diff --git a/app/Console/Commands/User/DeleteUserCommand.php b/app/Console/Commands/User/DeleteUserCommand.php index c9a69bee8..5f2a50e62 100644 --- a/app/Console/Commands/User/DeleteUserCommand.php +++ b/app/Console/Commands/User/DeleteUserCommand.php @@ -39,7 +39,7 @@ class DeleteUserCommand extends Command /** * DeleteUserCommand constructor. * - * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService + * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( diff --git a/app/Contracts/Criteria/CriteriaInterface.php b/app/Contracts/Criteria/CriteriaInterface.php index 628aee94e..1b8328192 100644 --- a/app/Contracts/Criteria/CriteriaInterface.php +++ b/app/Contracts/Criteria/CriteriaInterface.php @@ -16,7 +16,7 @@ interface CriteriaInterface /** * Apply selected criteria to a repository call. * - * @param \Illuminate\Database\Eloquent\Model $model + * @param \Illuminate\Database\Eloquent\Model $model * @param \Pterodactyl\Repositories\Repository $repository * @return mixed */ diff --git a/app/Contracts/Extensions/HashidsInterface.php b/app/Contracts/Extensions/HashidsInterface.php index 39fa7d624..8e1e69900 100644 --- a/app/Contracts/Extensions/HashidsInterface.php +++ b/app/Contracts/Extensions/HashidsInterface.php @@ -17,7 +17,7 @@ interface HashidsInterface extends VendorHashidsInterface * Decode an encoded hashid and return the first result. * * @param string $encoded - * @param null $default + * @param null $default * @return mixed * * @throws \InvalidArgumentException diff --git a/app/Contracts/Repository/AllocationRepositoryInterface.php b/app/Contracts/Repository/AllocationRepositoryInterface.php index 994ded2cc..6f038a853 100644 --- a/app/Contracts/Repository/AllocationRepositoryInterface.php +++ b/app/Contracts/Repository/AllocationRepositoryInterface.php @@ -11,7 +11,7 @@ interface AllocationRepositoryInterface extends RepositoryInterface * Set an array of allocation IDs to be assigned to a specific server. * * @param int|null $server - * @param array $ids + * @param array $ids * @return int */ public function assignAllocationsToServer(int $server = null, array $ids): int; @@ -76,7 +76,7 @@ interface AllocationRepositoryInterface extends RepositoryInterface * * @param array $nodes * @param array $ports - * @param bool $dedicated + * @param bool $dedicated * @return \Pterodactyl\Models\Allocation|null */ public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false); diff --git a/app/Contracts/Repository/ApiKeyRepositoryInterface.php b/app/Contracts/Repository/ApiKeyRepositoryInterface.php index 3eb03880b..89a722b22 100644 --- a/app/Contracts/Repository/ApiKeyRepositoryInterface.php +++ b/app/Contracts/Repository/ApiKeyRepositoryInterface.php @@ -27,7 +27,7 @@ interface ApiKeyRepositoryInterface extends RepositoryInterface * Delete an account API key from the panel for a specific user. * * @param \Pterodactyl\Models\User $user - * @param string $identifier + * @param string $identifier * @return int */ public function deleteAccountKey(User $user, string $identifier): int; @@ -36,7 +36,7 @@ interface ApiKeyRepositoryInterface extends RepositoryInterface * Delete an application API key from the panel for a specific user. * * @param \Pterodactyl\Models\User $user - * @param string $identifier + * @param string $identifier * @return int */ public function deleteApplicationKey(User $user, string $identifier): int; diff --git a/app/Contracts/Repository/Daemon/FileRepositoryInterface.php b/app/Contracts/Repository/Daemon/FileRepositoryInterface.php index c70fb859b..90d75e3d4 100644 --- a/app/Contracts/Repository/Daemon/FileRepositoryInterface.php +++ b/app/Contracts/Repository/Daemon/FileRepositoryInterface.php @@ -23,7 +23,7 @@ interface FileRepositoryInterface extends BaseRepositoryInterface /** * Return the contents of a given file if it can be edited in the Panel. * - * @param string $path + * @param string $path * @param int|null $notLargerThan * @return string */ diff --git a/app/Contracts/Repository/DaemonKeyRepositoryInterface.php b/app/Contracts/Repository/DaemonKeyRepositoryInterface.php index 7979980c0..e1f18b502 100644 --- a/app/Contracts/Repository/DaemonKeyRepositoryInterface.php +++ b/app/Contracts/Repository/DaemonKeyRepositoryInterface.php @@ -17,7 +17,7 @@ interface DaemonKeyRepositoryInterface extends RepositoryInterface * Load the server and user relations onto a key model. * * @param \Pterodactyl\Models\DaemonKey $key - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\DaemonKey */ public function loadServerAndUserRelations(DaemonKey $key, bool $refresh = false): DaemonKey; diff --git a/app/Contracts/Repository/EggRepositoryInterface.php b/app/Contracts/Repository/EggRepositoryInterface.php index 2d018eb65..0f6a88aa7 100644 --- a/app/Contracts/Repository/EggRepositoryInterface.php +++ b/app/Contracts/Repository/EggRepositoryInterface.php @@ -35,7 +35,7 @@ interface EggRepositoryInterface extends RepositoryInterface * Return an egg with the scriptFrom and configFrom relations loaded onto the model. * * @param int|string $value - * @param string $column + * @param string $column * @return \Pterodactyl\Models\Egg */ public function getWithCopyAttributes($value, string $column = 'id'): Egg; diff --git a/app/Contracts/Repository/NodeRepositoryInterface.php b/app/Contracts/Repository/NodeRepositoryInterface.php index c1bb25c40..6bf6cd18f 100644 --- a/app/Contracts/Repository/NodeRepositoryInterface.php +++ b/app/Contracts/Repository/NodeRepositoryInterface.php @@ -40,7 +40,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa * Return a single node with location and server information. * * @param \Pterodactyl\Models\Node $node - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Node */ public function loadLocationAndServerCount(Node $node, bool $refresh = false): Node; @@ -50,7 +50,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa * any servers that are also attached to those allocations. * * @param \Pterodactyl\Models\Node $node - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Node */ public function loadNodeAllocations(Node $node, bool $refresh = false): Node; @@ -67,8 +67,8 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa * available to support the additional disk and memory provided. * * @param array $locations - * @param int $disk - * @param int $memory + * @param int $disk + * @param int $memory * @return \Illuminate\Support\LazyCollection */ public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection; diff --git a/app/Contracts/Repository/PackRepositoryInterface.php b/app/Contracts/Repository/PackRepositoryInterface.php index 6ef7cef7f..f3ac27f96 100644 --- a/app/Contracts/Repository/PackRepositoryInterface.php +++ b/app/Contracts/Repository/PackRepositoryInterface.php @@ -12,7 +12,7 @@ interface PackRepositoryInterface extends RepositoryInterface, SearchableInterfa * Return a pack with the associated server models attached to it. * * @param \Pterodactyl\Models\Pack $pack - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Pack */ public function loadServerData(Pack $pack, bool $refresh = false): Pack; diff --git a/app/Contracts/Repository/RepositoryInterface.php b/app/Contracts/Repository/RepositoryInterface.php index 4cdebf7bb..5caaac907 100644 --- a/app/Contracts/Repository/RepositoryInterface.php +++ b/app/Contracts/Repository/RepositoryInterface.php @@ -71,8 +71,8 @@ interface RepositoryInterface * Create a new model instance and persist it to the database. * * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -134,10 +134,10 @@ interface RepositoryInterface /** * Update a given ID with the passed array of fields. * - * @param int $id + * @param int $id * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -150,8 +150,8 @@ interface RepositoryInterface * This does not perform any model data validation. * * @param string $column - * @param array $values - * @param array $fields + * @param array $values + * @param array $fields * @return int */ public function updateWhereIn(string $column, array $values, array $fields): int; @@ -161,8 +161,8 @@ interface RepositoryInterface * * @param array $where * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Contracts/Repository/ScheduleRepositoryInterface.php b/app/Contracts/Repository/ScheduleRepositoryInterface.php index 67bf40271..4f340601c 100644 --- a/app/Contracts/Repository/ScheduleRepositoryInterface.php +++ b/app/Contracts/Repository/ScheduleRepositoryInterface.php @@ -20,7 +20,7 @@ interface ScheduleRepositoryInterface extends RepositoryInterface * already present. * * @param \Pterodactyl\Models\Schedule $schedule - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Schedule */ public function loadTasks(Schedule $schedule, bool $refresh = false): Schedule; diff --git a/app/Contracts/Repository/ServerRepositoryInterface.php b/app/Contracts/Repository/ServerRepositoryInterface.php index b82e84fa1..71169088c 100644 --- a/app/Contracts/Repository/ServerRepositoryInterface.php +++ b/app/Contracts/Repository/ServerRepositoryInterface.php @@ -22,7 +22,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * Load the egg relations onto the server model. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function loadEggRelations(Server $server, bool $refresh = false): Server; @@ -61,7 +61,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * return the server from the database. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function getPrimaryAllocation(Server $server, bool $refresh = false): Server; @@ -70,7 +70,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * Return all of the server variables possible and default to the variable * default if there is no value defined for the specific server requested. * - * @param int $id + * @param int $id * @param bool $returnAsObject * @return array|object * @@ -82,7 +82,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * Return enough data to be used for the creation of a server via the daemon. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function getDataForCreation(Server $server, bool $refresh = false): Server; @@ -91,7 +91,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * Load associated databases onto the server model. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function loadDatabaseRelations(Server $server, bool $refresh = false): Server; @@ -102,7 +102,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * if they are missing, or refresh is set to true. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return array */ public function getDaemonServiceData(Server $server, bool $refresh = false): array; @@ -111,8 +111,8 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * Return a paginated list of servers that a user can access at a given level. * * @param \Pterodactyl\Models\User $user - * @param int $level - * @param bool|int $paginate + * @param int $level + * @param bool|int $paginate * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection */ public function filterUserAccessServers(User $user, int $level, $paginate = 25); @@ -132,7 +132,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter * * @param int[] $servers * @param int[] $nodes - * @param bool $returnCount + * @param bool $returnCount * @return int|\Illuminate\Support\LazyCollection */ public function getServersForPowerAction(array $servers = [], array $nodes = [], bool $returnCount = false); diff --git a/app/Contracts/Repository/SessionRepositoryInterface.php b/app/Contracts/Repository/SessionRepositoryInterface.php index 8020d15a3..496fa35e7 100644 --- a/app/Contracts/Repository/SessionRepositoryInterface.php +++ b/app/Contracts/Repository/SessionRepositoryInterface.php @@ -17,7 +17,7 @@ interface SessionRepositoryInterface extends RepositoryInterface /** * Delete a session for a given user. * - * @param int $user + * @param int $user * @param string $session * @return null|int */ diff --git a/app/Contracts/Repository/SettingsRepositoryInterface.php b/app/Contracts/Repository/SettingsRepositoryInterface.php index 7d192c80a..6c4db9dca 100644 --- a/app/Contracts/Repository/SettingsRepositoryInterface.php +++ b/app/Contracts/Repository/SettingsRepositoryInterface.php @@ -7,7 +7,7 @@ interface SettingsRepositoryInterface extends RepositoryInterface /** * Store a new persistent setting in the database. * - * @param string $key + * @param string $key * @param string|null $value * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -19,7 +19,7 @@ interface SettingsRepositoryInterface extends RepositoryInterface * Retrieve a persistent setting from the database. * * @param string $key - * @param mixed $default + * @param mixed $default * @return mixed */ public function get(string $key, $default); diff --git a/app/Contracts/Repository/SubuserRepositoryInterface.php b/app/Contracts/Repository/SubuserRepositoryInterface.php index 2d722119a..6babbfcc2 100644 --- a/app/Contracts/Repository/SubuserRepositoryInterface.php +++ b/app/Contracts/Repository/SubuserRepositoryInterface.php @@ -10,7 +10,7 @@ interface SubuserRepositoryInterface extends RepositoryInterface * Return a subuser with the associated server relationship. * * @param \Pterodactyl\Models\Subuser $subuser - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Subuser */ public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser; @@ -19,7 +19,7 @@ interface SubuserRepositoryInterface extends RepositoryInterface * Return a subuser with the associated permissions relationship. * * @param \Pterodactyl\Models\Subuser $subuser - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Subuser */ public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser; diff --git a/app/Exceptions/AccountNotFoundException.php b/app/Exceptions/AccountNotFoundException.php index f9430eeb7..885e712e6 100644 --- a/app/Exceptions/AccountNotFoundException.php +++ b/app/Exceptions/AccountNotFoundException.php @@ -9,6 +9,8 @@ namespace Pterodactyl\Exceptions; -class AccountNotFoundException extends \Exception +use Exception; + +class AccountNotFoundException extends Exception { } diff --git a/app/Exceptions/AutoDeploymentException.php b/app/Exceptions/AutoDeploymentException.php index d2455318f..96627763b 100644 --- a/app/Exceptions/AutoDeploymentException.php +++ b/app/Exceptions/AutoDeploymentException.php @@ -9,6 +9,8 @@ namespace Pterodactyl\Exceptions; -class AutoDeploymentException extends \Exception +use Exception; + +class AutoDeploymentException extends Exception { } diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php index a00939711..94a920056 100644 --- a/app/Exceptions/DisplayException.php +++ b/app/Exceptions/DisplayException.php @@ -24,10 +24,10 @@ class DisplayException extends PterodactylException /** * Exception constructor. * - * @param string $message + * @param string $message * @param Throwable|null $previous - * @param string $level - * @param int $code + * @param string $level + * @param int $code */ public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR, $code = 0) { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 9df75620e..8f60bcbf8 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -131,7 +131,7 @@ class Handler extends ExceptionHandler * Render an exception into an HTTP response. * * @param \Illuminate\Http\Request $request - * @param \Exception $exception + * @param \Exception $exception * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception @@ -160,7 +160,7 @@ class Handler extends ExceptionHandler * Transform a validation exception into a consistent format to be returned for * calls to the API. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Illuminate\Validation\ValidationException $exception * @return \Illuminate\Http\JsonResponse */ @@ -199,7 +199,7 @@ class Handler extends ExceptionHandler * Return the exception as a JSONAPI representation for use on API requests. * * @param \Exception $exception - * @param array $override + * @param array $override * @return array */ public static function convertToArray(Exception $exception, array $override = []): array @@ -240,7 +240,7 @@ class Handler extends ExceptionHandler /** * Convert an authentication exception into an unauthenticated response. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Illuminate\Auth\AuthenticationException $exception * @return \Illuminate\Http\Response */ diff --git a/app/Exceptions/Http/Connection/DaemonConnectionException.php b/app/Exceptions/Http/Connection/DaemonConnectionException.php index f2892789c..ea1ab4799 100644 --- a/app/Exceptions/Http/Connection/DaemonConnectionException.php +++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php @@ -17,7 +17,7 @@ class DaemonConnectionException extends DisplayException * Throw a displayable exception caused by a daemon connection error. * * @param \GuzzleHttp\Exception\GuzzleException $previous - * @param bool $useStatusCode + * @param bool $useStatusCode */ public function __construct(GuzzleException $previous, bool $useStatusCode = false) { diff --git a/app/Exceptions/PterodactylException.php b/app/Exceptions/PterodactylException.php index 451ae92cb..51766a924 100644 --- a/app/Exceptions/PterodactylException.php +++ b/app/Exceptions/PterodactylException.php @@ -2,6 +2,8 @@ namespace Pterodactyl\Exceptions; -class PterodactylException extends \Exception +use Exception; + +class PterodactylException extends Exception { } diff --git a/app/Exceptions/Service/Helper/CdnVersionFetchingException.php b/app/Exceptions/Service/Helper/CdnVersionFetchingException.php index d9a2cd7f5..2f934033a 100644 --- a/app/Exceptions/Service/Helper/CdnVersionFetchingException.php +++ b/app/Exceptions/Service/Helper/CdnVersionFetchingException.php @@ -9,6 +9,8 @@ namespace Pterodactyl\Exceptions\Service\Helper; -class CdnVersionFetchingException extends \Exception +use Exception; + +class CdnVersionFetchingException extends Exception { } diff --git a/app/Exceptions/Service/Pack/ZipArchiveCreationException.php b/app/Exceptions/Service/Pack/ZipArchiveCreationException.php index 79caab261..62b11136d 100644 --- a/app/Exceptions/Service/Pack/ZipArchiveCreationException.php +++ b/app/Exceptions/Service/Pack/ZipArchiveCreationException.php @@ -9,6 +9,8 @@ namespace Pterodactyl\Exceptions\Service\Pack; -class ZipArchiveCreationException extends \Exception +use Exception; + +class ZipArchiveCreationException extends Exception { } diff --git a/app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php b/app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php index fdd0ec67f..e14a33aed 100644 --- a/app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php +++ b/app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php @@ -9,6 +9,8 @@ namespace Pterodactyl\Exceptions\Service\User; -class TwoFactorAuthenticationTokenInvalid extends \Exception +use Exception; + +class TwoFactorAuthenticationTokenInvalid extends Exception { } diff --git a/app/Extensions/DynamicDatabaseConnection.php b/app/Extensions/DynamicDatabaseConnection.php index 670e75e44..f31a92b19 100644 --- a/app/Extensions/DynamicDatabaseConnection.php +++ b/app/Extensions/DynamicDatabaseConnection.php @@ -38,9 +38,9 @@ class DynamicDatabaseConnection /** * DynamicDatabaseConnection constructor. * - * @param \Illuminate\Config\Repository $config + * @param \Illuminate\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct( ConfigRepository $config, @@ -55,9 +55,9 @@ class DynamicDatabaseConnection /** * Adds a dynamic database connection entry to the runtime config. * - * @param string $connection + * @param string $connection * @param \Pterodactyl\Models\DatabaseHost|int $host - * @param string $database + * @param string $database * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException */ diff --git a/app/Extensions/League/Fractal/Serializers/PterodactylSerializer.php b/app/Extensions/League/Fractal/Serializers/PterodactylSerializer.php index 9599ca2c9..4a76d8ff6 100644 --- a/app/Extensions/League/Fractal/Serializers/PterodactylSerializer.php +++ b/app/Extensions/League/Fractal/Serializers/PterodactylSerializer.php @@ -10,7 +10,7 @@ class PterodactylSerializer extends ArraySerializer * Serialize an item. * * @param string $resourceKey - * @param array $data + * @param array $data * @return array */ public function item($resourceKey, array $data) @@ -25,7 +25,7 @@ class PterodactylSerializer extends ArraySerializer * Serialize a collection. * * @param string $resourceKey - * @param array $data + * @param array $data * @return array */ public function collection($resourceKey, array $data) diff --git a/app/Http/Controllers/Admin/ApiController.php b/app/Http/Controllers/Admin/ApiController.php index 2fa541bc7..6067b423c 100644 --- a/app/Http/Controllers/Admin/ApiController.php +++ b/app/Http/Controllers/Admin/ApiController.php @@ -34,9 +34,9 @@ class ApiController extends Controller /** * ApplicationApiController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository - * @param \Pterodactyl\Services\Api\KeyCreationService $keyCreationService + * @param \Pterodactyl\Services\Api\KeyCreationService $keyCreationService */ public function __construct( AlertsMessageBag $alert, @@ -106,7 +106,7 @@ class ApiController extends Controller * Delete an application API key from the database. * * @param \Illuminate\Http\Request $request - * @param string $identifier + * @param string $identifier * @return \Illuminate\Http\Response */ public function delete(Request $request, string $identifier): Response diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php index df25200af..5d967352f 100644 --- a/app/Http/Controllers/Admin/DatabaseController.php +++ b/app/Http/Controllers/Admin/DatabaseController.php @@ -57,13 +57,13 @@ class DatabaseController extends Controller /** * DatabaseController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository - * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository - * @param \Pterodactyl\Services\Databases\Hosts\HostCreationService $creationService - * @param \Pterodactyl\Services\Databases\Hosts\HostDeletionService $deletionService - * @param \Pterodactyl\Services\Databases\Hosts\HostUpdateService $updateService - * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository + * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository + * @param \Pterodactyl\Services\Databases\Hosts\HostCreationService $creationService + * @param \Pterodactyl\Services\Databases\Hosts\HostDeletionService $deletionService + * @param \Pterodactyl\Services\Databases\Hosts\HostUpdateService $updateService + * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository */ public function __construct( AlertsMessageBag $alert, @@ -146,7 +146,7 @@ class DatabaseController extends Controller * Handle updating database host. * * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request - * @param \Pterodactyl\Models\DatabaseHost $host + * @param \Pterodactyl\Models\DatabaseHost $host * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php index 9239889cc..286d15cf9 100644 --- a/app/Http/Controllers/Admin/LocationController.php +++ b/app/Http/Controllers/Admin/LocationController.php @@ -49,11 +49,11 @@ class LocationController extends Controller /** * LocationController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Locations\LocationCreationService $creationService - * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Locations\LocationCreationService $creationService + * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository - * @param \Pterodactyl\Services\Locations\LocationUpdateService $updateService + * @param \Pterodactyl\Services\Locations\LocationUpdateService $updateService */ public function __construct( AlertsMessageBag $alert, @@ -116,7 +116,7 @@ class LocationController extends Controller * Handle request to update or delete location. * * @param \Pterodactyl\Http\Requests\Admin\LocationFormRequest $request - * @param \Pterodactyl\Models\Location $location + * @param \Pterodactyl\Models\Location $location * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable diff --git a/app/Http/Controllers/Admin/Nests/EggController.php b/app/Http/Controllers/Admin/Nests/EggController.php index 56d69e3a7..209dad691 100644 --- a/app/Http/Controllers/Admin/Nests/EggController.php +++ b/app/Http/Controllers/Admin/Nests/EggController.php @@ -25,10 +25,15 @@ use Pterodactyl\Contracts\Repository\NestRepositoryInterface; class EggController extends Controller { protected $alert; + protected $creationService; + protected $deletionService; + protected $nestRepository; + protected $repository; + protected $updateService; public function __construct( @@ -94,7 +99,7 @@ class EggController extends Controller * Handle request to update an Egg. * * @param \Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest $request - * @param \Pterodactyl\Models\Egg $egg + * @param \Pterodactyl\Models\Egg $egg * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Admin/Nests/EggScriptController.php b/app/Http/Controllers/Admin/Nests/EggScriptController.php index ac67a2a6d..298126a6f 100644 --- a/app/Http/Controllers/Admin/Nests/EggScriptController.php +++ b/app/Http/Controllers/Admin/Nests/EggScriptController.php @@ -37,9 +37,9 @@ class EggScriptController extends Controller /** * EggScriptController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository - * @param \Pterodactyl\Services\Eggs\Scripts\InstallScriptService $installScriptService + * @param \Pterodactyl\Services\Eggs\Scripts\InstallScriptService $installScriptService */ public function __construct( AlertsMessageBag $alert, @@ -81,7 +81,7 @@ class EggScriptController extends Controller * Handle a request to update the installation script for an Egg. * * @param \Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest $request - * @param int $egg + * @param int $egg * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Admin/Nests/EggShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php index 80e8e30b9..9b9403e4d 100644 --- a/app/Http/Controllers/Admin/Nests/EggShareController.php +++ b/app/Http/Controllers/Admin/Nests/EggShareController.php @@ -44,9 +44,9 @@ class EggShareController extends Controller /** * OptionShareController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService - * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService + * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService * @param \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService $updateImporterService */ public function __construct( @@ -102,7 +102,7 @@ class EggShareController extends Controller * Update an existing Egg using a new imported file. * * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request - * @param int $egg + * @param int $egg * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Admin/Nests/EggVariableController.php b/app/Http/Controllers/Admin/Nests/EggVariableController.php index df29de5ae..c0677abb5 100644 --- a/app/Http/Controllers/Admin/Nests/EggVariableController.php +++ b/app/Http/Controllers/Admin/Nests/EggVariableController.php @@ -51,10 +51,10 @@ class EggVariableController extends Controller /** * EggVariableController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Eggs\Variables\VariableCreationService $creationService - * @param \Pterodactyl\Services\Eggs\Variables\VariableUpdateService $updateService - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Eggs\Variables\VariableCreationService $creationService + * @param \Pterodactyl\Services\Eggs\Variables\VariableUpdateService $updateService + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository */ public function __construct( @@ -109,8 +109,8 @@ class EggVariableController extends Controller * Handle a request to update an existing Egg variable. * * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request - * @param \Pterodactyl\Models\Egg $egg - * @param \Pterodactyl\Models\EggVariable $variable + * @param \Pterodactyl\Models\Egg $egg + * @param \Pterodactyl\Models\EggVariable $variable * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -131,7 +131,7 @@ class EggVariableController extends Controller /** * Handle a request to delete an existing Egg variable from the Panel. * - * @param int $egg + * @param int $egg * @param \Pterodactyl\Models\EggVariable $variable * @return \Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Controllers/Admin/Nests/NestController.php b/app/Http/Controllers/Admin/Nests/NestController.php index b62753cad..155df2a5c 100644 --- a/app/Http/Controllers/Admin/Nests/NestController.php +++ b/app/Http/Controllers/Admin/Nests/NestController.php @@ -49,11 +49,11 @@ class NestController extends Controller /** * NestController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Nests\NestCreationService $nestCreationService - * @param \Pterodactyl\Services\Nests\NestDeletionService $nestDeletionService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Nests\NestCreationService $nestCreationService + * @param \Pterodactyl\Services\Nests\NestDeletionService $nestDeletionService * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository - * @param \Pterodactyl\Services\Nests\NestUpdateService $nestUpdateService + * @param \Pterodactyl\Services\Nests\NestUpdateService $nestUpdateService */ public function __construct( AlertsMessageBag $alert, @@ -128,7 +128,7 @@ class NestController extends Controller * Handle request to update a nest. * * @param \Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest $request - * @param int $nest + * @param int $nest * * @return \Illuminate\Http\RedirectResponse * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php index 8d48f9dff..8d4048d21 100644 --- a/app/Http/Controllers/Admin/NodesController.php +++ b/app/Http/Controllers/Admin/NodesController.php @@ -97,18 +97,18 @@ class NodesController extends Controller /** * NodesController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Allocations\AllocationDeletionService $allocationDeletionService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Allocations\AllocationDeletionService $allocationDeletionService * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository - * @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService - * @param \Illuminate\Cache\Repository $cache - * @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\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService - * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService + * @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService + * @param \Illuminate\Cache\Repository $cache + * @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\Contracts\Repository\ServerRepositoryInterface $serverRepository + * @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService + * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService */ public function __construct( AlertsMessageBag $alert, @@ -261,7 +261,7 @@ class NodesController extends Controller * Updates settings for a node. * * @param \Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest $request - * @param \Pterodactyl\Models\Node $node + * @param \Pterodactyl\Models\Node $node * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -279,7 +279,7 @@ class NodesController extends Controller /** * Removes a single allocation from a node. * - * @param int $node + * @param int $node * @param \Pterodactyl\Models\Allocation $allocation * @return \Illuminate\Http\Response * @@ -296,7 +296,7 @@ class NodesController extends Controller * Removes multiple individual allocations from a node. * * @param \Illuminate\Http\Request $request - * @param int $node + * @param int $node * @return \Illuminate\Http\Response * * @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException @@ -317,7 +317,7 @@ class NodesController extends Controller * Remove all allocations for a specific IP at once on a node. * * @param \Illuminate\Http\Request $request - * @param int $node + * @param int $node * @return \Illuminate\Http\RedirectResponse */ public function allocationRemoveBlock(Request $request, $node) @@ -356,7 +356,7 @@ class NodesController extends Controller * Creates new allocations on a node. * * @param \Pterodactyl\Http\Requests\Admin\Node\AllocationFormRequest $request - * @param int|\Pterodactyl\Models\Node $node + * @param int|\Pterodactyl\Models\Node $node * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php index 1dd7c881c..98191222e 100644 --- a/app/Http/Controllers/Admin/PackController.php +++ b/app/Http/Controllers/Admin/PackController.php @@ -73,15 +73,15 @@ class PackController extends Controller /** * PackController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Pterodactyl\Services\Packs\ExportPackService $exportService - * @param \Pterodactyl\Services\Packs\PackCreationService $creationService - * @param \Pterodactyl\Services\Packs\PackDeletionService $deletionService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Pterodactyl\Services\Packs\ExportPackService $exportService + * @param \Pterodactyl\Services\Packs\PackCreationService $creationService + * @param \Pterodactyl\Services\Packs\PackDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository - * @param \Pterodactyl\Services\Packs\PackUpdateService $updateService + * @param \Pterodactyl\Services\Packs\PackUpdateService $updateService * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $serviceRepository - * @param \Pterodactyl\Services\Packs\TemplateUploadService $templateUploadService + * @param \Pterodactyl\Services\Packs\TemplateUploadService $templateUploadService */ public function __construct( AlertsMessageBag $alert, @@ -191,7 +191,7 @@ class PackController extends Controller * Handle updating or deleting pack information. * * @param \Pterodactyl\Http\Requests\Admin\PackFormRequest $request - * @param \Pterodactyl\Models\Pack $pack + * @param \Pterodactyl\Models\Pack $pack * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -229,7 +229,7 @@ class PackController extends Controller * Creates an archive of the pack and downloads it to the browser. * * @param \Pterodactyl\Models\Pack $pack - * @param bool|string $files + * @param bool|string $files * @return \Symfony\Component\HttpFoundation\Response * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index 6bf21b249..3e5e1542c 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -137,25 +137,25 @@ class ServersController extends Controller /** * ServersController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository - * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Pterodactyl\Services\Servers\ContainerRebuildService $containerRebuildService - * @param \Pterodactyl\Services\Servers\ServerCreationService $service - * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService - * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService - * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository - * @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository $databaseHostRepository - * @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\ReinstallServerService $reinstallService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $nestRepository - * @param \Pterodactyl\Services\Servers\StartupModificationService $startupModificationService - * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService + * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Pterodactyl\Services\Servers\ContainerRebuildService $containerRebuildService + * @param \Pterodactyl\Services\Servers\ServerCreationService $service + * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService + * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService + * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository + * @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository $databaseHostRepository + * @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\ReinstallServerService $reinstallService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $nestRepository + * @param \Pterodactyl\Services\Servers\StartupModificationService $startupModificationService + * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService */ public function __construct( AlertsMessageBag $alert, @@ -402,7 +402,7 @@ class ServersController extends Controller /** * Update the details for a server. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * @@ -482,7 +482,7 @@ class ServersController extends Controller /** * Manage the suspension status for a server. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * @@ -503,7 +503,7 @@ class ServersController extends Controller /** * Update the build configuration for a server. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * @@ -526,7 +526,7 @@ class ServersController extends Controller /** * Start the server deletion process. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * @@ -544,7 +544,7 @@ class ServersController extends Controller /** * Update the startup command as well as variables. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * @@ -566,7 +566,7 @@ class ServersController extends Controller * Creates a new database assigned to a specific server. * * @param \Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest $request - * @param int $server + * @param int $server * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -586,7 +586,7 @@ class ServersController extends Controller * Resets the database password for a specific database on this server. * * @param \Illuminate\Http\Request $request - * @param int $server + * @param int $server * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable diff --git a/app/Http/Controllers/Admin/Settings/AdvancedController.php b/app/Http/Controllers/Admin/Settings/AdvancedController.php index f32517e7a..54409d190 100644 --- a/app/Http/Controllers/Admin/Settings/AdvancedController.php +++ b/app/Http/Controllers/Admin/Settings/AdvancedController.php @@ -36,9 +36,9 @@ class AdvancedController extends Controller /** * AdvancedController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Console\Kernel $kernel + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Console\Kernel $kernel * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings */ public function __construct( diff --git a/app/Http/Controllers/Admin/Settings/IndexController.php b/app/Http/Controllers/Admin/Settings/IndexController.php index bb9aef3e4..1bf61d65a 100644 --- a/app/Http/Controllers/Admin/Settings/IndexController.php +++ b/app/Http/Controllers/Admin/Settings/IndexController.php @@ -39,10 +39,10 @@ class IndexController extends Controller /** * IndexController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Illuminate\Contracts\Console\Kernel $kernel + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Illuminate\Contracts\Console\Kernel $kernel * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings - * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService + * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService */ public function __construct( AlertsMessageBag $alert, diff --git a/app/Http/Controllers/Admin/Settings/MailController.php b/app/Http/Controllers/Admin/Settings/MailController.php index 7364a4ec5..ccd84fa5c 100644 --- a/app/Http/Controllers/Admin/Settings/MailController.php +++ b/app/Http/Controllers/Admin/Settings/MailController.php @@ -48,10 +48,10 @@ class MailController extends Controller /** * MailController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter - * @param \Illuminate\Contracts\Console\Kernel $kernel + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Console\Kernel $kernel * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings */ public function __construct( diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index e0474fa5b..7431023aa 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -52,11 +52,11 @@ class UserController extends Controller /** * UserController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Users\UserCreationService $creationService - * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService - * @param \Illuminate\Contracts\Translation\Translator $translator - * @param \Pterodactyl\Services\Users\UserUpdateService $updateService + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Users\UserCreationService $creationService + * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService + * @param \Illuminate\Contracts\Translation\Translator $translator + * @param \Pterodactyl\Services\Users\UserUpdateService $updateService * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( @@ -156,7 +156,7 @@ class UserController extends Controller * Update a user on the system. * * @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request - * @param \Pterodactyl\Models\User $user + * @param \Pterodactyl\Models\User $user * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Api/Application/ApplicationApiController.php b/app/Http/Controllers/Api/Application/ApplicationApiController.php index da37a1a73..903edeb65 100644 --- a/app/Http/Controllers/Api/Application/ApplicationApiController.php +++ b/app/Http/Controllers/Api/Application/ApplicationApiController.php @@ -47,7 +47,7 @@ abstract class ApplicationApiController extends Controller * without littering the constructors of classes that extend this abstract. * * @param \Pterodactyl\Extensions\Spatie\Fractalistic\Fractal $fractal - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request */ public function loadDependencies(Fractal $fractal, Request $request) { diff --git a/app/Http/Controllers/Api/Application/Locations/LocationController.php b/app/Http/Controllers/Api/Application/Locations/LocationController.php index 9220cf358..98ec30574 100644 --- a/app/Http/Controllers/Api/Application/Locations/LocationController.php +++ b/app/Http/Controllers/Api/Application/Locations/LocationController.php @@ -42,10 +42,10 @@ class LocationController extends ApplicationApiController /** * LocationController constructor. * - * @param \Pterodactyl\Services\Locations\LocationCreationService $creationService - * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService + * @param \Pterodactyl\Services\Locations\LocationCreationService $creationService + * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository - * @param \Pterodactyl\Services\Locations\LocationUpdateService $updateService + * @param \Pterodactyl\Services\Locations\LocationUpdateService $updateService */ public function __construct( LocationCreationService $creationService, diff --git a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php index 094834fe8..cc1a32ff8 100644 --- a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php +++ b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php @@ -34,8 +34,8 @@ class AllocationController extends ApplicationApiController /** * AllocationController constructor. * - * @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService - * @param \Pterodactyl\Services\Allocations\AllocationDeletionService $deletionService + * @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService + * @param \Pterodactyl\Services\Allocations\AllocationDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $repository */ public function __construct( diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php index 2ae2b9603..e6b4be6a2 100644 --- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php +++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php @@ -42,9 +42,9 @@ class NodeController extends ApplicationApiController /** * NodeController constructor. * - * @param \Pterodactyl\Services\Nodes\NodeCreationService $creationService - * @param \Pterodactyl\Services\Nodes\NodeDeletionService $deletionService - * @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService + * @param \Pterodactyl\Services\Nodes\NodeCreationService $creationService + * @param \Pterodactyl\Services\Nodes\NodeDeletionService $deletionService + * @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository */ public function __construct( diff --git a/app/Http/Controllers/Api/Application/Servers/DatabaseController.php b/app/Http/Controllers/Api/Application/Servers/DatabaseController.php index a2030bbc7..f556aff57 100644 --- a/app/Http/Controllers/Api/Application/Servers/DatabaseController.php +++ b/app/Http/Controllers/Api/Application/Servers/DatabaseController.php @@ -36,8 +36,8 @@ class DatabaseController extends ApplicationApiController /** * DatabaseController constructor. * - * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService - * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService + * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService + * @param \Pterodactyl\Services\Databases\DatabasePasswordService $databasePasswordService * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository */ public function __construct( diff --git a/app/Http/Controllers/Api/Application/Servers/ServerController.php b/app/Http/Controllers/Api/Application/Servers/ServerController.php index 1ef1e0b62..443dca5b1 100644 --- a/app/Http/Controllers/Api/Application/Servers/ServerController.php +++ b/app/Http/Controllers/Api/Application/Servers/ServerController.php @@ -35,8 +35,8 @@ class ServerController extends ApplicationApiController /** * ServerController constructor. * - * @param \Pterodactyl\Services\Servers\ServerCreationService $creationService - * @param \Pterodactyl\Services\Servers\ServerDeletionService $deletionService + * @param \Pterodactyl\Services\Servers\ServerCreationService $creationService + * @param \Pterodactyl\Services\Servers\ServerDeletionService $deletionService * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( @@ -104,8 +104,8 @@ class ServerController extends ApplicationApiController /** * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request - * @param \Pterodactyl\Models\Server $server - * @param string $force + * @param \Pterodactyl\Models\Server $server + * @param string $force * @return \Illuminate\Http\Response * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php index e544c138a..d4d0cc14d 100644 --- a/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php +++ b/app/Http/Controllers/Api/Application/Servers/ServerDetailsController.php @@ -25,7 +25,7 @@ class ServerDetailsController extends ApplicationApiController /** * ServerDetailsController constructor. * - * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService + * @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService * @param \Pterodactyl\Services\Servers\DetailsModificationService $detailsModificationService */ public function __construct( diff --git a/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php b/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php index 9ab324d7e..3c7e2997e 100644 --- a/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php +++ b/app/Http/Controllers/Api/Application/Servers/ServerManagementController.php @@ -31,8 +31,8 @@ class ServerManagementController extends ApplicationApiController * SuspensionController constructor. * * @param \Pterodactyl\Services\Servers\ContainerRebuildService $rebuildService - * @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallServerService - * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService + * @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallServerService + * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService */ public function __construct( ContainerRebuildService $rebuildService, diff --git a/app/Http/Controllers/Api/Application/Users/UserController.php b/app/Http/Controllers/Api/Application/Users/UserController.php index d845c9441..d067bab10 100644 --- a/app/Http/Controllers/Api/Application/Users/UserController.php +++ b/app/Http/Controllers/Api/Application/Users/UserController.php @@ -42,9 +42,9 @@ class UserController extends ApplicationApiController * UserController constructor. * * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository - * @param \Pterodactyl\Services\Users\UserCreationService $creationService - * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService - * @param \Pterodactyl\Services\Users\UserUpdateService $updateService + * @param \Pterodactyl\Services\Users\UserCreationService $creationService + * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService + * @param \Pterodactyl\Services\Users\UserUpdateService $updateService */ public function __construct( UserRepositoryInterface $repository, diff --git a/app/Http/Controllers/Api/Client/Servers/CommandController.php b/app/Http/Controllers/Api/Client/Servers/CommandController.php index 9ff2572f2..d4551aa2f 100644 --- a/app/Http/Controllers/Api/Client/Servers/CommandController.php +++ b/app/Http/Controllers/Api/Client/Servers/CommandController.php @@ -36,7 +36,7 @@ class CommandController extends ClientApiController * Send a command to a running server. * * @param \Pterodactyl\Http\Requests\Api\Client\Servers\SendCommandRequest $request - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\Response * * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException diff --git a/app/Http/Controllers/Api/Client/Servers/FileController.php b/app/Http/Controllers/Api/Client/Servers/FileController.php index ac1527603..f734cc127 100644 --- a/app/Http/Controllers/Api/Client/Servers/FileController.php +++ b/app/Http/Controllers/Api/Client/Servers/FileController.php @@ -43,9 +43,9 @@ class FileController extends ClientApiController /** * FileController constructor. * - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface $fileRepository - * @param \Illuminate\Contracts\Cache\Repository $cache + * @param \Illuminate\Contracts\Cache\Repository $cache */ public function __construct(ConfigRepository $config, FileRepositoryInterface $fileRepository, CacheRepository $cache) { diff --git a/app/Http/Controllers/Api/Remote/EggInstallController.php b/app/Http/Controllers/Api/Remote/EggInstallController.php index 65aedfbff..d26da5c85 100644 --- a/app/Http/Controllers/Api/Remote/EggInstallController.php +++ b/app/Http/Controllers/Api/Remote/EggInstallController.php @@ -23,7 +23,7 @@ class EggInstallController extends Controller /** * EggInstallController constructor. * - * @param \Pterodactyl\Services\Servers\EnvironmentService $environment + * @param \Pterodactyl\Services\Servers\EnvironmentService $environment * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct(EnvironmentService $environment, ServerRepositoryInterface $repository) @@ -37,7 +37,7 @@ class EggInstallController extends Controller * that is being created on the node. * * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param string $uuid * @return \Illuminate\Http\JsonResponse * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Controllers/Api/Remote/EggRetrievalController.php b/app/Http/Controllers/Api/Remote/EggRetrievalController.php index 2f006b64e..30fb7eda3 100644 --- a/app/Http/Controllers/Api/Remote/EggRetrievalController.php +++ b/app/Http/Controllers/Api/Remote/EggRetrievalController.php @@ -30,7 +30,7 @@ class EggRetrievalController extends Controller * OptionUpdateController constructor. * * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository - * @param \Pterodactyl\Services\Eggs\EggConfigurationService $configurationFileService + * @param \Pterodactyl\Services\Eggs\EggConfigurationService $configurationFileService */ public function __construct( EggRepositoryInterface $repository, diff --git a/app/Http/Controllers/Api/Remote/ValidateKeyController.php b/app/Http/Controllers/Api/Remote/ValidateKeyController.php index 86a02cbce..9ed52f7fe 100644 --- a/app/Http/Controllers/Api/Remote/ValidateKeyController.php +++ b/app/Http/Controllers/Api/Remote/ValidateKeyController.php @@ -55,9 +55,9 @@ class ValidateKeyController extends Controller /** * ValidateKeyController constructor. * - * @param \Illuminate\Contracts\Foundation\Application $app + * @param \Illuminate\Contracts\Foundation\Application $app * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $daemonKeyRepository - * @param \Spatie\Fractal\Fractal $fractal + * @param \Spatie\Fractal\Fractal $fractal */ public function __construct( Application $app, diff --git a/app/Http/Controllers/Auth/AbstractLoginController.php b/app/Http/Controllers/Auth/AbstractLoginController.php index 108a104e1..0810d7e93 100644 --- a/app/Http/Controllers/Auth/AbstractLoginController.php +++ b/app/Http/Controllers/Auth/AbstractLoginController.php @@ -51,7 +51,7 @@ abstract class AbstractLoginController extends Controller /** * LoginController constructor. * - * @param \Illuminate\Auth\AuthManager $auth + * @param \Illuminate\Auth\AuthManager $auth * @param \Illuminate\Contracts\Config\Repository $config */ public function __construct(AuthManager $auth, Repository $config) @@ -66,7 +66,7 @@ abstract class AbstractLoginController extends Controller /** * Get the failed login response instance. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Illuminate\Contracts\Auth\Authenticatable|null $user * * @throws \Pterodactyl\Exceptions\DisplayException @@ -123,7 +123,7 @@ abstract class AbstractLoginController extends Controller * Fire a failed login event. * * @param \Illuminate\Contracts\Auth\Authenticatable|null $user - * @param array $credentials + * @param array $credentials */ protected function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = []) { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index e772321f9..8f78f8c09 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -16,7 +16,7 @@ class ForgotPasswordController extends Controller /** * Get the response for a failed password reset link. * - * @param \Illuminate\Http\Request + * @param \Illuminate\Http\Request * @param string $response * @return \Illuminate\Http\JsonResponse */ @@ -34,7 +34,7 @@ class ForgotPasswordController extends Controller * Get the response for a successful password reset link. * * @param \Illuminate\Http\Request $request - * @param string $response + * @param string $response * @return \Illuminate\Http\JsonResponse */ protected function sendResetLinkResponse(Request $request, $response): JsonResponse diff --git a/app/Http/Controllers/Auth/LoginCheckpointController.php b/app/Http/Controllers/Auth/LoginCheckpointController.php index 8af396ede..a136779ce 100644 --- a/app/Http/Controllers/Auth/LoginCheckpointController.php +++ b/app/Http/Controllers/Auth/LoginCheckpointController.php @@ -37,11 +37,11 @@ class LoginCheckpointController extends AbstractLoginController /** * LoginCheckpointController constructor. * - * @param \Illuminate\Auth\AuthManager $auth - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter - * @param \PragmaRX\Google2FA\Google2FA $google2FA - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Cache\Repository $cache + * @param \Illuminate\Auth\AuthManager $auth + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \PragmaRX\Google2FA\Google2FA $google2FA + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Cache\Repository $cache * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 9cfbfee49..db1744a99 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -34,11 +34,11 @@ class LoginController extends AbstractLoginController /** * LoginController constructor. * - * @param \Illuminate\Auth\AuthManager $auth - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Cache\Repository $cache + * @param \Illuminate\Auth\AuthManager $auth + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Cache\Repository $cache * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository - * @param \Illuminate\Contracts\View\Factory $view + * @param \Illuminate\Contracts\View\Factory $view */ public function __construct( AuthManager $auth, diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 22aee3eb5..fe5591516 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -48,8 +48,8 @@ class ResetPasswordController extends Controller /** * ResetPasswordController constructor. * - * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher - * @param \Illuminate\Contracts\Hashing\Hasher $hasher + * @param \Illuminate\Contracts\Events\Dispatcher $dispatcher + * @param \Illuminate\Contracts\Hashing\Hasher $hasher * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $userRepository */ public function __construct(Dispatcher $dispatcher, Hasher $hasher, UserRepositoryInterface $userRepository) @@ -94,7 +94,7 @@ class ResetPasswordController extends Controller * form with a note telling them their password was changed and to log back in. * * @param \Illuminate\Contracts\Auth\CanResetPassword|\Pterodactyl\Models\User $user - * @param string $password + * @param string $password * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Controllers/Base/AccountKeyController.php b/app/Http/Controllers/Base/AccountKeyController.php index 04563ca8a..5a4e1b5fe 100644 --- a/app/Http/Controllers/Base/AccountKeyController.php +++ b/app/Http/Controllers/Base/AccountKeyController.php @@ -32,9 +32,9 @@ class AccountKeyController extends Controller /** * APIController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository - * @param \Pterodactyl\Services\Api\KeyCreationService $keyService + * @param \Pterodactyl\Services\Api\KeyCreationService $keyService */ public function __construct( AlertsMessageBag $alert, @@ -95,7 +95,7 @@ class AccountKeyController extends Controller * Delete an account API key from the Panel via an AJAX request. * * @param \Illuminate\Http\Request $request - * @param string $identifier + * @param string $identifier * @return \Illuminate\Http\Response */ public function revoke(Request $request, string $identifier): Response diff --git a/app/Http/Controllers/Base/ClientApiController.php b/app/Http/Controllers/Base/ClientApiController.php index a74c28db8..4051ffe78 100644 --- a/app/Http/Controllers/Base/ClientApiController.php +++ b/app/Http/Controllers/Base/ClientApiController.php @@ -33,9 +33,9 @@ class ClientApiController extends Controller /** * ClientApiController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Prologue\Alerts\AlertsMessageBag $alert * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository - * @param \Pterodactyl\Services\Api\KeyCreationService $creationService + * @param \Pterodactyl\Services\Api\KeyCreationService $creationService */ public function __construct(AlertsMessageBag $alert, ApiKeyRepositoryInterface $repository, KeyCreationService $creationService) { diff --git a/app/Http/Controllers/Base/SecurityController.php b/app/Http/Controllers/Base/SecurityController.php index 17327b66c..8ec1dd0e2 100644 --- a/app/Http/Controllers/Base/SecurityController.php +++ b/app/Http/Controllers/Base/SecurityController.php @@ -42,11 +42,11 @@ class SecurityController extends Controller /** * SecurityController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\SessionRepositoryInterface $repository - * @param \Pterodactyl\Services\Users\ToggleTwoFactorService $toggleTwoFactorService - * @param \Pterodactyl\Services\Users\TwoFactorSetupService $twoFactorSetupService + * @param \Pterodactyl\Services\Users\ToggleTwoFactorService $toggleTwoFactorService + * @param \Pterodactyl\Services\Users\TwoFactorSetupService $twoFactorSetupService */ public function __construct( AlertsMessageBag $alert, diff --git a/app/Http/Controllers/Daemon/ActionController.php b/app/Http/Controllers/Daemon/ActionController.php index 257d8775a..7ddcec8d0 100644 --- a/app/Http/Controllers/Daemon/ActionController.php +++ b/app/Http/Controllers/Daemon/ActionController.php @@ -6,7 +6,6 @@ use Cache; use Illuminate\Http\Request; use Pterodactyl\Models\Node; use Illuminate\Http\Response; -use Pterodactyl\Models\Server; use Illuminate\Http\JsonResponse; use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Repositories\Eloquent\ServerRepository; @@ -20,6 +19,7 @@ class ActionController extends Controller * @var \Illuminate\Contracts\Events\Dispatcher */ private $eventDispatcher; + /** * @var \Pterodactyl\Repositories\Eloquent\ServerRepository */ @@ -29,7 +29,7 @@ class ActionController extends Controller * ActionController constructor. * * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository - * @param \Illuminate\Contracts\Events\Dispatcher $eventDispatcher + * @param \Illuminate\Contracts\Events\Dispatcher $eventDispatcher */ public function __construct(ServerRepository $repository, EventDispatcher $eventDispatcher) { @@ -89,7 +89,7 @@ class ActionController extends Controller * Handles configuration data request from daemon. * * @param \Illuminate\Http\Request $request - * @param string $token + * @param string $token * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response */ public function configuration(Request $request, $token) diff --git a/app/Http/Controllers/Daemon/PackController.php b/app/Http/Controllers/Daemon/PackController.php index ce482013f..45c38bf6c 100644 --- a/app/Http/Controllers/Daemon/PackController.php +++ b/app/Http/Controllers/Daemon/PackController.php @@ -20,7 +20,7 @@ class PackController extends Controller * Pulls an install pack archive from the system. * * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param string $uuid * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse */ public function pull(Request $request, $uuid) @@ -42,7 +42,7 @@ class PackController extends Controller * Returns the hash information for a pack. * * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param string $uuid * @return \Illuminate\Http\JsonResponse */ public function hash(Request $request, $uuid) diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php index 6307669c3..878e56bb7 100644 --- a/app/Http/Middleware/AdminAuthenticate.php +++ b/app/Http/Middleware/AdminAuthenticate.php @@ -19,7 +19,7 @@ class AdminAuthenticate * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException diff --git a/app/Http/Middleware/Api/ApiSubstituteBindings.php b/app/Http/Middleware/Api/ApiSubstituteBindings.php index 94af9b1d4..5ef3bca30 100644 --- a/app/Http/Middleware/Api/ApiSubstituteBindings.php +++ b/app/Http/Middleware/Api/ApiSubstituteBindings.php @@ -42,7 +42,7 @@ class ApiSubstituteBindings extends SubstituteBindings * a 404 error if a model is not found. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php b/app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php index ddcd29484..70c52f5b5 100644 --- a/app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php +++ b/app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php @@ -13,7 +13,7 @@ class AuthenticateApplicationUser * and should be allowed to proceed through the application API. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/Api/AuthenticateIPAccess.php b/app/Http/Middleware/Api/AuthenticateIPAccess.php index aed8f53a4..30377794b 100644 --- a/app/Http/Middleware/Api/AuthenticateIPAccess.php +++ b/app/Http/Middleware/Api/AuthenticateIPAccess.php @@ -14,7 +14,7 @@ class AuthenticateIPAccess * Determine if a request IP has permission to access the API. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Exception diff --git a/app/Http/Middleware/Api/AuthenticateKey.php b/app/Http/Middleware/Api/AuthenticateKey.php index 429c26f90..515cc1fcf 100644 --- a/app/Http/Middleware/Api/AuthenticateKey.php +++ b/app/Http/Middleware/Api/AuthenticateKey.php @@ -35,8 +35,8 @@ class AuthenticateKey * AuthenticateKey constructor. * * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository - * @param \Illuminate\Auth\AuthManager $auth - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Auth\AuthManager $auth + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct(ApiKeyRepositoryInterface $repository, AuthManager $auth, Encrypter $encrypter) { @@ -50,8 +50,8 @@ class AuthenticateKey * is in a valid format and exists in the database. * * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param int $keyType + * @param \Closure $next + * @param int $keyType * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -86,7 +86,7 @@ class AuthenticateKey * Authenticate an API key. * * @param string $key - * @param int $keyType + * @param int $keyType * @return \Pterodactyl\Models\ApiKey * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php b/app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php index 4214791ba..800add18c 100644 --- a/app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php +++ b/app/Http/Middleware/Api/Client/Server/AuthenticateServerAccess.php @@ -31,7 +31,7 @@ class AuthenticateServerAccess * Authenticate that this server exists and is not suspended or marked as installing. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php b/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php index 5ad94cc90..40c26c538 100644 --- a/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php +++ b/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php @@ -17,7 +17,7 @@ class SubstituteClientApiBindings extends ApiSubstituteBindings * a 404 error if a model is not found. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php b/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php index c951b1b4a..f956302a4 100644 --- a/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php +++ b/app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php @@ -39,7 +39,7 @@ class DaemonAuthenticate * Check if a request from the daemon can be properly attributed back to a single node instance. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Symfony\Component\HttpKernel\Exception\HttpException diff --git a/app/Http/Middleware/Api/SetSessionDriver.php b/app/Http/Middleware/Api/SetSessionDriver.php index 8ce50a8b5..a04db7fab 100644 --- a/app/Http/Middleware/Api/SetSessionDriver.php +++ b/app/Http/Middleware/Api/SetSessionDriver.php @@ -27,7 +27,7 @@ class SetSessionDriver * Set the session for API calls to only last for the one request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d85cf95bf..ed8d31e02 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -12,7 +12,7 @@ class Authenticate * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Illuminate\Auth\AuthenticationException diff --git a/app/Http/Middleware/DaemonAuthenticate.php b/app/Http/Middleware/DaemonAuthenticate.php index b8e83bf8c..cb132b999 100644 --- a/app/Http/Middleware/DaemonAuthenticate.php +++ b/app/Http/Middleware/DaemonAuthenticate.php @@ -45,7 +45,7 @@ class DaemonAuthenticate * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index 65692d3e2..3dba67e22 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -27,7 +27,7 @@ class LanguageMiddleware * Handle an incoming request and set the user's preferred language. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/MaintenanceMiddleware.php b/app/Http/Middleware/MaintenanceMiddleware.php index c67a3f051..8f733bcd3 100644 --- a/app/Http/Middleware/MaintenanceMiddleware.php +++ b/app/Http/Middleware/MaintenanceMiddleware.php @@ -26,7 +26,7 @@ class MaintenanceMiddleware * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 8a5220cb5..a8c51bb04 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -27,8 +27,8 @@ class RedirectIfAuthenticated * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null $guard + * @param \Closure $next + * @param string|null $guard * @return mixed */ public function handle(Request $request, Closure $next, string $guard = null) diff --git a/app/Http/Middleware/RequireTwoFactorAuthentication.php b/app/Http/Middleware/RequireTwoFactorAuthentication.php index 486b8e3cc..0689cc14a 100644 --- a/app/Http/Middleware/RequireTwoFactorAuthentication.php +++ b/app/Http/Middleware/RequireTwoFactorAuthentication.php @@ -46,7 +46,7 @@ class RequireTwoFactorAuthentication * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/Server/AccessingValidServer.php b/app/Http/Middleware/Server/AccessingValidServer.php index 894dcaa1e..1f464f7df 100644 --- a/app/Http/Middleware/Server/AccessingValidServer.php +++ b/app/Http/Middleware/Server/AccessingValidServer.php @@ -31,8 +31,8 @@ class AccessingValidServer /** * AccessingValidServer constructor. * - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Routing\ResponseFactory $response + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Routing\ResponseFactory $response * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( @@ -49,7 +49,7 @@ class AccessingValidServer * Determine if a given user has permission to access a server. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return \Illuminate\Http\Response|mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Middleware/Server/AuthenticateAsSubuser.php b/app/Http/Middleware/Server/AuthenticateAsSubuser.php index ebf9cd622..06707117a 100644 --- a/app/Http/Middleware/Server/AuthenticateAsSubuser.php +++ b/app/Http/Middleware/Server/AuthenticateAsSubuser.php @@ -36,7 +36,7 @@ class AuthenticateAsSubuser * Determine if a subuser has permissions to access a server, if so set their access token. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Middleware/Server/DatabaseBelongsToServer.php b/app/Http/Middleware/Server/DatabaseBelongsToServer.php index 1617a8520..169b67525 100644 --- a/app/Http/Middleware/Server/DatabaseBelongsToServer.php +++ b/app/Http/Middleware/Server/DatabaseBelongsToServer.php @@ -30,7 +30,7 @@ class DatabaseBelongsToServer * and set an attribute with the database. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Middleware/Server/ScheduleBelongsToServer.php b/app/Http/Middleware/Server/ScheduleBelongsToServer.php index 26da5f843..b76636291 100644 --- a/app/Http/Middleware/Server/ScheduleBelongsToServer.php +++ b/app/Http/Middleware/Server/ScheduleBelongsToServer.php @@ -23,7 +23,7 @@ class ScheduleBelongsToServer /** * TaskAccess constructor. * - * @param \Pterodactyl\Contracts\Extensions\HashidsInterface $hashids + * @param \Pterodactyl\Contracts\Extensions\HashidsInterface $hashids * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository */ public function __construct(HashidsInterface $hashids, ScheduleRepositoryInterface $repository) @@ -36,7 +36,7 @@ class ScheduleBelongsToServer * Determine if a task is assigned to the active server. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Http/Middleware/Server/SubuserBelongsToServer.php b/app/Http/Middleware/Server/SubuserBelongsToServer.php index cdcd3f097..7efc64990 100644 --- a/app/Http/Middleware/Server/SubuserBelongsToServer.php +++ b/app/Http/Middleware/Server/SubuserBelongsToServer.php @@ -24,7 +24,7 @@ class SubuserBelongsToServer /** * SubuserAccess constructor. * - * @param \Pterodactyl\Contracts\Extensions\HashidsInterface $hashids + * @param \Pterodactyl\Contracts\Extensions\HashidsInterface $hashids * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository */ public function __construct(HashidsInterface $hashids, SubuserRepositoryInterface $repository) @@ -37,7 +37,7 @@ class SubuserBelongsToServer * Determine if a user has permission to access and modify subuser. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Http/Middleware/VerifyReCaptcha.php b/app/Http/Middleware/VerifyReCaptcha.php index 7464e854b..9d657548e 100644 --- a/app/Http/Middleware/VerifyReCaptcha.php +++ b/app/Http/Middleware/VerifyReCaptcha.php @@ -30,7 +30,7 @@ class VerifyReCaptcha * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * @return \Illuminate\Http\RedirectResponse|mixed */ public function handle($request, Closure $next) @@ -66,7 +66,7 @@ class VerifyReCaptcha /** * Determine if the response from the recaptcha servers was valid. * - * @param stdClass $result + * @param stdClass $result * @param \Illuminate\Http\Request $request * @return bool */ diff --git a/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php b/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php index f184b8cf3..9d5a3bb0a 100644 --- a/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php +++ b/app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php @@ -97,8 +97,8 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest * call. * * @param string $field - * @param array $rules - * @param bool $limits + * @param array $rules + * @param bool $limits * @return array * * @see https://github.com/pterodactyl/panel/issues/1500 diff --git a/app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php b/app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php index b1f779183..4ad98c0fc 100644 --- a/app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php +++ b/app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php @@ -47,6 +47,7 @@ class GetExternalUserRequest extends ApplicationApiRequest /** * Return the user model for the requested external user. + * * @return \Pterodactyl\Models\User */ public function getUserModel(): User diff --git a/app/Http/Requests/Api/Client/ClientApiRequest.php b/app/Http/Requests/Api/Client/ClientApiRequest.php index c80ae1a1e..85ea452ad 100644 --- a/app/Http/Requests/Api/Client/ClientApiRequest.php +++ b/app/Http/Requests/Api/Client/ClientApiRequest.php @@ -2,12 +2,13 @@ namespace Pterodactyl\Http\Requests\Api\Client; +use Pterodactyl\Models\User; use Pterodactyl\Models\Server; use Pterodactyl\Contracts\Http\ClientPermissionsRequest; use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest; /** - * @method \Pterodactyl\Models\User user($guard = null) + * @method User user($guard = null) */ abstract class ClientApiRequest extends ApplicationApiRequest { diff --git a/app/Http/Requests/Base/ApiKeyFormRequest.php b/app/Http/Requests/Base/ApiKeyFormRequest.php index 5959657f0..01722dab5 100644 --- a/app/Http/Requests/Base/ApiKeyFormRequest.php +++ b/app/Http/Requests/Base/ApiKeyFormRequest.php @@ -9,6 +9,7 @@ namespace Pterodactyl\Http\Requests\Base; +use Exception; use IPTools\Network; use Pterodactyl\Http\Requests\FrontendUserFormRequest; @@ -65,7 +66,7 @@ class ApiKeyFormRequest extends FrontendUserFormRequest try { Network::parse($ip); - } catch (\Exception $ex) { + } catch (Exception $ex) { $validator->errors()->add('allowed_ips', 'Could not parse IP ' . $ip . ' because it is in an invalid format.'); } } diff --git a/app/Http/Requests/Server/UpdateFileContentsFormRequest.php b/app/Http/Requests/Server/UpdateFileContentsFormRequest.php index 7ded39bc0..24f671995 100644 --- a/app/Http/Requests/Server/UpdateFileContentsFormRequest.php +++ b/app/Http/Requests/Server/UpdateFileContentsFormRequest.php @@ -63,7 +63,7 @@ class UpdateFileContentsFormRequest extends ServerFormRequest * Checks if a given file can be edited by a user on this server. * * @param \Pterodactyl\Models\Server $server - * @param string $token + * @param string $token * @return bool * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Http/ViewComposers/ServerListComposer.php b/app/Http/ViewComposers/ServerListComposer.php index 4c3ac71fb..9b57884aa 100644 --- a/app/Http/ViewComposers/ServerListComposer.php +++ b/app/Http/ViewComposers/ServerListComposer.php @@ -22,7 +22,7 @@ class ServerListComposer /** * ServerListComposer constructor. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct(Request $request, ServerRepositoryInterface $repository) diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php index 7f206ec8f..0b09102a1 100644 --- a/app/Jobs/Schedule/RunTaskJob.php +++ b/app/Jobs/Schedule/RunTaskJob.php @@ -62,9 +62,9 @@ class RunTaskJob extends Job implements ShouldQueue * Run the job and send actions to the daemon running the server. * * @param \Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface $commandRepository - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService - * @param \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface $powerRepository - * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService + * @param \Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface $powerRepository + * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\Daemon\InvalidPowerSignalException diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 3891cce73..fcd20b7c2 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -126,7 +126,7 @@ class Permission extends Validable * Find permission by permission node. * * @param \Illuminate\Database\Query\Builder $query - * @param string $permission + * @param string $permission * @return \Illuminate\Database\Query\Builder */ public function scopePermission($query, $permission) @@ -138,7 +138,7 @@ class Permission extends Validable * Filter permission by server. * * @param \Illuminate\Database\Query\Builder $query - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Database\Query\Builder */ public function scopeServer($query, Server $server) diff --git a/app/Models/ServerVariable.php b/app/Models/ServerVariable.php index f706d5942..b2bb4b7d5 100644 --- a/app/Models/ServerVariable.php +++ b/app/Models/ServerVariable.php @@ -32,9 +32,9 @@ class ServerVariable extends Model * @var array */ protected $casts = [ - 'server_id' => 'integer', - 'variable_id' => 'integer', - ]; + 'server_id' => 'integer', + 'variable_id' => 'integer', + ]; /** * Determine if variable is viewable by users. diff --git a/app/Models/Validable.php b/app/Models/Validable.php index 59e4c0f5b..0f6d5cdbb 100644 --- a/app/Models/Validable.php +++ b/app/Models/Validable.php @@ -98,7 +98,7 @@ abstract class Validable extends Model * rather than just creating it. * * @param \Illuminate\Database\Eloquent\Model|int|string $id - * @param string $primaryKey + * @param string $primaryKey * @return array */ public static function getRulesForUpdate($id, string $primaryKey = 'id') diff --git a/app/Notifications/AccountCreated.php b/app/Notifications/AccountCreated.php index 7dd258dd4..304978048 100644 --- a/app/Notifications/AccountCreated.php +++ b/app/Notifications/AccountCreated.php @@ -31,7 +31,7 @@ class AccountCreated extends Notification implements ShouldQueue * Create a new notification instance. * * @param \Pterodactyl\Models\User $user - * @param string|null $token + * @param string|null $token */ public function __construct(User $user, string $token = null) { diff --git a/app/Policies/ServerPolicy.php b/app/Policies/ServerPolicy.php index 9b4db6f05..ac89be673 100644 --- a/app/Policies/ServerPolicy.php +++ b/app/Policies/ServerPolicy.php @@ -19,9 +19,9 @@ class ServerPolicy /** * Checks if the user has the given permission on/for the server. * - * @param \Pterodactyl\Models\User $user + * @param \Pterodactyl\Models\User $user * @param \Pterodactyl\Models\Server $server - * @param string $permission + * @param string $permission * @return bool */ protected function checkPermission(User $user, Server $server, $permission) @@ -38,8 +38,8 @@ class ServerPolicy /** * Runs before any of the functions are called. Used to determine if user is root admin, if so, ignore permissions. * - * @param \Pterodactyl\Models\User $user - * @param string $ability + * @param \Pterodactyl\Models\User $user + * @param string $ability * @param \Pterodactyl\Models\Server $server * @return bool */ @@ -58,7 +58,7 @@ class ServerPolicy * policy permission. * * @param string $name - * @param mixed $arguments + * @param mixed $arguments */ public function __call($name, $arguments) { diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php index 2cc26e663..8a1d4db21 100644 --- a/app/Providers/SettingsServiceProvider.php +++ b/app/Providers/SettingsServiceProvider.php @@ -60,9 +60,9 @@ class SettingsServiceProvider extends ServiceProvider /** * Boot the service provider. * - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter - * @param \Psr\Log\LoggerInterface $log + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Psr\Log\LoggerInterface $log * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings */ public function boot(ConfigRepository $config, Encrypter $encrypter, Log $log, SettingsRepositoryInterface $settings) diff --git a/app/Repositories/Daemon/BaseRepository.php b/app/Repositories/Daemon/BaseRepository.php index 186b5917d..6e38c1cad 100644 --- a/app/Repositories/Daemon/BaseRepository.php +++ b/app/Repositories/Daemon/BaseRepository.php @@ -40,7 +40,7 @@ abstract class BaseRepository implements BaseRepositoryInterface /** * BaseRepository constructor. * - * @param \Illuminate\Foundation\Application $app + * @param \Illuminate\Foundation\Application $app * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $nodeRepository */ public function __construct(Application $app, NodeRepositoryInterface $nodeRepository) @@ -129,7 +129,7 @@ abstract class BaseRepository implements BaseRepositoryInterface // If no node is set, load the relationship onto the Server model // and pass that to the setNode function. if (! $this->getNode() instanceof Node) { - if (! $this->getServer() instanceof Server) { + if (! $this->getServer() instanceof Server) { throw new RuntimeException('An instance of ' . Node::class . ' or ' . Server::class . ' must be set on this repository in order to return a client.'); } diff --git a/app/Repositories/Eloquent/AllocationRepository.php b/app/Repositories/Eloquent/AllocationRepository.php index a9721ac09..920b5c135 100644 --- a/app/Repositories/Eloquent/AllocationRepository.php +++ b/app/Repositories/Eloquent/AllocationRepository.php @@ -24,7 +24,7 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos * Set an array of allocation IDs to be assigned to a specific server. * * @param int|null $server - * @param array $ids + * @param array $ids * @return int */ public function assignAllocationsToServer(int $server = null, array $ids): int @@ -129,7 +129,7 @@ class AllocationRepository extends EloquentRepository implements AllocationRepos * * @param array $nodes * @param array $ports - * @param bool $dedicated + * @param bool $dedicated * @return \Pterodactyl\Models\Allocation|null */ public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false) diff --git a/app/Repositories/Eloquent/ApiKeyRepository.php b/app/Repositories/Eloquent/ApiKeyRepository.php index 7ba0c9982..55d559544 100644 --- a/app/Repositories/Eloquent/ApiKeyRepository.php +++ b/app/Repositories/Eloquent/ApiKeyRepository.php @@ -49,7 +49,7 @@ class ApiKeyRepository extends EloquentRepository implements ApiKeyRepositoryInt * Delete an account API key from the panel for a specific user. * * @param \Pterodactyl\Models\User $user - * @param string $identifier + * @param string $identifier * @return int */ public function deleteAccountKey(User $user, string $identifier): int @@ -64,7 +64,7 @@ class ApiKeyRepository extends EloquentRepository implements ApiKeyRepositoryInt * Delete an application API key from the panel for a specific user. * * @param \Pterodactyl\Models\User $user - * @param string $identifier + * @param string $identifier * @return int */ public function deleteApplicationKey(User $user, string $identifier): int diff --git a/app/Repositories/Eloquent/DaemonKeyRepository.php b/app/Repositories/Eloquent/DaemonKeyRepository.php index c53f8a471..2f11ff962 100644 --- a/app/Repositories/Eloquent/DaemonKeyRepository.php +++ b/app/Repositories/Eloquent/DaemonKeyRepository.php @@ -26,7 +26,7 @@ class DaemonKeyRepository extends EloquentRepository implements DaemonKeyReposit * Load the server and user relations onto a key model. * * @param \Pterodactyl\Models\DaemonKey $key - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\DaemonKey */ public function loadServerAndUserRelations(DaemonKey $key, bool $refresh = false): DaemonKey diff --git a/app/Repositories/Eloquent/DatabaseRepository.php b/app/Repositories/Eloquent/DatabaseRepository.php index cfec3a4d4..c26be52f3 100644 --- a/app/Repositories/Eloquent/DatabaseRepository.php +++ b/app/Repositories/Eloquent/DatabaseRepository.php @@ -25,7 +25,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor /** * DatabaseRepository constructor. * - * @param \Illuminate\Foundation\Application $application + * @param \Illuminate\Foundation\Application $application * @param \Illuminate\Database\DatabaseManager $database */ public function __construct(Application $application, DatabaseManager $database) diff --git a/app/Repositories/Eloquent/EggRepository.php b/app/Repositories/Eloquent/EggRepository.php index a3a96efb0..a716a5ec9 100644 --- a/app/Repositories/Eloquent/EggRepository.php +++ b/app/Repositories/Eloquent/EggRepository.php @@ -52,7 +52,7 @@ class EggRepository extends EloquentRepository implements EggRepositoryInterface * Return an egg with the scriptFrom and configFrom relations loaded onto the model. * * @param int|string $value - * @param string $column + * @param string $column * @return \Pterodactyl\Models\Egg * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Repositories/Eloquent/EloquentRepository.php b/app/Repositories/Eloquent/EloquentRepository.php index cf0931799..5b22c4c32 100644 --- a/app/Repositories/Eloquent/EloquentRepository.php +++ b/app/Repositories/Eloquent/EloquentRepository.php @@ -40,8 +40,8 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf * Create a new record in the database and return the associated model. * * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return \Illuminate\Database\Eloquent\Model|bool * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -121,7 +121,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf /** * Delete a given record from the database. * - * @param int $id + * @param int $id * @param bool $destroy * @return int */ @@ -134,7 +134,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf * Delete records matching the given attributes. * * @param array $attributes - * @param bool $force + * @param bool $force * @return int */ public function deleteWhere(array $attributes, bool $force = false): int @@ -147,10 +147,10 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf /** * Update a given ID with the passed array of fields. * - * @param int $id + * @param int $id * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return \Illuminate\Database\Eloquent\Model|bool * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -182,8 +182,8 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf * This does not perform any model data validation. * * @param string $column - * @param array $values - * @param array $fields + * @param array $values + * @param array $fields * @return int */ public function updateWhereIn(string $column, array $values, array $fields): int @@ -198,8 +198,8 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf * * @param array $where * @param array $fields - * @param bool $validate - * @param bool $force + * @param bool $validate + * @param bool $force * @return \Illuminate\Database\Eloquent\Model * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Repositories/Eloquent/NodeRepository.php b/app/Repositories/Eloquent/NodeRepository.php index 8343129d5..a4d57354e 100644 --- a/app/Repositories/Eloquent/NodeRepository.php +++ b/app/Repositories/Eloquent/NodeRepository.php @@ -101,7 +101,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa * Return a single node with location and server information. * * @param \Pterodactyl\Models\Node $node - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Node */ public function loadLocationAndServerCount(Node $node, bool $refresh = false): Node @@ -126,7 +126,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa * any servers that are also attached to those allocations. * * @param \Pterodactyl\Models\Node $node - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Node */ public function loadNodeAllocations(Node $node, bool $refresh = false): Node @@ -170,8 +170,8 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa * available to support the additional disk and memory provided. * * @param array $locations - * @param int $disk - * @param int $memory + * @param int $disk + * @param int $memory * @return \Illuminate\Support\LazyCollection */ public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection diff --git a/app/Repositories/Eloquent/PackRepository.php b/app/Repositories/Eloquent/PackRepository.php index 922e6415a..bdd5eca6a 100644 --- a/app/Repositories/Eloquent/PackRepository.php +++ b/app/Repositories/Eloquent/PackRepository.php @@ -25,7 +25,7 @@ class PackRepository extends EloquentRepository implements PackRepositoryInterfa * Return a pack with the associated server models attached to it. * * @param \Pterodactyl\Models\Pack $pack - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Pack */ public function loadServerData(Pack $pack, bool $refresh = false): Pack diff --git a/app/Repositories/Eloquent/ScheduleRepository.php b/app/Repositories/Eloquent/ScheduleRepository.php index 1d2dda244..389d06720 100644 --- a/app/Repositories/Eloquent/ScheduleRepository.php +++ b/app/Repositories/Eloquent/ScheduleRepository.php @@ -36,7 +36,7 @@ class ScheduleRepository extends EloquentRepository implements ScheduleRepositor * already present. * * @param \Pterodactyl\Models\Schedule $schedule - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Schedule */ public function loadTasks(Schedule $schedule, bool $refresh = false): Schedule diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php index 5b2fa8828..88556234a 100644 --- a/app/Repositories/Eloquent/ServerRepository.php +++ b/app/Repositories/Eloquent/ServerRepository.php @@ -2,7 +2,6 @@ namespace Pterodactyl\Repositories\Eloquent; -use Pterodactyl\Models\Node; use Pterodactyl\Models\User; use Webmozart\Assert\Assert; use Pterodactyl\Models\Server; @@ -44,7 +43,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * Load the egg relations onto the server model. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function loadEggRelations(Server $server, bool $refresh = false): Server @@ -121,7 +120,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * return the server from the database. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function getPrimaryAllocation(Server $server, bool $refresh = false): Server @@ -137,7 +136,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * Return all of the server variables possible and default to the variable * default if there is no value defined for the specific server requested. * - * @param int $id + * @param int $id * @param bool $returnAsObject * @return array|object * @@ -172,7 +171,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * Return enough data to be used for the creation of a server via the daemon. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function getDataForCreation(Server $server, bool $refresh = false): Server @@ -190,7 +189,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * Load associated databases onto the server model. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Server */ public function loadDatabaseRelations(Server $server, bool $refresh = false): Server @@ -208,7 +207,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * if they are missing, or refresh is set to true. * * @param \Pterodactyl\Models\Server $server - * @param bool $refresh + * @param bool $refresh * @return array */ public function getDaemonServiceData(Server $server, bool $refresh = false): array @@ -231,8 +230,8 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * Return a paginated list of servers that a user can access at a given level. * * @param \Pterodactyl\Models\User $user - * @param int $level - * @param bool|int $paginate + * @param int $level + * @param bool|int $paginate * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection */ public function filterUserAccessServers(User $user, int $level, $paginate = 25) @@ -290,7 +289,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt * * @param int[] $servers * @param int[] $nodes - * @param bool $returnCount + * @param bool $returnCount * @return int|\Illuminate\Support\LazyCollection */ public function getServersForPowerAction(array $servers = [], array $nodes = [], bool $returnCount = false) diff --git a/app/Repositories/Eloquent/SessionRepository.php b/app/Repositories/Eloquent/SessionRepository.php index a49226452..50d9d3362 100644 --- a/app/Repositories/Eloquent/SessionRepository.php +++ b/app/Repositories/Eloquent/SessionRepository.php @@ -32,7 +32,7 @@ class SessionRepository extends EloquentRepository implements SessionRepositoryI /** * Delete a session for a given user. * - * @param int $user + * @param int $user * @param string $session * @return null|int */ diff --git a/app/Repositories/Eloquent/SettingsRepository.php b/app/Repositories/Eloquent/SettingsRepository.php index 0d25a1b80..42cc7efed 100644 --- a/app/Repositories/Eloquent/SettingsRepository.php +++ b/app/Repositories/Eloquent/SettingsRepository.php @@ -30,7 +30,7 @@ class SettingsRepository extends EloquentRepository implements SettingsRepositor /** * Store a new persistent setting in the database. * - * @param string $key + * @param string $key * @param string|null $value * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -49,7 +49,7 @@ class SettingsRepository extends EloquentRepository implements SettingsRepositor * Retrieve a persistent setting from the database. * * @param string $key - * @param mixed $default + * @param mixed $default * @return mixed */ public function get(string $key, $default = null) diff --git a/app/Repositories/Eloquent/SubuserRepository.php b/app/Repositories/Eloquent/SubuserRepository.php index 0296e0dbd..c0fb930a6 100644 --- a/app/Repositories/Eloquent/SubuserRepository.php +++ b/app/Repositories/Eloquent/SubuserRepository.php @@ -22,7 +22,7 @@ class SubuserRepository extends EloquentRepository implements SubuserRepositoryI * Return a subuser with the associated server relationship. * * @param \Pterodactyl\Models\Subuser $subuser - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Subuser */ public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser @@ -42,7 +42,7 @@ class SubuserRepository extends EloquentRepository implements SubuserRepositoryI * Return a subuser with the associated permissions relationship. * * @param \Pterodactyl\Models\Subuser $subuser - * @param bool $refresh + * @param bool $refresh * @return \Pterodactyl\Models\Subuser */ public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser diff --git a/app/Repositories/Wings/DaemonFileRepository.php b/app/Repositories/Wings/DaemonFileRepository.php index 94f7599e3..9e1252933 100644 --- a/app/Repositories/Wings/DaemonFileRepository.php +++ b/app/Repositories/Wings/DaemonFileRepository.php @@ -28,7 +28,7 @@ class DaemonFileRepository extends DaemonRepository /** * Return the contents of a given file. * - * @param string $path + * @param string $path * @param int|null $notLargerThan the maximum content length in bytes * @return string * diff --git a/app/Rules/Username.php b/app/Rules/Username.php index 335c3c186..1cceae5f9 100644 --- a/app/Rules/Username.php +++ b/app/Rules/Username.php @@ -18,7 +18,7 @@ class Username implements Rule * Allowed characters: a-z0-9_-. * * @param string $attribute - * @param mixed $value + * @param mixed $value * @return bool */ public function passes($attribute, $value): bool diff --git a/app/Services/Acl/Api/AdminAcl.php b/app/Services/Acl/Api/AdminAcl.php index 6dfa87971..77e30be4f 100644 --- a/app/Services/Acl/Api/AdminAcl.php +++ b/app/Services/Acl/Api/AdminAcl.php @@ -57,8 +57,8 @@ class AdminAcl * at a specific action level. * * @param \Pterodactyl\Models\ApiKey $key - * @param string $resource - * @param int $action + * @param string $resource + * @param int $action * @return bool */ public static function check(ApiKey $key, string $resource, int $action = self::READ) diff --git a/app/Services/Allocations/AssignmentService.php b/app/Services/Allocations/AssignmentService.php index 905bb776f..99ae40f29 100644 --- a/app/Services/Allocations/AssignmentService.php +++ b/app/Services/Allocations/AssignmentService.php @@ -34,7 +34,7 @@ class AssignmentService * AssignmentService constructor. * * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $repository - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection */ public function __construct(AllocationRepositoryInterface $repository, ConnectionInterface $connection) { @@ -46,7 +46,7 @@ class AssignmentService * Insert allocations into the database and link them to a specific node. * * @param \Pterodactyl\Models\Node $node - * @param array $data + * @param array $data * * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException * @throws \Pterodactyl\Exceptions\Service\Allocation\PortOutOfRangeException diff --git a/app/Services/Allocations/SetDefaultAllocationService.php b/app/Services/Allocations/SetDefaultAllocationService.php index 6e9010316..b05b1c48f 100644 --- a/app/Services/Allocations/SetDefaultAllocationService.php +++ b/app/Services/Allocations/SetDefaultAllocationService.php @@ -37,10 +37,10 @@ class SetDefaultAllocationService /** * SetDefaultAllocationService constructor. * - * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $repository - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository */ public function __construct( AllocationRepositoryInterface $repository, @@ -59,7 +59,7 @@ class SetDefaultAllocationService * assigned to the specified server. * * @param int|\Pterodactyl\Models\Server $server - * @param int $allocation + * @param int $allocation * @return \Pterodactyl\Models\Allocation * * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException diff --git a/app/Services/Api/KeyCreationService.php b/app/Services/Api/KeyCreationService.php index b51431620..9c70353ed 100644 --- a/app/Services/Api/KeyCreationService.php +++ b/app/Services/Api/KeyCreationService.php @@ -27,7 +27,7 @@ class KeyCreationService * ApiKeyService constructor. * * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct(ApiKeyRepositoryInterface $repository, Encrypter $encrypter) { diff --git a/app/Services/DaemonKeys/DaemonKeyCreationService.php b/app/Services/DaemonKeys/DaemonKeyCreationService.php index 23aa1c0aa..d2551324a 100644 --- a/app/Services/DaemonKeys/DaemonKeyCreationService.php +++ b/app/Services/DaemonKeys/DaemonKeyCreationService.php @@ -48,8 +48,8 @@ class DaemonKeyCreationService /** * DaemonKeyCreationService constructor. * - * @param \Carbon\Carbon $carbon - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Carbon\Carbon $carbon + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/DaemonKeys/DaemonKeyDeletionService.php b/app/Services/DaemonKeys/DaemonKeyDeletionService.php index 054122d82..1c9919c9a 100644 --- a/app/Services/DaemonKeys/DaemonKeyDeletionService.php +++ b/app/Services/DaemonKeys/DaemonKeyDeletionService.php @@ -64,11 +64,11 @@ class DaemonKeyDeletionService /** * DaemonKeyDeletionService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Psr\Log\LoggerInterface $writer + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $connection, @@ -86,7 +86,7 @@ class DaemonKeyDeletionService /** * @param \Pterodactyl\Models\Server|int $server - * @param int $user + * @param int $user * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/DaemonKeys/DaemonKeyProviderService.php b/app/Services/DaemonKeys/DaemonKeyProviderService.php index a386d286e..c875239d7 100644 --- a/app/Services/DaemonKeys/DaemonKeyProviderService.php +++ b/app/Services/DaemonKeys/DaemonKeyProviderService.php @@ -56,10 +56,10 @@ class DaemonKeyProviderService /** * GetDaemonKeyService constructor. * - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService $keyUpdateService - * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyUpdateService $keyUpdateService + * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository */ public function __construct( DaemonKeyCreationService $keyCreationService, @@ -77,8 +77,8 @@ class DaemonKeyProviderService * Get the access key for a user on a specific server. * * @param \Pterodactyl\Models\Server $server - * @param \Pterodactyl\Models\User $user - * @param bool $updateIfExpired + * @param \Pterodactyl\Models\User $user + * @param bool $updateIfExpired * @return string * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/DaemonKeys/DaemonKeyUpdateService.php b/app/Services/DaemonKeys/DaemonKeyUpdateService.php index 750d833d9..91427f3de 100644 --- a/app/Services/DaemonKeys/DaemonKeyUpdateService.php +++ b/app/Services/DaemonKeys/DaemonKeyUpdateService.php @@ -49,8 +49,8 @@ class DaemonKeyUpdateService /** * DaemonKeyUpdateService constructor. * - * @param \Carbon\Carbon $carbon - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Carbon\Carbon $carbon + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/DaemonKeys/RevokeMultipleDaemonKeysService.php b/app/Services/DaemonKeys/RevokeMultipleDaemonKeysService.php index 7059be88e..84237f94d 100644 --- a/app/Services/DaemonKeys/RevokeMultipleDaemonKeysService.php +++ b/app/Services/DaemonKeys/RevokeMultipleDaemonKeysService.php @@ -28,7 +28,7 @@ class RevokeMultipleDaemonKeysService /** * RevokeMultipleDaemonKeysService constructor. * - * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository */ public function __construct( @@ -45,7 +45,7 @@ class RevokeMultipleDaemonKeysService * return an error. * * @param \Pterodactyl\Models\User $user - * @param bool $ignoreConnectionErrors + * @param bool $ignoreConnectionErrors */ public function handle(User $user, bool $ignoreConnectionErrors = false) { @@ -79,7 +79,7 @@ class RevokeMultipleDaemonKeysService /** * Add an exception for a node to the array. * - * @param int $node + * @param int $node * @param \GuzzleHttp\Exception\RequestException $exception */ protected function setConnectionException(int $node, RequestException $exception) diff --git a/app/Services/Databases/DatabaseManagementService.php b/app/Services/Databases/DatabaseManagementService.php index d7c942cba..456985292 100644 --- a/app/Services/Databases/DatabaseManagementService.php +++ b/app/Services/Databases/DatabaseManagementService.php @@ -2,6 +2,7 @@ namespace Pterodactyl\Services\Databases; +use Exception; use Pterodactyl\Models\Database; use Illuminate\Database\DatabaseManager; use Illuminate\Contracts\Encryption\Encrypter; @@ -38,10 +39,10 @@ class DatabaseManagementService /** * CreationService constructor. * - * @param \Illuminate\Database\DatabaseManager $database - * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic + * @param \Illuminate\Database\DatabaseManager $database + * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct( DatabaseManager $database, @@ -58,7 +59,7 @@ class DatabaseManagementService /** * Create a new database that is linked to a specific host. * - * @param int $server + * @param int $server * @param array $data * @return \Pterodactyl\Models\Database * @@ -90,14 +91,14 @@ class DatabaseManagementService $this->repository->flush(); $this->database->commit(); - } catch (\Exception $ex) { + } catch (Exception $ex) { try { if (isset($database) && $database instanceof Database) { $this->repository->dropDatabase($database->database); $this->repository->dropUser($database->username, $database->remote); $this->repository->flush(); } - } catch (\Exception $exTwo) { + } catch (Exception $exTwo) { // ignore an exception } diff --git a/app/Services/Databases/DatabasePasswordService.php b/app/Services/Databases/DatabasePasswordService.php index ed60bad4a..71aaf14f2 100644 --- a/app/Services/Databases/DatabasePasswordService.php +++ b/app/Services/Databases/DatabasePasswordService.php @@ -35,10 +35,10 @@ class DatabasePasswordService /** * DatabasePasswordService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository - * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct( ConnectionInterface $connection, diff --git a/app/Services/Databases/DeployServerDatabaseService.php b/app/Services/Databases/DeployServerDatabaseService.php index c8b5ed179..b48f9e6f4 100644 --- a/app/Services/Databases/DeployServerDatabaseService.php +++ b/app/Services/Databases/DeployServerDatabaseService.php @@ -30,9 +30,9 @@ class DeployServerDatabaseService /** * ServerDatabaseCreationService constructor. * - * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $databaseHostRepository - * @param \Pterodactyl\Services\Databases\DatabaseManagementService $managementService + * @param \Pterodactyl\Services\Databases\DatabaseManagementService $managementService */ public function __construct( DatabaseRepositoryInterface $repository, @@ -46,7 +46,7 @@ class DeployServerDatabaseService /** * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Database * * @throws \Pterodactyl\Exceptions\Service\Database\DatabaseClientFeatureNotEnabledException diff --git a/app/Services/Databases/Hosts/HostCreationService.php b/app/Services/Databases/Hosts/HostCreationService.php index d6ea2f485..cbe3024f6 100644 --- a/app/Services/Databases/Hosts/HostCreationService.php +++ b/app/Services/Databases/Hosts/HostCreationService.php @@ -39,11 +39,11 @@ class HostCreationService /** * HostCreationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Illuminate\Database\DatabaseManager $databaseManager + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\DatabaseManager $databaseManager * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository - * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct( ConnectionInterface $connection, diff --git a/app/Services/Databases/Hosts/HostDeletionService.php b/app/Services/Databases/Hosts/HostDeletionService.php index b69c8dcf9..f366305cb 100644 --- a/app/Services/Databases/Hosts/HostDeletionService.php +++ b/app/Services/Databases/Hosts/HostDeletionService.php @@ -21,7 +21,7 @@ class HostDeletionService /** * HostDeletionService constructor. * - * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository + * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/Databases/Hosts/HostUpdateService.php b/app/Services/Databases/Hosts/HostUpdateService.php index cb6312d21..9965abd9c 100644 --- a/app/Services/Databases/Hosts/HostUpdateService.php +++ b/app/Services/Databases/Hosts/HostUpdateService.php @@ -46,11 +46,11 @@ class HostUpdateService /** * DatabaseHostService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Illuminate\Database\DatabaseManager $databaseManager + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\DatabaseManager $databaseManager * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository - * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Pterodactyl\Extensions\DynamicDatabaseConnection $dynamic + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter */ public function __construct( ConnectionInterface $connection, @@ -69,7 +69,7 @@ class HostUpdateService /** * Update a database host and persist to the database. * - * @param int $hostId + * @param int $hostId * @param array $data * @return \Pterodactyl\Models\DatabaseHost * diff --git a/app/Services/Eggs/EggCreationService.php b/app/Services/Eggs/EggCreationService.php index 45fa8895f..33a0a919d 100644 --- a/app/Services/Eggs/EggCreationService.php +++ b/app/Services/Eggs/EggCreationService.php @@ -31,7 +31,7 @@ class EggCreationService /** * EggCreationService constructor. * - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository */ public function __construct(ConfigRepository $config, EggRepositoryInterface $repository) diff --git a/app/Services/Eggs/EggDeletionService.php b/app/Services/Eggs/EggDeletionService.php index 5179f6a50..7b30e4426 100644 --- a/app/Services/Eggs/EggDeletionService.php +++ b/app/Services/Eggs/EggDeletionService.php @@ -30,7 +30,7 @@ class EggDeletionService * EggDeletionService constructor. * * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository */ public function __construct( ServerRepositoryInterface $serverRepository, diff --git a/app/Services/Eggs/EggUpdateService.php b/app/Services/Eggs/EggUpdateService.php index 14d655178..aa4ec39b6 100644 --- a/app/Services/Eggs/EggUpdateService.php +++ b/app/Services/Eggs/EggUpdateService.php @@ -34,7 +34,7 @@ class EggUpdateService * Update a service option. * * @param int|\Pterodactyl\Models\Egg $egg - * @param array $data + * @param array $data * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Eggs/Scripts/InstallScriptService.php b/app/Services/Eggs/Scripts/InstallScriptService.php index b71c10d87..d51447568 100644 --- a/app/Services/Eggs/Scripts/InstallScriptService.php +++ b/app/Services/Eggs/Scripts/InstallScriptService.php @@ -34,7 +34,7 @@ class InstallScriptService * Modify the install script for a given Egg. * * @param int|\Pterodactyl\Models\Egg $egg - * @param array $data + * @param array $data * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php index d4e048f9a..45eee14f4 100644 --- a/app/Services/Eggs/Sharing/EggImporterService.php +++ b/app/Services/Eggs/Sharing/EggImporterService.php @@ -44,10 +44,10 @@ class EggImporterService /** * EggImporterService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $eggVariableRepository - * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $nestRepository + * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $nestRepository */ public function __construct( ConnectionInterface $connection, @@ -65,7 +65,7 @@ class EggImporterService * Take an uploaded JSON file and parse it into a new egg. * * @param \Illuminate\Http\UploadedFile $file - * @param int $nest + * @param int $nest * @return \Pterodactyl\Models\Egg * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Eggs/Sharing/EggUpdateImporterService.php b/app/Services/Eggs/Sharing/EggUpdateImporterService.php index 50342667d..b04904194 100644 --- a/app/Services/Eggs/Sharing/EggUpdateImporterService.php +++ b/app/Services/Eggs/Sharing/EggUpdateImporterService.php @@ -29,8 +29,8 @@ class EggUpdateImporterService /** * EggUpdateImporterService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository */ public function __construct( @@ -46,7 +46,7 @@ class EggUpdateImporterService /** * Update an existing Egg using an uploaded JSON file. * - * @param int $egg + * @param int $egg * @param \Illuminate\Http\UploadedFile $file * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Eggs/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php index 8a989fba2..ed7e72a4f 100644 --- a/app/Services/Eggs/Variables/VariableCreationService.php +++ b/app/Services/Eggs/Variables/VariableCreationService.php @@ -26,7 +26,7 @@ class VariableCreationService * VariableCreationService constructor. * * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository - * @param \Illuminate\Contracts\Validation\Factory $validator + * @param \Illuminate\Contracts\Validation\Factory $validator */ public function __construct(EggVariableRepositoryInterface $repository, Factory $validator) { @@ -48,7 +48,7 @@ class VariableCreationService /** * Create a new variable for a given Egg. * - * @param int $egg + * @param int $egg * @param array $data * @return \Pterodactyl\Models\EggVariable * diff --git a/app/Services/Eggs/Variables/VariableUpdateService.php b/app/Services/Eggs/Variables/VariableUpdateService.php index 15bbe2d31..910b50f05 100644 --- a/app/Services/Eggs/Variables/VariableUpdateService.php +++ b/app/Services/Eggs/Variables/VariableUpdateService.php @@ -27,7 +27,7 @@ class VariableUpdateService * VariableUpdateService constructor. * * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository - * @param \Illuminate\Contracts\Validation\Factory $validator + * @param \Illuminate\Contracts\Validation\Factory $validator */ public function __construct(EggVariableRepositoryInterface $repository, Factory $validator) { @@ -50,7 +50,7 @@ class VariableUpdateService * Update a specific egg variable. * * @param \Pterodactyl\Models\EggVariable $variable - * @param array $data + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Helpers/AssetHashService.php b/app/Services/Helpers/AssetHashService.php index f7efba65a..c02506a9e 100644 --- a/app/Services/Helpers/AssetHashService.php +++ b/app/Services/Helpers/AssetHashService.php @@ -38,8 +38,8 @@ class AssetHashService * AssetHashService constructor. * * @param \Illuminate\Contracts\Foundation\Application $application - * @param \Illuminate\Contracts\Cache\Repository $cache - * @param \Illuminate\Filesystem\FilesystemManager $filesystem + * @param \Illuminate\Contracts\Cache\Repository $cache + * @param \Illuminate\Filesystem\FilesystemManager $filesystem */ public function __construct(Application $application, CacheRepository $cache, FilesystemManager $filesystem) { diff --git a/app/Services/Helpers/SoftwareVersionService.php b/app/Services/Helpers/SoftwareVersionService.php index 8ab51f457..b984271c9 100644 --- a/app/Services/Helpers/SoftwareVersionService.php +++ b/app/Services/Helpers/SoftwareVersionService.php @@ -39,8 +39,8 @@ class SoftwareVersionService /** * SoftwareVersionService constructor. * - * @param \Illuminate\Contracts\Cache\Repository $cache - * @param \GuzzleHttp\Client $client + * @param \Illuminate\Contracts\Cache\Repository $cache + * @param \GuzzleHttp\Client $client * @param \Illuminate\Contracts\Config\Repository $config */ public function __construct( diff --git a/app/Services/Locations/LocationDeletionService.php b/app/Services/Locations/LocationDeletionService.php index 5d1495d16..5fc528ead 100644 --- a/app/Services/Locations/LocationDeletionService.php +++ b/app/Services/Locations/LocationDeletionService.php @@ -31,7 +31,7 @@ class LocationDeletionService * LocationDeletionService constructor. * * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository - * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $nodeRepository + * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $nodeRepository */ public function __construct( LocationRepositoryInterface $repository, diff --git a/app/Services/Locations/LocationUpdateService.php b/app/Services/Locations/LocationUpdateService.php index a245e71b1..dfb5bcc5f 100644 --- a/app/Services/Locations/LocationUpdateService.php +++ b/app/Services/Locations/LocationUpdateService.php @@ -33,7 +33,7 @@ class LocationUpdateService * Update an existing location. * * @param int|\Pterodactyl\Models\Location $location - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Location * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Nests/NestCreationService.php b/app/Services/Nests/NestCreationService.php index 439164485..5cac1c11a 100644 --- a/app/Services/Nests/NestCreationService.php +++ b/app/Services/Nests/NestCreationService.php @@ -22,7 +22,7 @@ class NestCreationService /** * NestCreationService constructor. * - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository */ public function __construct(ConfigRepository $config, NestRepositoryInterface $repository) @@ -34,7 +34,7 @@ class NestCreationService /** * Create a new nest on the system. * - * @param array $data + * @param array $data * @param string|null $author * @return \Pterodactyl\Models\Nest * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Nests/NestDeletionService.php b/app/Services/Nests/NestDeletionService.php index 6bdaf8de2..f747a7342 100644 --- a/app/Services/Nests/NestDeletionService.php +++ b/app/Services/Nests/NestDeletionService.php @@ -29,7 +29,7 @@ class NestDeletionService * NestDeletionService constructor. * * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository */ public function __construct( ServerRepositoryInterface $serverRepository, diff --git a/app/Services/Nests/NestUpdateService.php b/app/Services/Nests/NestUpdateService.php index c3cdcdd5d..de04e7e2f 100644 --- a/app/Services/Nests/NestUpdateService.php +++ b/app/Services/Nests/NestUpdateService.php @@ -31,7 +31,7 @@ class NestUpdateService /** * Update a nest and prevent changing the author once it is set. * - * @param int $nest + * @param int $nest * @param array $data * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Nodes/NodeDeletionService.php b/app/Services/Nodes/NodeDeletionService.php index e4d2ed999..75118fa30 100644 --- a/app/Services/Nodes/NodeDeletionService.php +++ b/app/Services/Nodes/NodeDeletionService.php @@ -35,9 +35,9 @@ class NodeDeletionService /** * DeletionService constructor. * - * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Illuminate\Contracts\Translation\Translator $translator + * @param \Illuminate\Contracts\Translation\Translator $translator */ public function __construct( NodeRepositoryInterface $repository, diff --git a/app/Services/Nodes/NodeUpdateService.php b/app/Services/Nodes/NodeUpdateService.php index 219e2a34f..5db59eb2d 100644 --- a/app/Services/Nodes/NodeUpdateService.php +++ b/app/Services/Nodes/NodeUpdateService.php @@ -31,9 +31,9 @@ class NodeUpdateService /** * UpdateService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface $configurationRepository - * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository */ public function __construct( ConnectionInterface $connection, @@ -49,8 +49,8 @@ class NodeUpdateService * Update the configuration values for a given node on the machine. * * @param \Pterodactyl\Models\Node $node - * @param array $data - * @param bool $resetToken + * @param array $data + * @param bool $resetToken * * @return \Pterodactyl\Models\Node * diff --git a/app/Services/Packs/ExportPackService.php b/app/Services/Packs/ExportPackService.php index 24b4db96b..1403bfdca 100644 --- a/app/Services/Packs/ExportPackService.php +++ b/app/Services/Packs/ExportPackService.php @@ -35,9 +35,9 @@ class ExportPackService /** * ExportPackService constructor. * - * @param \Illuminate\Contracts\Filesystem\Factory $storage + * @param \Illuminate\Contracts\Filesystem\Factory $storage * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository - * @param \ZipArchive $archive + * @param \ZipArchive $archive */ public function __construct( FilesystemFactory $storage, @@ -53,7 +53,7 @@ class ExportPackService * Prepare a pack for export. * * @param int|\Pterodactyl\Models\Pack $pack - * @param bool $files + * @param bool $files * @return string * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Packs/PackCreationService.php b/app/Services/Packs/PackCreationService.php index 80b452d88..5179ea0dd 100644 --- a/app/Services/Packs/PackCreationService.php +++ b/app/Services/Packs/PackCreationService.php @@ -42,8 +42,8 @@ class PackCreationService /** * PackCreationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Illuminate\Contracts\Filesystem\Factory $storage + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Contracts\Filesystem\Factory $storage * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository */ public function __construct( @@ -59,7 +59,7 @@ class PackCreationService /** * Add a new service pack to the system. * - * @param array $data + * @param array $data * @param \Illuminate\Http\UploadedFile|null $file * @return \Pterodactyl\Models\Pack * diff --git a/app/Services/Packs/PackDeletionService.php b/app/Services/Packs/PackDeletionService.php index 9d4743310..cd9be47b6 100644 --- a/app/Services/Packs/PackDeletionService.php +++ b/app/Services/Packs/PackDeletionService.php @@ -41,9 +41,9 @@ class PackDeletionService /** * PackDeletionService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Illuminate\Contracts\Filesystem\Factory $storage - * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Contracts\Filesystem\Factory $storage + * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository */ public function __construct( @@ -61,7 +61,7 @@ class PackDeletionService /** * Delete a pack from the database as well as the archive stored on the server. * - * @param int|\Pterodactyl\Models\Pack$pack + * @param int|\Pterodactyl\Models\Pack $pack * * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Packs/PackUpdateService.php b/app/Services/Packs/PackUpdateService.php index a22a55b9f..52c32818c 100644 --- a/app/Services/Packs/PackUpdateService.php +++ b/app/Services/Packs/PackUpdateService.php @@ -29,7 +29,7 @@ class PackUpdateService /** * PackUpdateService constructor. * - * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository */ public function __construct( @@ -44,7 +44,7 @@ class PackUpdateService * Update a pack. * * @param int|\Pterodactyl\Models\Pack $pack - * @param array $data + * @param array $data * @return bool * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Packs/TemplateUploadService.php b/app/Services/Packs/TemplateUploadService.php index 6495edd68..dbefd89a1 100644 --- a/app/Services/Packs/TemplateUploadService.php +++ b/app/Services/Packs/TemplateUploadService.php @@ -39,7 +39,7 @@ class TemplateUploadService * TemplateUploadService constructor. * * @param \Pterodactyl\Services\Packs\PackCreationService $creationService - * @param \ZipArchive $archive + * @param \ZipArchive $archive */ public function __construct( PackCreationService $creationService, @@ -52,7 +52,7 @@ class TemplateUploadService /** * Process an uploaded file to create a new pack from a JSON or ZIP format. * - * @param int $egg + * @param int $egg * @param \Illuminate\Http\UploadedFile $file * @return \Pterodactyl\Models\Pack * @@ -88,7 +88,7 @@ class TemplateUploadService /** * Process a ZIP file to create a pack and stored archive. * - * @param int $egg + * @param int $egg * @param \Illuminate\Http\UploadedFile $file * @return \Pterodactyl\Models\Pack * diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php index 4ada2aee8..ca27d1878 100644 --- a/app/Services/Schedules/ProcessScheduleService.php +++ b/app/Services/Schedules/ProcessScheduleService.php @@ -29,9 +29,9 @@ class ProcessScheduleService /** * ProcessScheduleService constructor. * - * @param \Illuminate\Contracts\Bus\Dispatcher $dispatcher + * @param \Illuminate\Contracts\Bus\Dispatcher $dispatcher * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $scheduleRepository - * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository + * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository */ public function __construct( Dispatcher $dispatcher, diff --git a/app/Services/Schedules/ScheduleCreationService.php b/app/Services/Schedules/ScheduleCreationService.php index c8cbd7fb3..641c968c6 100644 --- a/app/Services/Schedules/ScheduleCreationService.php +++ b/app/Services/Schedules/ScheduleCreationService.php @@ -28,9 +28,9 @@ class ScheduleCreationService /** * ScheduleCreationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository - * @param \Pterodactyl\Services\Schedules\Tasks\TaskCreationService $taskCreationService + * @param \Pterodactyl\Services\Schedules\Tasks\TaskCreationService $taskCreationService */ public function __construct( ConnectionInterface $connection, @@ -46,8 +46,8 @@ class ScheduleCreationService * Create a new schedule for a specific server. * * @param \Pterodactyl\Models\Server $server - * @param array $data - * @param array $tasks + * @param array $data + * @param array $tasks * @return \Pterodactyl\Models\Schedule * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Schedules/ScheduleUpdateService.php b/app/Services/Schedules/ScheduleUpdateService.php index 1ddbbd242..c99b97ccc 100644 --- a/app/Services/Schedules/ScheduleUpdateService.php +++ b/app/Services/Schedules/ScheduleUpdateService.php @@ -34,10 +34,10 @@ class ScheduleUpdateService /** * ScheduleUpdateService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository - * @param \Pterodactyl\Services\Schedules\Tasks\TaskCreationService $taskCreationService - * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository + * @param \Pterodactyl\Services\Schedules\Tasks\TaskCreationService $taskCreationService + * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $taskRepository */ public function __construct( ConnectionInterface $connection, @@ -56,8 +56,8 @@ class ScheduleUpdateService * new values. * * @param \Pterodactyl\Models\Schedule $schedule - * @param array $data - * @param array $tasks + * @param array $data + * @param array $tasks * @return \Pterodactyl\Models\Schedule * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Schedules/Tasks/TaskCreationService.php b/app/Services/Schedules/Tasks/TaskCreationService.php index 6cf4fc384..0899f9e0a 100644 --- a/app/Services/Schedules/Tasks/TaskCreationService.php +++ b/app/Services/Schedules/Tasks/TaskCreationService.php @@ -37,8 +37,8 @@ class TaskCreationService * Create a new task that is assigned to a schedule. * * @param int|\Pterodactyl\Models\Schedule $schedule - * @param array $data - * @param bool $returnModel + * @param array $data + * @param bool $returnModel * @return bool|\Pterodactyl\Models\Task * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/BuildModificationService.php b/app/Services/Servers/BuildModificationService.php index a662cd7b9..67f6f98da 100644 --- a/app/Services/Servers/BuildModificationService.php +++ b/app/Services/Servers/BuildModificationService.php @@ -37,10 +37,10 @@ class BuildModificationService /** * BuildModificationService constructor. * - * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( AllocationRepositoryInterface $allocationRepository, @@ -58,7 +58,7 @@ class BuildModificationService * Change the build details for a specified server. * * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Server * * @throws \Pterodactyl\Exceptions\DisplayException @@ -123,7 +123,7 @@ class BuildModificationService * are available for a server. * * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data * * @throws \Pterodactyl\Exceptions\DisplayException */ diff --git a/app/Services/Servers/DetailsModificationService.php b/app/Services/Servers/DetailsModificationService.php index 523185f2e..37bf0813c 100644 --- a/app/Services/Servers/DetailsModificationService.php +++ b/app/Services/Servers/DetailsModificationService.php @@ -36,10 +36,10 @@ class DetailsModificationService /** * DetailsModificationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService $keyDeletionService - * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository + * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository */ public function __construct( ConnectionInterface $connection, @@ -57,7 +57,7 @@ class DetailsModificationService * Update the details for a single server instance. * * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data * @return bool|\Pterodactyl\Models\Server * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Servers/EnvironmentService.php b/app/Services/Servers/EnvironmentService.php index b17076e07..68ae68dc4 100644 --- a/app/Services/Servers/EnvironmentService.php +++ b/app/Services/Servers/EnvironmentService.php @@ -26,7 +26,7 @@ class EnvironmentService /** * EnvironmentService constructor. * - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct(ConfigRepository $config, ServerRepositoryInterface $repository) @@ -39,7 +39,7 @@ class EnvironmentService * Dynamically configure additional environment variables to be assigned * with a specific server. * - * @param string $key + * @param string $key * @param callable $closure */ public function setEnvironmentKey(string $key, callable $closure) diff --git a/app/Services/Servers/ReinstallServerService.php b/app/Services/Servers/ReinstallServerService.php index 85800473f..1d0d4c6e8 100644 --- a/app/Services/Servers/ReinstallServerService.php +++ b/app/Services/Servers/ReinstallServerService.php @@ -36,9 +36,9 @@ class ReinstallServerService /** * ReinstallService constructor. * - * @param \Illuminate\Database\ConnectionInterface $database + * @param \Illuminate\Database\ConnectionInterface $database * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository */ public function __construct( ConnectionInterface $database, diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php index 46a710924..a087fad7d 100644 --- a/app/Services/Servers/ServerConfigurationStructureService.php +++ b/app/Services/Servers/ServerConfigurationStructureService.php @@ -30,7 +30,7 @@ class ServerConfigurationStructureService * ServerConfigurationStructureService constructor. * * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Pterodactyl\Services\Servers\EnvironmentService $environment + * @param \Pterodactyl\Services\Servers\EnvironmentService $environment */ public function __construct( ServerRepositoryInterface $repository, diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php index e9287caae..2f1abbbca 100644 --- a/app/Services/Servers/ServerCreationService.php +++ b/app/Services/Servers/ServerCreationService.php @@ -75,16 +75,16 @@ class ServerCreationService /** * CreationService constructor. * - * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository - * @param \Pterodactyl\Services\Deployment\AllocationSelectionService $allocationSelectionService - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $eggRepository - * @param \Pterodactyl\Services\Deployment\FindViableNodesService $findViableNodesService - * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository + * @param \Pterodactyl\Services\Deployment\AllocationSelectionService $allocationSelectionService + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $eggRepository + * @param \Pterodactyl\Services\Deployment\FindViableNodesService $findViableNodesService + * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository - * @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService + * @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService */ public function __construct( AllocationRepositoryInterface $allocationRepository, @@ -116,7 +116,7 @@ class ServerCreationService * as possible given the input data. For example, if an allocation_id is passed with * no node_id the node_is will be picked from the allocation. * - * @param array $data + * @param array $data * @param \Pterodactyl\Models\Objects\DeploymentObject|null $deployment * @return \Pterodactyl\Models\Server * @@ -179,7 +179,7 @@ class ServerCreationService /** * Gets an allocation to use for automatic deployment. * - * @param array $data + * @param array $data * @param \Pterodactyl\Models\Objects\DeploymentObject $deployment * * @return \Pterodactyl\Models\Allocation @@ -244,7 +244,7 @@ class ServerCreationService * Configure the allocations assigned to this server. * * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data */ private function storeAssignedAllocations(Server $server, array $data) { @@ -259,7 +259,7 @@ class ServerCreationService /** * Process environment variables passed for this server and store them in the database. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @param \Illuminate\Support\Collection $variables */ private function storeEggVariables(Server $server, Collection $variables) diff --git a/app/Services/Servers/ServerDeletionService.php b/app/Services/Servers/ServerDeletionService.php index faed3b9ff..e2919894b 100644 --- a/app/Services/Servers/ServerDeletionService.php +++ b/app/Services/Servers/ServerDeletionService.php @@ -58,12 +58,12 @@ class ServerDeletionService /** * DeletionService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Database\ConnectionInterface $connection * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository - * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Psr\Log\LoggerInterface $writer + * @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository + * @param \Pterodactyl\Services\Databases\DatabaseManagementService $databaseManagementService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $connection, diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php index 9fa1390db..82f11bbf8 100644 --- a/app/Services/Servers/StartupModificationService.php +++ b/app/Services/Servers/StartupModificationService.php @@ -55,13 +55,13 @@ class StartupModificationService /** * StartupModificationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $eggRepository - * @param \Pterodactyl\Services\Servers\EnvironmentService $environmentService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository + * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $eggRepository + * @param \Pterodactyl\Services\Servers\EnvironmentService $environmentService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository - * @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService + * @param \Pterodactyl\Services\Servers\VariableValidatorService $validatorService */ public function __construct( ConnectionInterface $connection, @@ -85,7 +85,7 @@ class StartupModificationService * Process startup modification for a server. * * @param \Pterodactyl\Models\Server $server - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Server * * @throws \Illuminate\Validation\ValidationException @@ -136,9 +136,9 @@ class StartupModificationService /** * Update certain administrative settings for a server in the DB. * - * @param array $data + * @param array $data * @param \Pterodactyl\Models\Server $server - * @param array $daemonData + * @param array $daemonData * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Servers/SuspensionService.php b/app/Services/Servers/SuspensionService.php index d8d367803..7dcbd2408 100644 --- a/app/Services/Servers/SuspensionService.php +++ b/app/Services/Servers/SuspensionService.php @@ -9,6 +9,7 @@ namespace Pterodactyl\Services\Servers; +use InvalidArgumentException; use Pterodactyl\Models\Server; use Psr\Log\LoggerInterface as Writer; use GuzzleHttp\Exception\RequestException; @@ -45,10 +46,10 @@ class SuspensionService /** * SuspensionService constructor. * - * @param \Illuminate\Database\ConnectionInterface $database + * @param \Illuminate\Database\ConnectionInterface $database * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository - * @param \Psr\Log\LoggerInterface $writer + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Psr\Log\LoggerInterface $writer */ public function __construct( ConnectionInterface $database, @@ -66,7 +67,7 @@ class SuspensionService * Suspends a server on the system. * * @param int|\Pterodactyl\Models\Server $server - * @param string $action + * @param string $action * @return bool * * @throws \Pterodactyl\Exceptions\DisplayException @@ -80,7 +81,7 @@ class SuspensionService } if (! in_array($action, [self::ACTION_SUSPEND, self::ACTION_UNSUSPEND])) { - throw new \InvalidArgumentException(sprintf( + throw new InvalidArgumentException(sprintf( 'Action must be either ' . self::ACTION_SUSPEND . ' or ' . self::ACTION_UNSUSPEND . ', %s passed.', $action )); diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php index 758460559..5fa0607f6 100644 --- a/app/Services/Servers/VariableValidatorService.php +++ b/app/Services/Servers/VariableValidatorService.php @@ -45,10 +45,10 @@ class VariableValidatorService /** * VariableValidatorService constructor. * - * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $optionVariableRepository - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository + * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $optionVariableRepository + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository - * @param \Illuminate\Contracts\Validation\Factory $validator + * @param \Illuminate\Contracts\Validation\Factory $validator */ public function __construct( EggVariableRepositoryInterface $optionVariableRepository, @@ -65,7 +65,7 @@ class VariableValidatorService /** * Validate all of the passed data against the given service option variables. * - * @param int $egg + * @param int $egg * @param array $fields * @return \Illuminate\Support\Collection * @throws \Illuminate\Validation\ValidationException diff --git a/app/Services/Sftp/AuthenticateUsingPasswordService.php b/app/Services/Sftp/AuthenticateUsingPasswordService.php index 4310a50f6..1930f71b9 100644 --- a/app/Services/Sftp/AuthenticateUsingPasswordService.php +++ b/app/Services/Sftp/AuthenticateUsingPasswordService.php @@ -34,10 +34,10 @@ class AuthenticateUsingPasswordService /** * AuthenticateUsingPasswordService constructor. * - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository - * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $userRepository + * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $userRepository */ public function __construct( DaemonKeyProviderService $keyProviderService, @@ -60,9 +60,9 @@ class AuthenticateUsingPasswordService * Server must exist on the node that the API call is being made from in order for a * valid response to be provided. * - * @param string $username - * @param string $password - * @param int $node + * @param string $username + * @param string $password + * @param int $node * @param string|null $server * @return array * diff --git a/app/Services/Subusers/PermissionCreationService.php b/app/Services/Subusers/PermissionCreationService.php index 074048f0a..328485ee1 100644 --- a/app/Services/Subusers/PermissionCreationService.php +++ b/app/Services/Subusers/PermissionCreationService.php @@ -33,7 +33,7 @@ class PermissionCreationService /** * Assign permissions to a given subuser. * - * @param int $subuser + * @param int $subuser * @param array $permissions * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Subusers/SubuserCreationService.php b/app/Services/Subusers/SubuserCreationService.php index 1a5d7120f..9c6b7c42e 100644 --- a/app/Services/Subusers/SubuserCreationService.php +++ b/app/Services/Subusers/SubuserCreationService.php @@ -60,13 +60,13 @@ class SubuserCreationService /** * SubuserCreationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService - * @param \Pterodactyl\Services\Subusers\PermissionCreationService $permissionService - * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService + * @param \Pterodactyl\Services\Subusers\PermissionCreationService $permissionService + * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository - * @param \Pterodactyl\Services\Users\UserCreationService $userCreationService - * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $userRepository + * @param \Pterodactyl\Services\Users\UserCreationService $userCreationService + * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $userRepository */ public function __construct( ConnectionInterface $connection, @@ -88,8 +88,8 @@ class SubuserCreationService /** * @param int|\Pterodactyl\Models\Server $server - * @param string $email - * @param array $permissions + * @param string $email + * @param array $permissions * @return \Pterodactyl\Models\Subuser * * @throws \Exception diff --git a/app/Services/Subusers/SubuserDeletionService.php b/app/Services/Subusers/SubuserDeletionService.php index 6b100cd18..28d7cd168 100644 --- a/app/Services/Subusers/SubuserDeletionService.php +++ b/app/Services/Subusers/SubuserDeletionService.php @@ -34,8 +34,8 @@ class SubuserDeletionService /** * SubuserDeletionService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService $keyDeletionService + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService $keyDeletionService * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/Subusers/SubuserUpdateService.php b/app/Services/Subusers/SubuserUpdateService.php index f56e47b9d..64d7f0b38 100644 --- a/app/Services/Subusers/SubuserUpdateService.php +++ b/app/Services/Subusers/SubuserUpdateService.php @@ -53,12 +53,12 @@ class SubuserUpdateService /** * SubuserUpdateService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService $keyProviderService * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository - * @param \Pterodactyl\Services\Subusers\PermissionCreationService $permissionService - * @param \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface $permissionRepository - * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository + * @param \Pterodactyl\Services\Subusers\PermissionCreationService $permissionService + * @param \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface $permissionRepository + * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository */ public function __construct( ConnectionInterface $connection, @@ -80,7 +80,7 @@ class SubuserUpdateService * Update permissions for a given subuser. * * @param \Pterodactyl\Models\Subuser $subuser - * @param array $permissions + * @param array $permissions * * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Users/ToggleTwoFactorService.php b/app/Services/Users/ToggleTwoFactorService.php index 6fe8bc9dd..0f68b76c2 100644 --- a/app/Services/Users/ToggleTwoFactorService.php +++ b/app/Services/Users/ToggleTwoFactorService.php @@ -35,9 +35,9 @@ class ToggleTwoFactorService /** * ToggleTwoFactorService constructor. * - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter - * @param \PragmaRX\Google2FA\Google2FA $google2FA - * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \PragmaRX\Google2FA\Google2FA $google2FA + * @param \Illuminate\Contracts\Config\Repository $config * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( @@ -56,8 +56,8 @@ class ToggleTwoFactorService * Toggle 2FA on an account only if the token provided is valid. * * @param \Pterodactyl\Models\User $user - * @param string $token - * @param bool|null $toggleState + * @param string $token + * @param bool|null $toggleState * @return bool * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Users/TwoFactorSetupService.php b/app/Services/Users/TwoFactorSetupService.php index 4f2389b18..032a43083 100644 --- a/app/Services/Users/TwoFactorSetupService.php +++ b/app/Services/Users/TwoFactorSetupService.php @@ -31,8 +31,8 @@ class TwoFactorSetupService /** * TwoFactorSetupService constructor. * - * @param \Illuminate\Contracts\Config\Repository $config - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Config\Repository $config + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/Users/UserCreationService.php b/app/Services/Users/UserCreationService.php index b54c4f2de..5bc56dd40 100644 --- a/app/Services/Users/UserCreationService.php +++ b/app/Services/Users/UserCreationService.php @@ -34,9 +34,9 @@ class UserCreationService /** * CreationService constructor. * - * @param \Illuminate\Database\ConnectionInterface $connection - * @param \Illuminate\Contracts\Hashing\Hasher $hasher - * @param \Illuminate\Contracts\Auth\PasswordBroker $passwordBroker + * @param \Illuminate\Database\ConnectionInterface $connection + * @param \Illuminate\Contracts\Hashing\Hasher $hasher + * @param \Illuminate\Contracts\Auth\PasswordBroker $passwordBroker * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( diff --git a/app/Services/Users/UserDeletionService.php b/app/Services/Users/UserDeletionService.php index 942e76faf..fd5196821 100644 --- a/app/Services/Users/UserDeletionService.php +++ b/app/Services/Users/UserDeletionService.php @@ -36,8 +36,8 @@ class UserDeletionService * DeletionService constructor. * * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository - * @param \Illuminate\Contracts\Translation\Translator $translator - * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository + * @param \Illuminate\Contracts\Translation\Translator $translator + * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( ServerRepositoryInterface $serverRepository, diff --git a/app/Services/Users/UserUpdateService.php b/app/Services/Users/UserUpdateService.php index 440f8b45a..4f6d99a5a 100644 --- a/app/Services/Users/UserUpdateService.php +++ b/app/Services/Users/UserUpdateService.php @@ -31,9 +31,9 @@ class UserUpdateService /** * UpdateService constructor. * - * @param \Illuminate\Contracts\Hashing\Hasher $hasher + * @param \Illuminate\Contracts\Hashing\Hasher $hasher * @param \Pterodactyl\Services\DaemonKeys\RevokeMultipleDaemonKeysService $revocationService - * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( Hasher $hasher, @@ -50,7 +50,7 @@ class UserUpdateService * revoke all of the authentication tokens that have been assigned to their account. * * @param \Pterodactyl\Models\User $user - * @param array $data + * @param array $data * @return \Illuminate\Support\Collection * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Traits/Controllers/JavascriptInjection.php b/app/Traits/Controllers/JavascriptInjection.php index bbda917d1..06cb6de58 100644 --- a/app/Traits/Controllers/JavascriptInjection.php +++ b/app/Traits/Controllers/JavascriptInjection.php @@ -36,7 +36,7 @@ trait JavascriptInjection * Injects server javascript into the page to be used by other services. * * @param array $args - * @param bool $overwrite + * @param bool $overwrite * @return array */ public function injectJavascript($args = [], $overwrite = false) diff --git a/app/Transformers/Api/Application/BaseTransformer.php b/app/Transformers/Api/Application/BaseTransformer.php index be5e367f6..410943712 100644 --- a/app/Transformers/Api/Application/BaseTransformer.php +++ b/app/Transformers/Api/Application/BaseTransformer.php @@ -82,7 +82,7 @@ abstract class BaseTransformer extends TransformerAbstract * set API key. * * @param string $abstract - * @param array $parameters + * @param array $parameters * @return \Pterodactyl\Transformers\Api\Application\BaseTransformer * * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException diff --git a/app/Transformers/Api/Client/BaseClientTransformer.php b/app/Transformers/Api/Client/BaseClientTransformer.php index faa1abbed..1278d5ad5 100644 --- a/app/Transformers/Api/Client/BaseClientTransformer.php +++ b/app/Transformers/Api/Client/BaseClientTransformer.php @@ -40,7 +40,7 @@ abstract class BaseClientTransformer extends BaseApplicationTransformer * to access a different resource. This is used when including other * models on a transformation request. * - * @param string $ability + * @param string $ability * @param \Pterodactyl\Models\Server $server * @return bool */ @@ -56,7 +56,7 @@ abstract class BaseClientTransformer extends BaseApplicationTransformer * set API key. * * @param string $abstract - * @param array $parameters + * @param array $parameters * @return self * * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException diff --git a/app/Transformers/Api/Client/DatabaseTransformer.php b/app/Transformers/Api/Client/DatabaseTransformer.php index c7b3177cc..feb6002eb 100644 --- a/app/Transformers/Api/Client/DatabaseTransformer.php +++ b/app/Transformers/Api/Client/DatabaseTransformer.php @@ -24,7 +24,7 @@ class DatabaseTransformer extends BaseClientTransformer /** * Handle dependency injection. * - * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter + * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter * @param \Pterodactyl\Contracts\Extensions\HashidsInterface $hashids */ public function handle(Encrypter $encrypter, HashidsInterface $hashids) diff --git a/app/Transformers/Daemon/ApiKeyTransformer.php b/app/Transformers/Daemon/ApiKeyTransformer.php index 7f1d7427b..292cd6fcf 100644 --- a/app/Transformers/Daemon/ApiKeyTransformer.php +++ b/app/Transformers/Daemon/ApiKeyTransformer.php @@ -25,7 +25,7 @@ class ApiKeyTransformer extends TransformerAbstract * ApiKeyTransformer constructor. * * @param \Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface $keyRepository - * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository + * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $repository */ public function __construct(DaemonKeyRepositoryInterface $keyRepository, SubuserRepositoryInterface $repository) { diff --git a/app/helpers.php b/app/helpers.php index bfb12cc7a..e66179387 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -11,7 +11,7 @@ if (! function_exists('human_readable')) { * Generate a human-readable filesize for a given file path. * * @param string $path - * @param int $precision + * @param int $precision * @return string */ function human_readable($path, $precision = 2) @@ -51,7 +51,7 @@ if (! function_exists('object_get_strict')) { * * @param object $object * @param string $key - * @param null $default + * @param null $default * @return mixed */ function object_get_strict($object, $key, $default = null)