Run php-cs-fixer
This commit is contained in:
parent
65f27d41a2
commit
5705d7dbdd
16 changed files with 4 additions and 36 deletions
|
@ -4,8 +4,8 @@ namespace Pterodactyl\Http;
|
||||||
|
|
||||||
use Pterodactyl\Models\ApiKey;
|
use Pterodactyl\Models\ApiKey;
|
||||||
use Illuminate\Auth\Middleware\Authorize;
|
use Illuminate\Auth\Middleware\Authorize;
|
||||||
use Illuminate\Http\Middleware\TrustProxies;
|
|
||||||
use Illuminate\Auth\Middleware\Authenticate;
|
use Illuminate\Auth\Middleware\Authenticate;
|
||||||
|
use Illuminate\Http\Middleware\TrustProxies;
|
||||||
use Pterodactyl\Http\Middleware\TrimStrings;
|
use Pterodactyl\Http\Middleware\TrimStrings;
|
||||||
use Illuminate\Session\Middleware\StartSession;
|
use Illuminate\Session\Middleware\StartSession;
|
||||||
use Pterodactyl\Http\Middleware\EncryptCookies;
|
use Pterodactyl\Http\Middleware\EncryptCookies;
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Models;
|
namespace Pterodactyl\Models;
|
||||||
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Illuminate\Container\Container;
|
use Illuminate\Container\Container;
|
||||||
use Illuminate\Contracts\Validation\Factory;
|
use Illuminate\Contracts\Validation\Factory;
|
||||||
|
|
|
@ -11,8 +11,6 @@ class AllocationTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Relationships that can be loaded onto allocation transformations.
|
* Relationships that can be loaded onto allocation transformations.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['node', 'server'];
|
protected array $availableIncludes = ['node', 'server'];
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,6 @@ use Pterodactyl\Services\Acl\Api\AdminAcl;
|
||||||
|
|
||||||
class DatabaseHostTransformer extends BaseTransformer
|
class DatabaseHostTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected array $availableIncludes = [
|
protected array $availableIncludes = [
|
||||||
'databases',
|
'databases',
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Transformers\Api\Application;
|
namespace Pterodactyl\Transformers\Api\Application;
|
||||||
|
|
||||||
use Pterodactyl\Models\Egg;
|
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
|
use Pterodactyl\Models\Egg;
|
||||||
use Pterodactyl\Models\Nest;
|
use Pterodactyl\Models\Nest;
|
||||||
use Pterodactyl\Models\Server;
|
use Pterodactyl\Models\Server;
|
||||||
use Pterodactyl\Models\EggVariable;
|
use Pterodactyl\Models\EggVariable;
|
||||||
|
@ -13,8 +13,6 @@ class EggTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Relationships that can be loaded onto this transformation.
|
* Relationships that can be loaded onto this transformation.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = [
|
protected array $availableIncludes = [
|
||||||
'nest',
|
'nest',
|
||||||
|
|
|
@ -9,8 +9,6 @@ class LocationTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['nodes', 'servers'];
|
protected array $availableIncludes = ['nodes', 'servers'];
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,6 @@ class NestTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Relationships that can be loaded onto this transformation.
|
* Relationships that can be loaded onto this transformation.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = [
|
protected array $availableIncludes = [
|
||||||
'eggs', 'servers',
|
'eggs', 'servers',
|
||||||
|
|
|
@ -9,8 +9,6 @@ class NodeTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['allocations', 'location', 'servers'];
|
protected array $availableIncludes = ['allocations', 'location', 'servers'];
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,6 @@ use Illuminate\Contracts\Encryption\Encrypter;
|
||||||
|
|
||||||
class ServerDatabaseTransformer extends BaseTransformer
|
class ServerDatabaseTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected array $availableIncludes = ['password', 'host'];
|
protected array $availableIncludes = ['password', 'host'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -15,8 +15,6 @@ class ServerTransformer extends BaseTransformer
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = [
|
protected array $availableIncludes = [
|
||||||
'allocations',
|
'allocations',
|
||||||
|
|
|
@ -9,8 +9,6 @@ class ServerVariableTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['parent'];
|
protected array $availableIncludes = ['parent'];
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,6 @@ class SubuserTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['user', 'server'];
|
protected array $availableIncludes = ['user', 'server'];
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,6 @@ class UserTransformer extends BaseTransformer
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* List of resources that can be included.
|
* List of resources that can be included.
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
*/
|
||||||
protected array $availableIncludes = ['servers'];
|
protected array $availableIncludes = ['servers'];
|
||||||
|
|
||||||
|
|
|
@ -8,14 +8,8 @@ use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class ScheduleTransformer extends BaseClientTransformer
|
class ScheduleTransformer extends BaseClientTransformer
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected array $availableIncludes = ['tasks'];
|
protected array $availableIncludes = ['tasks'];
|
||||||
|
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected array $defaultIncludes = ['tasks'];
|
protected array $defaultIncludes = ['tasks'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -18,9 +18,6 @@ class ServerTransformer extends BaseClientTransformer
|
||||||
*/
|
*/
|
||||||
protected array $defaultIncludes = ['allocations', 'variables'];
|
protected array $defaultIncludes = ['allocations', 'variables'];
|
||||||
|
|
||||||
/**
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected array $availableIncludes = ['egg', 'subusers'];
|
protected array $availableIncludes = ['egg', 'subusers'];
|
||||||
|
|
||||||
public function getResourceName(): string
|
public function getResourceName(): string
|
||||||
|
|
|
@ -89,6 +89,7 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
||||||
* is assumed that the user is actually a subuser of the server.
|
* is assumed that the user is actually a subuser of the server.
|
||||||
*
|
*
|
||||||
* @param string[] $permissions
|
* @param string[] $permissions
|
||||||
|
*
|
||||||
* @return array{\Pterodactyl\Models\User, \Pterodactyl\Models\Server}
|
* @return array{\Pterodactyl\Models\User, \Pterodactyl\Models\Server}
|
||||||
*/
|
*/
|
||||||
protected function generateTestAccount(array $permissions = []): array
|
protected function generateTestAccount(array $permissions = []): array
|
||||||
|
|
Loading…
Reference in a new issue