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

@ -20,15 +20,9 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
use DatabaseTransactions;
use IntegrationJsonRequestAssertions;
/**
* @var \Pterodactyl\Models\ApiKey
*/
private $key;
private ApiKey $key;
/**
* @var \Pterodactyl\Models\User
*/
private $user;
private User $user;
/**
* Bootstrap application API tests. Creates a default admin user and associated API key

View file

@ -161,7 +161,7 @@ class LocationControllerTest extends ApplicationApiIntegrationTestCase
}
/**
* Test that all of the defined relationships for a location can be loaded successfully.
* Test that all the defined relationships for a location can be loaded successfully.
*/
public function testRelationshipsCanBeLoaded()
{

View file

@ -49,7 +49,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
$this->assertSame(
$expected,
$actual,
'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL . "[{$expected}]" . PHP_EOL . PHP_EOL . 'within' . PHP_EOL . PHP_EOL . "[{$actual}]."
'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL . "[$expected]" . PHP_EOL . PHP_EOL . 'within' . PHP_EOL . PHP_EOL . "[$actual]."
);
}
}
@ -77,7 +77,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
}
/**
* Test that a single egg and all of the defined relationships can be returned.
* Test that a single egg and all the defined relationships can be returned.
*/
public function testReturnSingleEggWithRelationships()
{

View file

@ -9,10 +9,7 @@ use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestC
class NestControllerTest extends ApplicationApiIntegrationTestCase
{
/**
* @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
*/
private $repository;
private NestRepositoryInterface $repository;
/**
* Setup tests.
@ -25,7 +22,7 @@ class NestControllerTest extends ApplicationApiIntegrationTestCase
}
/**
* Test that the expected nests are returned in the request.
* Test that the expected nests are returned by the request.
*/
public function testNestResponse()
{

View file

@ -55,7 +55,7 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
'first_name' => $this->getApiUser()->name_first,
'last_name' => $this->getApiUser()->name_last,
'language' => $this->getApiUser()->language,
'root_admin' => (bool) $this->getApiUser()->root_admin,
'root_admin' => $this->getApiUser()->root_admin,
'2fa' => (bool) $this->getApiUser()->totp_enabled,
'created_at' => $this->formatTimestamp($this->getApiUser()->created_at),
'updated_at' => $this->formatTimestamp($this->getApiUser()->updated_at),