api(application): fix requests, again

This commit is contained in:
Matthew Penner 2021-01-24 15:30:58 -07:00
parent da3c7fa455
commit 18bdde8b81
15 changed files with 27 additions and 237 deletions

View file

@ -11,19 +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;
protected int $permission = AdminAcl::WRITE;
/**
* @var int
*/
protected $permission = AdminAcl::WRITE;
/**
* Rules to be applied to this request.
*/
public function rules(): array
{
$rules = Server::getRules();
@ -71,12 +61,7 @@ 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(): array
{
$data = parent::validated();
@ -105,11 +90,6 @@ class StoreServerRequest extends ApplicationApiRequest
];
}
/*
* Run validation after the rules above have been applied.
*
* @param \Illuminate\Contracts\Validation\Validator $validator
*/
public function withValidator(Validator $validator)
{
$validator->sometimes('allocation.default', [
@ -139,12 +119,7 @@ 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;