summaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/tests/Controller/CheckSetupControllerTest.php24
-rw-r--r--apps/settings/tests/Controller/MailSettingsControllerTest.php10
-rw-r--r--apps/settings/tests/Controller/UsersControllerTest.php36
-rw-r--r--apps/settings/tests/Mailer/NewUserMailHelperTest.php26
-rw-r--r--apps/settings/tests/Settings/Admin/SharingTest.php4
5 files changed, 50 insertions, 50 deletions
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index 271427d455a..ff3a43ae2a4 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -65,33 +65,33 @@ use Test\TestCase;
* @package Tests\Settings\Controller
*/
class CheckSetupControllerTest extends TestCase {
- /** @var CheckSetupController | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var CheckSetupController | \PHPUnit\Framework\MockObject\MockObject */
private $checkSetupController;
- /** @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 IClientService | \PHPUnit_Framework_MockObject_MockObject*/
+ /** @var IClientService | \PHPUnit\Framework\MockObject\MockObject*/
private $clientService;
- /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;
- /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */
private $l10n;
/** @var ILogger */
private $logger;
- /** @var Checker|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Checker|\PHPUnit\Framework\MockObject\MockObject */
private $checker;
- /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */
private $dispatcher;
- /** @var Connection|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Connection|\PHPUnit\Framework\MockObject\MockObject */
private $db;
- /** @var ILockingProvider|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILockingProvider|\PHPUnit\Framework\MockObject\MockObject */
private $lockingProvider;
- /** @var IDateTimeFormatter|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */
private $dateTimeFormatter;
/** @var MemoryInfo|MockObject */
private $memoryInfo;
- /** @var SecureRandom|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var SecureRandom|\PHPUnit\Framework\MockObject\MockObject */
private $secureRandom;
/**
diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php
index 7611d6bcf68..a4e6a3b7d99 100644
--- a/apps/settings/tests/Controller/MailSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php
@@ -44,13 +44,13 @@ use OCP\Mail\IMailer;
*/
class MailSettingsControllerTest extends \Test\TestCase {
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
private $userSession;
- /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
private $mailer;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l;
/** @var MailSettingsController */
@@ -63,7 +63,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
$this->config = $this->createMock(IConfig::class);
$this->userSession = $this->createMock(IUserSession::class);
$this->mailer = $this->createMock(IMailer::class);
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */
$request = $this->createMock(IRequest::class);
$this->mailController = new MailSettingsController(
'settings',
diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
index 9029b1af396..8cfb149188c 100644
--- a/apps/settings/tests/Controller/UsersControllerTest.php
+++ b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -55,39 +55,39 @@ use OCP\Security\ISecureRandom;
*/
class UsersControllerTest extends \Test\TestCase {
- /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
private $groupManager;
- /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
private $userManager;
- /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
private $userSession;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
private $logger;
- /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
private $mailer;
- /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
private $l10nFactory;
- /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
- /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
private $avatarManager;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l;
- /** @var AccountManager | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var AccountManager | \PHPUnit\Framework\MockObject\MockObject */
private $accountManager;
- /** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var ISecureRandom | \PHPUnit\Framework\MockObject\MockObject */
private $secureRandom;
- /** @var \OCA\Settings\Mailer\NewUserMailHelper|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCA\Settings\Mailer\NewUserMailHelper|\PHPUnit\Framework\MockObject\MockObject */
private $newUserMailHelper;
- /** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */
private $jobList;
- /** @var \OC\Security\IdentityProof\Manager |\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OC\Security\IdentityProof\Manager |\PHPUnit\Framework\MockObject\MockObject */
private $securityManager;
- /** @var IManager | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
private $encryptionManager;
- /** @var IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IEncryptionModule | \PHPUnit\Framework\MockObject\MockObject */
private $encryptionModule;
protected function setUp(): void {
@@ -120,7 +120,7 @@ class UsersControllerTest extends \Test\TestCase {
/**
* @param bool $isAdmin
- * @return UsersController | \PHPUnit_Framework_MockObject_MockObject
+ * @return UsersController | \PHPUnit\Framework\MockObject\MockObject
*/
protected function getController($isAdmin = false, $mockedMethods = []) {
if (empty($mockedMethods)) {
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index aa3a80dcc26..fdb5da3bb54 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -47,21 +47,21 @@ use OCP\Security\ISecureRandom;
use Test\TestCase;
class NewUserMailHelperTest extends TestCase {
- /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */
private $defaults;
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l10n;
- /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
private $mailer;
- /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */
private $secureRandom;
- /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
private $timeFactory;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */
private $crypto;
/** @var \OCA\Settings\Mailer\NewUserMailHelper */
private $newUserMailHelper;
@@ -137,7 +137,7 @@ class NewUserMailHelperTest extends TestCase {
->expects($this->once())
->method('getTime')
->willReturn('12345');
- /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class);
$user
->expects($this->any())
@@ -390,7 +390,7 @@ EOF;
->with('/')
->willReturn('https://example.com/');
- /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class);
$user
->expects($this->any())
@@ -621,7 +621,7 @@ EOF;
->with('/')
->willReturn('https://example.com/');
- /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class);
$user
->expects($this->any())
@@ -833,7 +833,7 @@ EOF;
}
public function testSendMail() {
- /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class);
$user
->expects($this->at(0))
@@ -843,7 +843,7 @@ EOF;
->expects($this->at(1))
->method('getDisplayName')
->willReturn('John Doe');
- /** @var IEMailTemplate|\PHPUnit_Framework_MockObject_MockObject $emailTemplate */
+ /** @var IEMailTemplate|\PHPUnit\Framework\MockObject\MockObject $emailTemplate */
$emailTemplate = $this->createMock(IEMailTemplate::class);
$message = $this->createMock(Message::class);
$message
diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php
index 72e5034d517..b1b3527f335 100644
--- a/apps/settings/tests/Settings/Admin/SharingTest.php
+++ b/apps/settings/tests/Settings/Admin/SharingTest.php
@@ -43,9 +43,9 @@ class SharingTest extends TestCase {
private $admin;
/** @var IConfig */
private $config;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l10n;
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
protected function setUp(): void {