MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dane/restore-backups

Browse Source
This commit is contained in:
Dane Everitt
2021-01-30 10:10:29 -08:00
parent 0dd0f09238 8c2d1cdffc
commit be26921fcc
41 changed files with 440 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Integration/Api/Client/ClientApiIntegrationTestCase.php
View File

@@ -55,7 +55,7 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
/**
* Returns a link to the specific resource using the client API.
*
* @param mixed $model
* @param mixed $model
* @param string|null $append
*/
protected function link($model, $append = null): string

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

@@ -24,7 +24,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
* Test that schedules for a server are returned.
*
* @param array $permissions
* @param bool $individual
* @param bool $individual
* @dataProvider permissionsDataProvider
*/
public function testServerSchedulesAreReturned($permissions, $individual)