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

@ -11,17 +11,12 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class DaemonBackupRepository extends DaemonRepository
{
/**
* @var string|null
*/
protected $adapter;
protected ?string $adapter;
/**
* Sets the backup adapter for this execution instance.
*
* @return $this
*/
public function setBackupAdapter(string $adapter)
public function setBackupAdapter(string $adapter): self
{
$this->adapter = $adapter;

View file

@ -13,11 +13,9 @@ class DaemonCommandRepository extends DaemonRepository
/**
* Sends a command or multiple commands to a running server instance.
*
* @param string|string[] $command
*
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function send($command): ResponseInterface
public function send(array|string $command): ResponseInterface
{
Assert::isInstanceOf($this->server, Server::class);

View file

@ -3,6 +3,7 @@
namespace Pterodactyl\Repositories\Wings;
use Pterodactyl\Models\Node;
use Psr\Http\Message\ResponseInterface;
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@ -29,11 +30,9 @@ class DaemonConfigurationRepository extends DaemonRepository
* this instance using a passed-in model. This allows us to change plenty of information
* in the model, and still use the old, pre-update model to actually make the HTTP request.
*
* @return \Psr\Http\Message\ResponseInterface
*
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function update(Node $node)
public function update(Node $node): ResponseInterface
{
try {
return $this->getHttpClient()->post(

View file

@ -10,35 +10,21 @@ use Illuminate\Contracts\Foundation\Application;
abstract class DaemonRepository
{
/**
* @var \Illuminate\Contracts\Foundation\Application
*/
protected $app;
protected ?Server $server;
protected ?Node $node;
/**
* @var \Pterodactyl\Models\Server|null
* DaemonRepository constructor.
*/
protected $server;
/**
* @var \Pterodactyl\Models\Node|null
*/
protected $node;
/**
* BaseWingsRepository constructor.
*/
public function __construct(Application $application)
public function __construct(protected Application $app)
{
$this->app = $application;
}
/**
* Set the server model this request is stemming from.
*
* @return $this
*/
public function setServer(Server $server)
public function setServer(Server $server): self
{
$this->server = $server;
@ -49,10 +35,8 @@ abstract class DaemonRepository
/**
* Set the node model this request is stemming from.
*
* @return $this
*/
public function setNode(Node $node)
public function setNode(Node $node): self
{
$this->node = $node;