Merge branch 'develop' into dane/restore-backups

This commit is contained in:
Dane Everitt 2021-01-30 10:10:29 -08:00
commit be26921fcc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 440 additions and 362 deletions

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

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)