aboutsummaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-08-11 21:32:18 +0200
committerMorris Jobke <hey@morrisjobke.de>2020-08-12 13:55:19 +0200
commit234b510652d117bb3ef9ef3b6315db3a2c2eb91b (patch)
tree880cec2bf4fe4846eff9fa5aa68d2671fb0495be /apps/theming
parent138f47a1b980aaceb116b256b8ccf14f523e7e67 (diff)
downloadnextcloud-server-234b510652d117bb3ef9ef3b6315db3a2c2eb91b.tar.gz
nextcloud-server-234b510652d117bb3ef9ef3b6315db3a2c2eb91b.zip
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/tests/CapabilitiesTest.php8
-rw-r--r--apps/theming/tests/Controller/IconControllerTest.php12
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php14
-rw-r--r--apps/theming/tests/ImageManagerTest.php16
-rw-r--r--apps/theming/tests/Settings/SectionTest.php4
-rw-r--r--apps/theming/tests/ThemingDefaultsTest.php22
6 files changed, 38 insertions, 38 deletions
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 3ad31f029ed..1a11421ce1d 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -44,16 +44,16 @@ use Test\TestCase;
* @package OCA\Theming\Tests
*/
class CapabilitiesTest extends TestCase {
- /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */
protected $theming;
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
protected $url;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
- /** @var Util|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
protected $util;
/** @var Capabilities */
diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php
index 05b74c58e79..6cd35be4fa4 100644
--- a/apps/theming/tests/Controller/IconControllerTest.php
+++ b/apps/theming/tests/Controller/IconControllerTest.php
@@ -43,19 +43,19 @@ use OCP\IRequest;
use Test\TestCase;
class IconControllerTest extends TestCase {
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
private $request;
- /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */
private $themingDefaults;
/** @var \OCP\AppFramework\Utility\ITimeFactory */
private $timeFactory;
- /** @var IconController|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IconController|\PHPUnit\Framework\MockObject\MockObject */
private $iconController;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IconBuilder|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IconBuilder|\PHPUnit\Framework\MockObject\MockObject */
private $iconBuilder;
- /** @var FileAccessHelper|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var FileAccessHelper|\PHPUnit\Framework\MockObject\MockObject */
private $fileAccessHelper;
/** @var ImageManager */
private $imageManager;
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index edaf1a451b5..cb00251419a 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -57,25 +57,25 @@ use OCP\IURLGenerator;
use Test\TestCase;
class ThemingControllerTest extends TestCase {
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
private $request;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */
private $themingDefaults;
/** @var \OCP\AppFramework\Utility\ITimeFactory */
private $timeFactory;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l10n;
/** @var ThemingController */
private $themingController;
/** @var ITempManager */
private $tempManager;
- /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
- /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
private $appData;
- /** @var ImageManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ImageManager|\PHPUnit\Framework\MockObject\MockObject */
private $imageManager;
/** @var SCSSCacher */
private $scssCacher;
diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 1187ecf0365..a14924db049 100644
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -40,17 +40,17 @@ use Test\TestCase;
class ImageManagerTest extends TestCase {
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
- /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
protected $appData;
/** @var ImageManager */
protected $imageManager;
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;
- /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
private $cacheFactory;
- /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
private $logger;
protected function setUp(): void {
@@ -83,7 +83,7 @@ class ImageManagerTest extends TestCase {
}
public function mockGetImage($key, $file) {
- /** @var \PHPUnit_Framework_MockObject_MockObject $folder */
+ /** @var \PHPUnit\Framework\MockObject\MockObject $folder */
$folder = $this->createMock(ISimpleFolder::class);
if ($file === null) {
$folder->expects($this->once())
@@ -185,7 +185,7 @@ class ImageManagerTest extends TestCase {
$this->assertEquals($file, $this->imageManager->getImage('logo', false));
}
-
+
public function testGetImageUnset() {
$this->expectException(\OCP\Files\NotFoundException::class);
@@ -240,7 +240,7 @@ class ImageManagerTest extends TestCase {
$this->assertEquals($expected, $this->imageManager->getCachedImage('filename'));
}
-
+
public function testGetCachedImageNotFound() {
$this->expectException(\OCP\Files\NotFoundException::class);
diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php
index 93ca2070f79..5ba9fc6b650 100644
--- a/apps/theming/tests/Settings/SectionTest.php
+++ b/apps/theming/tests/Settings/SectionTest.php
@@ -29,9 +29,9 @@ use OCP\IURLGenerator;
use Test\TestCase;
class SectionTest extends TestCase {
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $url;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l;
/** @var Section */
private $section;
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index e5b6fb72db0..fecde372622 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -50,29 +50,29 @@ use OCP\IURLGenerator;
use Test\TestCase;
class ThemingDefaultsTest extends TestCase {
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l10n;
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;
- /** @var \OC_Defaults|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OC_Defaults|\PHPUnit\Framework\MockObject\MockObject */
private $defaults;
- /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
private $appData;
- /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
private $cacheFactory;
/** @var ThemingDefaults */
private $template;
- /** @var Util|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Util|\PHPUnit\Framework\MockObject\MockObject */
private $util;
- /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */
private $cache;
- /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
- /** @var ImageManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ImageManager|\PHPUnit\Framework\MockObject\MockObject */
private $imageManager;
- /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var INavigationManager|\PHPUnit\Framework\MockObject\MockObject */
private $navigationManager;
protected function setUp(): void {