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

@ -9,23 +9,11 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
class NestCreationService
{
/**
* @var \Illuminate\Contracts\Config\Repository
*/
private $config;
/**
* @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
*/
private $repository;
/**
* NestCreationService constructor.
*/
public function __construct(ConfigRepository $config, NestRepositoryInterface $repository)
public function __construct(private ConfigRepository $config, private NestRepositoryInterface $repository)
{
$this->config = $config;
$this->repository = $repository;
}
/**

View file

@ -1,11 +1,4 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* This software is licensed under the terms of the MIT license.
* https://opensource.org/licenses/MIT
*/
namespace Pterodactyl\Services\Nests;
@ -15,25 +8,13 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
class NestDeletionService
{
/**
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
*/
protected $serverRepository;
/**
* @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
*/
protected $repository;
/**
* NestDeletionService constructor.
*/
public function __construct(
ServerRepositoryInterface $serverRepository,
NestRepositoryInterface $repository
protected ServerRepositoryInterface $serverRepository,
protected NestRepositoryInterface $repository
) {
$this->serverRepository = $serverRepository;
$this->repository = $repository;
}
/**

View file

@ -1,11 +1,4 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* This software is licensed under the terms of the MIT license.
* https://opensource.org/licenses/MIT
*/
namespace Pterodactyl\Services\Nests;
@ -13,17 +6,11 @@ use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
class NestUpdateService
{
/**
* @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
*/
protected $repository;
/**
* NestUpdateService constructor.
*/
public function __construct(NestRepositoryInterface $repository)
public function __construct(protected NestRepositoryInterface $repository)
{
$this->repository = $repository;
}
/**
@ -32,7 +19,7 @@ class NestUpdateService
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function handle(int $nest, array $data)
public function handle(int $nest, array $data): void
{
if (!is_null(array_get($data, 'author'))) {
unset($data['author']);