diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-21 16:40:38 +0100 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 13:34:41 +0100 |
commit | c007ca624f4a95e1a491221d425fcb2fa6e5589a (patch) | |
tree | b60aa133b438eb116ac3579283aa8a7967efd12b /apps/theming | |
parent | e0f32814e33f9ebb8c42744611048cbfac1eb588 (diff) | |
download | nextcloud-server-c007ca624f4a95e1a491221d425fcb2fa6e5589a.tar.gz nextcloud-server-c007ca624f4a95e1a491221d425fcb2fa6e5589a.zip |
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/theming')
-rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Controller/IconControllerTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 4 | ||||
-rw-r--r-- | apps/theming/tests/IconBuilderTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/ImageManagerTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/ServicesTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Settings/AdminTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Settings/SectionTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/UtilTest.php | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php index f007de1dbdb..76dd680b49a 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -55,7 +55,7 @@ class CapabilitiesTest extends TestCase { /** @var Capabilities */ protected $capabilities; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->theming = $this->createMock(ThemingDefaults::class); diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index 85259b9abe7..df0fdd52b3f 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -61,7 +61,7 @@ class IconControllerTest extends TestCase { /** @var ImageManager */ private $imageManager; - public function setUp() { + public function setUp(): void { $this->request = $this->createMock(IRequest::class); $this->themingDefaults = $this->createMock(ThemingDefaults::class); $this->iconBuilder = $this->createMock(IconBuilder::class); diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 63e5d1e285a..a626fdebe6d 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -83,7 +83,7 @@ class ThemingControllerTest extends TestCase { /** @var IURLGenerator */ private $urlGenerator; - public function setUp() { + public function setUp(): void { $this->request = $this->createMock(IRequest::class); $this->config = $this->createMock(IConfig::class); $this->themingDefaults = $this->createMock(ThemingDefaults::class); @@ -118,7 +118,7 @@ class ThemingControllerTest extends TestCase { $this->imageManager ); - return parent::setUp(); + parent::setUp(); } public function dataUpdateStylesheetSuccess() { diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php index 69ec6495605..a6999c331ce 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -54,7 +54,7 @@ class IconBuilderTest extends TestCase { /** @var IAppManager */ protected $appManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index 0f03c565e91..56fa63bea7b 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -51,7 +51,7 @@ class ImageManagerTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ private $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->appData = $this->createMock(IAppData::class); diff --git a/apps/theming/tests/ServicesTest.php b/apps/theming/tests/ServicesTest.php index a46e28235f5..b274e5868d6 100644 --- a/apps/theming/tests/ServicesTest.php +++ b/apps/theming/tests/ServicesTest.php @@ -49,7 +49,7 @@ class ServicesTest extends TestCase { /** @var \OCP\AppFramework\IAppContainer */ protected $container; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->app = new App('theming'); $this->container = $this->app->getContainer(); diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php index 5943866edc1..4e89366c3f2 100644 --- a/apps/theming/tests/Settings/AdminTest.php +++ b/apps/theming/tests/Settings/AdminTest.php @@ -50,7 +50,7 @@ class AdminTest extends TestCase { /** @var IL10N */ private $l10n; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->l10n = $this->createMock(IL10N::class); diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php index 09abf9e34f5..10d6bb172f2 100644 --- a/apps/theming/tests/Settings/SectionTest.php +++ b/apps/theming/tests/Settings/SectionTest.php @@ -37,7 +37,7 @@ class SectionTest extends TestCase { /** @var Section */ private $section; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->url = $this->createMock(IURLGenerator::class); $this->l = $this->createMock(IL10N::class); diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 71b8ba97e9b..b7413eaf47d 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -72,7 +72,7 @@ class ThemingDefaultsTest extends TestCase { /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */ private $navigationManager; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->l10n = $this->createMock(IL10N::class); diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php index 9fa5dd91da8..f8e1750113c 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -46,7 +46,7 @@ class UtilTest extends TestCase { /** @var IAppManager */ protected $appManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->appData = $this->createMock(IAppData::class); |