diff --git a/.php_cs b/.php_cs index c1e6da7eb..aca934c80 100644 --- a/.php_cs +++ b/.php_cs @@ -31,6 +31,7 @@ return PhpCsFixer\Config::create() 'no_unreachable_default_argument_value' => true, 'no_useless_return' => true, 'not_operator_with_successor_space' => true, + 'phpdoc_align' => ['tags' => ['param']], 'phpdoc_separation' => false, 'protected_to_private' => false, 'psr0' => ['dir' => 'app'], diff --git a/app/Console/Commands/AddLocation.php b/app/Console/Commands/AddLocation.php index 7d14cf0ee..80338a33f 100644 --- a/app/Console/Commands/AddLocation.php +++ b/app/Console/Commands/AddLocation.php @@ -49,8 +49,6 @@ class AddLocation extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/AddNode.php b/app/Console/Commands/AddNode.php index 0aac540c0..9f31527ed 100644 --- a/app/Console/Commands/AddNode.php +++ b/app/Console/Commands/AddNode.php @@ -57,8 +57,6 @@ class AddNode extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/CleanServiceBackup.php b/app/Console/Commands/CleanServiceBackup.php index 0a6a3e272..bb56ab7f0 100644 --- a/app/Console/Commands/CleanServiceBackup.php +++ b/app/Console/Commands/CleanServiceBackup.php @@ -46,8 +46,6 @@ class CleanServiceBackup extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/ClearServices.php b/app/Console/Commands/ClearServices.php index db62d268c..c0438b360 100644 --- a/app/Console/Commands/ClearServices.php +++ b/app/Console/Commands/ClearServices.php @@ -45,8 +45,6 @@ class ClearServices extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/ClearTasks.php b/app/Console/Commands/ClearTasks.php index 569caf028..027f9915c 100644 --- a/app/Console/Commands/ClearTasks.php +++ b/app/Console/Commands/ClearTasks.php @@ -49,8 +49,6 @@ class ClearTasks extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/MakeUser.php b/app/Console/Commands/MakeUser.php index 81038cb4a..a4c0d442a 100644 --- a/app/Console/Commands/MakeUser.php +++ b/app/Console/Commands/MakeUser.php @@ -51,8 +51,6 @@ class MakeUser extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/RebuildServer.php b/app/Console/Commands/RebuildServer.php index 2177b112a..c0e36535b 100644 --- a/app/Console/Commands/RebuildServer.php +++ b/app/Console/Commands/RebuildServer.php @@ -49,8 +49,6 @@ class RebuildServer extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/RunTasks.php b/app/Console/Commands/RunTasks.php index 6c3ccc6c9..9b1bff25f 100644 --- a/app/Console/Commands/RunTasks.php +++ b/app/Console/Commands/RunTasks.php @@ -50,8 +50,6 @@ class RunTasks extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/ShowVersion.php b/app/Console/Commands/ShowVersion.php index 199a905b1..a5a91bfa7 100644 --- a/app/Console/Commands/ShowVersion.php +++ b/app/Console/Commands/ShowVersion.php @@ -45,8 +45,6 @@ class ShowVersion extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/UpdateEmailSettings.php b/app/Console/Commands/UpdateEmailSettings.php index 1e316d6cb..93d28dfaa 100644 --- a/app/Console/Commands/UpdateEmailSettings.php +++ b/app/Console/Commands/UpdateEmailSettings.php @@ -51,8 +51,6 @@ class UpdateEmailSettings extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Commands/UpdateEnvironment.php b/app/Console/Commands/UpdateEnvironment.php index 6252a2824..5ee663908 100644 --- a/app/Console/Commands/UpdateEnvironment.php +++ b/app/Console/Commands/UpdateEnvironment.php @@ -55,8 +55,6 @@ class UpdateEnvironment extends Command /** * Create a new command instance. - * - * @return void */ public function __construct() { diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index bba5bb66e..e5fa22ee3 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -30,8 +30,7 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param \Illuminate\Console\Scheduling\Schedule $schedule - * @return void + * @param \Illuminate\Console\Scheduling\Schedule $schedule */ protected function schedule(Schedule $schedule) { diff --git a/app/Contracts/Criteria/CriteriaInterface.php b/app/Contracts/Criteria/CriteriaInterface.php index dba7a688b..8dc3599f8 100644 --- a/app/Contracts/Criteria/CriteriaInterface.php +++ b/app/Contracts/Criteria/CriteriaInterface.php @@ -31,8 +31,8 @@ interface CriteriaInterface /** * Apply selected criteria to a repository call. * - * @param \Illuminate\Database\Eloquent\Model $model - * @param \Pterodactyl\Repositories\Repository $repository + * @param \Illuminate\Database\Eloquent\Model $model + * @param \Pterodactyl\Repositories\Repository $repository * @return mixed */ public function apply($model, Repository $repository); diff --git a/app/Contracts/Repository/AllocationRepositoryInterface.php b/app/Contracts/Repository/AllocationRepositoryInterface.php index e2c2abb1a..ec54de974 100644 --- a/app/Contracts/Repository/AllocationRepositoryInterface.php +++ b/app/Contracts/Repository/AllocationRepositoryInterface.php @@ -29,8 +29,8 @@ 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 int|null $server + * @param array $ids * @return int */ public function assignAllocationsToServer($server, array $ids); @@ -38,7 +38,7 @@ interface AllocationRepositoryInterface extends RepositoryInterface /** * Return all of the allocations for a specific node. * - * @param int $node + * @param int $node * @return \Illuminate\Database\Eloquent\Collection */ public function getAllocationsForNode($node); diff --git a/app/Contracts/Repository/ApiKeyRepositoryInterface.php b/app/Contracts/Repository/ApiKeyRepositoryInterface.php index bfd44e921..613a629e2 100644 --- a/app/Contracts/Repository/ApiKeyRepositoryInterface.php +++ b/app/Contracts/Repository/ApiKeyRepositoryInterface.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Contracts\Repository; interface ApiKeyRepositoryInterface extends RepositoryInterface { - // } diff --git a/app/Contracts/Repository/ApiPermissionRepositoryInterface.php b/app/Contracts/Repository/ApiPermissionRepositoryInterface.php index f0556b453..4e5492972 100644 --- a/app/Contracts/Repository/ApiPermissionRepositoryInterface.php +++ b/app/Contracts/Repository/ApiPermissionRepositoryInterface.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Contracts\Repository; interface ApiPermissionRepositoryInterface extends RepositoryInterface { - // } diff --git a/app/Contracts/Repository/Attributes/SearchableInterface.php b/app/Contracts/Repository/Attributes/SearchableInterface.php index 60ca52b97..d33c1e41d 100644 --- a/app/Contracts/Repository/Attributes/SearchableInterface.php +++ b/app/Contracts/Repository/Attributes/SearchableInterface.php @@ -29,7 +29,7 @@ interface SearchableInterface /** * Filter results by search term. * - * @param string $term + * @param string $term * @return $this */ public function search($term); diff --git a/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php b/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php index 490f38a44..a18924f98 100644 --- a/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php +++ b/app/Contracts/Repository/Daemon/BaseRepositoryInterface.php @@ -29,7 +29,7 @@ interface BaseRepositoryInterface /** * Set the node model to be used for this daemon connection. * - * @param int $id + * @param int $id * @return $this */ public function setNode($id); @@ -44,7 +44,7 @@ interface BaseRepositoryInterface /** * Set the UUID for the server to be used in the X-Access-Server header for daemon requests. * - * @param null|string $server + * @param null|string $server * @return $this */ public function setAccessServer($server = null); @@ -59,7 +59,7 @@ interface BaseRepositoryInterface /** * Set the token to be used in the X-Access-Token header for requests to the daemon. * - * @param null|string $token + * @param null|string $token * @return $this */ public function setAccessToken($token = null); @@ -74,7 +74,7 @@ interface BaseRepositoryInterface /** * Return an instance of the Guzzle HTTP Client to be used for requests. * - * @param array $headers + * @param array $headers * @return \GuzzleHttp\Client */ public function getHttpClient($headers = []); diff --git a/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php b/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php index c56dde57a..0d4421f80 100644 --- a/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php +++ b/app/Contracts/Repository/Daemon/ConfigurationRepositoryInterface.php @@ -29,7 +29,7 @@ interface ConfigurationRepositoryInterface extends BaseRepositoryInterface /** * Update the configuration details for the specified node using data from the database. * - * @param array $overrides + * @param array $overrides * @return \Psr\Http\Message\ResponseInterface */ public function update(array $overrides = []); diff --git a/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php b/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php index a0cfc8e2b..de9fe0c3f 100644 --- a/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php +++ b/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php @@ -29,9 +29,9 @@ interface ServerRepositoryInterface extends BaseRepositoryInterface /** * Create a new server on the daemon for the panel. * - * @param int $id - * @param array $overrides - * @param bool $start + * @param int $id + * @param array $overrides + * @param bool $start * @return \Psr\Http\Message\ResponseInterface */ public function create($id, $overrides = [], $start = false); @@ -39,7 +39,7 @@ interface ServerRepositoryInterface extends BaseRepositoryInterface /** * Update server details on the daemon. * - * @param array $data + * @param array $data * @return \Psr\Http\Message\ResponseInterface */ public function update(array $data); @@ -47,7 +47,7 @@ interface ServerRepositoryInterface extends BaseRepositoryInterface /** * Mark a server to be reinstalled on the system. * - * @param array|null $data + * @param array|null $data * @return \Psr\Http\Message\ResponseInterface */ public function reinstall($data = null); diff --git a/app/Contracts/Repository/DatabaseHostRepositoryInterface.php b/app/Contracts/Repository/DatabaseHostRepositoryInterface.php index 3abd9be8c..59ff2405d 100644 --- a/app/Contracts/Repository/DatabaseHostRepositoryInterface.php +++ b/app/Contracts/Repository/DatabaseHostRepositoryInterface.php @@ -36,7 +36,7 @@ interface DatabaseHostRepositoryInterface extends RepositoryInterface /** * Return a database host with the databases and associated servers that are attached to said databases. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -46,7 +46,7 @@ interface DatabaseHostRepositoryInterface extends RepositoryInterface /** * Delete a database host from the DB if there are no databases using it. * - * @param int $id + * @param int $id * @return bool|null * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Contracts/Repository/DatabaseRepositoryInterface.php b/app/Contracts/Repository/DatabaseRepositoryInterface.php index 1f49a54d5..97a2c7d8a 100644 --- a/app/Contracts/Repository/DatabaseRepositoryInterface.php +++ b/app/Contracts/Repository/DatabaseRepositoryInterface.php @@ -30,7 +30,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface * Create a new database if it does not already exist on the host with * the provided details. * - * @param array $data + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException @@ -41,8 +41,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Create a new database on a given connection. * - * @param string $database - * @param null|string $connection + * @param string $database + * @param null|string $connection * @return bool */ public function createDatabase($database, $connection = null); @@ -50,10 +50,10 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Create a new database user on a given connection. * - * @param string $username - * @param string $remote - * @param string $password - * @param null|string $connection + * @param string $username + * @param string $remote + * @param string $password + * @param null|string $connection * @return bool */ public function createUser($username, $remote, $password, $connection = null); @@ -61,10 +61,10 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Give a specific user access to a given database. * - * @param string $database - * @param string $username - * @param string $remote - * @param null|string $connection + * @param string $database + * @param string $username + * @param string $remote + * @param null|string $connection * @return bool */ public function assignUserToDatabase($database, $username, $remote, $connection = null); @@ -72,7 +72,7 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Flush the privileges for a given connection. * - * @param null|string $connection + * @param null|string $connection * @return mixed */ public function flush($connection = null); @@ -80,8 +80,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Drop a given database on a specific connection. * - * @param string $database - * @param null|string $connection + * @param string $database + * @param null|string $connection * @return bool */ public function dropDatabase($database, $connection = null); @@ -89,9 +89,9 @@ interface DatabaseRepositoryInterface extends RepositoryInterface /** * Drop a given user on a specific connection. * - * @param string $username - * @param string $remote - * @param null|string $connection + * @param string $username + * @param string $remote + * @param null|string $connection * @return mixed */ public function dropUser($username, $remote, $connection = null); diff --git a/app/Contracts/Repository/LocationRepositoryInterface.php b/app/Contracts/Repository/LocationRepositoryInterface.php index 10ba143e4..600c41c14 100644 --- a/app/Contracts/Repository/LocationRepositoryInterface.php +++ b/app/Contracts/Repository/LocationRepositoryInterface.php @@ -56,7 +56,7 @@ interface LocationRepositoryInterface extends RepositoryInterface, SearchableInt /** * Return all of the nodes and their respective count of servers for a location. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Contracts/Repository/NodeRepositoryInterface.php b/app/Contracts/Repository/NodeRepositoryInterface.php index 51c6540ea..fe0449a38 100644 --- a/app/Contracts/Repository/NodeRepositoryInterface.php +++ b/app/Contracts/Repository/NodeRepositoryInterface.php @@ -31,7 +31,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return the usage stats for a single node. * - * @param int $id + * @param int $id * @return array */ public function getUsageStats($id); @@ -39,7 +39,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return all available nodes with a searchable interface. * - * @param int $count + * @param int $count * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator */ public function getNodeListingData($count = 25); @@ -47,7 +47,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return a single node with location and server information. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -57,7 +57,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return a node with all of the associated allocations and servers that are attached to said allocations. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -67,7 +67,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return a node with all of the servers attached to that node. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -77,7 +77,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return a collection of nodes beloning to a specific location for use on frontend display. * - * @param int $location + * @param int $location * @return mixed */ public function getNodesForLocation($location); diff --git a/app/Contracts/Repository/OptionVariableRepositoryInterface.php b/app/Contracts/Repository/OptionVariableRepositoryInterface.php index 794bfc791..7a8f055d9 100644 --- a/app/Contracts/Repository/OptionVariableRepositoryInterface.php +++ b/app/Contracts/Repository/OptionVariableRepositoryInterface.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Contracts\Repository; interface OptionVariableRepositoryInterface extends RepositoryInterface { - // } diff --git a/app/Contracts/Repository/PackRepositoryInterface.php b/app/Contracts/Repository/PackRepositoryInterface.php index 5160245c0..e644e0399 100644 --- a/app/Contracts/Repository/PackRepositoryInterface.php +++ b/app/Contracts/Repository/PackRepositoryInterface.php @@ -39,7 +39,7 @@ interface PackRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return a pack with the associated server models attached to it. * - * @param int $id + * @param int $id * @return \Illuminate\Database\Eloquent\Collection * * @throws \Illuminate\Database\Eloquent\ModelNotFoundException @@ -49,8 +49,8 @@ interface PackRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return all of the file archives for a given pack. * - * @param int $id - * @param bool $collection + * @param int $id + * @param bool $collection * @return object|\Illuminate\Support\Collection * * @throws \Illuminate\Database\Eloquent\ModelNotFoundException diff --git a/app/Contracts/Repository/RepositoryInterface.php b/app/Contracts/Repository/RepositoryInterface.php index a26646d08..15c3a4165 100644 --- a/app/Contracts/Repository/RepositoryInterface.php +++ b/app/Contracts/Repository/RepositoryInterface.php @@ -57,7 +57,7 @@ interface RepositoryInterface /** * An array of columns to filter the response by. * - * @param array $columns + * @param array $columns * @return $this */ public function withColumns($columns = ['*']); @@ -72,8 +72,8 @@ interface RepositoryInterface /** * Create a new model instance and persist it to the database. * - * @param array $fields - * @param bool $validate + * @param array $fields + * @param bool $validate * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -83,7 +83,7 @@ interface RepositoryInterface /** * Delete a given record from the database. * - * @param int $id + * @param int $id * @return int */ public function delete($id); @@ -91,7 +91,7 @@ interface RepositoryInterface /** * Delete records matching the given attributes. * - * @param array $attributes + * @param array $attributes * @return int */ public function deleteWhere(array $attributes); @@ -99,7 +99,7 @@ interface RepositoryInterface /** * Find a model that has the specific ID passed. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -109,7 +109,7 @@ interface RepositoryInterface /** * Find a model matching an array of where clauses. * - * @param array $fields + * @param array $fields * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -119,7 +119,7 @@ interface RepositoryInterface /** * Find and return the first matching instance for the given fields. * - * @param array $fields + * @param array $fields * @return mixed */ public function findFirstWhere(array $fields); @@ -127,7 +127,7 @@ interface RepositoryInterface /** * Return a count of records matching the passed arguments. * - * @param array $fields + * @param array $fields * @return int */ public function findCountWhere(array $fields); @@ -135,10 +135,10 @@ interface RepositoryInterface /** * Update a given ID with the passed array of fields. * - * @param int $id - * @param array $fields - * @param bool $validate - * @param bool $force + * @param int $id + * @param array $fields + * @param bool $validate + * @param bool $force * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -150,9 +150,9 @@ interface RepositoryInterface * Perform a mass update where matching records are updated using whereIn. * This does not perform any model data validation. * - * @param string $column - * @param array $values - * @param array $fields + * @param string $column + * @param array $values + * @param array $fields * @return int */ public function updateWhereIn($column, array $values, array $fields); @@ -160,10 +160,10 @@ interface RepositoryInterface /** * Update a record if it exists in the database, otherwise create it. * - * @param array $where - * @param array $fields - * @param bool $validate - * @param bool $force + * @param array $where + * @param array $fields + * @param bool $validate + * @param bool $force * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -173,8 +173,8 @@ interface RepositoryInterface /** * Update multiple records matching the passed clauses. * - * @param array $where - * @param array $fields + * @param array $where + * @param array $fields * @return mixed */ public function massUpdate(array $where, array $fields); @@ -190,7 +190,7 @@ interface RepositoryInterface * Insert a single or multiple records into the database at once skipping * validation and mass assignment checking. * - * @param array $data + * @param array $data * @return bool */ public function insert(array $data); @@ -198,7 +198,7 @@ interface RepositoryInterface /** * Insert multiple records into the database and ignore duplicates. * - * @param array $values + * @param array $values * @return bool */ public function insertIgnore(array $values); diff --git a/app/Contracts/Repository/ServerRepositoryInterface.php b/app/Contracts/Repository/ServerRepositoryInterface.php index 4b9d3b961..d71a349a5 100644 --- a/app/Contracts/Repository/ServerRepositoryInterface.php +++ b/app/Contracts/Repository/ServerRepositoryInterface.php @@ -31,7 +31,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter /** * Returns a listing of all servers that exist including relationships. * - * @param int $paginate + * @param int $paginate * @return mixed */ public function getAllServers($paginate); @@ -39,7 +39,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter /** * Return a server model and all variables associated with the server. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -50,8 +50,8 @@ 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 bool $returnAsObject + * @param int $id + * @param bool $returnAsObject * @return array|object * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -71,7 +71,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter /** * Return a server as well as associated databases and their hosts. * - * @param int $id + * @param int $id * @return mixed * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -81,7 +81,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter /** * Return data about the daemon service in a consumable format. * - * @param int $id + * @param int $id * @return array * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Contracts/Repository/ServerVariableRepositoryInterface.php b/app/Contracts/Repository/ServerVariableRepositoryInterface.php index b0ca226cf..dc5b761cd 100644 --- a/app/Contracts/Repository/ServerVariableRepositoryInterface.php +++ b/app/Contracts/Repository/ServerVariableRepositoryInterface.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Contracts\Repository; interface ServerVariableRepositoryInterface extends RepositoryInterface { - // } diff --git a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php index e662c7b1d..84ce0bea0 100644 --- a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php +++ b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php @@ -29,7 +29,7 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface /** * Return a service option with the variables relation attached. * - * @param int $id + * @param int $id * @return mixed */ public function getWithVariables($id); @@ -37,7 +37,7 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface /** * Return a service option with the copyFrom relation loaded onto the model. * - * @param int $id + * @param int $id * @return mixed */ public function getWithCopyFrom($id); @@ -45,8 +45,8 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface /** * Confirm a copy script belongs to the same service as the item trying to use it. * - * @param int $copyFromId - * @param int $service + * @param int $copyFromId + * @param int $service * @return bool */ public function isCopiableScript($copyFromId, $service); diff --git a/app/Contracts/Repository/ServiceRepositoryInterface.php b/app/Contracts/Repository/ServiceRepositoryInterface.php index 7459d1c40..da8543a6a 100644 --- a/app/Contracts/Repository/ServiceRepositoryInterface.php +++ b/app/Contracts/Repository/ServiceRepositoryInterface.php @@ -29,7 +29,7 @@ interface ServiceRepositoryInterface extends RepositoryInterface /** * Return a service or all services with their associated options, variables, and packs. * - * @param int $id + * @param int $id * @return \Illuminate\Support\Collection */ public function getWithOptions($id = null); @@ -37,7 +37,7 @@ interface ServiceRepositoryInterface extends RepositoryInterface /** * Return a service along with its associated options and the servers relation on those options. * - * @param int $id + * @param int $id * @return mixed */ public function getWithOptionServers($id); diff --git a/app/Contracts/Repository/ServiceVariableRepositoryInterface.php b/app/Contracts/Repository/ServiceVariableRepositoryInterface.php index bcdc6196d..3c975a046 100644 --- a/app/Contracts/Repository/ServiceVariableRepositoryInterface.php +++ b/app/Contracts/Repository/ServiceVariableRepositoryInterface.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Contracts\Repository; interface ServiceVariableRepositoryInterface extends RepositoryInterface { - // } diff --git a/app/Contracts/Repository/UserRepositoryInterface.php b/app/Contracts/Repository/UserRepositoryInterface.php index b35914c04..1638c7ddd 100644 --- a/app/Contracts/Repository/UserRepositoryInterface.php +++ b/app/Contracts/Repository/UserRepositoryInterface.php @@ -38,7 +38,7 @@ interface UserRepositoryInterface extends RepositoryInterface, SearchableInterfa /** * Return all matching models for a user in a format that can be used for dropdowns. * - * @param string $query + * @param string $query * @return \Illuminate\Database\Eloquent\Collection */ public function filterUsersByQuery($query); diff --git a/app/Events/Auth/FailedCaptcha.php b/app/Events/Auth/FailedCaptcha.php index 903117265..4915f4c43 100644 --- a/app/Events/Auth/FailedCaptcha.php +++ b/app/Events/Auth/FailedCaptcha.php @@ -47,9 +47,8 @@ class FailedCaptcha /** * Create a new event instance. * - * @param string $ip - * @param string $domain - * @return void + * @param string $ip + * @param string $domain */ public function __construct($ip, $domain) { diff --git a/app/Events/Auth/FailedPasswordReset.php b/app/Events/Auth/FailedPasswordReset.php index ec2de3b47..8a06261e4 100644 --- a/app/Events/Auth/FailedPasswordReset.php +++ b/app/Events/Auth/FailedPasswordReset.php @@ -47,9 +47,8 @@ class FailedPasswordReset /** * Create a new event instance. * - * @param string $ip - * @param string $email - * @return void + * @param string $ip + * @param string $email */ public function __construct($ip, $email) { diff --git a/app/Events/Event.php b/app/Events/Event.php index af6056df3..2db145df6 100644 --- a/app/Events/Event.php +++ b/app/Events/Event.php @@ -4,5 +4,4 @@ namespace Pterodactyl\Events; abstract class Event { - // } diff --git a/app/Events/Server/Created.php b/app/Events/Server/Created.php index 2591cd5af..46b25e0d9 100644 --- a/app/Events/Server/Created.php +++ b/app/Events/Server/Created.php @@ -41,8 +41,7 @@ class Created /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Creating.php b/app/Events/Server/Creating.php index 46e4898c1..79b358c54 100644 --- a/app/Events/Server/Creating.php +++ b/app/Events/Server/Creating.php @@ -41,8 +41,7 @@ class Creating /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Deleted.php b/app/Events/Server/Deleted.php index 6f8709b85..18fb674da 100644 --- a/app/Events/Server/Deleted.php +++ b/app/Events/Server/Deleted.php @@ -41,8 +41,7 @@ class Deleted /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Deleting.php b/app/Events/Server/Deleting.php index 3152ed96e..f75c91849 100644 --- a/app/Events/Server/Deleting.php +++ b/app/Events/Server/Deleting.php @@ -41,8 +41,7 @@ class Deleting /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Saved.php b/app/Events/Server/Saved.php index d19659045..91d704b75 100644 --- a/app/Events/Server/Saved.php +++ b/app/Events/Server/Saved.php @@ -41,8 +41,7 @@ class Saved /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Saving.php b/app/Events/Server/Saving.php index 1ae31da32..0ce98adc4 100644 --- a/app/Events/Server/Saving.php +++ b/app/Events/Server/Saving.php @@ -41,8 +41,7 @@ class Saving /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Updated.php b/app/Events/Server/Updated.php index 1284ea504..b0f76820a 100644 --- a/app/Events/Server/Updated.php +++ b/app/Events/Server/Updated.php @@ -41,8 +41,7 @@ class Updated /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Server/Updating.php b/app/Events/Server/Updating.php index b2fc255c8..c0ce6ad9e 100644 --- a/app/Events/Server/Updating.php +++ b/app/Events/Server/Updating.php @@ -41,8 +41,7 @@ class Updating /** * Create a new event instance. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function __construct(Server $server) { diff --git a/app/Events/Subuser/Created.php b/app/Events/Subuser/Created.php index 9a2d28536..4e661da66 100644 --- a/app/Events/Subuser/Created.php +++ b/app/Events/Subuser/Created.php @@ -41,8 +41,7 @@ class Created /** * Create a new event instance. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function __construct(Subuser $subuser) { diff --git a/app/Events/Subuser/Creating.php b/app/Events/Subuser/Creating.php index 5083c497c..17ae1d9e5 100644 --- a/app/Events/Subuser/Creating.php +++ b/app/Events/Subuser/Creating.php @@ -41,8 +41,7 @@ class Creating /** * Create a new event instance. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function __construct(Subuser $subuser) { diff --git a/app/Events/Subuser/Deleted.php b/app/Events/Subuser/Deleted.php index 1e419ab81..837bfc509 100644 --- a/app/Events/Subuser/Deleted.php +++ b/app/Events/Subuser/Deleted.php @@ -41,8 +41,7 @@ class Deleted /** * Create a new event instance. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function __construct(Subuser $subuser) { diff --git a/app/Events/Subuser/Deleting.php b/app/Events/Subuser/Deleting.php index a06ebe2dc..7f7ef9444 100644 --- a/app/Events/Subuser/Deleting.php +++ b/app/Events/Subuser/Deleting.php @@ -41,8 +41,7 @@ class Deleting /** * Create a new event instance. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function __construct(Subuser $subuser) { diff --git a/app/Events/User/Created.php b/app/Events/User/Created.php index 4e1fd9e75..2b614a90c 100644 --- a/app/Events/User/Created.php +++ b/app/Events/User/Created.php @@ -41,8 +41,7 @@ class Created /** * Create a new event instance. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function __construct(User $user) { diff --git a/app/Events/User/Creating.php b/app/Events/User/Creating.php index cc544af9e..ca4c517bf 100644 --- a/app/Events/User/Creating.php +++ b/app/Events/User/Creating.php @@ -41,8 +41,7 @@ class Creating /** * Create a new event instance. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function __construct(User $user) { diff --git a/app/Events/User/Deleted.php b/app/Events/User/Deleted.php index a3cc3cffe..ce6ca1c91 100644 --- a/app/Events/User/Deleted.php +++ b/app/Events/User/Deleted.php @@ -41,8 +41,7 @@ class Deleted /** * Create a new event instance. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function __construct(User $user) { diff --git a/app/Events/User/Deleting.php b/app/Events/User/Deleting.php index ad9397e45..581d4e2f6 100644 --- a/app/Events/User/Deleting.php +++ b/app/Events/User/Deleting.php @@ -41,8 +41,7 @@ class Deleting /** * Create a new event instance. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function __construct(User $user) { diff --git a/app/Exceptions/AccountNotFoundException.php b/app/Exceptions/AccountNotFoundException.php index b35bd2fc0..f8e36ed49 100644 --- a/app/Exceptions/AccountNotFoundException.php +++ b/app/Exceptions/AccountNotFoundException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions; class AccountNotFoundException extends \Exception { - // } diff --git a/app/Exceptions/AutoDeploymentException.php b/app/Exceptions/AutoDeploymentException.php index 109fe1096..4e56a0081 100644 --- a/app/Exceptions/AutoDeploymentException.php +++ b/app/Exceptions/AutoDeploymentException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions; class AutoDeploymentException extends \Exception { - // } diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php index 530ad40cf..ba88486a0 100644 --- a/app/Exceptions/DisplayException.php +++ b/app/Exceptions/DisplayException.php @@ -31,9 +31,8 @@ class DisplayException extends PterodactylException /** * Exception constructor. * - * @param string $message - * @param mixed $log - * @return void + * @param string $message + * @param mixed $log */ public function __construct($message, $log = null) { diff --git a/app/Exceptions/DisplayValidationException.php b/app/Exceptions/DisplayValidationException.php index ae97318aa..2c4e586a3 100644 --- a/app/Exceptions/DisplayValidationException.php +++ b/app/Exceptions/DisplayValidationException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions; class DisplayValidationException extends PterodactylException { - // } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4fb287688..31fb975f0 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -37,7 +37,7 @@ class Handler extends ExceptionHandler * * This is a great spot to send exceptions to Sentry, Bugsnag, etc. * - * @param \Exception $exception + * @param \Exception $exception * * @throws \Exception */ @@ -49,8 +49,8 @@ class Handler extends ExceptionHandler /** * Render an exception into an HTTP response. * - * @param \Illuminate\Http\Request $request - * @param \Exception $exception + * @param \Illuminate\Http\Request $request + * @param \Exception $exception * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response * * @throws \Exception @@ -85,8 +85,8 @@ class Handler extends ExceptionHandler /** * Convert an authentication exception into an unauthenticated response. * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $exception + * @param \Illuminate\Http\Request $request + * @param \Illuminate\Auth\AuthenticationException $exception * @return \Illuminate\Http\Response */ protected function unauthenticated($request, AuthenticationException $exception) diff --git a/app/Exceptions/PterodactylException.php b/app/Exceptions/PterodactylException.php index 4ec48d663..4766deb30 100644 --- a/app/Exceptions/PterodactylException.php +++ b/app/Exceptions/PterodactylException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions; class PterodactylException extends \Exception { - // } diff --git a/app/Exceptions/Repository/RecordNotFoundException.php b/app/Exceptions/Repository/RecordNotFoundException.php index 1e9ac9874..796b4c083 100644 --- a/app/Exceptions/Repository/RecordNotFoundException.php +++ b/app/Exceptions/Repository/RecordNotFoundException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions\Repository; class RecordNotFoundException extends \Exception { - // } diff --git a/app/Exceptions/Repository/RepositoryException.php b/app/Exceptions/Repository/RepositoryException.php index b55b6304c..07ce6b22b 100644 --- a/app/Exceptions/Repository/RepositoryException.php +++ b/app/Exceptions/Repository/RepositoryException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions\Repository; class RepositoryException extends \Exception { - // } diff --git a/app/Exceptions/Service/HasActiveServersException.php b/app/Exceptions/Service/HasActiveServersException.php index 09c13c186..fe24a0c03 100644 --- a/app/Exceptions/Service/HasActiveServersException.php +++ b/app/Exceptions/Service/HasActiveServersException.php @@ -28,5 +28,4 @@ use Pterodactyl\Exceptions\DisplayException; class HasActiveServersException extends DisplayException { - // } diff --git a/app/Exceptions/Service/Pack/InvalidFileMimeTypeException.php b/app/Exceptions/Service/Pack/InvalidFileMimeTypeException.php index bbd5d4107..dd3b89450 100644 --- a/app/Exceptions/Service/Pack/InvalidFileMimeTypeException.php +++ b/app/Exceptions/Service/Pack/InvalidFileMimeTypeException.php @@ -28,5 +28,4 @@ use Pterodactyl\Exceptions\DisplayException; class InvalidFileMimeTypeException extends DisplayException { - // } diff --git a/app/Exceptions/Service/Pack/InvalidFileUploadException.php b/app/Exceptions/Service/Pack/InvalidFileUploadException.php index 4861512c2..719f02e8c 100644 --- a/app/Exceptions/Service/Pack/InvalidFileUploadException.php +++ b/app/Exceptions/Service/Pack/InvalidFileUploadException.php @@ -28,5 +28,4 @@ use Pterodactyl\Exceptions\DisplayException; class InvalidFileUploadException extends DisplayException { - // } diff --git a/app/Exceptions/Service/Pack/InvalidPackArchiveFormatException.php b/app/Exceptions/Service/Pack/InvalidPackArchiveFormatException.php index f13a33581..eb57fd4cd 100644 --- a/app/Exceptions/Service/Pack/InvalidPackArchiveFormatException.php +++ b/app/Exceptions/Service/Pack/InvalidPackArchiveFormatException.php @@ -28,5 +28,4 @@ use Pterodactyl\Exceptions\DisplayException; class InvalidPackArchiveFormatException extends DisplayException { - // } diff --git a/app/Exceptions/Service/Pack/UnreadableZipArchiveException.php b/app/Exceptions/Service/Pack/UnreadableZipArchiveException.php index a803d1583..013b15e2e 100644 --- a/app/Exceptions/Service/Pack/UnreadableZipArchiveException.php +++ b/app/Exceptions/Service/Pack/UnreadableZipArchiveException.php @@ -28,5 +28,4 @@ use Pterodactyl\Exceptions\DisplayException; class UnreadableZipArchiveException extends DisplayException { - // } diff --git a/app/Exceptions/Service/Pack/ZipArchiveCreationException.php b/app/Exceptions/Service/Pack/ZipArchiveCreationException.php index 14eb8ce9b..30043ee9c 100644 --- a/app/Exceptions/Service/Pack/ZipArchiveCreationException.php +++ b/app/Exceptions/Service/Pack/ZipArchiveCreationException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions\Service\Pack; class ZipArchiveCreationException extends \Exception { - // } diff --git a/app/Exceptions/Service/Server/RequiredVariableMissingException.php b/app/Exceptions/Service/Server/RequiredVariableMissingException.php index 61ed01974..f026ccce5 100644 --- a/app/Exceptions/Service/Server/RequiredVariableMissingException.php +++ b/app/Exceptions/Service/Server/RequiredVariableMissingException.php @@ -28,5 +28,4 @@ use Exception; class RequiredVariableMissingException extends Exception { - // } diff --git a/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php b/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php index 8aab35b48..c7ba77909 100644 --- a/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php +++ b/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions\Service\ServiceOption; class InvalidCopyFromException extends \Exception { - // } diff --git a/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php b/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php index c5ec1e720..6a9ff9bc8 100644 --- a/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php +++ b/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php @@ -26,5 +26,4 @@ namespace Pterodactyl\Exceptions\Service\ServiceOption; class NoParentConfigurationFoundException extends \Exception { - // } diff --git a/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php b/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php index c5b001be1..07769f4ce 100644 --- a/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php +++ b/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php @@ -28,5 +28,4 @@ use Exception; class ReservedVariableNameException extends Exception { - // } diff --git a/app/Extensions/DynamicDatabaseConnection.php b/app/Extensions/DynamicDatabaseConnection.php index 3b5f12477..1e13e231c 100644 --- a/app/Extensions/DynamicDatabaseConnection.php +++ b/app/Extensions/DynamicDatabaseConnection.php @@ -70,9 +70,9 @@ class DynamicDatabaseConnection /** * Adds a dynamic database connection entry to the runtime config. * - * @param string $connection - * @param \Pterodactyl\Models\DatabaseHost|int $host - * @param string $database + * @param string $connection + * @param \Pterodactyl\Models\DatabaseHost|int $host + * @param string $database */ public function set($connection, $host, $database = 'mysql') { diff --git a/app/Extensions/PhraseAppTranslator.php b/app/Extensions/PhraseAppTranslator.php index f79cf2820..b61344cf7 100644 --- a/app/Extensions/PhraseAppTranslator.php +++ b/app/Extensions/PhraseAppTranslator.php @@ -31,10 +31,10 @@ class PhraseAppTranslator extends LaravelTranslator /** * Get the translation for the given key. * - * @param string $key - * @param array $replace - * @param string|null $locale - * @param bool $fallback + * @param string $key + * @param array $replace + * @param string|null $locale + * @param bool $fallback * @return string */ public function get($key, array $replace = [], $locale = null, $fallback = true) diff --git a/app/Http/Controllers/API/Admin/LocationController.php b/app/Http/Controllers/API/Admin/LocationController.php index 41405e91e..34230ea76 100644 --- a/app/Http/Controllers/API/Admin/LocationController.php +++ b/app/Http/Controllers/API/Admin/LocationController.php @@ -35,7 +35,7 @@ class LocationController extends Controller /** * Controller to handle returning all locations on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) diff --git a/app/Http/Controllers/API/Admin/NodeController.php b/app/Http/Controllers/API/Admin/NodeController.php index 74784fdb6..3c6586543 100644 --- a/app/Http/Controllers/API/Admin/NodeController.php +++ b/app/Http/Controllers/API/Admin/NodeController.php @@ -40,7 +40,7 @@ class NodeController extends Controller /** * Controller to handle returning all nodes on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) @@ -63,8 +63,8 @@ class NodeController extends Controller /** * Display information about a single node on the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return array */ public function view(Request $request, $id) @@ -84,8 +84,8 @@ class NodeController extends Controller /** * Display information about a single node on the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\JsonResponse */ public function viewConfig(Request $request, $id) @@ -100,7 +100,7 @@ class NodeController extends Controller /** * Create a new node on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse|array */ public function store(Request $request) @@ -146,8 +146,8 @@ class NodeController extends Controller /** * Delete a node from the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function delete(Request $request, $id) diff --git a/app/Http/Controllers/API/Admin/ServerController.php b/app/Http/Controllers/API/Admin/ServerController.php index 28cb40641..409cf6d67 100644 --- a/app/Http/Controllers/API/Admin/ServerController.php +++ b/app/Http/Controllers/API/Admin/ServerController.php @@ -41,7 +41,7 @@ class ServerController extends Controller /** * Controller to handle returning all servers on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) @@ -64,8 +64,8 @@ class ServerController extends Controller /** * Controller to handle returning information on a single server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return array */ public function view(Request $request, $id) @@ -87,7 +87,7 @@ class ServerController extends Controller /** * Create a new server on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse|array */ public function store(Request $request) @@ -130,8 +130,8 @@ class ServerController extends Controller /** * Delete a server from the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function delete(Request $request, $id) @@ -165,8 +165,8 @@ class ServerController extends Controller /** * Update the details for a server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\JsonResponse|array */ public function details(Request $request, $id) @@ -205,8 +205,8 @@ class ServerController extends Controller /** * Set the new docker container for a server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\RedirectResponse|array */ public function container(Request $request, $id) @@ -245,8 +245,8 @@ class ServerController extends Controller /** * Toggles the install status for a server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function install(Request $request, $id) @@ -274,8 +274,8 @@ class ServerController extends Controller /** * Setup a server to have a container rebuild. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function rebuild(Request $request, $id) @@ -302,8 +302,8 @@ class ServerController extends Controller /** * Manage the suspension status for a server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function suspend(Request $request, $id) @@ -344,8 +344,8 @@ class ServerController extends Controller /** * Update the build configuration for a server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\JsonResponse|array */ public function build(Request $request, $id) @@ -391,8 +391,8 @@ class ServerController extends Controller /** * Update the startup command as well as variables. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function startup(Request $request, $id) diff --git a/app/Http/Controllers/API/Admin/ServiceController.php b/app/Http/Controllers/API/Admin/ServiceController.php index fbe911f14..a7b03b0ca 100644 --- a/app/Http/Controllers/API/Admin/ServiceController.php +++ b/app/Http/Controllers/API/Admin/ServiceController.php @@ -35,7 +35,7 @@ class ServiceController extends Controller /** * Controller to handle returning all locations on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) @@ -52,8 +52,8 @@ class ServiceController extends Controller /** * Controller to handle returning information on a single server. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return array */ public function view(Request $request, $id) diff --git a/app/Http/Controllers/API/Admin/UserController.php b/app/Http/Controllers/API/Admin/UserController.php index b524d1ee7..d2b70f7d8 100644 --- a/app/Http/Controllers/API/Admin/UserController.php +++ b/app/Http/Controllers/API/Admin/UserController.php @@ -40,7 +40,7 @@ class UserController extends Controller /** * Controller to handle returning all users on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) @@ -63,8 +63,8 @@ class UserController extends Controller /** * Display information about a single user on the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return array */ public function view(Request $request, $id) @@ -84,7 +84,7 @@ class UserController extends Controller /** * Create a new user on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse|array */ public function store(Request $request) @@ -120,8 +120,8 @@ class UserController extends Controller /** * Update a user. * - * @param \Illuminate\Http\Request $request - * @param int $user + * @param \Illuminate\Http\Request $request + * @param int $user * @return \Illuminate\Http\RedirectResponse */ public function update(Request $request, $user) @@ -157,8 +157,8 @@ class UserController extends Controller /** * Delete a user from the system. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function delete(Request $request, $id) diff --git a/app/Http/Controllers/API/User/CoreController.php b/app/Http/Controllers/API/User/CoreController.php index 5c1d07406..851ff6b60 100644 --- a/app/Http/Controllers/API/User/CoreController.php +++ b/app/Http/Controllers/API/User/CoreController.php @@ -34,7 +34,7 @@ class CoreController extends Controller /** * Controller to handle base user request for all of their servers. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function index(Request $request) diff --git a/app/Http/Controllers/API/User/ServerController.php b/app/Http/Controllers/API/User/ServerController.php index dcdb7f6b2..dfb625be5 100644 --- a/app/Http/Controllers/API/User/ServerController.php +++ b/app/Http/Controllers/API/User/ServerController.php @@ -37,8 +37,8 @@ class ServerController extends Controller /** * Controller to handle base request for individual server information. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return array */ public function index(Request $request, $uuid) @@ -60,8 +60,8 @@ class ServerController extends Controller /** * Controller to handle request for server power toggle. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\Response */ public function power(Request $request, $uuid) @@ -80,8 +80,8 @@ class ServerController extends Controller /** * Controller to handle base request for individual server information. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\Response */ public function command(Request $request, $uuid) diff --git a/app/Http/Controllers/Admin/BaseController.php b/app/Http/Controllers/Admin/BaseController.php index d4dd5dc82..14665c32a 100644 --- a/app/Http/Controllers/Admin/BaseController.php +++ b/app/Http/Controllers/Admin/BaseController.php @@ -70,7 +70,7 @@ class BaseController extends Controller /** * Handle settings post request. * - * @param \Pterodactyl\Http\Requests\Admin\BaseFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\BaseFormRequest $request * @return \Illuminate\Http\RedirectResponse */ public function postSettings(BaseFormRequest $request) diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php index 7964d38c9..0a9dbad88 100644 --- a/app/Http/Controllers/Admin/DatabaseController.php +++ b/app/Http/Controllers/Admin/DatabaseController.php @@ -90,7 +90,7 @@ class DatabaseController extends Controller /** * Display database host to user. * - * @param int $host + * @param int $host * @return \Illuminate\View\View * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -106,7 +106,7 @@ class DatabaseController extends Controller /** * Handle request to create a new database host. * - * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable @@ -128,8 +128,8 @@ class DatabaseController extends Controller /** * Handle updating database host. * - * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request - * @param \Pterodactyl\Models\DatabaseHost $host + * @param \Pterodactyl\Http\Requests\Admin\DatabaseHostFormRequest $request + * @param \Pterodactyl\Models\DatabaseHost $host * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -154,7 +154,7 @@ class DatabaseController extends Controller /** * Handle request to delete a database host. * - * @param \Pterodactyl\Models\DatabaseHost $host + * @param \Pterodactyl\Models\DatabaseHost $host * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php index 63375cc9d..f3e121961 100644 --- a/app/Http/Controllers/Admin/LocationController.php +++ b/app/Http/Controllers/Admin/LocationController.php @@ -52,9 +52,9 @@ class LocationController extends Controller /** * LocationController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository - * @param \Pterodactyl\Services\LocationService $service + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository + * @param \Pterodactyl\Services\LocationService $service */ public function __construct( AlertsMessageBag $alert, @@ -81,7 +81,7 @@ class LocationController extends Controller /** * Return the location view page. * - * @param int $id + * @param int $id * @return \Illuminate\View\View */ public function view($id) @@ -94,7 +94,7 @@ class LocationController extends Controller /** * Handle request to create new location. * - * @param \Pterodactyl\Http\Requests\Admin\LocationFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\LocationFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable @@ -111,8 +111,8 @@ 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\Http\Requests\Admin\LocationFormRequest $request + * @param \Pterodactyl\Models\Location $location * @return \Illuminate\Http\RedirectResponse * * @throws \Throwable @@ -133,7 +133,7 @@ class LocationController extends Controller /** * Delete a location from the system. * - * @param \Pterodactyl\Models\Location $location + * @param \Pterodactyl\Models\Location $location * @return \Illuminate\Http\RedirectResponse * * @throws \Exception diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php index 854ab486a..24e7ce105 100644 --- a/app/Http/Controllers/Admin/NodesController.php +++ b/app/Http/Controllers/Admin/NodesController.php @@ -126,7 +126,7 @@ class NodesController extends Controller /** * Displays the index page listing all nodes on the panel. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -139,7 +139,7 @@ class NodesController extends Controller /** * Displays create new node page. * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View + * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View */ public function create() { @@ -156,7 +156,7 @@ class NodesController extends Controller /** * Post controller to create a new node on the system. * - * @param \Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -172,7 +172,7 @@ class NodesController extends Controller /** * Shows the index overview page for a specific node. * - * @param int $node + * @param int $node * @return \Illuminate\View\View * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -188,7 +188,7 @@ class NodesController extends Controller /** * Shows the settings page for a specific node. * - * @param \Pterodactyl\Models\Node $node + * @param \Pterodactyl\Models\Node $node * @return \Illuminate\View\View */ public function viewSettings(Node $node) @@ -202,7 +202,7 @@ class NodesController extends Controller /** * Shows the configuration page for a specific node. * - * @param \Pterodactyl\Models\Node $node + * @param \Pterodactyl\Models\Node $node * @return \Illuminate\View\View */ public function viewConfiguration(Node $node) @@ -213,7 +213,7 @@ class NodesController extends Controller /** * Shows the allocation page for a specific node. * - * @param int $node + * @param int $node * @return \Illuminate\View\View * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -229,7 +229,7 @@ class NodesController extends Controller /** * Shows the server listing page for a specific node. * - * @param int $node + * @param int $node * @return \Illuminate\View\View * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -247,8 +247,8 @@ class NodesController extends Controller /** * Updates settings for a node. * - * @param \Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest $request - * @param \Pterodactyl\Models\Node $node + * @param \Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest $request + * @param \Pterodactyl\Models\Node $node * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -265,8 +265,8 @@ class NodesController extends Controller /** * Removes a single allocation from a node. * - * @param int $node - * @param int $allocation + * @param int $node + * @param int $allocation * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse */ public function allocationRemoveSingle($node, $allocation) @@ -283,8 +283,8 @@ 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 \Illuminate\Http\Request $request + * @param int $node * @return \Illuminate\Http\RedirectResponse */ public function allocationRemoveBlock(Request $request, $node) @@ -304,7 +304,7 @@ class NodesController extends Controller /** * Sets an alias for a specific allocation on a node. * - * @param \Pterodactyl\Http\Requests\Admin\Node\AllocationAliasFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\Node\AllocationAliasFormRequest $request * @return \Symfony\Component\HttpFoundation\Response * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -322,8 +322,8 @@ 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 \Pterodactyl\Http\Requests\Admin\Node\AllocationFormRequest $request + * @param int|\Pterodactyl\Models\Node $node * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -355,7 +355,7 @@ class NodesController extends Controller /** * Returns the configuration token to auto-deploy a node. * - * @param \Pterodactyl\Models\Node $node + * @param \Pterodactyl\Models\Node $node * @return \Illuminate\Http\JsonResponse */ public function setToken(Node $node) diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php index 04e69e850..22b3ea4ce 100644 --- a/app/Http/Controllers/Admin/OptionController.php +++ b/app/Http/Controllers/Admin/OptionController.php @@ -122,7 +122,7 @@ class OptionController extends Controller /** * Handle adding a new service option. * - * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -144,7 +144,7 @@ class OptionController extends Controller /** * Delete a given option from the database. * - * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Models\ServiceOption $option * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException @@ -160,7 +160,7 @@ class OptionController extends Controller /** * Display option overview page. * - * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Models\ServiceOption $option * @return \Illuminate\View\View */ public function viewConfiguration(ServiceOption $option) @@ -171,7 +171,7 @@ class OptionController extends Controller /** * Display script management page for an option. * - * @param int $option + * @param int $option * @return \Illuminate\View\View * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -196,8 +196,8 @@ class OptionController extends Controller /** * Handles POST when editing a configration for a service option. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\ServiceOption $option + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\ServiceOption $option * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -219,8 +219,8 @@ class OptionController extends Controller /** * Handles POST when updating script for a service option. * - * @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request - * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request + * @param \Pterodactyl\Models\ServiceOption $option * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php index ab87807ca..604ba3337 100644 --- a/app/Http/Controllers/Admin/PackController.php +++ b/app/Http/Controllers/Admin/PackController.php @@ -123,7 +123,7 @@ class PackController extends Controller /** * Display listing of all packs on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -188,7 +188,7 @@ class PackController extends Controller /** * Display pack view template to user. * - * @param int $pack + * @param int $pack * @return \Illuminate\View\View */ public function view($pack) @@ -202,8 +202,8 @@ class PackController extends Controller /** * Handle updating or deleting pack information. * - * @param \Pterodactyl\Http\Requests\Admin\PackFormRequest $request - * @param \Pterodactyl\Models\Pack $pack + * @param \Pterodactyl\Http\Requests\Admin\PackFormRequest $request + * @param \Pterodactyl\Models\Pack $pack * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -221,7 +221,7 @@ class PackController extends Controller /** * Delete a pack if no servers are attached to it currently. * - * @param \Pterodactyl\Models\Pack $pack + * @param \Pterodactyl\Models\Pack $pack * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException @@ -240,8 +240,8 @@ 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 \Pterodactyl\Models\Pack $pack + * @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 84b7ecbc5..efd74b2e5 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -245,7 +245,7 @@ class ServersController extends Controller /** * Handle POST of server creation form. * - * @param \Pterodactyl\Http\Requests\Admin\ServerFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\ServerFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -262,7 +262,7 @@ class ServersController extends Controller /** * Returns a tree of all avaliable nodes in a given location. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Support\Collection */ public function nodes(Request $request) @@ -273,7 +273,7 @@ class ServersController extends Controller /** * Display the index when viewing a specific server. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\View\View */ public function viewIndex(Server $server) @@ -284,7 +284,7 @@ class ServersController extends Controller /** * Display the details page when viewing a specific server. * - * @param int $server + * @param int $server * @return \Illuminate\View\View */ public function viewDetails($server) @@ -300,7 +300,7 @@ class ServersController extends Controller /** * Display the build details page when viewing a specific server. * - * @param int $server + * @param int $server * @return \Illuminate\View\View */ public function viewBuild($server) @@ -322,7 +322,7 @@ class ServersController extends Controller /** * Display startup configuration page for a server. * - * @param int $server + * @param int $server * @return \Illuminate\View\View */ public function viewStartup($server) @@ -352,7 +352,7 @@ class ServersController extends Controller /** * Display the database management page for a specific server. * - * @param int $server + * @param int $server * @return \Illuminate\View\View */ public function viewDatabase($server) @@ -368,7 +368,7 @@ class ServersController extends Controller /** * Display the management page when viewing a specific server. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\View\View */ public function viewManage(Server $server) @@ -379,7 +379,7 @@ class ServersController extends Controller /** * Display the deletion page for a server. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\View\View */ public function viewDelete(Server $server) @@ -390,8 +390,8 @@ class ServersController extends Controller /** * Update the details for a server. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\Server $server + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -411,8 +411,8 @@ class ServersController extends Controller /** * Set the new docker container for a server. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\Server $server + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -429,7 +429,7 @@ class ServersController extends Controller /** * Toggles the install status for a server. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -453,7 +453,7 @@ class ServersController extends Controller /** * Reinstalls the server with the currently assigned pack and service. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -471,7 +471,7 @@ class ServersController extends Controller /** * Setup a server to have a container rebuild. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -487,8 +487,8 @@ class ServersController extends Controller /** * Manage the suspension status for a server. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\Server $server + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -507,7 +507,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 * @throws \Pterodactyl\Exceptions\DisplayException @@ -528,8 +528,8 @@ class ServersController extends Controller /** * Start the server deletion process. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\Server $server + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -545,7 +545,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 * @@ -555,7 +555,8 @@ class ServersController extends Controller public function saveStartup(Request $request, Server $server) { $this->startupModificationService->isAdmin()->handle( - $server, $request->except('_token') + $server, + $request->except('_token') ); $this->alert->success(trans('admin/server.alerts.startup_changed'))->flash(); @@ -565,8 +566,8 @@ class ServersController extends Controller /** * Creates a new database assigned to a specific server. * - * @param \Illuminate\Http\Request $request - * @param int $server + * @param \Illuminate\Http\Request $request + * @param int $server * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -587,8 +588,8 @@ class ServersController extends Controller /** * Resets the database password for a specific database on this server. * - * @param \Illuminate\Http\Request $request - * @param int $server + * @param \Illuminate\Http\Request $request + * @param int $server * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -609,8 +610,8 @@ class ServersController extends Controller /** * Deletes a database from a server. * - * @param int $server - * @param int $database + * @param int $server + * @param int $database * @return \Illuminate\Http\RedirectResponse * * @throws \Exception diff --git a/app/Http/Controllers/Admin/ServiceController.php b/app/Http/Controllers/Admin/ServiceController.php index 26f6c0ce1..817f082f7 100644 --- a/app/Http/Controllers/Admin/ServiceController.php +++ b/app/Http/Controllers/Admin/ServiceController.php @@ -100,7 +100,7 @@ class ServiceController extends Controller /** * Return base view for a service. * - * @param int $service + * @param int $service * @return \Illuminate\View\View */ public function view($service) @@ -113,7 +113,7 @@ class ServiceController extends Controller /** * Return function editing view for a service. * - * @param \Pterodactyl\Models\Service $service + * @param \Pterodactyl\Models\Service $service * @return \Illuminate\View\View */ public function viewFunctions(Service $service) @@ -124,7 +124,7 @@ class ServiceController extends Controller /** * Handle post action for new service. * - * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -140,8 +140,8 @@ class ServiceController extends Controller /** * Edits configuration for a specific service. * - * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request - * @param \Pterodactyl\Models\Service $service + * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request + * @param \Pterodactyl\Models\Service $service * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -158,8 +158,8 @@ class ServiceController extends Controller /** * Update the functions file for a service. * - * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest $request - * @param \Pterodactyl\Models\Service $service + * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest $request + * @param \Pterodactyl\Models\Service $service * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -176,7 +176,7 @@ class ServiceController extends Controller /** * Delete a service from the panel. * - * @param \Pterodactyl\Models\Service $service + * @param \Pterodactyl\Models\Service $service * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 81a4a7783..2daa40154 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -71,12 +71,12 @@ class UserController extends Controller /** * UserController constructor. * - * @param \Prologue\Alerts\AlertsMessageBag $alert - * @param \Pterodactyl\Services\Users\CreationService $creationService - * @param \Pterodactyl\Services\Users\DeletionService $deletionService - * @param \Illuminate\Contracts\Translation\Translator $translator - * @param \Pterodactyl\Services\Users\UpdateService $updateService - * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository + * @param \Prologue\Alerts\AlertsMessageBag $alert + * @param \Pterodactyl\Services\Users\CreationService $creationService + * @param \Pterodactyl\Services\Users\DeletionService $deletionService + * @param \Illuminate\Contracts\Translation\Translator $translator + * @param \Pterodactyl\Services\Users\UpdateService $updateService + * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository */ public function __construct( AlertsMessageBag $alert, @@ -97,7 +97,7 @@ class UserController extends Controller /** * Display user index page. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -120,7 +120,7 @@ class UserController extends Controller /** * Display user view page. * - * @param \Pterodactyl\Models\User $user + * @param \Pterodactyl\Models\User $user * @return \Illuminate\View\View */ public function view(User $user) @@ -131,8 +131,8 @@ class UserController extends Controller /** * Delete a user from the system. * - * @param \Illuminate\Http\Request $request - * @param \Pterodactyl\Models\User $user + * @param \Illuminate\Http\Request $request + * @param \Pterodactyl\Models\User $user * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -152,7 +152,7 @@ class UserController extends Controller /** * Create a user. * - * @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request + * @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -169,8 +169,8 @@ class UserController extends Controller /** * Update a user on the system. * - * @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request - * @param \Pterodactyl\Models\User $user + * @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request + * @param \Pterodactyl\Models\User $user * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -186,7 +186,7 @@ class UserController extends Controller /** * Get a JSON response of users on the system. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Database\Eloquent\Collection */ public function json(Request $request) diff --git a/app/Http/Controllers/Admin/VariableController.php b/app/Http/Controllers/Admin/VariableController.php index 78caf4063..d634052aa 100644 --- a/app/Http/Controllers/Admin/VariableController.php +++ b/app/Http/Controllers/Admin/VariableController.php @@ -78,8 +78,8 @@ class VariableController extends Controller /** * Handles POST request to create a new option variable. * - * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request - * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request + * @param \Pterodactyl\Models\ServiceOption $option * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -96,7 +96,7 @@ class VariableController extends Controller /** * Display variable overview page for a service option. * - * @param int $option + * @param int $option * @return \Illuminate\View\View */ public function view($option) @@ -109,9 +109,9 @@ class VariableController extends Controller /** * Handles POST when editing a configration for a service variable. * - * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request - * @param \Pterodactyl\Models\ServiceOption $option - * @param \Pterodactyl\Models\ServiceVariable $variable + * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request + * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Models\ServiceVariable $variable * @return \Illuminate\Http\RedirectResponse * * @throws \Pterodactyl\Exceptions\DisplayException @@ -132,8 +132,8 @@ class VariableController extends Controller /** * Delete a service variable from the system. * - * @param \Pterodactyl\Models\ServiceOption $option - * @param \Pterodactyl\Models\ServiceVariable $variable + * @param \Pterodactyl\Models\ServiceOption $option + * @param \Pterodactyl\Models\ServiceVariable $variable * @return \Illuminate\Http\RedirectResponse */ public function delete(ServiceOption $option, ServiceVariable $variable) diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 9dd80824a..fd3e6147e 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -47,8 +47,6 @@ class ForgotPasswordController extends Controller /** * Create a new controller instance. - * - * @return void */ public function __construct() { @@ -59,7 +57,7 @@ class ForgotPasswordController extends Controller * Get the response for a failed password reset link. * * @param \Illuminate\Http\Request - * @param string $response + * @param string $response * @return \Illuminate\Http\RedirectResponse */ protected function sendResetLinkFailedResponse(Request $request, $response) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index e4ca0d2ca..12f3df533 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -71,8 +71,6 @@ class LoginController extends Controller /** * Create a new controller instance. - * - * @return void */ public function __construct() { @@ -82,7 +80,7 @@ class LoginController extends Controller /** * Get the failed login response instance. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ protected function sendFailedLoginResponse(Request $request) @@ -103,7 +101,7 @@ class LoginController extends Controller /** * Handle a login request to the application. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response|\Illuminate\Response\RedirectResponse */ public function login(Request $request) @@ -156,7 +154,7 @@ class LoginController extends Controller /** * Handle a TOTP implementation page. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View */ public function totp(Request $request) @@ -176,7 +174,7 @@ class LoginController extends Controller /** * Handle a TOTP input. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function totpCheckpoint(Request $request) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index d28692293..c0621270a 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -31,8 +31,6 @@ class RegisterController extends Controller /** * Create a new controller instance. - * - * @return void */ public function __construct() { @@ -42,7 +40,7 @@ class RegisterController extends Controller /** * Get a validator for an incoming registration request. * - * @param array $data + * @param array $data * @return \Illuminate\Contracts\Validation\Validator */ protected function validator(array $data) @@ -57,7 +55,7 @@ class RegisterController extends Controller /** * Create a new user instance after a valid registration. * - * @param array $data + * @param array $data * @return User */ protected function create(array $data) diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 628f55f42..67d9b8f33 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -30,8 +30,6 @@ class ResetPasswordController extends Controller /** * Create a new controller instance. - * - * @return void */ public function __construct() { diff --git a/app/Http/Controllers/Base/APIController.php b/app/Http/Controllers/Base/APIController.php index 94783036c..7d7e39521 100644 --- a/app/Http/Controllers/Base/APIController.php +++ b/app/Http/Controllers/Base/APIController.php @@ -71,7 +71,7 @@ class APIController extends Controller /** * Display base API index page. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -99,7 +99,7 @@ class APIController extends Controller /** * Handle saving new API key. * - * @param \Pterodactyl\Http\Requests\ApiKeyRequest $request + * @param \Pterodactyl\Http\Requests\ApiKeyRequest $request * @return \Illuminate\Http\RedirectResponse * * @throws \Exception @@ -128,8 +128,8 @@ class APIController extends Controller } /** - * @param \Illuminate\Http\Request $request - * @param string $key + * @param \Illuminate\Http\Request $request + * @param string $key * @return \Illuminate\Http\Response * * @throws \Exception diff --git a/app/Http/Controllers/Base/AccountController.php b/app/Http/Controllers/Base/AccountController.php index 7167a6f2a..332ceadde 100644 --- a/app/Http/Controllers/Base/AccountController.php +++ b/app/Http/Controllers/Base/AccountController.php @@ -38,7 +38,7 @@ class AccountController extends Controller /** * Display base account information page. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -49,7 +49,7 @@ class AccountController extends Controller /** * Update details for a users account. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse * @throws \Symfony\Component\HttpKernel\Exception\HttpException */ diff --git a/app/Http/Controllers/Base/IndexController.php b/app/Http/Controllers/Base/IndexController.php index 556ea157c..e9d9e7682 100644 --- a/app/Http/Controllers/Base/IndexController.php +++ b/app/Http/Controllers/Base/IndexController.php @@ -34,7 +34,7 @@ class IndexController extends Controller /** * Returns listing of user's servers. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function getIndex(Request $request) @@ -53,8 +53,8 @@ class IndexController extends Controller /** * Generate a random string. * - * @param \Illuminate\Http\Request $request - * @param int $length + * @param \Illuminate\Http\Request $request + * @param int $length * @return string * @deprecated */ @@ -76,8 +76,8 @@ class IndexController extends Controller /** * Returns status of the server in a JSON response used for populating active status list. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\JsonResponse */ public function status(Request $request, $uuid) @@ -102,7 +102,6 @@ class IndexController extends Controller return response()->json(json_decode($res->getBody())); } } catch (\Exception $e) { - // } return response()->json([]); diff --git a/app/Http/Controllers/Base/LanguageController.php b/app/Http/Controllers/Base/LanguageController.php index 67d04f66c..0addd2185 100644 --- a/app/Http/Controllers/Base/LanguageController.php +++ b/app/Http/Controllers/Base/LanguageController.php @@ -51,8 +51,8 @@ class LanguageController extends Controller /** * Sets the language for a user. * - * @param \Illuminate\Http\Request $request - * @param string $language + * @param \Illuminate\Http\Request $request + * @param string $language * @return \Illuminate\Http\RedirectResponse */ public function setLanguage(Request $request, $language) diff --git a/app/Http/Controllers/Base/SecurityController.php b/app/Http/Controllers/Base/SecurityController.php index 052a7a527..5a143e658 100644 --- a/app/Http/Controllers/Base/SecurityController.php +++ b/app/Http/Controllers/Base/SecurityController.php @@ -36,7 +36,7 @@ class SecurityController extends Controller /** * Returns Security Management Page. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\View\View */ public function index(Request $request) @@ -50,7 +50,7 @@ class SecurityController extends Controller * Generates TOTP Secret and returns popup data for user to verify * that they can generate a valid response. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function generateTotp(Request $request) @@ -73,7 +73,7 @@ class SecurityController extends Controller /** * Verifies that 2FA token recieved is valid and will work on the account. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function setTotp(Request $request) @@ -95,7 +95,7 @@ class SecurityController extends Controller /** * Disables TOTP on an account. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function disableTotp(Request $request) @@ -119,8 +119,8 @@ class SecurityController extends Controller /** * Revokes a user session. * - * @param \Illuminate\Http\Request $request - * @param int $id + * @param \Illuminate\Http\Request $request + * @param int $id * @return \Illuminate\Http\RedirectResponse */ public function revoke(Request $request, $id) diff --git a/app/Http/Controllers/Daemon/ActionController.php b/app/Http/Controllers/Daemon/ActionController.php index 0a054218c..f0e84ed0d 100644 --- a/app/Http/Controllers/Daemon/ActionController.php +++ b/app/Http/Controllers/Daemon/ActionController.php @@ -35,7 +35,7 @@ class ActionController extends Controller /** * Handles download request from daemon. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function authenticateDownload(Request $request) @@ -57,7 +57,7 @@ class ActionController extends Controller /** * Handles install toggle request from daemon. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function markInstall(Request $request) @@ -87,8 +87,8 @@ class ActionController extends Controller /** * Handles configuration data request from daemon. * - * @param \Illuminate\Http\Request $request - * @param string $token + * @param \Illuminate\Http\Request $request + * @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 419ae7c9c..21866ed59 100644 --- a/app/Http/Controllers/Daemon/PackController.php +++ b/app/Http/Controllers/Daemon/PackController.php @@ -34,8 +34,8 @@ class PackController extends Controller /** * Pulls an install pack archive from the system. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse */ public function pull(Request $request, $uuid) @@ -56,8 +56,8 @@ class PackController extends Controller /** * Returns the hash information for a pack. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\JsonResponse */ public function hash(Request $request, $uuid) @@ -80,11 +80,9 @@ class PackController extends Controller /** * Pulls an update pack archive from the system. * - * @param \Illuminate\Http\Request $request - * @return void + * @param \Illuminate\Http\Request $request */ public function pullUpdate(Request $request) { - // } } diff --git a/app/Http/Controllers/Daemon/ServiceController.php b/app/Http/Controllers/Daemon/ServiceController.php index d461786f0..a9de34d97 100644 --- a/app/Http/Controllers/Daemon/ServiceController.php +++ b/app/Http/Controllers/Daemon/ServiceController.php @@ -36,7 +36,7 @@ class ServiceController extends Controller * as well as the associated files and the file hashes for * caching purposes. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse */ public function listServices(Request $request) @@ -55,9 +55,9 @@ class ServiceController extends Controller /** * Returns the contents of the requested file for the given service. * - * @param \Illuminate\Http\Request $request - * @param string $folder - * @param string $file + * @param \Illuminate\Http\Request $request + * @param string $folder + * @param string $file * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\FileResponse */ public function pull(Request $request, $folder, $file) @@ -77,7 +77,7 @@ class ServiceController extends Controller * Returns a `main.json` file based on the configuration * of each service option. * - * @param int $id + * @param int $id * @return \Illuminate\Support\Collection */ protected function getConfiguration($id) diff --git a/app/Http/Controllers/Server/AjaxController.php b/app/Http/Controllers/Server/AjaxController.php index 1d824ddf8..01adb250e 100644 --- a/app/Http/Controllers/Server/AjaxController.php +++ b/app/Http/Controllers/Server/AjaxController.php @@ -52,8 +52,8 @@ class AjaxController extends Controller /** * Returns a listing of files in a given directory for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View|\Illuminate\Http\Response */ public function postDirectoryList(Request $request, $uuid) @@ -103,8 +103,8 @@ class AjaxController extends Controller /** * Handles a POST request to save a file. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\Response */ public function postSaveFile(Request $request, $uuid) @@ -130,8 +130,8 @@ class AjaxController extends Controller /** * Sets the primary allocation for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\JsonResponse * @deprecated */ @@ -180,8 +180,8 @@ class AjaxController extends Controller /** * Resets a database password for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\JsonResponse * @deprecated */ diff --git a/app/Http/Controllers/Server/ServerController.php b/app/Http/Controllers/Server/ServerController.php index 6b70a829d..86382186d 100644 --- a/app/Http/Controllers/Server/ServerController.php +++ b/app/Http/Controllers/Server/ServerController.php @@ -40,8 +40,8 @@ class ServerController extends Controller /** * Renders server index page for specified server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getIndex(Request $request, $uuid) @@ -68,8 +68,8 @@ class ServerController extends Controller /** * Renders server console as an individual item. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getConsole(Request $request, $uuid) @@ -93,8 +93,8 @@ class ServerController extends Controller /** * Renders file overview page. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getFiles(Request $request, $uuid) @@ -127,8 +127,8 @@ class ServerController extends Controller /** * Renders add file page. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getAddFile(Request $request, $uuid) @@ -148,9 +148,9 @@ class ServerController extends Controller /** * Renders edit file page for a given file. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param string $file + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param string $file * @return \Illuminate\View\View */ public function getEditFile(Request $request, $uuid, $file) @@ -191,9 +191,9 @@ class ServerController extends Controller /** * Handles downloading a file for the user. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param string $file + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param string $file * @return \Illuminate\View\View */ public function getDownloadFile(Request $request, $uuid, $file) @@ -213,8 +213,8 @@ class ServerController extends Controller /** * Returns the allocation overview for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getAllocation(Request $request, $uuid) @@ -235,8 +235,8 @@ class ServerController extends Controller /** * Returns the startup overview for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getStartup(Request $request, $uuid) @@ -280,8 +280,8 @@ class ServerController extends Controller /** * Returns the database overview for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getDatabases(Request $request, $uuid) @@ -302,8 +302,8 @@ class ServerController extends Controller /** * Returns the SFTP overview for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function getSFTP(Request $request, $uuid) @@ -321,8 +321,8 @@ class ServerController extends Controller /** * Handles changing the SFTP password for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\RedirectResponse */ public function postSettingsSFTP(Request $request, $uuid) @@ -349,8 +349,8 @@ class ServerController extends Controller /** * Handles changing the startup settings for a server. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\RedirectResponse */ public function postSettingsStartup(Request $request, $uuid) diff --git a/app/Http/Controllers/Server/SubuserController.php b/app/Http/Controllers/Server/SubuserController.php index 9a8b35075..2eaa8df09 100644 --- a/app/Http/Controllers/Server/SubuserController.php +++ b/app/Http/Controllers/Server/SubuserController.php @@ -39,8 +39,8 @@ class SubuserController extends Controller /** * Displays the subuser overview index. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function index(Request $request, $uuid) @@ -60,9 +60,9 @@ class SubuserController extends Controller /** * Displays the a single subuser overview. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param int $id + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param int $id * @return \Illuminate\View\View */ public function view(Request $request, $uuid, $id) @@ -89,9 +89,9 @@ class SubuserController extends Controller /** * Handles editing a subuser. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param int $id + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param int $id * @return \Illuminate\Http\RedirectResponse */ public function update(Request $request, $uuid, $id) @@ -135,8 +135,8 @@ class SubuserController extends Controller /** * Display new subuser creation page. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function create(Request $request, $uuid) @@ -155,8 +155,8 @@ class SubuserController extends Controller /** * Handles creating a new subuser. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\RedirectResponse */ public function store(Request $request, $uuid) @@ -190,9 +190,9 @@ class SubuserController extends Controller /** * Handles deleting a subuser. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param int $id + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param int $id * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response */ public function delete(Request $request, $uuid, $id) diff --git a/app/Http/Controllers/Server/TaskController.php b/app/Http/Controllers/Server/TaskController.php index a3908943a..618a14902 100644 --- a/app/Http/Controllers/Server/TaskController.php +++ b/app/Http/Controllers/Server/TaskController.php @@ -38,8 +38,8 @@ class TaskController extends Controller /** * Display task index page. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function index(Request $request, $uuid) @@ -62,8 +62,8 @@ class TaskController extends Controller /** * Display new task page. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\View\View */ public function create(Request $request, $uuid) @@ -81,8 +81,8 @@ class TaskController extends Controller /** * Handle creation of new task. * - * @param \Illuminate\Http\Request $request - * @param string $uuid + * @param \Illuminate\Http\Request $request + * @param string $uuid * @return \Illuminate\Http\RedirectResponse */ public function store(Request $request, $uuid) @@ -112,9 +112,9 @@ class TaskController extends Controller /** * Handle deletion of a task. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param int $id + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param int $id * @return \Illuminate\Http\JsonResponse */ public function delete(Request $request, $uuid, $id) @@ -146,9 +146,9 @@ class TaskController extends Controller /** * Toggle the status of a task. * - * @param \Illuminate\Http\Request $request - * @param string $uuid - * @param int $id + * @param \Illuminate\Http\Request $request + * @param string $uuid + * @param int $id * @return \Illuminate\Http\JsonResponse */ public function toggle(Request $request, $uuid, $id) diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php index 175210929..e5fbdc412 100644 --- a/app/Http/Middleware/AdminAuthenticate.php +++ b/app/Http/Middleware/AdminAuthenticate.php @@ -39,8 +39,7 @@ class AdminAuthenticate /** * Create a new filter instance. * - * @param \Illuminate\Contracts\Auth\Guard $auth - * @return void + * @param \Illuminate\Contracts\Auth\Guard $auth */ public function __construct(Guard $auth) { @@ -50,8 +49,8 @@ class AdminAuthenticate /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index b6db005ef..06e2d6b70 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -17,8 +17,7 @@ class Authenticate /** * Create a new filter instance. * - * @param \Illuminate\Contracts\Auth\Guard $auth - * @return void + * @param \Illuminate\Contracts\Auth\Guard $auth */ public function __construct(Guard $auth) { @@ -28,8 +27,8 @@ class Authenticate /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/CheckServer.php b/app/Http/Middleware/CheckServer.php index 4cfe08191..c1da9ea1b 100644 --- a/app/Http/Middleware/CheckServer.php +++ b/app/Http/Middleware/CheckServer.php @@ -51,8 +51,8 @@ class CheckServer /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/app/Http/Middleware/DaemonAuthenticate.php b/app/Http/Middleware/DaemonAuthenticate.php index b924b6fb5..9e190ba9f 100644 --- a/app/Http/Middleware/DaemonAuthenticate.php +++ b/app/Http/Middleware/DaemonAuthenticate.php @@ -49,8 +49,7 @@ class DaemonAuthenticate /** * Create a new filter instance. * - * @param \Illuminate\Contracts\Auth\Guard $auth - * @return void + * @param \Illuminate\Contracts\Auth\Guard $auth */ public function __construct(Guard $auth) { @@ -60,8 +59,8 @@ class DaemonAuthenticate /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 8e8559f23..eefb3359f 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -12,6 +12,5 @@ class EncryptCookies extends BaseEncrypter * @var array */ protected $except = [ - // ]; } diff --git a/app/Http/Middleware/HMACAuthorization.php b/app/Http/Middleware/HMACAuthorization.php index 4f5c86f2b..12b6ac40f 100644 --- a/app/Http/Middleware/HMACAuthorization.php +++ b/app/Http/Middleware/HMACAuthorization.php @@ -68,8 +68,6 @@ class HMACAuthorization /** * Construct class instance. - * - * @return void */ public function __construct() { @@ -80,8 +78,8 @@ class HMACAuthorization /** * Handle an incoming request for the API. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle(Request $request, Closure $next) @@ -101,7 +99,6 @@ class HMACAuthorization /** * Checks that the Bearer token is provided and in a valid format. * - * @return void * * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException */ @@ -126,7 +123,6 @@ class HMACAuthorization * Determine if the request contains a valid public API key * as well as permissions for the resource. * - * @return void * * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException */ @@ -164,7 +160,6 @@ class HMACAuthorization * Determine if the HMAC sent in the request matches the one generated * on the panel side. * - * @return void * * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException */ diff --git a/app/Http/Middleware/LanguageMiddleware.php b/app/Http/Middleware/LanguageMiddleware.php index 44553ebef..c83f6aa15 100644 --- a/app/Http/Middleware/LanguageMiddleware.php +++ b/app/Http/Middleware/LanguageMiddleware.php @@ -35,8 +35,8 @@ class LanguageMiddleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @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 731a1767f..a25e05fb2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -10,9 +10,9 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null $guard + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @param string|null $guard * @return mixed */ public function handle($request, Closure $next, $guard = null) diff --git a/app/Http/Middleware/VerifyReCaptcha.php b/app/Http/Middleware/VerifyReCaptcha.php index 58c0597aa..07a0783c7 100644 --- a/app/Http/Middleware/VerifyReCaptcha.php +++ b/app/Http/Middleware/VerifyReCaptcha.php @@ -10,8 +10,8 @@ class VerifyReCaptcha /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return \Illuminate\Http\RediectResponse */ public function handle($request, Closure $next) diff --git a/app/Http/Requests/Admin/AdminFormRequest.php b/app/Http/Requests/Admin/AdminFormRequest.php index 769cf9dd9..4399d56c5 100644 --- a/app/Http/Requests/Admin/AdminFormRequest.php +++ b/app/Http/Requests/Admin/AdminFormRequest.php @@ -49,7 +49,7 @@ abstract class AdminFormRequest extends FormRequest * Return only the fields that we are interested in from the request. * This will include empty fields as a null value. * - * @param array $only + * @param array $only * @return array */ public function normalize($only = []) diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 5e3ae0bc5..a9771726f 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -6,5 +6,4 @@ use Illuminate\Foundation\Http\FormRequest; abstract class Request extends FormRequest { - // } diff --git a/app/Jobs/SendScheduledTask.php b/app/Jobs/SendScheduledTask.php index 8f9889730..8e44e3e9b 100644 --- a/app/Jobs/SendScheduledTask.php +++ b/app/Jobs/SendScheduledTask.php @@ -45,8 +45,6 @@ class SendScheduledTask extends Job implements ShouldQueue /** * Create a new job instance. - * - * @return void */ public function __construct(Task $task) { @@ -58,8 +56,6 @@ class SendScheduledTask extends Job implements ShouldQueue /** * Execute the job. - * - * @return void */ public function handle() { @@ -96,7 +92,8 @@ class SendScheduledTask extends Job implements ShouldQueue 'response' => $ex->getMessage(), ]); } finally { - $cron = Cron::factory(sprintf('%s %s %s %s %s %s', + $cron = Cron::factory(sprintf( + '%s %s %s %s %s %s', $this->task->minute, $this->task->hour, $this->task->day_of_month, diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php index cbdba2e17..e5d862bfe 100644 --- a/app/Models/Allocation.php +++ b/app/Models/Allocation.php @@ -82,7 +82,7 @@ class Allocation extends Model implements CleansAttributes, ValidableContract /** * Accessor to automatically provide the IP alias if defined. * - * @param null|string $value + * @param null|string $value * @return string */ public function getAliasAttribute($value) @@ -93,7 +93,7 @@ class Allocation extends Model implements CleansAttributes, ValidableContract /** * Accessor to quickly determine if this allocation has an alias. * - * @param null|string $value + * @param null|string $value * @return bool */ public function getHasAliasAttribute($value) diff --git a/app/Models/Node.php b/app/Models/Node.php index 138d29d81..76f04e9c9 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -144,7 +144,7 @@ class Node extends Model implements CleansAttributes, ValidableContract /** * Return an instance of the Guzzle client for this specific node. * - * @param array $headers + * @param array $headers * @return \GuzzleHttp\Client */ public function guzzleClient($headers = []) @@ -160,7 +160,7 @@ class Node extends Model implements CleansAttributes, ValidableContract /** * Returns the configuration in JSON format. * - * @param bool $pretty + * @param bool $pretty * @return string */ public function getConfigurationAsJson($pretty = false) diff --git a/app/Models/Pack.php b/app/Models/Pack.php index 0139fcf8f..48382a425 100644 --- a/app/Models/Pack.php +++ b/app/Models/Pack.php @@ -107,7 +107,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract /** * Returns all of the archived files for a given pack. * - * @param bool $collection + * @param bool $collection * @return \Illuminate\Support\Collection|object * @deprecated */ diff --git a/app/Models/Permission.php b/app/Models/Permission.php index c126967ec..086586cd7 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -81,7 +81,7 @@ class Permission extends Model 'server' => [ 'set-connection' => null, 'view-startup' => null, - 'edit-startup' => null, + 'edit-startup' => null, ], 'sftp' => [ 'view-sftp' => null, @@ -118,7 +118,7 @@ class Permission extends Model /** * Return a collection of permissions available. * - * @param array $single + * @param array $single * @return \Illuminate\Support\Collection|array */ public static function listPermissions($single = false) @@ -135,8 +135,8 @@ class Permission extends Model /** * Find permission by permission node. * - * @param \Illuminate\Database\Query\Builder $query - * @param string $permission + * @param \Illuminate\Database\Query\Builder $query + * @param string $permission * @return \Illuminate\Database\Query\Builder */ public function scopePermission($query, $permission) @@ -147,8 +147,8 @@ class Permission extends Model /** * Filter permission by server. * - * @param \Illuminate\Database\Query\Builder $query - * @param \Pterodactyl\Models\Server $server + * @param \Illuminate\Database\Query\Builder $query + * @param \Pterodactyl\Models\Server $server * @return \Illuminate\Database\Query\Builder */ public function scopeServer($query, Server $server) diff --git a/app/Models/Server.php b/app/Models/Server.php index 45091372a..b31a89a7c 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -155,9 +155,9 @@ class Server extends Model implements CleansAttributes, ValidableContract * DO NOT USE THIS TO MODIFY SERVER DETAILS OR SAVE THOSE DETAILS. * YOU WILL OVERWRITE THE SECRET KEY AND BREAK THINGS. * - * @param string $uuid - * @param array $with - * @param array $withCount + * @param string $uuid + * @param array $with + * @param array $withCount * @return \Pterodactyl\Models\Server * @throws \Exception * @todo Remove $with and $withCount due to cache issues, they aren't used anyways. @@ -191,7 +191,7 @@ class Server extends Model implements CleansAttributes, ValidableContract /** * Returns non-administrative headers for accessing a server on the daemon. * - * @param Pterodactyl\Models\User|null $user + * @param Pterodactyl\Models\User|null $user * @return array */ public function guzzleHeaders(User $user = null) @@ -211,7 +211,7 @@ class Server extends Model implements CleansAttributes, ValidableContract /** * Return an instance of the Guzzle client for this specific server using defined access token. * - * @param Pterodactyl\Models\User|null $user + * @param Pterodactyl\Models\User|null $user * @return \GuzzleHttp\Client */ public function guzzleClient(User $user = null) @@ -222,8 +222,8 @@ class Server extends Model implements CleansAttributes, ValidableContract /** * Returns javascript object to be embedded on server view pages with relevant information. * - * @param array|null $additional - * @param array|null $overwrite + * @param array|null $additional + * @param array|null $overwrite * @return \Laracasts\Utilities\JavaScript\JavaScriptFacade */ public function js($additional = null, $overwrite = null) diff --git a/app/Models/Service.php b/app/Models/Service.php index 25355981b..391f4ae1c 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -90,8 +90,10 @@ class Service extends Model implements CleansAttributes, ValidableContract public function packs() { return $this->hasManyThrough( - 'Pterodactyl\Models\Pack', 'Pterodactyl\Models\ServiceOption', - 'service_id', 'option_id' + 'Pterodactyl\Models\Pack', + 'Pterodactyl\Models\ServiceOption', + 'service_id', + 'option_id' ); } diff --git a/app/Models/User.php b/app/Models/User.php index 972d0943c..d9f99d019 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -162,7 +162,7 @@ class User extends Model implements /** * Enables or disables TOTP on an account if the token is valid. * - * @param int $token + * @param int $token * @return bool * @deprecated */ @@ -184,9 +184,8 @@ class User extends Model implements * - at least one lowercase character * - at least one number. * - * @param string $password - * @param string $regex - * @return void + * @param string $password + * @param string $regex * @throws \Pterodactyl\Exceptions\DisplayException * @deprecated */ @@ -203,8 +202,7 @@ class User extends Model implements /** * Send the password reset notification. * - * @param string $token - * @return void + * @param string $token */ public function sendPasswordResetNotification($token) { @@ -225,7 +223,7 @@ class User extends Model implements /** * Returns the user's daemon secret for a given server. * - * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\Server $server * @return null|string */ public function daemonToken(Server $server) @@ -255,7 +253,7 @@ class User extends Model implements /** * Change the access level for a given call to `access()` on the user. * - * @param string $level can be all, admin, subuser, owner + * @param string $level can be all, admin, subuser, owner * @return $this */ public function setAccessLevel($level = 'all') @@ -272,7 +270,7 @@ class User extends Model implements * Returns an array of all servers a user is able to access. * Note: does not account for user admin status. * - * @param array $load + * @param array $load * @return \Pterodactyl\Models\Server */ public function access(...$load) @@ -310,7 +308,7 @@ class User extends Model implements /** * Store the username as a lowecase string. * - * @param string $value + * @param string $value */ public function setUsernameAttribute($value) { diff --git a/app/Notifications/AccountCreated.php b/app/Notifications/AccountCreated.php index f92a7a477..47fbf7551 100644 --- a/app/Notifications/AccountCreated.php +++ b/app/Notifications/AccountCreated.php @@ -43,8 +43,7 @@ class AccountCreated extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param aray $user - * @return void + * @param aray $user */ public function __construct(array $user) { @@ -54,7 +53,7 @@ class AccountCreated extends Notification implements ShouldQueue /** * Get the notification's delivery channels. * - * @param mixed $notifiable + * @param mixed $notifiable * @return array */ public function via($notifiable) @@ -65,7 +64,7 @@ class AccountCreated extends Notification implements ShouldQueue /** * Get the mail representation of the notification. * - * @param mixed $notifiable + * @param mixed $notifiable * @return \Illuminate\Notifications\Messages\MailMessage */ public function toMail($notifiable) diff --git a/app/Notifications/AddedToServer.php b/app/Notifications/AddedToServer.php index 415b39fb0..4d8bf838e 100644 --- a/app/Notifications/AddedToServer.php +++ b/app/Notifications/AddedToServer.php @@ -41,8 +41,7 @@ class AddedToServer extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param array $server - * @return void + * @param array $server */ public function __construct(array $server) { @@ -52,7 +51,7 @@ class AddedToServer extends Notification implements ShouldQueue /** * Get the notification's delivery channels. * - * @param mixed $notifiable + * @param mixed $notifiable * @return array */ public function via($notifiable) @@ -63,7 +62,7 @@ class AddedToServer extends Notification implements ShouldQueue /** * Get the mail representation of the notification. * - * @param mixed $notifiable + * @param mixed $notifiable * @return \Illuminate\Notifications\Messages\MailMessage */ public function toMail($notifiable) diff --git a/app/Notifications/RemovedFromServer.php b/app/Notifications/RemovedFromServer.php index d4831dbe4..46b7143a5 100644 --- a/app/Notifications/RemovedFromServer.php +++ b/app/Notifications/RemovedFromServer.php @@ -41,8 +41,7 @@ class RemovedFromServer extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param array $server - * @return void + * @param array $server */ public function __construct(array $server) { @@ -52,7 +51,7 @@ class RemovedFromServer extends Notification implements ShouldQueue /** * Get the notification's delivery channels. * - * @param mixed $notifiable + * @param mixed $notifiable * @return array */ public function via($notifiable) @@ -63,7 +62,7 @@ class RemovedFromServer extends Notification implements ShouldQueue /** * Get the mail representation of the notification. * - * @param mixed $notifiable + * @param mixed $notifiable * @return \Illuminate\Notifications\Messages\MailMessage */ public function toMail($notifiable) diff --git a/app/Notifications/SendPasswordReset.php b/app/Notifications/SendPasswordReset.php index 367f863ed..1ba616eae 100644 --- a/app/Notifications/SendPasswordReset.php +++ b/app/Notifications/SendPasswordReset.php @@ -43,8 +43,7 @@ class SendPasswordReset extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param string $token - * @return void + * @param string $token */ public function __construct($token) { @@ -54,7 +53,7 @@ class SendPasswordReset extends Notification implements ShouldQueue /** * Get the notification's delivery channels. * - * @param mixed $notifiable + * @param mixed $notifiable * @return array */ public function via($notifiable) @@ -65,7 +64,7 @@ class SendPasswordReset extends Notification implements ShouldQueue /** * Get the mail representation of the notification. * - * @param mixed $notifiable + * @param mixed $notifiable * @return \Illuminate\Notifications\Messages\MailMessage */ public function toMail($notifiable) diff --git a/app/Notifications/ServerCreated.php b/app/Notifications/ServerCreated.php index 9f881729a..054b4adb1 100644 --- a/app/Notifications/ServerCreated.php +++ b/app/Notifications/ServerCreated.php @@ -41,8 +41,7 @@ class ServerCreated extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param array $server - * @return void + * @param array $server */ public function __construct(array $server) { @@ -52,7 +51,7 @@ class ServerCreated extends Notification implements ShouldQueue /** * Get the notification's delivery channels. * - * @param mixed $notifiable + * @param mixed $notifiable * @return array */ public function via($notifiable) @@ -63,7 +62,7 @@ class ServerCreated extends Notification implements ShouldQueue /** * Get the mail representation of the notification. * - * @param mixed $notifiable + * @param mixed $notifiable * @return \Illuminate\Notifications\Messages\MailMessage */ public function toMail($notifiable) diff --git a/app/Observers/ServerObserver.php b/app/Observers/ServerObserver.php index cd8c2187a..557da2eb9 100644 --- a/app/Observers/ServerObserver.php +++ b/app/Observers/ServerObserver.php @@ -37,8 +37,7 @@ class ServerObserver /** * Listen to the Server creating event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function creating(Server $server) { @@ -48,8 +47,7 @@ class ServerObserver /** * Listen to the Server created event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function created(Server $server) { @@ -69,8 +67,7 @@ class ServerObserver /** * Listen to the Server deleting event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function deleting(Server $server) { @@ -80,8 +77,7 @@ class ServerObserver /** * Listen to the Server deleted event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function deleted(Server $server) { @@ -91,8 +87,7 @@ class ServerObserver /** * Listen to the Server saving event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function saving(Server $server) { @@ -102,8 +97,7 @@ class ServerObserver /** * Listen to the Server saved event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function saved(Server $server) { @@ -113,8 +107,7 @@ class ServerObserver /** * Listen to the Server updating event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function updating(Server $server) { @@ -124,8 +117,7 @@ class ServerObserver /** * Listen to the Server saved event. * - * @param \Pterodactyl\Models\Server $server - * @return void + * @param \Pterodactyl\Models\Server $server */ public function updated(Server $server) { diff --git a/app/Observers/SubuserObserver.php b/app/Observers/SubuserObserver.php index 57eab2680..a6bcdaccf 100644 --- a/app/Observers/SubuserObserver.php +++ b/app/Observers/SubuserObserver.php @@ -34,8 +34,7 @@ class SubuserObserver /** * Listen to the Subuser creating event. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function creating(Subuser $subuser) { @@ -45,8 +44,7 @@ class SubuserObserver /** * Listen to the Subuser created event. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function created(Subuser $subuser) { @@ -62,8 +60,7 @@ class SubuserObserver /** * Listen to the Subuser deleting event. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function deleting(Subuser $subuser) { @@ -73,8 +70,7 @@ class SubuserObserver /** * Listen to the Subuser deleted event. * - * @param \Pterodactyl\Models\Subuser $subuser - * @return void + * @param \Pterodactyl\Models\Subuser $subuser */ public function deleted(Subuser $subuser) { diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index e75c053bd..5b1ee844c 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -40,8 +40,7 @@ class UserObserver /** * Listen to the User creating event. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function creating(User $user) { @@ -53,8 +52,7 @@ class UserObserver /** * Listen to the User created event. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function created(User $user) { @@ -64,8 +62,7 @@ class UserObserver /** * Listen to the User deleting event. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function deleting(User $user) { @@ -75,8 +72,7 @@ class UserObserver /** * Listen to the User deleted event. * - * @param \Pterodactyl\Models\User $user - * @return void + * @param \Pterodactyl\Models\User $user */ public function deleted(User $user) { diff --git a/app/Policies/APIKeyPolicy.php b/app/Policies/APIKeyPolicy.php index 95846b9e4..31b888a75 100644 --- a/app/Policies/APIKeyPolicy.php +++ b/app/Policies/APIKeyPolicy.php @@ -61,9 +61,9 @@ class APIKeyPolicy /** * Determine if a user has permission to perform this action against the system. * - * @param \Pterodactyl\Models\User $user - * @param string $permission - * @param \Pterodactyl\Models\APIKey $key + * @param \Pterodactyl\Models\User $user + * @param string $permission + * @param \Pterodactyl\Models\APIKey $key * @return bool */ public function before(User $user, $permission, Key $key) diff --git a/app/Policies/ServerPolicy.php b/app/Policies/ServerPolicy.php index 56cd359e1..618deebf3 100644 --- a/app/Policies/ServerPolicy.php +++ b/app/Policies/ServerPolicy.php @@ -53,9 +53,9 @@ 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\Server $server + * @param \Pterodactyl\Models\User $user + * @param string $ability + * @param \Pterodactyl\Models\Server $server * @return bool */ public function before(User $user, $ability, Server $server) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9bb72d1f8..1fc8b7423 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -34,8 +34,6 @@ class AppServiceProvider extends ServiceProvider { /** * Bootstrap any application services. - * - * @return void */ public function boot() { @@ -49,8 +47,6 @@ class AppServiceProvider extends ServiceProvider /** * Register any application services. - * - * @return void */ public function register() { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index e1401e844..0cdb82a29 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -19,8 +19,7 @@ class AuthServiceProvider extends ServiceProvider /** * Register any application authentication / authorization services. * - * @param \Illuminate\Contracts\Auth\Access\Gate $gate - * @return void + * @param \Illuminate\Contracts\Auth\Access\Gate $gate */ public function boot() { diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index e61e610d5..3f7c84be4 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -9,8 +9,6 @@ class BroadcastServiceProvider extends ServiceProvider { /** * Bootstrap any application services. - * - * @return void */ public function boot() { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 9126aa6ae..1f48d33da 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -16,8 +16,6 @@ class EventServiceProvider extends ServiceProvider /** * Register any other events for your application. - * - * @return void */ public function boot() { diff --git a/app/Providers/MacroServiceProvider.php b/app/Providers/MacroServiceProvider.php index 600c0d3f3..50e205151 100644 --- a/app/Providers/MacroServiceProvider.php +++ b/app/Providers/MacroServiceProvider.php @@ -36,8 +36,6 @@ class MacroServiceProvider extends ServiceProvider { /** * Bootstrap the application services. - * - * @return void */ public function boot() { @@ -48,7 +46,7 @@ class MacroServiceProvider extends ServiceProvider $i = 0; while (($size / 1024) > 0.9) { $size = $size / 1024; - $i++; + ++$i; } return round($size, ($i < 2) ? 0 : $precision) . ' ' . $units[$i]; diff --git a/app/Providers/PhraseAppTranslationProvider.php b/app/Providers/PhraseAppTranslationProvider.php index 840234917..cfc68bb3f 100644 --- a/app/Providers/PhraseAppTranslationProvider.php +++ b/app/Providers/PhraseAppTranslationProvider.php @@ -32,8 +32,6 @@ class PhraseAppTranslationProvider extends TranslationServiceProvider { /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 1563e35f6..9876208c5 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -19,8 +19,6 @@ class RouteServiceProvider extends ServiceProvider /** * Define your route model bindings, pattern filters, etc. - * - * @return void */ public function boot() { @@ -29,8 +27,6 @@ class RouteServiceProvider extends ServiceProvider /** * Define the routes for the application. - * - * @return void */ public function map() { diff --git a/app/Repositories/Concerns/Searchable.php b/app/Repositories/Concerns/Searchable.php index ec957824f..75b95ba5a 100644 --- a/app/Repositories/Concerns/Searchable.php +++ b/app/Repositories/Concerns/Searchable.php @@ -36,7 +36,7 @@ trait Searchable /** * Perform a search of the model using the given term. * - * @param string $term + * @param string $term * @return $this */ public function search($term) diff --git a/app/Repositories/Eloquent/DatabaseRepository.php b/app/Repositories/Eloquent/DatabaseRepository.php index 347c6b9d7..e274f1935 100644 --- a/app/Repositories/Eloquent/DatabaseRepository.php +++ b/app/Repositories/Eloquent/DatabaseRepository.php @@ -85,7 +85,8 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor public function createDatabase($database, $connection = null) { return $this->runStatement( - sprintf('CREATE DATABASE IF NOT EXISTS `%s`', $database), $connection + sprintf('CREATE DATABASE IF NOT EXISTS `%s`', $database), + $connection ); } @@ -95,7 +96,8 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor public function createUser($username, $remote, $password, $connection = null) { return $this->runStatement( - sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password), $connection + sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password), + $connection ); } @@ -107,7 +109,9 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor return $this->runStatement( sprintf( 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, INDEX ON `%s`.* TO `%s`@`%s`', - $database, $username, $remote + $database, + $username, + $remote ), $connection ); @@ -127,7 +131,8 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor public function dropDatabase($database, $connection = null) { return $this->runStatement( - sprintf('DROP DATABASE IF EXISTS `%s`', $database), $connection + sprintf('DROP DATABASE IF EXISTS `%s`', $database), + $connection ); } @@ -137,15 +142,16 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor public function dropUser($username, $remote, $connection = null) { return $this->runStatement( - sprintf('DROP USER IF EXISTS `%s`@`%s`', $username, $remote), $connection + sprintf('DROP USER IF EXISTS `%s`@`%s`', $username, $remote), + $connection ); } /** * Run the provided statement against the database on a given connection. * - * @param string $statement - * @param null|string $connection + * @param string $statement + * @param null|string $connection * @return bool */ protected function runStatement($statement, $connection = null) diff --git a/app/Repositories/Eloquent/EloquentRepository.php b/app/Repositories/Eloquent/EloquentRepository.php index fce974030..f29418d00 100644 --- a/app/Repositories/Eloquent/EloquentRepository.php +++ b/app/Repositories/Eloquent/EloquentRepository.php @@ -44,7 +44,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf /** * {@inheritdoc} - * @param bool $force + * @param bool $force * @return \Illuminate\Database\Eloquent\Model|bool */ public function create(array $fields, $validate = true, $force = false) @@ -214,7 +214,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf /** * Insert multiple records into the database and ignore duplicates. * - * @param array $values + * @param array $values * @return bool */ public function insertIgnore(array $values) diff --git a/app/Repositories/Eloquent/NodeRepository.php b/app/Repositories/Eloquent/NodeRepository.php index 9a63ca93e..e421d778e 100644 --- a/app/Repositories/Eloquent/NodeRepository.php +++ b/app/Repositories/Eloquent/NodeRepository.php @@ -47,7 +47,10 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa public function getUsageStats($id) { $node = $this->getBuilder()->select( - 'nodes.disk_overallocate', 'nodes.memory_overallocate', 'nodes.disk', 'nodes.memory', + 'nodes.disk_overallocate', + 'nodes.memory_overallocate', + 'nodes.disk', + 'nodes.memory', $this->getBuilder()->raw('SUM(servers.memory) as sum_memory, SUM(servers.disk) as sum_disk') )->join('servers', 'servers.node_id', '=', 'nodes.id') ->where('nodes.id', $id) diff --git a/app/Repositories/Eloquent/UserRepository.php b/app/Repositories/Eloquent/UserRepository.php index ec1abe57f..38f7e355c 100644 --- a/app/Repositories/Eloquent/UserRepository.php +++ b/app/Repositories/Eloquent/UserRepository.php @@ -72,7 +72,8 @@ class UserRepository extends EloquentRepository implements UserRepositoryInterfa } return $users->paginate( - $this->config->get('pterodactyl.paginate.admin.users'), $this->getColumns() + $this->config->get('pterodactyl.paginate.admin.users'), + $this->getColumns() ); } diff --git a/app/Repositories/Old/SubuserRepository.php b/app/Repositories/Old/SubuserRepository.php index b7d736551..26c95107d 100644 --- a/app/Repositories/Old/SubuserRepository.php +++ b/app/Repositories/Old/SubuserRepository.php @@ -52,8 +52,8 @@ class SubuserRepository /** * Creates a new subuser on the server. * - * @param int $sid - * @param array $data + * @param int $sid + * @param array $data * @return \Pterodactyl\Models\Subuser * * @throws \Pterodactyl\Exceptions\DisplayException @@ -152,8 +152,7 @@ class SubuserRepository /** * Revokes a users permissions on a server. * - * @param int $id - * @return void + * @param int $id * * @throws \Pterodactyl\Exceptions\DisplayException */ @@ -193,9 +192,8 @@ class SubuserRepository /** * Updates permissions for a given subuser. * - * @param int $id - * @param array $data - * @return void + * @param int $id + * @param array $data * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\DisplayValidationException diff --git a/app/Repositories/Repository.php b/app/Repositories/Repository.php index 32beb8cb4..375001b01 100644 --- a/app/Repositories/Repository.php +++ b/app/Repositories/Repository.php @@ -64,7 +64,7 @@ abstract class Repository implements RepositoryInterface /** * Take the provided model and make it accessible to the rest of the repository. * - * @param string|array $model + * @param string|array $model * @return mixed */ protected function setModel($model) @@ -77,7 +77,8 @@ abstract class Repository implements RepositoryInterface } return $this->model = call_user_func( - $model[1], $this->app->make($model[0]) + $model[1], + $this->app->make($model[0]) ); } @@ -102,7 +103,7 @@ abstract class Repository implements RepositoryInterface /** * Setup column selection functionality. * - * @param array $columns + * @param array $columns * @return $this */ public function withColumns($columns = ['*']) diff --git a/app/Repositories/old_Daemon/CommandRepository.php b/app/Repositories/old_Daemon/CommandRepository.php index 2f1a41ee8..ce12e12df 100644 --- a/app/Repositories/old_Daemon/CommandRepository.php +++ b/app/Repositories/old_Daemon/CommandRepository.php @@ -48,9 +48,8 @@ class CommandRepository /** * Constuctor for repository. * - * @param \Pterodactyl\Models\Server $server - * @param \Pterodactyl\Models\User|null $user - * @return void + * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\User|null $user */ public function __construct(Server $server, User $user = null) { @@ -61,7 +60,7 @@ class CommandRepository /** * Sends a command to the daemon. * - * @param string $command + * @param string $command * @return string * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Repositories/old_Daemon/FileRepository.php b/app/Repositories/old_Daemon/FileRepository.php index 8254c2273..b4dc5f7f7 100644 --- a/app/Repositories/old_Daemon/FileRepository.php +++ b/app/Repositories/old_Daemon/FileRepository.php @@ -42,8 +42,7 @@ class FileRepository /** * Constructor. * - * @param string $uuid - * @return void + * @param string $uuid */ public function __construct($uuid) { @@ -53,7 +52,7 @@ class FileRepository /** * Get the contents of a requested file for the server. * - * @param string $file + * @param string $file * @return array * * @throws \GuzzleHttp\Exception\RequestException @@ -99,8 +98,8 @@ class FileRepository /** * Save the contents of a requested file on the daemon. * - * @param string $file - * @param string $content + * @param string $file + * @param string $content * @return bool * * @throws \GuzzleHttp\Exception\RequestException @@ -132,7 +131,7 @@ class FileRepository /** * Returns a listing of all files and folders within a specified directory on the daemon. * - * @param string $directory + * @param string $directory * @return object * * @throws \GuzzleHttp\Exception\RequestException diff --git a/app/Repositories/old_Daemon/PowerRepository.php b/app/Repositories/old_Daemon/PowerRepository.php index 9e0cbc29a..7b941f121 100644 --- a/app/Repositories/old_Daemon/PowerRepository.php +++ b/app/Repositories/old_Daemon/PowerRepository.php @@ -48,9 +48,8 @@ class PowerRepository /** * Constuctor for repository. * - * @param \Pterodactyl\Models\Server $server - * @param \Pterodactyl\Models\User|null $user - * @return void + * @param \Pterodactyl\Models\Server $server + * @param \Pterodactyl\Models\User|null $user */ public function __construct(Server $server, User $user = null) { @@ -61,7 +60,7 @@ class PowerRepository /** * Sends a power option to the daemon. * - * @param string $action + * @param string $action * @return string * * @throws \GuzzleHttp\Exception\RequestException @@ -89,8 +88,6 @@ class PowerRepository /** * Starts a server. - * - * @return void */ public function start() { @@ -99,8 +96,6 @@ class PowerRepository /** * Stops a server. - * - * @return void */ public function stop() { @@ -109,8 +104,6 @@ class PowerRepository /** * Restarts a server. - * - * @return void */ public function restart() { @@ -119,8 +112,6 @@ class PowerRepository /** * Kills a server. - * - * @return void */ public function kill() { diff --git a/app/Services/Allocations/AssignmentService.php b/app/Services/Allocations/AssignmentService.php index bc7ea35c8..abf31079d 100644 --- a/app/Services/Allocations/AssignmentService.php +++ b/app/Services/Allocations/AssignmentService.php @@ -64,8 +64,8 @@ class AssignmentService /** * Insert allocations into the database and link them to a specific node. * - * @param int|\Pterodactyl\Models\Node $node - * @param array $data + * @param int|\Pterodactyl\Models\Node $node + * @param array $data * * @throws \Pterodactyl\Exceptions\DisplayException */ diff --git a/app/Services/Api/KeyService.php b/app/Services/Api/KeyService.php index 4bf03da58..fc67b8926 100644 --- a/app/Services/Api/KeyService.php +++ b/app/Services/Api/KeyService.php @@ -76,9 +76,9 @@ class KeyService /** * Create a new API Key on the system with the given permissions. * - * @param array $data - * @param array $permissions - * @param array $administrative + * @param array $data + * @param array $permissions + * @param array $administrative * @return string * * @throws \Exception @@ -136,7 +136,7 @@ class KeyService /** * Delete the API key and associated permissions from the database. * - * @param int $id + * @param int $id * @return bool|null */ public function revoke($id) diff --git a/app/Services/Api/PermissionService.php b/app/Services/Api/PermissionService.php index a669c7262..050599794 100644 --- a/app/Services/Api/PermissionService.php +++ b/app/Services/Api/PermissionService.php @@ -46,8 +46,8 @@ class PermissionService /** * Store a permission key in the database. * - * @param string $key - * @param string $permission + * @param string $key + * @param string $permission * @return bool * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Components/UuidService.php b/app/Services/Components/UuidService.php index 27d7e541f..7f5b0535a 100644 --- a/app/Services/Components/UuidService.php +++ b/app/Services/Components/UuidService.php @@ -33,9 +33,9 @@ class UuidService * Generate a unique UUID validating against specified table and column. * Defaults to `users.uuid`. * - * @param string $table - * @param string $field - * @param int $type + * @param string $table + * @param string $field + * @param int $type * @return string * @deprecated */ @@ -55,9 +55,9 @@ class UuidService /** * Generates a ShortUUID code which is 8 characters long and is used for identifying servers in the system. * - * @param string $table - * @param string $field - * @param null|string $attachedUuid + * @param string $table + * @param string $field + * @param null|string $attachedUuid * @return string * @deprecated */ diff --git a/app/Services/Database/DatabaseHostService.php b/app/Services/Database/DatabaseHostService.php index 33d46c318..654ce6127 100644 --- a/app/Services/Database/DatabaseHostService.php +++ b/app/Services/Database/DatabaseHostService.php @@ -74,7 +74,7 @@ class DatabaseHostService /** * Create a new database host and persist it to the database. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\DatabaseHost * * @throws \Throwable @@ -106,8 +106,8 @@ class DatabaseHostService /** * Update a database host and persist to the database. * - * @param int $id - * @param array $data + * @param int $id + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -135,7 +135,7 @@ class DatabaseHostService /** * Delete a database host if it has no active databases attached to it. * - * @param int $id + * @param int $id * @return bool|null * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Database/DatabaseManagementService.php b/app/Services/Database/DatabaseManagementService.php index a0343fc7a..beecfa9a4 100644 --- a/app/Services/Database/DatabaseManagementService.php +++ b/app/Services/Database/DatabaseManagementService.php @@ -74,8 +74,8 @@ class DatabaseManagementService /** * Create a new database that is linked to a specific host. * - * @param int $server - * @param array $data + * @param int $server + * @param array $data * @return \Illuminate\Database\Eloquent\Model * * @throws \Exception @@ -96,10 +96,16 @@ class DatabaseManagementService $this->repository->createDatabase($database->database, 'dynamic'); $this->repository->createUser( - $database->username, $database->remote, $this->encrypter->decrypt($database->password), 'dynamic' + $database->username, + $database->remote, + $this->encrypter->decrypt($database->password), + 'dynamic' ); $this->repository->assignUserToDatabase( - $database->database, $database->username, $database->remote, 'dynamic' + $database->database, + $database->username, + $database->remote, + 'dynamic' ); $this->repository->flush('dynamic'); @@ -125,8 +131,8 @@ class DatabaseManagementService /** * Change the password for a specific user and database combination. * - * @param int $id - * @param string $password + * @param int $id + * @param string $password * @return bool * * @throws \Exception @@ -148,7 +154,10 @@ class DatabaseManagementService $this->repository->dropUser($database->username, $database->remote, 'dynamic'); $this->repository->createUser($database->username, $database->remote, $password, 'dynamic'); $this->repository->assignUserToDatabase( - $database->database, $database->username, $database->remote, 'dynamic' + $database->database, + $database->username, + $database->remote, + 'dynamic' ); $this->repository->flush('dynamic'); @@ -164,7 +173,7 @@ class DatabaseManagementService /** * Delete a database from the given host server. * - * @param int $id + * @param int $id * @return bool|null */ public function delete($id) diff --git a/app/Services/Helpers/TemporaryPasswordService.php b/app/Services/Helpers/TemporaryPasswordService.php index 0e5ff4f25..58bff6b76 100644 --- a/app/Services/Helpers/TemporaryPasswordService.php +++ b/app/Services/Helpers/TemporaryPasswordService.php @@ -67,7 +67,7 @@ class TemporaryPasswordService /** * Store a password reset token for a specific email address. * - * @param string $email + * @param string $email * @return string */ public function generateReset($email) diff --git a/app/Services/LocationService.php b/app/Services/LocationService.php index 982534520..fc8880335 100644 --- a/app/Services/LocationService.php +++ b/app/Services/LocationService.php @@ -46,7 +46,7 @@ class LocationService /** * Create the location in the database and return it. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Location * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -59,8 +59,8 @@ class LocationService /** * Update location model in the DB. * - * @param int $id - * @param array $data + * @param int $id + * @param array $data * @return \Pterodactyl\Models\Location * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -73,7 +73,7 @@ class LocationService /** * Delete a model from the DB. * - * @param int $id + * @param int $id * @return bool * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Nodes/CreationService.php b/app/Services/Nodes/CreationService.php index b33817f32..e2327c55c 100644 --- a/app/Services/Nodes/CreationService.php +++ b/app/Services/Nodes/CreationService.php @@ -48,7 +48,7 @@ class CreationService /** * Create a new node on the panel. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Node * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Nodes/UpdateService.php b/app/Services/Nodes/UpdateService.php index e34c9ff25..0b7f7b121 100644 --- a/app/Services/Nodes/UpdateService.php +++ b/app/Services/Nodes/UpdateService.php @@ -68,8 +68,8 @@ class UpdateService /** * Update the configuration values for a given node on the machine. * - * @param int|\Pterodactyl\Models\Node $node - * @param array $data + * @param int|\Pterodactyl\Models\Node $node + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Old/APILogService.php b/app/Services/Old/APILogService.php index c8e5c098c..d44670411 100644 --- a/app/Services/Old/APILogService.php +++ b/app/Services/Old/APILogService.php @@ -33,10 +33,9 @@ class APILogService /** * Log an API Request. * - * @param \Illuminate\Http\Request $request - * @param null|string $error - * @param bool $authorized - * @return void + * @param \Illuminate\Http\Request $request + * @param null|string $error + * @param bool $authorized */ public static function log(Request $request, $error = null, $authorized = false) { diff --git a/app/Services/Old/DeploymentService.php b/app/Services/Old/DeploymentService.php index f25c04e93..eed48c58d 100644 --- a/app/Services/Old/DeploymentService.php +++ b/app/Services/Old/DeploymentService.php @@ -70,8 +70,7 @@ class DeploymentService /** * Set the location to use when auto-deploying. * - * @param int|\Pterodactyl\Models\Location $location - * @return void + * @param int|\Pterodactyl\Models\Location $location */ public function setLocation($location) { @@ -90,8 +89,7 @@ class DeploymentService /** * Set the node to use when auto-deploying. * - * @param int|\Pterodactyl\Models\Node $node - * @return void + * @param int|\Pterodactyl\Models\Node $node */ public function setNode($node) { @@ -108,8 +106,7 @@ class DeploymentService /** * Set the amount of disk space to be used by the new server. * - * @param int $disk - * @return void + * @param int $disk */ public function setDisk(int $disk) { @@ -121,8 +118,7 @@ class DeploymentService /** * Set the amount of memory to be used by the new server. * - * @param int $memory - * @return void + * @param int $memory */ public function setMemory(int $memory) { @@ -134,8 +130,7 @@ class DeploymentService /** * Return a random location model. * - * @param array $exclude - * @return void; + * @param array $exclude */ protected function findLocation(array $exclude = []) { @@ -154,8 +149,6 @@ class DeploymentService /** * Return a model instance of a random node. - * - * @return void; */ protected function findNode(array $exclude = []) { @@ -240,8 +233,6 @@ class DeploymentService /** * Select and return the node to be used by the auto-deployment system. - * - * @return void */ public function select() { diff --git a/app/Services/Old/VersionService.php b/app/Services/Old/VersionService.php index e3eaf8ade..7134b31f0 100644 --- a/app/Services/Old/VersionService.php +++ b/app/Services/Old/VersionService.php @@ -38,8 +38,6 @@ class VersionService /** * Version constructor. - * - * @return void */ public function __construct() { diff --git a/app/Services/Packs/ExportPackService.php b/app/Services/Packs/ExportPackService.php index 1432efb9b..42f1cf305 100644 --- a/app/Services/Packs/ExportPackService.php +++ b/app/Services/Packs/ExportPackService.php @@ -67,8 +67,8 @@ class ExportPackService /** * Prepare a pack for export. * - * @param int|\Pterodactyl\Models\Pack $pack - * @param bool $files + * @param int|\Pterodactyl\Models\Pack $pack + * @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 10daaeb3b..9890882ff 100644 --- a/app/Services/Packs/PackCreationService.php +++ b/app/Services/Packs/PackCreationService.php @@ -74,8 +74,8 @@ class PackCreationService /** * Add a new service pack to the system. * - * @param array $data - * @param \Illuminate\Http\UploadedFile|null $file + * @param array $data + * @param \Illuminate\Http\UploadedFile|null $file * @return \Pterodactyl\Models\Pack * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -103,7 +103,8 @@ class PackCreationService $this->connection->beginTransaction(); $pack = $this->repository->create(array_merge( - ['uuid' => Uuid::uuid4()], $data + ['uuid' => Uuid::uuid4()], + $data )); $this->storage->disk()->makeDirectory('packs/' . $pack->uuid); diff --git a/app/Services/Packs/PackUpdateService.php b/app/Services/Packs/PackUpdateService.php index 22e387270..5928b95ac 100644 --- a/app/Services/Packs/PackUpdateService.php +++ b/app/Services/Packs/PackUpdateService.php @@ -58,8 +58,8 @@ class PackUpdateService /** * Update a pack. * - * @param int|\Pterodactyl\Models\Pack $pack - * @param array $data + * @param int|\Pterodactyl\Models\Pack $pack + * @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 c4e5b5fb9..248ccfcf2 100644 --- a/app/Services/Packs/TemplateUploadService.php +++ b/app/Services/Packs/TemplateUploadService.php @@ -67,8 +67,8 @@ class TemplateUploadService /** * Process an uploaded file to create a new pack from a JSON or ZIP format. * - * @param int $option - * @param \Illuminate\Http\UploadedFile $file + * @param int $option + * @param \Illuminate\Http\UploadedFile $file * @return \Pterodactyl\Models\Pack * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -103,8 +103,8 @@ class TemplateUploadService /** * Process a ZIP file to create a pack and stored archive. * - * @param int $option - * @param \Illuminate\Http\UploadedFile $file + * @param int $option + * @param \Illuminate\Http\UploadedFile $file * @return \Pterodactyl\Models\Pack * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/BuildModificationService.php b/app/Services/Servers/BuildModificationService.php index 24c52a16c..3b40b9d2c 100644 --- a/app/Services/Servers/BuildModificationService.php +++ b/app/Services/Servers/BuildModificationService.php @@ -97,8 +97,8 @@ class BuildModificationService /** * Set build array parameters. * - * @param string $key - * @param mixed $value + * @param string $key + * @param mixed $value */ public function setBuild($key, $value) { @@ -108,7 +108,7 @@ class BuildModificationService /** * Return the build array or an item out of the build array. * - * @param string|null $attribute + * @param string|null $attribute * @return array|mixed|null */ public function getBuild($attribute = null) @@ -123,8 +123,8 @@ class BuildModificationService /** * Change the build details for a specified server. * - * @param int|\Pterodactyl\Models\Server $server - * @param array $data + * @param int|\Pterodactyl\Models\Server $server + * @param array $data * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/CreationService.php b/app/Services/Servers/CreationService.php index ff0b50f71..baad73075 100644 --- a/app/Services/Servers/CreationService.php +++ b/app/Services/Servers/CreationService.php @@ -129,7 +129,7 @@ class CreationService /** * Create a server on both the panel and daemon. * - * @param array $data + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Servers/DeletionService.php b/app/Services/Servers/DeletionService.php index a3e34e3ab..850ca9ffd 100644 --- a/app/Services/Servers/DeletionService.php +++ b/app/Services/Servers/DeletionService.php @@ -100,7 +100,7 @@ class DeletionService /** * Set if the server should be forcibly deleted from the panel (ignoring daemon errors) or not. * - * @param bool $bool + * @param bool $bool * @return $this */ public function withForce($bool = true) diff --git a/app/Services/Servers/DetailsModificationService.php b/app/Services/Servers/DetailsModificationService.php index 7b1aac372..6e31e2de8 100644 --- a/app/Services/Servers/DetailsModificationService.php +++ b/app/Services/Servers/DetailsModificationService.php @@ -135,8 +135,8 @@ class DetailsModificationService /** * Update the docker container for a specified server. * - * @param int|\Pterodactyl\Models\Server $server - * @param string $image + * @param int|\Pterodactyl\Models\Server $server + * @param string $image * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/EnvironmentService.php b/app/Services/Servers/EnvironmentService.php index 94920534b..a8bd8517c 100644 --- a/app/Services/Servers/EnvironmentService.php +++ b/app/Services/Servers/EnvironmentService.php @@ -59,8 +59,8 @@ class EnvironmentService * Dynamically configure additional environment variables to be assigned * with a specific server. * - * @param string $key - * @param callable $closure + * @param string $key + * @param callable $closure * @return $this */ public function setEnvironmentKey($key, callable $closure) @@ -74,7 +74,7 @@ class EnvironmentService * Take all of the environment variables configured for this server and return * them in an easy to process format. * - * @param int|\Pterodactyl\Models\Server $server + * @param int|\Pterodactyl\Models\Server $server * @return array */ public function process($server) diff --git a/app/Services/Servers/ReinstallService.php b/app/Services/Servers/ReinstallService.php index f9b0f16ee..4dc5d1254 100644 --- a/app/Services/Servers/ReinstallService.php +++ b/app/Services/Servers/ReinstallService.php @@ -75,7 +75,7 @@ class ReinstallService } /** - * @param int|\Pterodactyl\Models\Server $server + * @param int|\Pterodactyl\Models\Server $server * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php index c9ea23917..73af5c799 100644 --- a/app/Services/Servers/StartupModificationService.php +++ b/app/Services/Servers/StartupModificationService.php @@ -107,7 +107,7 @@ class StartupModificationService /** * Determine if this function should run at an administrative level. * - * @param bool $bool + * @param bool $bool * @return $this */ public function isAdmin($bool = true) @@ -120,8 +120,8 @@ class StartupModificationService /** * Process startup modification for a server. * - * @param int|\Pterodactyl\Models\Server $server - * @param array $data + * @param int|\Pterodactyl\Models\Server $server + * @param array $data * * @throws \Pterodactyl\Exceptions\DisplayException * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Servers/SuspensionService.php b/app/Services/Servers/SuspensionService.php index 63f4aacab..4996bb609 100644 --- a/app/Services/Servers/SuspensionService.php +++ b/app/Services/Servers/SuspensionService.php @@ -77,8 +77,8 @@ class SuspensionService /** * Suspends a server on the system. * - * @param int|\Pterodactyl\Models\Server $server - * @param string $action + * @param int|\Pterodactyl\Models\Server $server + * @param string $action * @return bool * * @throws \Pterodactyl\Exceptions\DisplayException @@ -93,7 +93,8 @@ class SuspensionService if (! in_array($action, ['suspend', 'unsuspend'])) { throw new \InvalidArgumentException(sprintf( - 'Action must be either suspend or unsuspend, %s passed.', $action + 'Action must be either suspend or unsuspend, %s passed.', + $action )); } diff --git a/app/Services/Servers/UsernameGenerationService.php b/app/Services/Servers/UsernameGenerationService.php index 4c3569241..488288b47 100644 --- a/app/Services/Servers/UsernameGenerationService.php +++ b/app/Services/Servers/UsernameGenerationService.php @@ -30,8 +30,8 @@ class UsernameGenerationService * Generate a unique username to be used for SFTP connections and identification * of the server docker container on the host system. * - * @param string $name - * @param null $identifier + * @param string $name + * @param null $identifier * @return string */ public function generate($name, $identifier = null) diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php index 1904f6750..749349047 100644 --- a/app/Services/Servers/VariableValidatorService.php +++ b/app/Services/Servers/VariableValidatorService.php @@ -90,7 +90,7 @@ class VariableValidatorService /** * Set the fields with populated data to validate. * - * @param array $fields + * @param array $fields * @return $this */ public function setFields(array $fields) @@ -103,7 +103,7 @@ class VariableValidatorService /** * Set this function to be running at the administrative level. * - * @param bool $bool + * @param bool $bool * @return $this */ public function isAdmin($bool = true) @@ -116,7 +116,7 @@ class VariableValidatorService /** * Validate all of the passed data aganist the given service option variables. * - * @param int $option + * @param int $option * @return $this */ public function validate($option) diff --git a/app/Services/Services/Options/InstallScriptUpdateService.php b/app/Services/Services/Options/InstallScriptUpdateService.php index f1fd9ae26..efdd08dfe 100644 --- a/app/Services/Services/Options/InstallScriptUpdateService.php +++ b/app/Services/Services/Options/InstallScriptUpdateService.php @@ -48,8 +48,8 @@ class InstallScriptUpdateService /** * Modify the option install script for a given service option. * - * @param int|\Pterodactyl\Models\ServiceOption $option - * @param array $data + * @param int|\Pterodactyl\Models\ServiceOption $option + * @param array $data * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Services/Options/OptionCreationService.php b/app/Services/Services/Options/OptionCreationService.php index ac4f179fd..8755f0e9d 100644 --- a/app/Services/Services/Options/OptionCreationService.php +++ b/app/Services/Services/Options/OptionCreationService.php @@ -47,7 +47,7 @@ class OptionCreationService /** * Create a new service option and assign it to the given service. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\ServiceOption * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Services/Options/OptionDeletionService.php b/app/Services/Services/Options/OptionDeletionService.php index b94132a59..c614348ff 100644 --- a/app/Services/Services/Options/OptionDeletionService.php +++ b/app/Services/Services/Options/OptionDeletionService.php @@ -57,7 +57,7 @@ class OptionDeletionService /** * Delete an option from the database if it has no active servers attached to it. * - * @param int $option + * @param int $option * @return int * * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException diff --git a/app/Services/Services/Options/OptionUpdateService.php b/app/Services/Services/Options/OptionUpdateService.php index b2e310fba..6bfe634e3 100644 --- a/app/Services/Services/Options/OptionUpdateService.php +++ b/app/Services/Services/Options/OptionUpdateService.php @@ -48,8 +48,8 @@ class OptionUpdateService /** * Update a service option. * - * @param int|\Pterodactyl\Models\ServiceOption $option - * @param array $data + * @param int|\Pterodactyl\Models\ServiceOption $option + * @param array $data * * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException diff --git a/app/Services/Services/ServiceCreationService.php b/app/Services/Services/ServiceCreationService.php index 9e9b4e208..fc76f99d9 100644 --- a/app/Services/Services/ServiceCreationService.php +++ b/app/Services/Services/ServiceCreationService.php @@ -59,7 +59,7 @@ class ServiceCreationService /** * Create a new service on the system. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\Service * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Services/Services/ServiceDeletionService.php b/app/Services/Services/ServiceDeletionService.php index f127d3616..9a299beeb 100644 --- a/app/Services/Services/ServiceDeletionService.php +++ b/app/Services/Services/ServiceDeletionService.php @@ -57,7 +57,7 @@ class ServiceDeletionService /** * Delete a service from the system only if there are no servers attached to it. * - * @param int $service + * @param int $service * @return int * * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException diff --git a/app/Services/Services/ServiceUpdateService.php b/app/Services/Services/ServiceUpdateService.php index 203f52dfc..3c573ff15 100644 --- a/app/Services/Services/ServiceUpdateService.php +++ b/app/Services/Services/ServiceUpdateService.php @@ -46,8 +46,8 @@ class ServiceUpdateService /** * Update a service and prevent changing the author once it is set. * - * @param int $service - * @param array $data + * @param int $service + * @param array $data * @throws \Pterodactyl\Exceptions\Model\DataValidationException * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException */ diff --git a/app/Services/Services/Variables/VariableCreationService.php b/app/Services/Services/Variables/VariableCreationService.php index 908207327..78301ac7e 100644 --- a/app/Services/Services/Variables/VariableCreationService.php +++ b/app/Services/Services/Variables/VariableCreationService.php @@ -53,8 +53,8 @@ class VariableCreationService /** * Create a new variable for a given service option. * - * @param int|\Pterodactyl\Models\ServiceOption $option - * @param array $data + * @param int|\Pterodactyl\Models\ServiceOption $option + * @param array $data * @return \Pterodactyl\Models\ServiceVariable * * @throws \Pterodactyl\Exceptions\Model\DataValidationException @@ -68,7 +68,8 @@ class VariableCreationService if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) { throw new ReservedVariableNameException(sprintf( - 'Cannot use the protected name %s for this environment variable.', array_get($data, 'env_variable') + 'Cannot use the protected name %s for this environment variable.', + array_get($data, 'env_variable') )); } diff --git a/app/Services/Services/Variables/VariableUpdateService.php b/app/Services/Services/Variables/VariableUpdateService.php index bce5dd70b..1806c11c3 100644 --- a/app/Services/Services/Variables/VariableUpdateService.php +++ b/app/Services/Services/Variables/VariableUpdateService.php @@ -49,8 +49,8 @@ class VariableUpdateService /** * Update a specific service variable. * - * @param int|\Pterodactyl\Models\ServiceVariable $variable - * @param array $data + * @param int|\Pterodactyl\Models\ServiceVariable $variable + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\DisplayException diff --git a/app/Services/Users/CreationService.php b/app/Services/Users/CreationService.php index f6a60f1c0..a5e5a55ba 100644 --- a/app/Services/Users/CreationService.php +++ b/app/Services/Users/CreationService.php @@ -93,7 +93,7 @@ class CreationService /** * Create a new user on the system. * - * @param array $data + * @param array $data * @return \Pterodactyl\Models\User * * @throws \Exception diff --git a/app/Services/Users/UpdateService.php b/app/Services/Users/UpdateService.php index 5c1234676..5ba352f69 100644 --- a/app/Services/Users/UpdateService.php +++ b/app/Services/Users/UpdateService.php @@ -56,8 +56,8 @@ class UpdateService /** * Update the user model instance. * - * @param int $id - * @param array $data + * @param int $id + * @param array $data * @return mixed * * @throws \Pterodactyl\Exceptions\Model\DataValidationException diff --git a/app/Transformers/Admin/AllocationTransformer.php b/app/Transformers/Admin/AllocationTransformer.php index e7bd15c36..246d1a75c 100644 --- a/app/Transformers/Admin/AllocationTransformer.php +++ b/app/Transformers/Admin/AllocationTransformer.php @@ -47,9 +47,8 @@ class AllocationTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @param bool $filter - * @return void + * @param \Illuminate\Http\Request|bool $request + * @param bool $filter */ public function __construct($request = false, $filter = false) { diff --git a/app/Transformers/Admin/LocationTransformer.php b/app/Transformers/Admin/LocationTransformer.php index f3fd95885..c3277ea19 100644 --- a/app/Transformers/Admin/LocationTransformer.php +++ b/app/Transformers/Admin/LocationTransformer.php @@ -50,8 +50,7 @@ class LocationTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/NodeTransformer.php b/app/Transformers/Admin/NodeTransformer.php index d18b64f23..bba4162aa 100644 --- a/app/Transformers/Admin/NodeTransformer.php +++ b/app/Transformers/Admin/NodeTransformer.php @@ -51,8 +51,7 @@ class NodeTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/OptionTransformer.php b/app/Transformers/Admin/OptionTransformer.php index 5b86b53d6..b0836fea5 100644 --- a/app/Transformers/Admin/OptionTransformer.php +++ b/app/Transformers/Admin/OptionTransformer.php @@ -52,8 +52,7 @@ class OptionTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/PackTransformer.php b/app/Transformers/Admin/PackTransformer.php index 8d059faaf..e1239c0fd 100644 --- a/app/Transformers/Admin/PackTransformer.php +++ b/app/Transformers/Admin/PackTransformer.php @@ -50,8 +50,7 @@ class PackTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/ServerTransformer.php b/app/Transformers/Admin/ServerTransformer.php index 4d94b7e10..8a9bf3a6b 100644 --- a/app/Transformers/Admin/ServerTransformer.php +++ b/app/Transformers/Admin/ServerTransformer.php @@ -57,8 +57,7 @@ class ServerTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/ServerVariableTransformer.php b/app/Transformers/Admin/ServerVariableTransformer.php index 3211e0295..120f8ef30 100644 --- a/app/Transformers/Admin/ServerVariableTransformer.php +++ b/app/Transformers/Admin/ServerVariableTransformer.php @@ -47,8 +47,7 @@ class ServerVariableTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/ServiceTransformer.php b/app/Transformers/Admin/ServiceTransformer.php index 2df1fc8cc..57639df90 100644 --- a/app/Transformers/Admin/ServiceTransformer.php +++ b/app/Transformers/Admin/ServiceTransformer.php @@ -51,8 +51,7 @@ class ServiceTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/ServiceVariableTransformer.php b/app/Transformers/Admin/ServiceVariableTransformer.php index aa10428d9..190a08a67 100644 --- a/app/Transformers/Admin/ServiceVariableTransformer.php +++ b/app/Transformers/Admin/ServiceVariableTransformer.php @@ -47,8 +47,7 @@ class ServiceVariableTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/SubuserTransformer.php b/app/Transformers/Admin/SubuserTransformer.php index 129da7ad3..cfaf28b77 100644 --- a/app/Transformers/Admin/SubuserTransformer.php +++ b/app/Transformers/Admin/SubuserTransformer.php @@ -41,8 +41,7 @@ class SubuserTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/Admin/UserTransformer.php b/app/Transformers/Admin/UserTransformer.php index 0d26961b9..2cbc37e77 100644 --- a/app/Transformers/Admin/UserTransformer.php +++ b/app/Transformers/Admin/UserTransformer.php @@ -50,8 +50,7 @@ class UserTransformer extends TransformerAbstract /** * Setup request object for transformer. * - * @param \Illuminate\Http\Request|bool $request - * @return void + * @param \Illuminate\Http\Request|bool $request */ public function __construct($request = false) { diff --git a/app/Transformers/User/AllocationTransformer.php b/app/Transformers/User/AllocationTransformer.php index 0fd0be453..eb0f28c94 100644 --- a/app/Transformers/User/AllocationTransformer.php +++ b/app/Transformers/User/AllocationTransformer.php @@ -39,8 +39,6 @@ class AllocationTransformer extends TransformerAbstract /** * Setup allocation transformer with access to server data. - * - * @return void */ public function __construct(Server $server) { diff --git a/app/helpers.php b/app/helpers.php index 3f218cc55..763886f0d 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -26,8 +26,8 @@ if (! function_exists('human_readable')) { /** * Generate a human-readable filesize for a given file path. * - * @param string $path - * @param int $precision + * @param string $path + * @param int $precision * @return string */ function human_readable($path, $precision = 2) diff --git a/config/app.php b/config/app.php index c211d37fe..af3cf02fc 100644 --- a/config/app.php +++ b/config/app.php @@ -1,7 +1,6 @@ env('APP_ENV', 'production'), 'version' => env('APP_VERSION', 'canary'), @@ -126,7 +125,6 @@ return [ */ 'providers' => [ - /* * Laravel Framework Service Providers... */ @@ -181,7 +179,6 @@ return [ Lord\Laroute\LarouteServiceProvider::class, Spatie\Fractal\FractalServiceProvider::class, Sofa\Eloquence\ServiceProvider::class, - ], /* @@ -196,53 +193,50 @@ return [ */ 'aliases' => [ - - 'Alert' => Prologue\Alerts\Facades\Alert::class, - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Bus' => Illuminate\Support\Facades\Bus::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Carbon' => Carbon\Carbon::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Cron' => Cron\CronExpression::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Debugbar' => Barryvdh\Debugbar\Facade::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Fractal' => Spatie\Fractal\FractalFacade::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Alert' => Prologue\Alerts\Facades\Alert::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Carbon' => Carbon\Carbon::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Cron' => Cron\CronExpression::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Debugbar' => Barryvdh\Debugbar\Facade::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Fractal' => Spatie\Fractal\FractalFacade::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, 'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Input' => Illuminate\Support\Facades\Input::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Input' => Illuminate\Support\Facades\Input::class, 'Inspiring' => Illuminate\Foundation\Inspiring::class, 'Javascript' => Laracasts\Utilities\JavaScript\JavaScriptFacade::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Settings' => Krucas\Settings\Facades\Settings::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'Theme' => igaster\laravelTheme\Facades\Theme::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Uuid' => Webpatser\Uuid\Uuid::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Settings' => Krucas\Settings\Facades\Settings::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Theme' => igaster\laravelTheme\Facades\Theme::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Uuid' => Webpatser\Uuid\Uuid::class, 'Validator' => Illuminate\Support\Facades\Validator::class, - 'Version' => Pterodactyl\Facades\Version::class, - 'View' => Illuminate\Support\Facades\View::class, - + 'Version' => Pterodactyl\Facades\Version::class, + 'View' => Illuminate\Support\Facades\View::class, ], - ]; diff --git a/config/auth.php b/config/auth.php index 6f7fc83c2..b83dd9eca 100644 --- a/config/auth.php +++ b/config/auth.php @@ -1,7 +1,6 @@ 60, ], ], - ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 85e045124..9c4c792de 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -1,7 +1,6 @@ [ - 'pusher' => [ 'driver' => 'pusher', 'key' => env('PUSHER_KEY'), @@ -48,7 +46,5 @@ return [ 'null' => [ 'driver' => 'null', ], - ], - ]; diff --git a/config/cache.php b/config/cache.php index 7bd9dd70e..fb619fb54 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,7 +1,6 @@ [ - 'apc' => [ 'driver' => 'apc', ], @@ -69,7 +67,6 @@ return [ 'driver' => 'redis', 'connection' => 'default', ], - ], /* @@ -84,5 +81,4 @@ return [ */ 'prefix' => 'laravel', - ]; diff --git a/config/compile.php b/config/compile.php index 04807eac4..cbf7739a6 100644 --- a/config/compile.php +++ b/config/compile.php @@ -1,7 +1,6 @@ [ - // ], /* @@ -29,7 +27,5 @@ return [ */ 'providers' => [ - // ], - ]; diff --git a/config/database.php b/config/database.php index 58324a0b5..b9ce78c03 100644 --- a/config/database.php +++ b/config/database.php @@ -1,7 +1,6 @@ [ 'mysql' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', + 'driver' => 'mysql', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - 'strict' => false, + 'prefix' => '', + 'strict' => false, ], ], @@ -79,5 +78,4 @@ return [ 'database' => 0, ], ], - ]; diff --git a/config/debugbar.php b/config/debugbar.php index 05e78c34c..f1a1fd753 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,7 +1,6 @@ [ - 'phpinfo' => true, // Php version - 'messages' => true, // Messages - 'time' => true, // Time Datalogger - 'memory' => true, // Memory usage - 'exceptions' => true, // Exception displayer - 'log' => true, // Logs from Monolog (merged in messages if enabled) - 'db' => true, // Show database (PDO) queries and bindings - 'views' => true, // Views with their data - 'route' => true, // Current route information - 'laravel' => false, // Laravel version and environment - 'events' => true, // All events fired + 'phpinfo' => true, // Php version + 'messages' => true, // Messages + 'time' => true, // Time Datalogger + 'memory' => true, // Memory usage + 'exceptions' => true, // Exception displayer + 'log' => true, // Logs from Monolog (merged in messages if enabled) + 'db' => true, // Show database (PDO) queries and bindings + 'views' => true, // Views with their data + 'route' => true, // Current route information + 'laravel' => false, // Laravel version and environment + 'events' => true, // All events fired 'default_request' => false, // Regular or special Symfony request logger 'symfony_request' => true, // Only one can be enabled.. - 'mail' => true, // Catch mail messages - 'logs' => false, // Add the latest log messages - 'files' => false, // Show the included files - 'config' => false, // Display config settings - 'auth' => false, // Display Laravel authentication status - 'gate' => false, // Display Laravel Gate checks - 'session' => true, // Display session data + 'mail' => true, // Catch mail messages + 'logs' => false, // Add the latest log messages + 'files' => false, // Show the included files + 'config' => false, // Display config settings + 'auth' => false, // Display Laravel authentication status + 'gate' => false, // Display Laravel Gate checks + 'session' => true, // Display session data ], /* @@ -118,14 +117,14 @@ return [ 'show_name' => false, // Also show the users name/email in the debugbar ], 'db' => [ - 'with_params' => true, // Render SQL with the parameters substituted - 'timeline' => true, // Add the queries to the timeline - 'backtrace' => true, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. + 'with_params' => true, // Render SQL with the parameters substituted + 'timeline' => true, // Add the queries to the timeline + 'backtrace' => true, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries 'enabled' => false, 'types' => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ ], - 'hints' => false, // Show hints for common mistakes + 'hints' => false, // Show hints for common mistakes ], 'mail' => [ 'full_log' => false, @@ -165,5 +164,4 @@ return [ | */ 'route_prefix' => '_debugbar', - ]; diff --git a/config/filesystems.php b/config/filesystems.php index e726fda0c..305142930 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -1,7 +1,6 @@ [ - 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), @@ -63,7 +61,5 @@ return [ 'region' => env('AWS_REGION'), 'bucket' => env('AWS_BUCKET'), ], - ], - ]; diff --git a/config/javascript.php b/config/javascript.php index 1aeb222e0..57504395d 100644 --- a/config/javascript.php +++ b/config/javascript.php @@ -1,7 +1,6 @@ 'Pterodactyl', - ]; diff --git a/config/laravel-fractal.php b/config/laravel-fractal.php index 32ced203e..92bfe2cea 100644 --- a/config/laravel-fractal.php +++ b/config/laravel-fractal.php @@ -1,7 +1,6 @@ League\Fractal\Serializer\JsonApiSerializer::class, - ]; diff --git a/config/laroute.php b/config/laroute.php index 7b332c40a..b2b4a2f30 100644 --- a/config/laroute.php +++ b/config/laroute.php @@ -1,7 +1,6 @@ '', - ]; diff --git a/config/mail.php b/config/mail.php index 146e1b11c..f47793438 100644 --- a/config/mail.php +++ b/config/mail.php @@ -1,7 +1,6 @@ 'alert_messages', - ]; diff --git a/config/pterodactyl.php b/config/pterodactyl.php index ba604d1bc..32b239bd1 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -1,7 +1,6 @@ [ - 'sync' => [ 'driver' => 'sync', ], @@ -43,20 +41,19 @@ return [ 'sqs' => [ 'driver' => 'sqs', - 'key' => env('SQS_KEY'), + 'key' => env('SQS_KEY'), 'secret' => env('SQS_SECRET'), 'prefix' => env('SQS_QUEUE_PREFIX'), - 'queue' => env('QUEUE_STANDARD', 'standard'), + 'queue' => env('QUEUE_STANDARD', 'standard'), 'region' => env('SQS_REGION', 'us-east-1'), ], 'redis' => [ 'driver' => 'redis', 'connection' => 'default', - 'queue' => env('QUEUE_STANDARD', 'standard'), + 'queue' => env('QUEUE_STANDARD', 'standard'), 'retry_after' => 90, ], - ], /* @@ -74,5 +71,4 @@ return [ 'database' => 'mysql', 'table' => 'failed_jobs', ], - ]; diff --git a/config/recaptcha.php b/config/recaptcha.php index 646c9931a..1bac5a877 100644 --- a/config/recaptcha.php +++ b/config/recaptcha.php @@ -1,7 +1,6 @@ true, - ]; diff --git a/config/services.php b/config/services.php index e16817cc2..be637e501 100644 --- a/config/services.php +++ b/config/services.php @@ -1,7 +1,6 @@ [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], @@ -32,5 +31,4 @@ return [ 'sparkpost' => [ 'secret' => env('SPARKPOST_SECRET'), ], - ]; diff --git a/config/session.php b/config/session.php index 0c1b3bb8e..08d97fd56 100644 --- a/config/session.php +++ b/config/session.php @@ -1,7 +1,6 @@ true, - ]; diff --git a/config/settings.php b/config/settings.php index e5c82eea0..c6a75fb01 100644 --- a/config/settings.php +++ b/config/settings.php @@ -1,7 +1,6 @@ [ - 'database' => [ 'driver' => 'database', 'connection' => env('DB_CONNECTION', 'mysql'), 'table' => 'settings', ], - ], /* @@ -112,7 +109,5 @@ return [ */ 'override' => [ - ], - ]; diff --git a/config/themes.php b/config/themes.php index f90a29f68..1a7083681 100644 --- a/config/themes.php +++ b/config/themes.php @@ -8,9 +8,9 @@ return [ 'themes' => [ 'pterodactyl' => [ - 'extends' => null, - 'views-path' => 'pterodactyl', - 'asset-path' => 'themes/pterodactyl', + 'extends' => null, + 'views-path' => 'pterodactyl', + 'asset-path' => 'themes/pterodactyl', ], ], ]; diff --git a/config/trustedproxy.php b/config/trustedproxy.php index a06211497..c60aa6a06 100644 --- a/config/trustedproxy.php +++ b/config/trustedproxy.php @@ -1,7 +1,6 @@ [ - \Illuminate\Http\Request::HEADER_CLIENT_IP => 'X_FORWARDED_FOR', - \Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST', + \Illuminate\Http\Request::HEADER_CLIENT_IP => 'X_FORWARDED_FOR', + \Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST', \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO', - \Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT', + \Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT', ], ]; diff --git a/config/view.php b/config/view.php index 2acfd9cc9..8796b0abc 100644 --- a/config/view.php +++ b/config/view.php @@ -1,7 +1,6 @@ realpath(storage_path('framework/views')), - ]; diff --git a/database/migrations/2016_01_23_195641_add_allocations_table.php b/database/migrations/2016_01_23_195641_add_allocations_table.php index 7384b7de2..cfff2b359 100644 --- a/database/migrations/2016_01_23_195641_add_allocations_table.php +++ b/database/migrations/2016_01_23_195641_add_allocations_table.php @@ -7,8 +7,6 @@ class AddAllocationsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class AddAllocationsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_195851_add_api_keys.php b/database/migrations/2016_01_23_195851_add_api_keys.php index 290c124a0..af7deb62d 100644 --- a/database/migrations/2016_01_23_195851_add_api_keys.php +++ b/database/migrations/2016_01_23_195851_add_api_keys.php @@ -7,8 +7,6 @@ class AddApiKeys extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddApiKeys extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200044_add_api_permissions.php b/database/migrations/2016_01_23_200044_add_api_permissions.php index f1843aad5..e6f6bcbf8 100644 --- a/database/migrations/2016_01_23_200044_add_api_permissions.php +++ b/database/migrations/2016_01_23_200044_add_api_permissions.php @@ -7,8 +7,6 @@ class AddApiPermissions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AddApiPermissions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200159_add_downloads.php b/database/migrations/2016_01_23_200159_add_downloads.php index f1c192432..b1771c5e4 100644 --- a/database/migrations/2016_01_23_200159_add_downloads.php +++ b/database/migrations/2016_01_23_200159_add_downloads.php @@ -7,8 +7,6 @@ class AddDownloads extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddDownloads extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200421_create_failed_jobs_table.php b/database/migrations/2016_01_23_200421_create_failed_jobs_table.php index 63eaf53a6..83923e7d0 100644 --- a/database/migrations/2016_01_23_200421_create_failed_jobs_table.php +++ b/database/migrations/2016_01_23_200421_create_failed_jobs_table.php @@ -7,8 +7,6 @@ class CreateFailedJobsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class CreateFailedJobsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200440_create_jobs_table.php b/database/migrations/2016_01_23_200440_create_jobs_table.php index 01d3a9e65..277acae31 100644 --- a/database/migrations/2016_01_23_200440_create_jobs_table.php +++ b/database/migrations/2016_01_23_200440_create_jobs_table.php @@ -7,8 +7,6 @@ class CreateJobsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -27,8 +25,6 @@ class CreateJobsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200528_add_locations.php b/database/migrations/2016_01_23_200528_add_locations.php index 6ad7de75b..b34a5fbcc 100644 --- a/database/migrations/2016_01_23_200528_add_locations.php +++ b/database/migrations/2016_01_23_200528_add_locations.php @@ -7,8 +7,6 @@ class AddLocations extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddLocations extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_200648_add_nodes.php b/database/migrations/2016_01_23_200648_add_nodes.php index 57613cabd..52c0a29e6 100644 --- a/database/migrations/2016_01_23_200648_add_nodes.php +++ b/database/migrations/2016_01_23_200648_add_nodes.php @@ -7,8 +7,6 @@ class AddNodes extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -33,8 +31,6 @@ class AddNodes extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_201433_add_password_resets.php b/database/migrations/2016_01_23_201433_add_password_resets.php index 45454b801..0584e3617 100644 --- a/database/migrations/2016_01_23_201433_add_password_resets.php +++ b/database/migrations/2016_01_23_201433_add_password_resets.php @@ -7,8 +7,6 @@ class AddPasswordResets extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AddPasswordResets extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_201531_add_permissions.php b/database/migrations/2016_01_23_201531_add_permissions.php index bf6327ac6..12c9bbe0f 100644 --- a/database/migrations/2016_01_23_201531_add_permissions.php +++ b/database/migrations/2016_01_23_201531_add_permissions.php @@ -7,8 +7,6 @@ class AddPermissions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddPermissions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_201649_add_server_variables.php b/database/migrations/2016_01_23_201649_add_server_variables.php index 229b33c60..d9a436e6d 100644 --- a/database/migrations/2016_01_23_201649_add_server_variables.php +++ b/database/migrations/2016_01_23_201649_add_server_variables.php @@ -7,8 +7,6 @@ class AddServerVariables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddServerVariables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_201748_add_servers.php b/database/migrations/2016_01_23_201748_add_servers.php index f4ae554c7..5e1061069 100644 --- a/database/migrations/2016_01_23_201748_add_servers.php +++ b/database/migrations/2016_01_23_201748_add_servers.php @@ -7,8 +7,6 @@ class AddServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -40,8 +38,6 @@ class AddServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_202544_add_service_options.php b/database/migrations/2016_01_23_202544_add_service_options.php index 172f1eb7b..7b0a33609 100644 --- a/database/migrations/2016_01_23_202544_add_service_options.php +++ b/database/migrations/2016_01_23_202544_add_service_options.php @@ -7,8 +7,6 @@ class AddServiceOptions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -25,8 +23,6 @@ class AddServiceOptions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_202731_add_service_varibles.php b/database/migrations/2016_01_23_202731_add_service_varibles.php index 5ea938986..e79fa1fe9 100644 --- a/database/migrations/2016_01_23_202731_add_service_varibles.php +++ b/database/migrations/2016_01_23_202731_add_service_varibles.php @@ -7,8 +7,6 @@ class AddServiceVaribles extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -29,8 +27,6 @@ class AddServiceVaribles extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_202943_add_services.php b/database/migrations/2016_01_23_202943_add_services.php index c837dc923..31f723445 100644 --- a/database/migrations/2016_01_23_202943_add_services.php +++ b/database/migrations/2016_01_23_202943_add_services.php @@ -7,8 +7,6 @@ class AddServices extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -25,8 +23,6 @@ class AddServices extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_203119_create_settings_table.php b/database/migrations/2016_01_23_203119_create_settings_table.php index 0e2c0cbfe..2cd6922c2 100644 --- a/database/migrations/2016_01_23_203119_create_settings_table.php +++ b/database/migrations/2016_01_23_203119_create_settings_table.php @@ -7,8 +7,6 @@ class CreateSettingsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class CreateSettingsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_203150_add_subusers.php b/database/migrations/2016_01_23_203150_add_subusers.php index 1cc8e334c..2f0e46310 100644 --- a/database/migrations/2016_01_23_203150_add_subusers.php +++ b/database/migrations/2016_01_23_203150_add_subusers.php @@ -7,8 +7,6 @@ class AddSubusers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddSubusers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_203159_add_users.php b/database/migrations/2016_01_23_203159_add_users.php index 14e28eeba..05ace7e22 100644 --- a/database/migrations/2016_01_23_203159_add_users.php +++ b/database/migrations/2016_01_23_203159_add_users.php @@ -7,8 +7,6 @@ class AddUsers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -28,8 +26,6 @@ class AddUsers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_23_203947_create_sessions_table.php b/database/migrations/2016_01_23_203947_create_sessions_table.php index f1c84aa4b..533fa8aa2 100644 --- a/database/migrations/2016_01_23_203947_create_sessions_table.php +++ b/database/migrations/2016_01_23_203947_create_sessions_table.php @@ -7,8 +7,6 @@ class CreateSessionsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class CreateSessionsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_01_25_234418_rename_permissions_column.php b/database/migrations/2016_01_25_234418_rename_permissions_column.php index c0632b1d9..ae46dceb2 100644 --- a/database/migrations/2016_01_25_234418_rename_permissions_column.php +++ b/database/migrations/2016_01_25_234418_rename_permissions_column.php @@ -7,8 +7,6 @@ class RenamePermissionsColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -19,13 +17,10 @@ class RenamePermissionsColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { Schema::table('permissions', function (Blueprint $table) { - // }); } } diff --git a/database/migrations/2016_02_07_172148_add_databases_tables.php b/database/migrations/2016_02_07_172148_add_databases_tables.php index 9a36a690a..7b1048b15 100644 --- a/database/migrations/2016_02_07_172148_add_databases_tables.php +++ b/database/migrations/2016_02_07_172148_add_databases_tables.php @@ -7,8 +7,6 @@ class AddDatabasesTables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -26,8 +24,6 @@ class AddDatabasesTables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_02_07_181319_add_database_servers_table.php b/database/migrations/2016_02_07_181319_add_database_servers_table.php index 9d6da726e..5a6740ae6 100644 --- a/database/migrations/2016_02_07_181319_add_database_servers_table.php +++ b/database/migrations/2016_02_07_181319_add_database_servers_table.php @@ -7,8 +7,6 @@ class AddDatabaseServersTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -27,8 +25,6 @@ class AddDatabaseServersTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_02_13_154306_add_service_option_default_startup.php b/database/migrations/2016_02_13_154306_add_service_option_default_startup.php index 1f8ad36fc..c8255ff47 100644 --- a/database/migrations/2016_02_13_154306_add_service_option_default_startup.php +++ b/database/migrations/2016_02_13_154306_add_service_option_default_startup.php @@ -7,8 +7,6 @@ class AddServiceOptionDefaultStartup extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddServiceOptionDefaultStartup extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_02_20_155318_add_unique_service_field.php b/database/migrations/2016_02_20_155318_add_unique_service_field.php index 798ac4ba9..01ff91359 100644 --- a/database/migrations/2016_02_20_155318_add_unique_service_field.php +++ b/database/migrations/2016_02_20_155318_add_unique_service_field.php @@ -7,8 +7,6 @@ class AddUniqueServiceField extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -19,8 +17,6 @@ class AddUniqueServiceField extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_02_27_163411_add_tasks_table.php b/database/migrations/2016_02_27_163411_add_tasks_table.php index 2cdaa30b6..aee1e7cae 100644 --- a/database/migrations/2016_02_27_163411_add_tasks_table.php +++ b/database/migrations/2016_02_27_163411_add_tasks_table.php @@ -7,8 +7,6 @@ class AddTasksTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -33,8 +31,6 @@ class AddTasksTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_02_27_163447_add_tasks_log_table.php b/database/migrations/2016_02_27_163447_add_tasks_log_table.php index 6d9352dff..265e7fd96 100644 --- a/database/migrations/2016_02_27_163447_add_tasks_log_table.php +++ b/database/migrations/2016_02_27_163447_add_tasks_log_table.php @@ -7,8 +7,6 @@ class AddTasksLogTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class AddTasksLogTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_03_18_155649_add_nullable_field_lastrun.php b/database/migrations/2016_03_18_155649_add_nullable_field_lastrun.php index 9065947d6..9d4752eb6 100644 --- a/database/migrations/2016_03_18_155649_add_nullable_field_lastrun.php +++ b/database/migrations/2016_03_18_155649_add_nullable_field_lastrun.php @@ -6,8 +6,6 @@ class AddNullableFieldLastrun extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -17,8 +15,6 @@ class AddNullableFieldLastrun extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_08_30_212718_add_ip_alias.php b/database/migrations/2016_08_30_212718_add_ip_alias.php index e75930edd..26aa5eaa5 100644 --- a/database/migrations/2016_08_30_212718_add_ip_alias.php +++ b/database/migrations/2016_08_30_212718_add_ip_alias.php @@ -7,8 +7,6 @@ class AddIpAlias extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -30,8 +28,6 @@ class AddIpAlias extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php index b77ccbea6..ee7e704fb 100644 --- a/database/migrations/2016_08_30_213301_modify_ip_storage_method.php +++ b/database/migrations/2016_08_30_213301_modify_ip_storage_method.php @@ -7,8 +7,6 @@ class ModifyIpStorageMethod extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -48,8 +46,6 @@ class ModifyIpStorageMethod extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_01_193520_add_suspension_for_servers.php b/database/migrations/2016_09_01_193520_add_suspension_for_servers.php index 39717253b..7bfb75b20 100644 --- a/database/migrations/2016_09_01_193520_add_suspension_for_servers.php +++ b/database/migrations/2016_09_01_193520_add_suspension_for_servers.php @@ -7,8 +7,6 @@ class AddSuspensionForServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -19,8 +17,6 @@ class AddSuspensionForServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_01_211924_remove_active_column.php b/database/migrations/2016_09_01_211924_remove_active_column.php index 746559a80..22a2bde13 100644 --- a/database/migrations/2016_09_01_211924_remove_active_column.php +++ b/database/migrations/2016_09_01_211924_remove_active_column.php @@ -7,8 +7,6 @@ class RemoveActiveColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -19,8 +17,6 @@ class RemoveActiveColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_02_190647_add_sftp_password_storage.php b/database/migrations/2016_09_02_190647_add_sftp_password_storage.php index b950c631b..565957d59 100644 --- a/database/migrations/2016_09_02_190647_add_sftp_password_storage.php +++ b/database/migrations/2016_09_02_190647_add_sftp_password_storage.php @@ -7,8 +7,6 @@ class AddSftpPasswordStorage extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -19,8 +17,6 @@ class AddSftpPasswordStorage extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_04_171338_update_jobs_tables.php b/database/migrations/2016_09_04_171338_update_jobs_tables.php index 482bb08c7..840ecacb5 100644 --- a/database/migrations/2016_09_04_171338_update_jobs_tables.php +++ b/database/migrations/2016_09_04_171338_update_jobs_tables.php @@ -8,8 +8,6 @@ class UpdateJobsTables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class UpdateJobsTables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_04_172028_update_failed_jobs_table.php b/database/migrations/2016_09_04_172028_update_failed_jobs_table.php index 38f2ef3a5..a00f5f18d 100644 --- a/database/migrations/2016_09_04_172028_update_failed_jobs_table.php +++ b/database/migrations/2016_09_04_172028_update_failed_jobs_table.php @@ -8,8 +8,6 @@ class UpdateFailedJobsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class UpdateFailedJobsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_04_182835_create_notifications_table.php b/database/migrations/2016_09_04_182835_create_notifications_table.php index 160a1c42f..30fc23a59 100644 --- a/database/migrations/2016_09_04_182835_create_notifications_table.php +++ b/database/migrations/2016_09_04_182835_create_notifications_table.php @@ -7,8 +7,6 @@ class CreateNotificationsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class CreateNotificationsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_07_163017_add_unique_identifier.php b/database/migrations/2016_09_07_163017_add_unique_identifier.php index d26e5995a..e1bab9ccc 100644 --- a/database/migrations/2016_09_07_163017_add_unique_identifier.php +++ b/database/migrations/2016_09_07_163017_add_unique_identifier.php @@ -8,8 +8,6 @@ class AddUniqueIdentifier extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddUniqueIdentifier extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_14_145945_allow_longer_regex_field.php b/database/migrations/2016_09_14_145945_allow_longer_regex_field.php index d8a4e8c65..a7df1ca1b 100644 --- a/database/migrations/2016_09_14_145945_allow_longer_regex_field.php +++ b/database/migrations/2016_09_14_145945_allow_longer_regex_field.php @@ -8,8 +8,6 @@ class AllowLongerRegexField extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AllowLongerRegexField extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_17_194246_add_docker_image_column.php b/database/migrations/2016_09_17_194246_add_docker_image_column.php index 58e4b87a3..05d26112e 100644 --- a/database/migrations/2016_09_17_194246_add_docker_image_column.php +++ b/database/migrations/2016_09_17_194246_add_docker_image_column.php @@ -8,8 +8,6 @@ class AddDockerImageColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -33,8 +31,6 @@ class AddDockerImageColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_21_165554_update_servers_column_name.php b/database/migrations/2016_09_21_165554_update_servers_column_name.php index 064c57c3b..14ae07c4a 100644 --- a/database/migrations/2016_09_21_165554_update_servers_column_name.php +++ b/database/migrations/2016_09_21_165554_update_servers_column_name.php @@ -8,8 +8,6 @@ class UpdateServersColumnName extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class UpdateServersColumnName extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_09_29_213518_rename_double_insurgency.php b/database/migrations/2016_09_29_213518_rename_double_insurgency.php index 4fecb8bdf..adb577754 100644 --- a/database/migrations/2016_09_29_213518_rename_double_insurgency.php +++ b/database/migrations/2016_09_29_213518_rename_double_insurgency.php @@ -6,8 +6,6 @@ class RenameDoubleInsurgency extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,11 +20,8 @@ class RenameDoubleInsurgency extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { - // } } diff --git a/database/migrations/2016_10_07_152117_build_api_log_table.php b/database/migrations/2016_10_07_152117_build_api_log_table.php index 5f1ceb22f..08ea312dc 100644 --- a/database/migrations/2016_10_07_152117_build_api_log_table.php +++ b/database/migrations/2016_10_07_152117_build_api_log_table.php @@ -8,8 +8,6 @@ class BuildApiLogTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -29,8 +27,6 @@ class BuildApiLogTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_14_164802_update_api_keys.php b/database/migrations/2016_10_14_164802_update_api_keys.php index 80d7f9501..56c3e8097 100644 --- a/database/migrations/2016_10_14_164802_update_api_keys.php +++ b/database/migrations/2016_10_14_164802_update_api_keys.php @@ -8,8 +8,6 @@ class UpdateApiKeys extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class UpdateApiKeys extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_181719_update_misnamed_bungee.php b/database/migrations/2016_10_23_181719_update_misnamed_bungee.php index 0a5316755..70ec18b33 100644 --- a/database/migrations/2016_10_23_181719_update_misnamed_bungee.php +++ b/database/migrations/2016_10_23_181719_update_misnamed_bungee.php @@ -6,8 +6,6 @@ class UpdateMisnamedBungee extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -18,8 +16,6 @@ class UpdateMisnamedBungee extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php b/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php index 59bc0ac39..3a2663527 100644 --- a/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php +++ b/database/migrations/2016_10_23_193810_add_foreign_keys_servers.php @@ -8,8 +8,6 @@ class AddForeignKeysServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -33,8 +31,6 @@ class AddForeignKeysServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_201624_add_foreign_allocations.php b/database/migrations/2016_10_23_201624_add_foreign_allocations.php index d2d869cd3..0660081cb 100644 --- a/database/migrations/2016_10_23_201624_add_foreign_allocations.php +++ b/database/migrations/2016_10_23_201624_add_foreign_allocations.php @@ -8,8 +8,6 @@ class AddForeignAllocations extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -26,8 +24,6 @@ class AddForeignAllocations extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_202222_add_foreign_api_keys.php b/database/migrations/2016_10_23_202222_add_foreign_api_keys.php index 67dcd3ce3..700342d74 100644 --- a/database/migrations/2016_10_23_202222_add_foreign_api_keys.php +++ b/database/migrations/2016_10_23_202222_add_foreign_api_keys.php @@ -8,8 +8,6 @@ class AddForeignApiKeys extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddForeignApiKeys extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php b/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php index 16e1eebd1..d8eb3504d 100644 --- a/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php +++ b/database/migrations/2016_10_23_202703_add_foreign_api_permissions.php @@ -8,8 +8,6 @@ class AddForeignApiPermissions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddForeignApiPermissions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_202953_add_foreign_database_servers.php b/database/migrations/2016_10_23_202953_add_foreign_database_servers.php index b6f012dff..769b7daa3 100644 --- a/database/migrations/2016_10_23_202953_add_foreign_database_servers.php +++ b/database/migrations/2016_10_23_202953_add_foreign_database_servers.php @@ -8,8 +8,6 @@ class AddForeignDatabaseServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddForeignDatabaseServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_203105_add_foreign_databases.php b/database/migrations/2016_10_23_203105_add_foreign_databases.php index 2d6b6e9a2..be26e3cb0 100644 --- a/database/migrations/2016_10_23_203105_add_foreign_databases.php +++ b/database/migrations/2016_10_23_203105_add_foreign_databases.php @@ -8,8 +8,6 @@ class AddForeignDatabases extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AddForeignDatabases extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_203335_add_foreign_nodes.php b/database/migrations/2016_10_23_203335_add_foreign_nodes.php index 8fa516c00..f861e0a7d 100644 --- a/database/migrations/2016_10_23_203335_add_foreign_nodes.php +++ b/database/migrations/2016_10_23_203335_add_foreign_nodes.php @@ -8,8 +8,6 @@ class AddForeignNodes extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddForeignNodes extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_203522_add_foreign_permissions.php b/database/migrations/2016_10_23_203522_add_foreign_permissions.php index 2f872de6f..a43f0eacf 100644 --- a/database/migrations/2016_10_23_203522_add_foreign_permissions.php +++ b/database/migrations/2016_10_23_203522_add_foreign_permissions.php @@ -8,8 +8,6 @@ class AddForeignPermissions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AddForeignPermissions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_203857_add_foreign_server_variables.php b/database/migrations/2016_10_23_203857_add_foreign_server_variables.php index 0a975dc8b..b4720495d 100644 --- a/database/migrations/2016_10_23_203857_add_foreign_server_variables.php +++ b/database/migrations/2016_10_23_203857_add_foreign_server_variables.php @@ -8,8 +8,6 @@ class AddForeignServerVariables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -26,8 +24,6 @@ class AddForeignServerVariables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_204157_add_foreign_service_options.php b/database/migrations/2016_10_23_204157_add_foreign_service_options.php index ff6e3b35d..cb8c0e2e8 100644 --- a/database/migrations/2016_10_23_204157_add_foreign_service_options.php +++ b/database/migrations/2016_10_23_204157_add_foreign_service_options.php @@ -8,8 +8,6 @@ class AddForeignServiceOptions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddForeignServiceOptions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_204321_add_foreign_service_variables.php b/database/migrations/2016_10_23_204321_add_foreign_service_variables.php index 5a543898d..02bbc46f2 100644 --- a/database/migrations/2016_10_23_204321_add_foreign_service_variables.php +++ b/database/migrations/2016_10_23_204321_add_foreign_service_variables.php @@ -8,8 +8,6 @@ class AddForeignServiceVariables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddForeignServiceVariables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_204454_add_foreign_subusers.php b/database/migrations/2016_10_23_204454_add_foreign_subusers.php index 2f4045669..b637c80ae 100644 --- a/database/migrations/2016_10_23_204454_add_foreign_subusers.php +++ b/database/migrations/2016_10_23_204454_add_foreign_subusers.php @@ -8,8 +8,6 @@ class AddForeignSubusers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AddForeignSubusers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_10_23_204610_add_foreign_tasks.php b/database/migrations/2016_10_23_204610_add_foreign_tasks.php index 3821caffc..18ea297e5 100644 --- a/database/migrations/2016_10_23_204610_add_foreign_tasks.php +++ b/database/migrations/2016_10_23_204610_add_foreign_tasks.php @@ -8,8 +8,6 @@ class AddForeignTasks extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddForeignTasks extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php b/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php index 5a2dd6da4..4383c11cd 100644 --- a/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php +++ b/database/migrations/2016_11_04_000949_add_ark_service_option_fixed.php @@ -6,8 +6,6 @@ class AddArkServiceOptionFixed extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -74,8 +72,6 @@ class AddArkServiceOptionFixed extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_11_11_220649_add_pack_support.php b/database/migrations/2016_11_11_220649_add_pack_support.php index 7cb3eb10e..b6fa0972b 100644 --- a/database/migrations/2016_11_11_220649_add_pack_support.php +++ b/database/migrations/2016_11_11_220649_add_pack_support.php @@ -8,8 +8,6 @@ class AddPackSupport extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -30,8 +28,6 @@ class AddPackSupport extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_11_11_231731_set_service_name_unique.php b/database/migrations/2016_11_11_231731_set_service_name_unique.php index 4db76f8e8..42b0f6953 100644 --- a/database/migrations/2016_11_11_231731_set_service_name_unique.php +++ b/database/migrations/2016_11_11_231731_set_service_name_unique.php @@ -8,8 +8,6 @@ class SetServiceNameUnique extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class SetServiceNameUnique extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_11_27_142519_add_pack_column.php b/database/migrations/2016_11_27_142519_add_pack_column.php index 4e3507c39..d520466a8 100644 --- a/database/migrations/2016_11_27_142519_add_pack_column.php +++ b/database/migrations/2016_11_27_142519_add_pack_column.php @@ -8,8 +8,6 @@ class AddPackColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddPackColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php b/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php index 91ef1fbbd..d2d14f4d0 100644 --- a/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php +++ b/database/migrations/2016_12_01_173018_add_configurable_upload_limit.php @@ -8,8 +8,6 @@ class AddConfigurableUploadLimit extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddConfigurableUploadLimit extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_12_02_185206_correct_service_variables.php b/database/migrations/2016_12_02_185206_correct_service_variables.php index dd99c1223..e9c87989a 100644 --- a/database/migrations/2016_12_02_185206_correct_service_variables.php +++ b/database/migrations/2016_12_02_185206_correct_service_variables.php @@ -6,8 +6,6 @@ class CorrectServiceVariables extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -67,8 +65,6 @@ class CorrectServiceVariables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php b/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php index a03584ca0..7cdf96807 100644 --- a/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php +++ b/database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php @@ -6,8 +6,6 @@ class FixMisnamedOptionTag extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class FixMisnamedOptionTag extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php b/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php index 905d28a46..77693c265 100644 --- a/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php +++ b/database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php @@ -8,8 +8,6 @@ class CreateNodeConfigurationTokensTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -25,8 +23,6 @@ class CreateNodeConfigurationTokensTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_01_12_135449_add_more_user_data.php b/database/migrations/2017_01_12_135449_add_more_user_data.php index 67bc3f59d..0206040b5 100644 --- a/database/migrations/2017_01_12_135449_add_more_user_data.php +++ b/database/migrations/2017_01_12_135449_add_more_user_data.php @@ -9,8 +9,6 @@ class AddMoreUserData extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -35,8 +33,6 @@ class AddMoreUserData extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_02_175548_UpdateColumnNames.php b/database/migrations/2017_02_02_175548_UpdateColumnNames.php index 233780bfd..c88aa8de7 100644 --- a/database/migrations/2017_02_02_175548_UpdateColumnNames.php +++ b/database/migrations/2017_02_02_175548_UpdateColumnNames.php @@ -8,8 +8,6 @@ class UpdateColumnNames extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -48,8 +46,6 @@ class UpdateColumnNames extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_03_140948_UpdateNodesTable.php b/database/migrations/2017_02_03_140948_UpdateNodesTable.php index 4408e612b..58ec63ef4 100644 --- a/database/migrations/2017_02_03_140948_UpdateNodesTable.php +++ b/database/migrations/2017_02_03_140948_UpdateNodesTable.php @@ -8,8 +8,6 @@ class UpdateNodesTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class UpdateNodesTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_03_155554_RenameColumns.php b/database/migrations/2017_02_03_155554_RenameColumns.php index 519ccc826..5f617abec 100644 --- a/database/migrations/2017_02_03_155554_RenameColumns.php +++ b/database/migrations/2017_02_03_155554_RenameColumns.php @@ -8,8 +8,6 @@ class RenameColumns extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -28,8 +26,6 @@ class RenameColumns extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_05_164123_AdjustColumnNames.php b/database/migrations/2017_02_05_164123_AdjustColumnNames.php index ddb37b891..c7688f056 100644 --- a/database/migrations/2017_02_05_164123_AdjustColumnNames.php +++ b/database/migrations/2017_02_05_164123_AdjustColumnNames.php @@ -8,8 +8,6 @@ class AdjustColumnNames extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class AdjustColumnNames extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php b/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php index 5e57ffef3..6f86b3b6e 100644 --- a/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php +++ b/database/migrations/2017_02_05_164516_AdjustColumnNamesForServicePacks.php @@ -8,8 +8,6 @@ class AdjustColumnNamesForServicePacks extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class AdjustColumnNamesForServicePacks extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php b/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php index 7194bf075..45efce83a 100644 --- a/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php +++ b/database/migrations/2017_02_09_174834_SetupPermissionsPivotTable.php @@ -10,8 +10,6 @@ class SetupPermissionsPivotTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -43,8 +41,6 @@ class SetupPermissionsPivotTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php b/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php index 358f9938d..8b541d941 100644 --- a/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php +++ b/database/migrations/2017_02_10_171858_UpdateAPIKeyColumnNames.php @@ -8,8 +8,6 @@ class UpdateAPIKeyColumnNames extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class UpdateAPIKeyColumnNames extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php b/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php index 5931518d6..4f27346fa 100644 --- a/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php +++ b/database/migrations/2017_03_03_224254_UpdateNodeConfigTokensColumns.php @@ -8,8 +8,6 @@ class UpdateNodeConfigTokensColumns extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class UpdateNodeConfigTokensColumns extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php index e4af2511a..2d6413ede 100644 --- a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php +++ b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php @@ -9,8 +9,6 @@ class DeleteServiceExecutableOption extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -51,8 +49,6 @@ class DeleteServiceExecutableOption extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php b/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php index 351327d3c..385004fa4 100644 --- a/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php +++ b/database/migrations/2017_03_10_162934_AddNewServiceOptionsColumns.php @@ -8,8 +8,6 @@ class AddNewServiceOptionsColumns extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -28,8 +26,6 @@ class AddNewServiceOptionsColumns extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php index ee247ee96..172979303 100644 --- a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php +++ b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php @@ -29,8 +29,6 @@ class MigrateToNewServiceSystem extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -56,8 +54,6 @@ class MigrateToNewServiceSystem extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php index 617c349fa..7784083a1 100644 --- a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php +++ b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php @@ -9,8 +9,6 @@ class ChangeServiceVariablesValidationRules extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -32,8 +30,6 @@ class ChangeServiceVariablesValidationRules extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php index bbd5fda42..5d5a3d164 100644 --- a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php +++ b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php @@ -85,8 +85,6 @@ EOF; /** * Run the migrations. - * - * @return void */ public function up() { @@ -107,8 +105,6 @@ EOF; /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php b/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php index 910fb79df..d01012e41 100644 --- a/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php +++ b/database/migrations/2017_03_14_175631_RenameServicePacksToSingluarPacks.php @@ -8,8 +8,6 @@ class RenameServicePacksToSingluarPacks extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -26,8 +24,6 @@ class RenameServicePacksToSingluarPacks extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php b/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php index 4916cd028..b1a8ee3a0 100644 --- a/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php +++ b/database/migrations/2017_03_14_200326_AddLockedStatusToTable.php @@ -8,8 +8,6 @@ class AddLockedStatusToTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddLockedStatusToTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php b/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php index 50699a688..a7166df9e 100644 --- a/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php +++ b/database/migrations/2017_03_16_181109_ReOrganizeDatabaseServersToDatabaseHost.php @@ -8,8 +8,6 @@ class ReOrganizeDatabaseServersToDatabaseHost extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -28,8 +26,6 @@ class ReOrganizeDatabaseServersToDatabaseHost extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php b/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php index 07192f898..bc6fb45c7 100644 --- a/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php +++ b/database/migrations/2017_03_16_181515_CleanupDatabasesDatabase.php @@ -8,8 +8,6 @@ class CleanupDatabasesDatabase extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class CleanupDatabasesDatabase extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php b/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php index 0271616a0..3f26a1e34 100644 --- a/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php +++ b/database/migrations/2017_03_18_204953_AddForeignKeyToPacks.php @@ -8,8 +8,6 @@ class AddForeignKeyToPacks extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddForeignKeyToPacks extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php index 1e5ce0273..e8ebcb20d 100644 --- a/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php +++ b/database/migrations/2017_03_31_221948_AddServerDescriptionColumn.php @@ -8,8 +8,6 @@ class AddServerDescriptionColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddServerDescriptionColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php b/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php index ccd318654..3cd08f1a9 100644 --- a/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php +++ b/database/migrations/2017_04_02_163232_DropDeletedAtColumnFromServers.php @@ -8,8 +8,6 @@ class DropDeletedAtColumnFromServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class DropDeletedAtColumnFromServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php b/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php index 5264122b4..dc58df4d9 100644 --- a/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php +++ b/database/migrations/2017_04_15_125021_UpgradeTaskSystem.php @@ -9,8 +9,6 @@ class UpgradeTaskSystem extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -34,8 +32,6 @@ class UpgradeTaskSystem extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php b/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php index 610f18e5f..ba2f57c41 100644 --- a/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php +++ b/database/migrations/2017_04_20_171943_AddScriptsToServiceOptions.php @@ -8,8 +8,6 @@ class AddScriptsToServiceOptions extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -23,8 +21,6 @@ class AddScriptsToServiceOptions extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php b/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php index 07afdfeea..2bc8f27b3 100644 --- a/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php +++ b/database/migrations/2017_04_21_151432_AddServiceScriptTrackingToServers.php @@ -8,8 +8,6 @@ class AddServiceScriptTrackingToServers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddServiceScriptTrackingToServers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php b/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php index 027d1964b..514d17e1c 100644 --- a/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php +++ b/database/migrations/2017_04_27_145300_AddCopyScriptFromColumn.php @@ -8,8 +8,6 @@ class AddCopyScriptFromColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class AddCopyScriptFromColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php b/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php index f82d39258..aa5e04498 100644 --- a/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php +++ b/database/migrations/2017_04_27_223629_AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy.php @@ -8,8 +8,6 @@ class AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddAbilityToDefineConnectionOverSSLWithDaemonBehindProxy extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_05_01_141528_DeleteDownloadTable.php b/database/migrations/2017_05_01_141528_DeleteDownloadTable.php index 90a7f7a6a..7dcae3c6f 100644 --- a/database/migrations/2017_05_01_141528_DeleteDownloadTable.php +++ b/database/migrations/2017_05_01_141528_DeleteDownloadTable.php @@ -8,8 +8,6 @@ class DeleteDownloadTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -18,8 +16,6 @@ class DeleteDownloadTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php b/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php index 369c867be..90c8c4b1e 100644 --- a/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php +++ b/database/migrations/2017_05_01_141559_DeleteNodeConfigurationTable.php @@ -8,8 +8,6 @@ class DeleteNodeConfigurationTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -18,8 +16,6 @@ class DeleteNodeConfigurationTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_06_10_152951_add_external_id_to_users.php b/database/migrations/2017_06_10_152951_add_external_id_to_users.php index 696f10f4a..9ce5057e8 100644 --- a/database/migrations/2017_06_10_152951_add_external_id_to_users.php +++ b/database/migrations/2017_06_10_152951_add_external_id_to_users.php @@ -8,8 +8,6 @@ class AddExternalIdToUsers extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class AddExternalIdToUsers extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php b/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php index 17dbe8228..a089ab4db 100644 --- a/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php +++ b/database/migrations/2017_06_25_133923_ChangeForeignKeyToBeOnCascadeDelete.php @@ -8,8 +8,6 @@ class ChangeForeignKeyToBeOnCascadeDelete extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class ChangeForeignKeyToBeOnCascadeDelete extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php b/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php index eaa7a4bf5..0bfc7d527 100644 --- a/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php +++ b/database/migrations/2017_07_08_152806_ChangeUserPermissionsToDeleteOnUserDeletion.php @@ -8,8 +8,6 @@ class ChangeUserPermissionsToDeleteOnUserDeletion extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -30,8 +28,6 @@ class ChangeUserPermissionsToDeleteOnUserDeletion extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php b/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php index 76e475b0e..fb156ba8c 100644 --- a/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php +++ b/database/migrations/2017_07_08_154416_SetAllocationToReferenceNullOnServerDelete.php @@ -8,8 +8,6 @@ class SetAllocationToReferenceNullOnServerDelete extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class SetAllocationToReferenceNullOnServerDelete extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php b/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php index f599f02cc..5ae9a29f9 100644 --- a/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php +++ b/database/migrations/2017_07_08_154650_CascadeDeletionWhenAServerOrVariableIsDeleted.php @@ -8,8 +8,6 @@ class CascadeDeletionWhenAServerOrVariableIsDeleted extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -24,8 +22,6 @@ class CascadeDeletionWhenAServerOrVariableIsDeleted extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php b/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php index 8a3d78426..88e2e0135 100644 --- a/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php +++ b/database/migrations/2017_07_24_194433_DeleteTaskWhenParentServerIsDeleted.php @@ -8,8 +8,6 @@ class DeleteTaskWhenParentServerIsDeleted extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class DeleteTaskWhenParentServerIsDeleted extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php b/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php index 137384a8d..a33b78af6 100644 --- a/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php +++ b/database/migrations/2017_08_05_115800_CascadeNullValuesForDatabaseHostWhenNodeIsDeleted.php @@ -8,8 +8,6 @@ class CascadeNullValuesForDatabaseHostWhenNodeIsDeleted extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class CascadeNullValuesForDatabaseHostWhenNodeIsDeleted extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php b/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php index 60eadcafc..260af9a4d 100644 --- a/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php +++ b/database/migrations/2017_08_05_144104_AllowNegativeValuesForOverallocation.php @@ -8,8 +8,6 @@ class AllowNegativeValuesForOverallocation extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -21,8 +19,6 @@ class AllowNegativeValuesForOverallocation extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php b/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php index 56e149d4c..ea1cb8914 100644 --- a/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php +++ b/database/migrations/2017_08_05_174811_SetAllocationUnqiueUsingMultipleFields.php @@ -8,8 +8,6 @@ class SetAllocationUnqiueUsingMultipleFields extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -20,8 +18,6 @@ class SetAllocationUnqiueUsingMultipleFields extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php b/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php index aef299028..074f872e0 100644 --- a/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php +++ b/database/migrations/2017_08_15_214555_CascadeDeletionWhenAParentServiceIsDeleted.php @@ -8,8 +8,6 @@ class CascadeDeletionWhenAParentServiceIsDeleted extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class CascadeDeletionWhenAParentServiceIsDeleted extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php b/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php index 694b39938..1b8f1a567 100644 --- a/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php +++ b/database/migrations/2017_08_18_215428_RemovePackWhenParentServiceOptionIsDeleted.php @@ -8,8 +8,6 @@ class RemovePackWhenParentServiceOptionIsDeleted extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -22,8 +20,6 @@ class RemovePackWhenParentServiceOptionIsDeleted extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index ae48c7c82..6afdea04d 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -7,8 +7,6 @@ class DatabaseSeeder extends Seeder { /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/database/seeds/MinecraftServiceTableSeeder.php b/database/seeds/MinecraftServiceTableSeeder.php index 74d777f42..7ff69b079 100644 --- a/database/seeds/MinecraftServiceTableSeeder.php +++ b/database/seeds/MinecraftServiceTableSeeder.php @@ -85,8 +85,6 @@ EOF; /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/database/seeds/RustServiceTableSeeder.php b/database/seeds/RustServiceTableSeeder.php index e6688ef87..6f47773be 100644 --- a/database/seeds/RustServiceTableSeeder.php +++ b/database/seeds/RustServiceTableSeeder.php @@ -47,8 +47,6 @@ class RustServiceTableSeeder extends Seeder /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/database/seeds/SourceServiceTableSeeder.php b/database/seeds/SourceServiceTableSeeder.php index a20ce2552..fcb2a90ed 100644 --- a/database/seeds/SourceServiceTableSeeder.php +++ b/database/seeds/SourceServiceTableSeeder.php @@ -47,8 +47,6 @@ class SourceServiceTableSeeder extends Seeder /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/database/seeds/TerrariaServiceTableSeeder.php b/database/seeds/TerrariaServiceTableSeeder.php index 72afdd86f..6d19b9faf 100644 --- a/database/seeds/TerrariaServiceTableSeeder.php +++ b/database/seeds/TerrariaServiceTableSeeder.php @@ -47,8 +47,6 @@ class TerrariaServiceTableSeeder extends Seeder /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php index cd0ba033e..3d273de53 100644 --- a/database/seeds/VoiceServiceTableSeeder.php +++ b/database/seeds/VoiceServiceTableSeeder.php @@ -47,8 +47,6 @@ class VoiceServiceTableSeeder extends Seeder /** * Run the database seeds. - * - * @return void */ public function run() { diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index fcab34b25..ecac3aa33 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -1,7 +1,6 @@ '« Previous', - 'next' => 'Next »', - + 'next' => 'Next »', ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 9608bc25b..d6b784673 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -1,7 +1,6 @@ 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', - 'string' => 'The :attribute must be between :min and :max characters.', - 'array' => 'The :attribute must have between :min and :max items.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'dimensions' => 'The :attribute has invalid image dimensions.', - 'distinct' => 'The :attribute field has a duplicate value.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'file' => 'The :attribute must be a file.', - 'filled' => 'The :attribute field is required.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'json' => 'The :attribute must be a valid JSON string.', - 'max' => [ + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field is required.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', - 'file' => 'The :attribute may not be greater than :max kilobytes.', - 'string' => 'The :attribute may not be greater than :max characters.', - 'array' => 'The :attribute may not have more than :max items.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'mimetypes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'present' => 'The :attribute field must be present.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', - 'required_without' => 'The :attribute field is required when :values is not present.', + 'not_in' => 'The selected :attribute is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', - 'size' => [ + 'same' => 'The :attribute and :other must match.', + 'size' => [ 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', - 'array' => 'The :attribute must contain :size items.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'The :attribute has already been taken.', - 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute format is invalid.', + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute format is invalid.', /* |-------------------------------------------------------------------------- @@ -115,5 +114,4 @@ return [ */ 'attributes' => [], - ]; diff --git a/tests/Unit/Services/Api/KeyServiceTest.php b/tests/Unit/Services/Api/KeyServiceTest.php index 33d01cb07..b4912fcab 100644 --- a/tests/Unit/Services/Api/KeyServiceTest.php +++ b/tests/Unit/Services/Api/KeyServiceTest.php @@ -72,7 +72,10 @@ class KeyServiceTest extends TestCase $this->repository = m::mock(ApiKeyRepositoryInterface::class); $this->service = new KeyService( - $this->repository, $this->database, $this->encrypter, $this->permissions + $this->repository, + $this->database, + $this->encrypter, + $this->permissions ); } @@ -108,7 +111,9 @@ class KeyServiceTest extends TestCase $this->database->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); $response = $this->service->create( - ['test-data' => 'test'], ['invalid-node', 'server-list'], ['invalid-node', 'server-create'] + ['test-data' => 'test'], + ['invalid-node', 'server-list'], + ['invalid-node', 'server-create'] ); $this->assertNotEmpty($response); diff --git a/tests/Unit/Services/Database/DatabaseManagementServiceTest.php b/tests/Unit/Services/Database/DatabaseManagementServiceTest.php index ca1e29ce4..280fbce87 100644 --- a/tests/Unit/Services/Database/DatabaseManagementServiceTest.php +++ b/tests/Unit/Services/Database/DatabaseManagementServiceTest.php @@ -112,16 +112,23 @@ class DatabaseManagementServiceTest extends TestCase ->once() ->andReturnNull(); $this->repository->shouldReceive('createDatabase')->with( - self::TEST_DATA['database'], 'dynamic' + self::TEST_DATA['database'], + 'dynamic' )->once()->andReturnNull(); $this->encrypter->shouldReceive('decrypt')->with('enc_password')->once()->andReturn('str_random'); $this->repository->shouldReceive('createUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'str_random', 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'str_random', + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('assignUserToDatabase')->with( - self::TEST_DATA['database'], self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['database'], + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('flush')->with('dynamic')->once()->andReturnNull(); @@ -184,7 +191,8 @@ class DatabaseManagementServiceTest extends TestCase ->once() ->andReturnNull(); $this->repository->shouldReceive('createDatabase')->with( - self::TEST_DATA['database'], 'dynamic' + self::TEST_DATA['database'], + 'dynamic' )->once()->andThrow(new Exception('Test Message')); $this->repository->shouldReceive('dropDatabase') @@ -192,7 +200,9 @@ class DatabaseManagementServiceTest extends TestCase ->once() ->andReturnNull(); $this->repository->shouldReceive('dropUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('flush')->with('dynamic')->once()->andReturnNull(); @@ -221,7 +231,8 @@ class DatabaseManagementServiceTest extends TestCase ->once() ->andReturnNull(); $this->repository->shouldReceive('createDatabase')->with( - self::TEST_DATA['database'], 'dynamic' + self::TEST_DATA['database'], + 'dynamic' )->once()->andThrow(new Exception('Test One')); $this->repository->shouldReceive('dropDatabase')->with(self::TEST_DATA['database'], 'dynamic') @@ -260,15 +271,23 @@ class DatabaseManagementServiceTest extends TestCase ])->andReturn(true); $this->repository->shouldReceive('dropUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('createUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'new_password', 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'new_password', + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('assignUserToDatabase')->with( - self::TEST_DATA['database'], self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['database'], + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('flush')->with('dynamic')->once()->andReturnNull(); @@ -300,7 +319,9 @@ class DatabaseManagementServiceTest extends TestCase ])->andReturn(true); $this->repository->shouldReceive('dropUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andThrow(new Exception()); $this->database->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull(); @@ -324,7 +345,9 @@ class DatabaseManagementServiceTest extends TestCase ->once() ->andReturnNull(); $this->repository->shouldReceive('dropUser')->with( - self::TEST_DATA['username'], self::TEST_DATA['remote'], 'dynamic' + self::TEST_DATA['username'], + self::TEST_DATA['remote'], + 'dynamic' )->once()->andReturnNull(); $this->repository->shouldReceive('flush')->with('dynamic')->once()->andReturnNull(); $this->repository->shouldReceive('delete')->with(1)->once()->andReturn(1); diff --git a/tests/Unit/Services/Nodes/UpdateServiceTest.php b/tests/Unit/Services/Nodes/UpdateServiceTest.php index 74db802b6..5b042edbf 100644 --- a/tests/Unit/Services/Nodes/UpdateServiceTest.php +++ b/tests/Unit/Services/Nodes/UpdateServiceTest.php @@ -157,7 +157,8 @@ class UpdateServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/exceptions.node.daemon_off_config_updated', ['code' => 400]), $exception->getMessage() + trans('admin/exceptions.node.daemon_off_config_updated', ['code' => 400]), + $exception->getMessage() ); } } diff --git a/tests/Unit/Services/Packs/PackUpdateServiceTest.php b/tests/Unit/Services/Packs/PackUpdateServiceTest.php index 628979bd0..dffdecb9f 100644 --- a/tests/Unit/Services/Packs/PackUpdateServiceTest.php +++ b/tests/Unit/Services/Packs/PackUpdateServiceTest.php @@ -73,7 +73,7 @@ class PackUpdateServiceTest extends TestCase 'locked' => false, 'visible' => false, 'selectable' => false, - 'test-data' => 'value' + 'test-data' => 'value', ])->once()->andReturn(1); $this->assertEquals(1, $this->service->handle($model, ['test-data' => 'value'])); @@ -108,7 +108,7 @@ class PackUpdateServiceTest extends TestCase 'locked' => false, 'visible' => false, 'selectable' => false, - 'test-data' => 'value' + 'test-data' => 'value', ])->once()->andReturn(1); $this->assertEquals(1, $this->service->handle($model->id, ['test-data' => 'value'])); diff --git a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php index 4f8a81d24..f16583c75 100644 --- a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php +++ b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php @@ -246,7 +246,7 @@ class TemplateUploadServiceTest extends TestCase } /** - * Return values for archive->locateName function, import.json and archive.tar.gz respectively + * Return values for archive->locateName function, import.json and archive.tar.gz respectively. * * @return array */ diff --git a/tests/Unit/Services/Servers/ContainerRebuildServiceTest.php b/tests/Unit/Services/Servers/ContainerRebuildServiceTest.php index ad18baa4d..f36e262d9 100644 --- a/tests/Unit/Services/Servers/ContainerRebuildServiceTest.php +++ b/tests/Unit/Services/Servers/ContainerRebuildServiceTest.php @@ -133,7 +133,8 @@ class ContainerRebuildServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/server.exceptions.daemon_exception', ['code' => 400]), $exception->getMessage() + trans('admin/server.exceptions.daemon_exception', ['code' => 400]), + $exception->getMessage() ); } } diff --git a/tests/Unit/Services/Servers/DetailsModificationServiceTest.php b/tests/Unit/Services/Servers/DetailsModificationServiceTest.php index a617fbaaa..a56697ba5 100644 --- a/tests/Unit/Services/Servers/DetailsModificationServiceTest.php +++ b/tests/Unit/Services/Servers/DetailsModificationServiceTest.php @@ -258,7 +258,8 @@ class DetailsModificationServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/server.exceptions.daemon_exception', ['code' => 400]), $exception->getMessage() + trans('admin/server.exceptions.daemon_exception', ['code' => 400]), + $exception->getMessage() ); } } @@ -371,7 +372,8 @@ class DetailsModificationServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/server.exceptions.daemon_exception', ['code' => 400]), $exception->getMessage() + trans('admin/server.exceptions.daemon_exception', ['code' => 400]), + $exception->getMessage() ); } } diff --git a/tests/Unit/Services/Servers/ReinstallServiceTest.php b/tests/Unit/Services/Servers/ReinstallServiceTest.php index a2fee9517..d57a1b553 100644 --- a/tests/Unit/Services/Servers/ReinstallServiceTest.php +++ b/tests/Unit/Services/Servers/ReinstallServiceTest.php @@ -162,7 +162,8 @@ class ReinstallServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/server.exceptions.daemon_exception', ['code' => 400]), $exception->getMessage() + trans('admin/server.exceptions.daemon_exception', ['code' => 400]), + $exception->getMessage() ); } } diff --git a/tests/Unit/Services/Servers/SuspensionServiceTest.php b/tests/Unit/Services/Servers/SuspensionServiceTest.php index 3445e02b9..1ef5b071d 100644 --- a/tests/Unit/Services/Servers/SuspensionServiceTest.php +++ b/tests/Unit/Services/Servers/SuspensionServiceTest.php @@ -190,7 +190,8 @@ class SuspensionServiceTest extends TestCase } catch (Exception $exception) { $this->assertInstanceOf(DisplayException::class, $exception); $this->assertEquals( - trans('admin/server.exceptions.daemon_exception', ['code' => 400]), $exception->getMessage() + trans('admin/server.exceptions.daemon_exception', ['code' => 400]), + $exception->getMessage() ); } } diff --git a/tests/Unit/Services/Users/DeletionServiceTest.php b/tests/Unit/Services/Users/DeletionServiceTest.php index e98a375f7..a4e3cd1cb 100644 --- a/tests/Unit/Services/Users/DeletionServiceTest.php +++ b/tests/Unit/Services/Users/DeletionServiceTest.php @@ -72,7 +72,9 @@ class DeletionServiceTest extends TestCase $this->serverRepository = m::mock(ServerRepositoryInterface::class); $this->service = new DeletionService( - $this->serverRepository, $this->translator, $this->repository + $this->serverRepository, + $this->translator, + $this->repository ); }