Merge branch 'develop' into dane/restore-backups

2021-01-25 19:16:40 -08:00 · 2021-01-25 19:16:40 -08:00 · 663143de0b
commit 663143de0b
parent f24193801a b7d1c45bcc
575 changed files with 6080 additions and 6864 deletions
--- a/tests/Integration/Api/Client/Server/SettingsControllerTest.php
+++ b/tests/Integration/Api/Client/Server/SettingsControllerTest.php
@ -110,17 +110,11 @@ class SettingsControllerTest extends ClientApiIntegrationTestCase
        $this->assertTrue($server->isInstalled());
    }

-    /**
-     * @return array
-     */
    public function renamePermissionsDataProvider(): array
    {
        return [[[]], [[Permission::ACTION_SETTINGS_RENAME]]];
    }

-    /**
-     * @return array
-     */
    public function reinstallPermissionsDataProvider(): array
    {
        return [[[]], [[Permission::ACTION_SETTINGS_REINSTALL]]];