summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api
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/provisioning_api
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/provisioning_api')
-rw-r--r--apps/provisioning_api/tests/Controller/AppConfigControllerTest.php6
-rw-r--r--apps/provisioning_api/tests/Controller/GroupsControllerTest.php26
-rw-r--r--apps/provisioning_api/tests/Controller/UsersControllerTest.php31
-rw-r--r--apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php2
4 files changed, 32 insertions, 33 deletions
diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
index 22172ed711f..6cb08e968c0 100644
--- a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
@@ -40,9 +40,9 @@ use Test\TestCase;
*/
class AppConfigControllerTest extends TestCase {
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IAppConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */
private $appConfig;
protected function setUp(): void {
@@ -54,7 +54,7 @@ class AppConfigControllerTest extends TestCase {
/**
* @param string[] $methods
- * @return AppConfigController|\PHPUnit_Framework_MockObject_MockObject
+ * @return AppConfigController|\PHPUnit\Framework\MockObject\MockObject
*/
protected function getInstance(array $methods = []) {
$request = $this->createMock(IRequest::class);
diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
index 367a54465bc..1973e6f8b6a 100644
--- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php
@@ -46,24 +46,24 @@ use OCP\UserInterface;
class GroupsControllerTest extends \Test\TestCase {
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
protected $request;
- /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
protected $userManager;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
protected $config;
- /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */
protected $groupManager;
- /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
protected $userSession;
- /** @var AccountManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var AccountManager|\PHPUnit\Framework\MockObject\MockObject */
protected $accountManager;
- /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
protected $logger;
- /** @var SubAdmin|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var SubAdmin|\PHPUnit\Framework\MockObject\MockObject */
protected $subAdminManager;
- /** @var GroupsController|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var GroupsController|\PHPUnit\Framework\MockObject\MockObject */
protected $api;
@@ -103,7 +103,7 @@ class GroupsControllerTest extends \Test\TestCase {
/**
* @param string $gid
- * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
+ * @return \OCP\IGroup|\PHPUnit\Framework\MockObject\MockObject
*/
private function createGroup($gid) {
$group = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
@@ -131,7 +131,7 @@ class GroupsControllerTest extends \Test\TestCase {
/**
* @param string $uid
- * @return \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject
+ * @return \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject
*/
private function createUser($uid) {
$user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
@@ -534,7 +534,7 @@ class GroupsControllerTest extends \Test\TestCase {
->method('getUserGroups')
->willReturn([$group]);
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \PHPUnit\Framework\MockObject\MockObject */
$this->subAdminManager->expects($this->any())
->method('isSubAdminOfGroup')
->willReturn(false);
@@ -580,7 +580,7 @@ class GroupsControllerTest extends \Test\TestCase {
->method('getUserGroups')
->willReturn([$group]);
- /** @var \PHPUnit_Framework_MockObject_MockObject */
+ /** @var \PHPUnit\Framework\MockObject\MockObject */
$this->subAdminManager->expects($this->any())
->method('isSubAdminOfGroup')
->willReturn(false);
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index ceb84cbed4e..b025236c26c 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -63,36 +63,35 @@ use OCP\Security\Events\GenerateSecurePasswordEvent;
use OCP\Security\ISecureRandom;
use OCP\UserInterface;
use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit_Framework_MockObject_MockObject;
use Test\TestCase;
class UsersControllerTest extends TestCase {
- /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserManager|MockObject */
protected $userManager;
- /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|MockObject */
protected $config;
- /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|MockObject */
protected $appManager;
- /** @var Manager|PHPUnit_Framework_MockObject_MockObject */
+ /** @var Manager|MockObject */
protected $groupManager;
- /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|MockObject */
protected $userSession;
- /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILogger|MockObject */
protected $logger;
- /** @var UsersController|PHPUnit_Framework_MockObject_MockObject */
+ /** @var UsersController|MockObject */
protected $api;
- /** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */
+ /** @var AccountManager|MockObject */
protected $accountManager;
- /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|MockObject */
protected $request;
- /** @var IFactory|PHPUnit_Framework_MockObject_MockObject */
+ /** @var IFactory|MockObject */
private $l10nFactory;
- /** @var NewUserMailHelper|PHPUnit_Framework_MockObject_MockObject */
+ /** @var NewUserMailHelper|MockObject */
private $newUserMailHelper;
- /** @var FederatedShareProviderFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var FederatedShareProviderFactory|MockObject */
private $federatedShareProviderFactory;
- /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ISecureRandom|MockObject */
private $secureRandom;
/** @var RemoteWipe|MockObject */
private $remoteWipe;
@@ -3156,7 +3155,7 @@ class UsersControllerTest extends TestCase {
$this->userSession->expects($this->once())->method('getUser')
->willReturn($user);
- /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */
+ /** @var UsersController | MockObject $api */
$api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
->setConstructorArgs([
'provisioning_api',
@@ -3221,7 +3220,7 @@ class UsersControllerTest extends TestCase {
public function testGetUser() {
- /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */
+ /** @var UsersController | MockObject $api */
$api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
->setConstructorArgs([
'provisioning_api',
diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
index b3b2184b2ba..90a480c18ad 100644
--- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
+++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
@@ -32,7 +32,7 @@ use Test\TestCase;
class ProvisioningApiMiddlewareTest extends TestCase {
- /** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */
private $reflector;
protected function setUp(): void {