Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.0-develop' into develop

Browse source
This commit is contained in:
Matthew Penner 2023-02-23 12:36:22 -07:00
commit 18f6611a2d
No known key found for this signature in database
60 changed files with 181 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/Integration/Api/Client/ApiKeyControllerTest.php
View file

@ -241,7 +241,7 @@ class ApiKeyControllerTest extends ClientApiIntegrationTestCase
* Provides some different IP address combinations that can be used when
* testing that we accept the expected IP values.
*/
public function validIPAddressDataProvider(): array
public static function validIPAddressDataProvider(): array
{
return [
[[]],

2
tests/Integration/Api/Client/ClientControllerTest.php
View file

@ -331,7 +331,7 @@ class ClientControllerTest extends ClientApiIntegrationTestCase
$response->assertJsonPath('data.0.attributes.relationships.allocations.data.0.attributes.notes', null);
}
public function filterTypeDataProvider(): array
public static function filterTypeDataProvider(): array
{
return [['admin'], ['admin-all']];
}

2
tests/Integration/Api/Client/Server/Allocation/AllocationAuthorizationTest.php
View file

@ -46,7 +46,7 @@ class AllocationAuthorizationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->json($method, $this->link($server3, '/network/allocations/' . $allocation3->id . $endpoint))->assertNotFound();
}
public function methodDataProvider(): array
public static function methodDataProvider(): array
{
return [
['POST', ''],

2
tests/Integration/Api/Client/Server/Allocation/CreateNewAllocationTest.php
View file

@ -86,7 +86,7 @@ class CreateNewAllocationTest extends ClientApiIntegrationTestCase
->assertJsonPath('errors.0.detail', 'Cannot assign additional allocations to this server: limit has been reached.');
}
public function permissionDataProvider(): array
public static function permissionDataProvider(): array
{
return [[[Permission::ACTION_ALLOCATION_CREATE]], [[]]];
}

5
tests/Integration/Api/Client/Server/Allocation/DeleteAllocationTest.php
View file

@ -98,10 +98,7 @@ class DeleteAllocationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->deleteJson($this->link($server, "/network/allocations/{$server2->allocation_id}"))->assertNotFound();
}
/**
* @return array
*/
public function permissionDataProvider()
public static function permissionDataProvider(): array
{
return [[[Permission::ACTION_ALLOCATION_DELETE]], [[]]];
}

2
tests/Integration/Api/Client/Server/Backup/BackupAuthorizationTest.php
View file

@ -54,7 +54,7 @@ class BackupAuthorizationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->json($method, $this->link($server3, '/backups/' . $backup3->uuid . $endpoint))->assertNotFound();
}
public function methodDataProvider(): array
public static function methodDataProvider(): array
{
return [
['GET', ''],

2
tests/Integration/Api/Client/Server/Database/DatabaseAuthorizationTest.php
View file

@ -58,7 +58,7 @@ class DatabaseAuthorizationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->json($method, $this->link($server3, '/databases/' . $hashids->encode($database3->id) . $endpoint))->assertNotFound();
}
public function methodDataProvider(): array
public static function methodDataProvider(): array
{
return [
['POST', '/rotate-password'],

2
tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php
View file

@ -133,7 +133,7 @@ class NetworkAllocationControllerTest extends ClientApiIntegrationTestCase
->assertForbidden();
}
public function updatePermissionsDataProvider(): array
public static function updatePermissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_ALLOCATION_UPDATE]]];
}

4
tests/Integration/Api/Client/Server/PowerControllerTest.php
View file

@ -72,7 +72,7 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
/**
* Returns invalid permission combinations for a given power action.
*/
public function invalidPermissionDataProvider(): array
public static function invalidPermissionDataProvider(): array
{
return [
['start', [Permission::ACTION_CONTROL_STOP, Permission::ACTION_CONTROL_RESTART]],
@ -83,7 +83,7 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
];
}
public function validPowerActionDataProvider(): array
public static function validPowerActionDataProvider(): array
{
return [
['start', Permission::ACTION_CONTROL_START],

2
tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php
View file

@ -89,7 +89,7 @@ class CreateServerScheduleTest extends ClientApiIntegrationTestCase
->assertForbidden();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SCHEDULE_CREATE]]];
}

2
tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php
View file

@ -77,7 +77,7 @@ class DeleteServerScheduleTest extends ClientApiIntegrationTestCase
$this->assertDatabaseHas('schedules', ['id' => $schedule->id]);
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SCHEDULE_DELETE]]];
}

2
tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php
View file

@ -64,7 +64,7 @@ class ExecuteScheduleTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->postJson($this->link($schedule, '/execute'))->assertForbidden();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
}

2
tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php
View file

@ -89,7 +89,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
->assertForbidden();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [
[[], false],

2
tests/Integration/Api/Client/Server/Schedule/ScheduleAuthorizationTest.php
View file

@ -54,7 +54,7 @@ class ScheduleAuthorizationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->json($method, $this->link($server3, '/schedules/' . $schedule3->id . $endpoint))->assertNotFound();
}
public function methodDataProvider(): array
public static function methodDataProvider(): array
{
return [
['GET', ''],

2
tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php
View file

@ -109,7 +109,7 @@ class UpdateServerScheduleTest extends ClientApiIntegrationTestCase
$this->assertFalse($schedule->is_processing);
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
}

2
tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
View file

@ -170,7 +170,7 @@ class CreateServerScheduleTaskTest extends ClientApiIntegrationTestCase
->assertForbidden();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
}

4
tests/Integration/Api/Client/Server/SettingsControllerTest.php
View file

@ -112,12 +112,12 @@ class SettingsControllerTest extends ClientApiIntegrationTestCase
$this->assertTrue($server->isInstalled());
}
public function renamePermissionsDataProvider(): array
public static function renamePermissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SETTINGS_RENAME]]];
}
public function reinstallPermissionsDataProvider(): array
public static function reinstallPermissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_SETTINGS_REINSTALL]]];
}

2
tests/Integration/Api/Client/Server/Startup/GetStartupAndVariablesTest.php
View file

@ -58,7 +58,7 @@ class GetStartupAndVariablesTest extends ClientApiIntegrationTestCase
$this->actingAs($user2)->getJson($this->link($server) . '/startup')->assertNotFound();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_STARTUP_READ]]];
}

2
tests/Integration/Api/Client/Server/Startup/UpdateStartupVariableTest.php
View file

@ -149,7 +149,7 @@ class UpdateStartupVariableTest extends ClientApiIntegrationTestCase
$this->actingAs($user2)->putJson($this->link($server) . '/startup/variable')->assertNotFound();
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_STARTUP_UPDATE]]];
}

2
tests/Integration/Api/Client/Server/Subuser/CreateServerSubuserTest.php
View file

@ -155,7 +155,7 @@ class CreateServerSubuserTest extends ClientApiIntegrationTestCase
$response->assertJsonPath('errors.0.detail', 'A user with that email address is already assigned as a subuser for this server.');
}
public function permissionsDataProvider(): array
public static function permissionsDataProvider(): array
{
return [[[]], [[Permission::ACTION_USER_CREATE]]];
}

2
tests/Integration/Api/Client/Server/Subuser/SubuserAuthorizationTest.php
View file

@ -49,7 +49,7 @@ class SubuserAuthorizationTest extends ClientApiIntegrationTestCase
$this->actingAs($user)->json($method, $this->link($server3, '/users/' . $internal->uuid))->assertNotFound();
}
public function methodDataProvider(): array
public static function methodDataProvider(): array
{
return [['GET'], ['POST'], ['DELETE']];
}