Upgrade to Laravel 9 (#4413)

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

View file

@ -7,11 +7,9 @@ use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class AdvancedSettingsFormRequest extends AdminFormRequest
{
/**
* Return all of the rules to apply to this request's data.
*
* @return array
* Return all the rules to apply to this request's data.
*/
public function rules()
public function rules(): array
{
return [
'recaptcha:enabled' => 'required|in:true,false',
@ -36,10 +34,7 @@ class AdvancedSettingsFormRequest extends AdminFormRequest
];
}
/**
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'recaptcha:enabled' => 'reCAPTCHA Enabled',

View file

@ -10,10 +10,7 @@ class BaseSettingsFormRequest extends AdminFormRequest
{
use AvailableLanguages;
/**
* @return array
*/
public function rules()
public function rules(): array
{
return [
'app:name' => 'required|string|max:191',
@ -22,10 +19,7 @@ class BaseSettingsFormRequest extends AdminFormRequest
];
}
/**
* @return array
*/
public function attributes()
public function attributes(): array
{
return [
'app:name' => 'Company Name',

View file

@ -9,10 +9,8 @@ class MailSettingsFormRequest extends AdminFormRequest
{
/**
* Return rules to validate mail settings POST data against.
*
* @return array
*/
public function rules()
public function rules(): array
{
return [
'mail:host' => 'required|string',
@ -28,12 +26,8 @@ class MailSettingsFormRequest extends AdminFormRequest
/**
* Override the default normalization function for this type of request
* as we need to accept empty values on the keys.
*
* @param array $only
*
* @return array
*/
public function normalize(array $only = null)
public function normalize(array $only = null): array
{
$keys = array_flip(array_keys($this->rules()));