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

Upgrade to Laravel 9 (#4413)

Browse source 
Co-authored-by: DaneEveritt <dane@daneeveritt.com>
This commit is contained in:
Matthew Penner 2022-10-14 10:59:20 -06:00 • committed by GitHub
parent 95e15d2c8a
commit cbcf62086f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
573 changed files with 4387 additions and 9411 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteAllocationRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_ALLOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

10
app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetAllocationsRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_ALLOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

15
app/Http/Requests/Api/Application/Allocations/StoreAllocationRequest.php
View file

@ -7,15 +7,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreAllocationRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_ALLOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
public function rules(): array
{
@ -27,10 +21,7 @@ class StoreAllocationRequest extends ApplicationApiRequest
];
}
/**
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$data = parent::validated();

10
app/Http/Requests/Api/Application/ApplicationApiRequest.php
View file

@ -16,18 +16,14 @@ abstract class ApplicationApiRequest extends FormRequest
/**
* The resource that should be checked when performing the authorization
* function for this request.
*
* @var string|null
*/
protected $resource;
protected ?string $resource;
/**
* The permission level that a given API key should have for accessing
* the defined $resource during the request cycle.
*
* @var int
*/
protected $permission = AdminAcl::NONE;
protected int $permission = AdminAcl::NONE;
/**
* Determine if the current user is authorized to perform
@ -80,7 +76,7 @@ abstract class ApplicationApiRequest extends FormRequest
* @param class-string<T> $expect
*
* @return T
* @noinspection PhpUndefinedClassInspection
*
* @noinspection PhpDocSignatureInspection
*/
public function parameter(string $key, string $expect)

10
app/Http/Requests/Api/Application/Locations/DeleteLocationRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteLocationRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_LOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_LOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

10
app/Http/Requests/Api/Application/Locations/GetLocationsRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetLocationsRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_LOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_LOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

14
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View file

@ -8,15 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreLocationRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_LOCATIONS;
protected ?string $resource = AdminAcl::RESOURCE_LOCATIONS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Rules to validate the request against.
@ -31,10 +25,8 @@ class StoreLocationRequest extends ApplicationApiRequest
/**
* Rename fields to be more clear in error messages.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'long' => 'Location Description',

10
app/Http/Requests/Api/Application/Nests/Eggs/GetEggRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetEggRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_EGGS;
protected ?string $resource = AdminAcl::RESOURCE_EGGS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Nests/Eggs/GetEggsRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetEggsRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_EGGS;
protected ?string $resource = AdminAcl::RESOURCE_EGGS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Nests/GetNestsRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetNestsRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NESTS;
protected ?string $resource = AdminAcl::RESOURCE_NESTS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteNodeRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NODES;
protected ?string $resource = AdminAcl::RESOURCE_NODES;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

3
app/Http/Requests/Api/Application/Nodes/GetDeployableNodesRequest.php
View file

@ -4,9 +4,6 @@ namespace Pterodactyl\Http\Requests\Api\Application\Nodes;
class GetDeployableNodesRequest extends GetNodesRequest
{
/**
* @return string[]
*/
public function rules(): array
{
return [

10
app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetNodesRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NODES;
protected ?string $resource = AdminAcl::RESOURCE_NODES;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

18
app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
View file

@ -8,15 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreNodeRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_NODES;
protected ?string $resource = AdminAcl::RESOURCE_NODES;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Validation rules to apply to this request.
@ -47,10 +41,8 @@ class StoreNodeRequest extends ApplicationApiRequest
/**
* Fields to rename for clarity in the API response.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'daemon_base' => 'Daemon Base Path',
@ -63,10 +55,8 @@ class StoreNodeRequest extends ApplicationApiRequest
/**
* Change the formatting of some data keys in the validated response data
* to match what the application expects in the services.
*
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$response = parent::validated();
$response['daemonListen'] = $response['daemon_listen'];

10
app/Http/Requests/Api/Application/Servers/Databases/GetServerDatabaseRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetServerDatabaseRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Servers/Databases/GetServerDatabasesRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetServerDatabasesRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

5
app/Http/Requests/Api/Application/Servers/Databases/ServerDatabaseWriteRequest.php
View file

@ -6,8 +6,5 @@ use Pterodactyl\Services\Acl\Api\AdminAcl;
class ServerDatabaseWriteRequest extends GetServerDatabasesRequest
{
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

18
app/Http/Requests/Api/Application/Servers/Databases/StoreServerDatabaseRequest.php
View file

@ -12,15 +12,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreServerDatabaseRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Validation rules for database creation.
@ -46,10 +40,8 @@ class StoreServerDatabaseRequest extends ApplicationApiRequest
/**
* Return data formatted in the correct format for the service to consume.
*
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
return [
'database' => $this->input('database'),
@ -60,10 +52,8 @@ class StoreServerDatabaseRequest extends ApplicationApiRequest
/**
* Format error messages in a more understandable format for API output.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'host' => 'Database Host Server ID',

10
app/Http/Requests/Api/Application/Servers/GetExternalServerRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetExternalServerRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Servers/GetServerRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetServerRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Servers/ServerWriteRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class ServerWriteRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

22
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View file

@ -11,15 +11,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreServerRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Rules to be applied to this request.
@ -73,10 +67,8 @@ class StoreServerRequest extends ApplicationApiRequest
/**
* Normalize the data into a format that can be consumed by the service.
*
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$data = parent::validated();
@ -119,7 +111,7 @@ class StoreServerRequest extends ApplicationApiRequest
$query->whereNull('server_id');
}),
], function ($input) {
return !($input->deploy);
return !$input->deploy;
});
$validator->sometimes('allocation.additional.*', [
@ -128,7 +120,7 @@ class StoreServerRequest extends ApplicationApiRequest
$query->whereNull('server_id');
}),
], function ($input) {
return !($input->deploy);
return !$input->deploy;
});
$validator->sometimes('deploy.locations', 'present', function ($input) {
@ -142,10 +134,8 @@ class StoreServerRequest extends ApplicationApiRequest
/**
* Return a deployment object that can be passed to the server creation service.
*
* @return \Pterodactyl\Models\Objects\DeploymentObject|null
*/
public function getDeploymentObject()
public function getDeploymentObject(): ?DeploymentObject
{
if (is_null($this->input('deploy'))) {
return null;

12
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View file

@ -51,10 +51,8 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
/**
* Convert the allocation field into the expected format for the service handler.
*
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$data = parent::validated();
@ -78,10 +76,8 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
/**
* Custom attributes to use in error message responses.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'add_allocations' => 'allocations to add',
@ -99,11 +95,9 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
* compatability with the old API endpoint while also supporting a more correct API
* call.
*
* @return array
*
* @see https://github.com/pterodactyl/panel/issues/1500
*/
protected function requiredToOptional(string $field, array $rules, bool $limits = false)
protected function requiredToOptional(string $field, array $rules, bool $limits = false): array
{
if (!in_array('required', $rules)) {
return $rules;

4
app/Http/Requests/Api/Application/Servers/UpdateServerDetailsRequest.php
View file

@ -25,7 +25,7 @@ class UpdateServerDetailsRequest extends ServerWriteRequest
* Convert the posted data into the correct format that is expected
* by the application.
*/
public function validated(): array
public function validated($key = null, $default = null): array
{
return [
'external_id' => $this->input('external_id'),
@ -36,7 +36,7 @@ class UpdateServerDetailsRequest extends ServerWriteRequest
}
/**
* Rename some of the attributes in error messages to clarify the field
* Rename some attributes in error messages to clarify the field
* being discussed.
*/
public function attributes(): array

14
app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php
View file

@ -8,15 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class UpdateServerStartupRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_SERVERS;
protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Validation rules to run the input against.
@ -36,10 +30,8 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
/**
* Return the validated data in a format that is expected by the service.
*
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$data = parent::validated();

10
app/Http/Requests/Api/Application/Users/DeleteUserRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class DeleteUserRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
protected ?string $resource = AdminAcl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
}

10
app/Http/Requests/Api/Application/Users/GetExternalUserRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetExternalUserRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
protected ?string $resource = AdminAcl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = AdminAcl::READ;
protected int $permission = AdminAcl::READ;
}

10
app/Http/Requests/Api/Application/Users/GetUsersRequest.php
View file

@ -7,13 +7,7 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class GetUsersRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = Acl::RESOURCE_USERS;
protected ?string $resource = Acl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = Acl::READ;
protected int $permission = Acl::READ;
}

19
app/Http/Requests/Api/Application/Users/StoreUserRequest.php
View file

@ -8,15 +8,9 @@ use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
class StoreUserRequest extends ApplicationApiRequest
{
/**
* @var string
*/
protected $resource = AdminAcl::RESOURCE_USERS;
protected ?string $resource = AdminAcl::RESOURCE_USERS;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
protected int $permission = AdminAcl::WRITE;
/**
* Return the validation rules for this request.
@ -40,10 +34,7 @@ class StoreUserRequest extends ApplicationApiRequest
return $response;
}
/**
* @return array
*/
public function validated()
public function validated($key = null, $default = null): array
{
$data = parent::validated();
@ -57,10 +48,8 @@ class StoreUserRequest extends ApplicationApiRequest
/**
* Rename some fields to be more user friendly.
*
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'external_id' => 'Third Party Identifier',