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

9
app/Traits/Services/HasUserLevels.php
View file

@ -6,17 +6,12 @@ use Pterodactyl\Models\User;
trait HasUserLevels
{
/**
* @var int
*/
private $userLevel = User::USER_LEVEL_USER;
private int $userLevel = User::USER_LEVEL_USER;
/**
* Set the access level for running this function.
*
* @return $this
*/
public function setUserLevel(int $level)
public function setUserLevel(int $level): self
{
$this->userLevel = $level;

14
app/Traits/Services/ReturnsUpdatedModels.php
View file

@ -4,15 +4,9 @@ namespace Pterodactyl\Traits\Services;
trait ReturnsUpdatedModels
{
/**
* @var bool
*/
private $updatedModel = false;
private bool $updatedModel = false;
/**
* @return bool
*/
public function getUpdatedModel()
public function getUpdatedModel(): bool
{
return $this->updatedModel;
}
@ -21,10 +15,8 @@ trait ReturnsUpdatedModels
* If called a fresh model will be returned from the database. This is used
* for API calls, but is unnecessary for UI based updates where the page is
* being reloaded and a fresh model will be pulled anyways.
*
* @return $this
*/
public function returnUpdatedModel(bool $toggle = true)
public function returnUpdatedModel(bool $toggle = true): self
{
$this->updatedModel = $toggle;

8
app/Traits/Services/ValidatesValidationRules.php
View file

@ -4,22 +4,20 @@ namespace Pterodactyl\Traits\Services;
use BadMethodCallException;
use Illuminate\Support\Str;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\Factory as ValidationFactory;
use Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException;
trait ValidatesValidationRules
{
abstract protected function getValidator(): Factory;
abstract protected function getValidator(): ValidationFactory;
/**
* Validate that the rules being provided are valid for Laravel and can
* be resolved.
*
* @param array|string $rules
*
* @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
*/
public function validateRules($rules)
public function validateRules(array|string $rules): void
{
try {
$this->getValidator()->make(['__TEST' => 'test'], ['__TEST' => $rules])->fails();