aboutsummaryrefslogtreecommitdiffstats
path: root/apps/federation
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/federation
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/federation')
-rw-r--r--apps/federation/tests/BackgroundJob/GetSharedSecretTest.php20
-rw-r--r--apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php20
-rw-r--r--apps/federation/tests/Controller/OCSAuthAPIControllerTest.php16
-rw-r--r--apps/federation/tests/Controller/SettingsControllerTest.php6
-rw-r--r--apps/federation/tests/DAV/FedAuthTest.php2
-rw-r--r--apps/federation/tests/DbHandlerTest.php2
-rw-r--r--apps/federation/tests/HooksTest.php2
-rw-r--r--apps/federation/tests/Middleware/AddServerMiddlewareTest.php6
-rw-r--r--apps/federation/tests/SyncFederationAddressbooksTest.php6
-rw-r--r--apps/federation/tests/TrustedServersTest.php26
10 files changed, 53 insertions, 53 deletions
diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index 691b9fb19a4..435503e9d38 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -50,31 +50,31 @@ use OCP\OCS\IDiscoveryService;
*/
class GetSharedSecretTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject|IClient */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IClient */
private $httpClient;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IClientService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IClientService */
private $httpClientService;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IJobList */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IJobList */
private $jobList;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator */
private $urlGenerator;
- /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */
private $trustedServers;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */
private $logger;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IResponse */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IResponse */
private $response;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IDiscoveryService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IDiscoveryService */
private $discoverService;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
private $timeFactory;
/** @var GetSharedSecret */
@@ -115,7 +115,7 @@ class GetSharedSecretTest extends TestCase {
* @param bool $retainBackgroundJob
*/
public function testExecute($isTrustedServer, $retainBackgroundJob) {
- /** @var GetSharedSecret |\PHPUnit_Framework_MockObject_MockObject $getSharedSecret */
+ /** @var GetSharedSecret |\PHPUnit\Framework\MockObject\MockObject $getSharedSecret */
$getSharedSecret = $this->getMockBuilder('OCA\Federation\BackgroundJob\GetSharedSecret')
->setConstructorArgs(
[
diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index 2ef6fd4250d..8bf06d87c0f 100644
--- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -42,31 +42,31 @@ use Test\TestCase;
class RequestSharedSecretTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject|IClientService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IClientService */
private $httpClientService;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IClient */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IClient */
private $httpClient;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IJobList */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IJobList */
private $jobList;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator */
private $urlGenerator;
- /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */
private $trustedServers;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IResponse */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IResponse */
private $response;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IDiscoveryService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IDiscoveryService */
private $discoveryService;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */
private $logger;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
private $timeFactory;
/** @var RequestSharedSecret */
@@ -107,7 +107,7 @@ class RequestSharedSecretTest extends TestCase {
* @param bool $retainBackgroundJob
*/
public function testExecute($isTrustedServer, $retainBackgroundJob) {
- /** @var RequestSharedSecret |\PHPUnit_Framework_MockObject_MockObject $requestSharedSecret */
+ /** @var RequestSharedSecret |\PHPUnit\Framework\MockObject\MockObject $requestSharedSecret */
$requestSharedSecret = $this->getMockBuilder('OCA\Federation\BackgroundJob\RequestSharedSecret')
->setConstructorArgs(
[
diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index 3617e4c2467..96987e52d72 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -39,25 +39,25 @@ use Test\TestCase;
class OCSAuthAPIControllerTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject|IRequest */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IRequest */
private $request;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ISecureRandom */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ISecureRandom */
private $secureRandom;
- /** @var \PHPUnit_Framework_MockObject_MockObject|JobList */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|JobList */
private $jobList;
- /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */
private $trustedServers;
- /** @var \PHPUnit_Framework_MockObject_MockObject|DbHandler */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|DbHandler */
private $dbHandler;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */
private $logger;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
private $timeFactory;
@@ -146,7 +146,7 @@ class OCSAuthAPIControllerTest extends TestCase {
$url = 'url';
$token = 'token';
- /** @var OCSAuthAPIController | \PHPUnit_Framework_MockObject_MockObject $ocsAuthApi */
+ /** @var OCSAuthAPIController | \PHPUnit\Framework\MockObject\MockObject $ocsAuthApi */
$ocsAuthApi = $this->getMockBuilder('OCA\Federation\Controller\OCSAuthAPIController')
->setConstructorArgs(
[
diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index 90db0b58035..8677d4bdab2 100644
--- a/apps/federation/tests/Controller/SettingsControllerTest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
@@ -35,13 +35,13 @@ class SettingsControllerTest extends TestCase {
/** @var SettingsController */
private $controller;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IRequest */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IRequest */
private $request;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IL10N */
private $l10n;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Federation\TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Federation\TrustedServers */
private $trustedServers;
protected function setUp(): void {
diff --git a/apps/federation/tests/DAV/FedAuthTest.php b/apps/federation/tests/DAV/FedAuthTest.php
index 6e91f147a84..46cd6d96659 100644
--- a/apps/federation/tests/DAV/FedAuthTest.php
+++ b/apps/federation/tests/DAV/FedAuthTest.php
@@ -36,7 +36,7 @@ class FedAuthTest extends TestCase {
* @param string $password
*/
public function testFedAuth($expected, $user, $password) {
- /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $db */
+ /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $db */
$db = $this->getMockBuilder('OCA\Federation\DbHandler')->disableOriginalConstructor()->getMock();
$db->method('auth')->willReturn(true);
$auth = new FedAuth($db);
diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php
index 7256333f9b4..8e8dbc4becd 100644
--- a/apps/federation/tests/DbHandlerTest.php
+++ b/apps/federation/tests/DbHandlerTest.php
@@ -40,7 +40,7 @@ class DbHandlerTest extends TestCase {
/** @var DbHandler */
private $dbHandler;
- /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */
private $il10n;
/** @var IDBConnection */
diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
index afb6b2408f9..c44081064c1 100644
--- a/apps/federation/tests/HooksTest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -30,7 +30,7 @@ use Test\TestCase;
class HooksTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */
private $trustedServers;
/** @var Hooks */
diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index 41116d40cc8..35fecf2f0e4 100644
--- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
@@ -37,16 +37,16 @@ use Test\TestCase;
class AddServerMiddlewareTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | ILogger */
private $logger;
- /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IL10N */
private $l10n;
/** @var AddServerMiddleware */
private $middleware;
- /** @var \PHPUnit_Framework_MockObject_MockObject | SettingsController */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | SettingsController */
private $controller;
protected function setUp(): void {
diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php
index fa6e3a575e1..c71556ebf0c 100644
--- a/apps/federation/tests/SyncFederationAddressbooksTest.php
+++ b/apps/federation/tests/SyncFederationAddressbooksTest.php
@@ -37,7 +37,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
/** @var array */
private $callBacks = [];
- /** @var \PHPUnit_Framework_MockObject_MockObject | DiscoveryService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | DiscoveryService */
private $discoveryService;
protected function setUp(): void {
@@ -49,7 +49,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
}
public function testSync() {
- /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */
+ /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $dbHandler */
$dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')->
disableOriginalConstructor()->
getMock();
@@ -79,7 +79,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
}
public function testException() {
- /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */
+ /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $dbHandler */
$dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')->
disableOriginalConstructor()->
getMock();
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index dc91e9057f1..0073fdcf7c9 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -42,37 +42,37 @@ use Test\TestCase;
class TrustedServersTest extends TestCase {
- /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */
private $trustedServers;
- /** @var \PHPUnit_Framework_MockObject_MockObject | DbHandler */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | DbHandler */
private $dbHandler;
- /** @var \PHPUnit_Framework_MockObject_MockObject | IClientService */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */
private $httpClientService;
- /** @var \PHPUnit_Framework_MockObject_MockObject | IClient */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | IClient */
private $httpClient;
- /** @var \PHPUnit_Framework_MockObject_MockObject | IResponse */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | IResponse */
private $response;
- /** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | ILogger */
private $logger;
- /** @var \PHPUnit_Framework_MockObject_MockObject | IJobList */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | IJobList */
private $jobList;
- /** @var \PHPUnit_Framework_MockObject_MockObject | ISecureRandom */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | ISecureRandom */
private $secureRandom;
- /** @var \PHPUnit_Framework_MockObject_MockObject | IConfig */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | IConfig */
private $config;
- /** @var \PHPUnit_Framework_MockObject_MockObject | EventDispatcherInterface */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | EventDispatcherInterface */
private $dispatcher;
- /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */
private $timeFactory;
protected function setUp(): void {
@@ -109,7 +109,7 @@ class TrustedServersTest extends TestCase {
* @param bool $success
*/
public function testAddServer($success) {
- /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers $trustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers $trustedServers */
$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
->setConstructorArgs(
[
@@ -269,7 +269,7 @@ class TrustedServersTest extends TestCase {
public function testIsOwnCloudServer($statusCode, $isValidOwnCloudVersion, $expected) {
$server = 'server1';
- /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServers */
+ /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers $trustedServers */
$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
->setConstructorArgs(
[