Merge remote-tracking branch 'origin/master' into vue

This commit is contained in:
Julius Härtl
2019-12-17 20:36:16 +01:00
108 changed files with 1839 additions and 673 deletions

View File

@@ -42,7 +42,7 @@ class PageControllerTest extends \Test\TestCase {
private $permissionService;
private $config;
public function setUp() {
public function setUp(): void {
$this->l10n = $this->createMock(IL10N::class);
$this->request = $this->createMock(IRequest::class);
$this->defaultBoardService = $this->createMock(DefaultBoardService::class);