summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php10
-rw-r--r--apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php4
-rw-r--r--apps/files_sharing/tests/Controller/ShareAPIControllerTest.php30
-rw-r--r--apps/files_sharing/tests/Controller/ShareInfoControllerTest.php2
-rw-r--r--apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php26
-rw-r--r--apps/files_sharing/tests/External/ManagerTest.php12
-rw-r--r--apps/files_sharing/tests/External/ScannerTest.php4
-rw-r--r--apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php2
-rw-r--r--apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php2
-rw-r--r--apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php16
-rw-r--r--apps/files_sharing/tests/Migration/SetPasswordColumnTest.php2
-rw-r--r--apps/files_sharing/tests/MountProviderTest.php10
12 files changed, 60 insertions, 60 deletions
diff --git a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
index 1efd99706c2..9b5924c9dec 100644
--- a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
+++ b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
@@ -34,11 +34,11 @@ use OCP\Share\IManager;
use Test\TestCase;
class ShareRecipientSorterTest extends TestCase {
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
protected $shareManager;
- /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
protected $rootFolder;
- /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
protected $userSession;
/** @var ShareRecipientSorter */
protected $sorter;
@@ -60,7 +60,7 @@ class ShareRecipientSorterTest extends TestCase {
public function testSort($data) {
$node = $this->createMock(Node::class);
- /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $folder */
+ /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $folder */
$folder = $this->createMock(Folder::class);
$this->rootFolder->expects($this->any())
->method('getUserFolder')
@@ -99,7 +99,7 @@ class ShareRecipientSorterTest extends TestCase {
}
public function testSortNoNodes() {
- /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $folder */
+ /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $folder */
$folder = $this->createMock(Folder::class);
$this->rootFolder->expects($this->any())
->method('getUserFolder')
diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
index fb6014be9b6..6fa0ad7efc2 100644
--- a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
+++ b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
@@ -45,9 +45,9 @@ use Test\TestCase;
class PublicPreviewControllerTest extends TestCase {
- /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */
private $previewManager;
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
/** @var ITimeFactory|MockObject */
private $timeFactory;
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index e186092f0bf..4da51f7e5e9 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -68,40 +68,40 @@ class ShareAPIControllerTest extends TestCase {
/** @var string */
private $appName = 'files_sharing';
- /** @var \OC\Share20\Manager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OC\Share20\Manager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
- /** @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 IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
private $request;
- /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
private $rootFolder;
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
private $urlGenerator;
- /** @var string|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var string|\PHPUnit\Framework\MockObject\MockObject */
private $currentUser;
/** @var ShareAPIController */
private $ocs;
- /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
- /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */
private $serverContainer;
protected function setUp(): void {
@@ -146,7 +146,7 @@ class ShareAPIControllerTest extends TestCase {
}
/**
- * @return ShareAPIController|\PHPUnit_Framework_MockObject_MockObject
+ * @return ShareAPIController|\PHPUnit\Framework\MockObject\MockObject
*/
private function mockFormatShare() {
return $this->getMockBuilder(ShareAPIController::class)
@@ -701,7 +701,7 @@ class ShareAPIControllerTest extends TestCase {
* @dataProvider dataGetShare
*/
public function testGetShare(\OCP\Share\IShare $share, array $result) {
- /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */
+ /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */
$ocs = $this->getMockBuilder(ShareAPIController::class)
->setConstructorArgs([
$this->appName,
@@ -1763,7 +1763,7 @@ class ShareAPIControllerTest extends TestCase {
$share = $this->newShare();
$this->shareManager->method('newShare')->willReturn($share);
- /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */
+ /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */
$ocs = $this->getMockBuilder(ShareAPIController::class)
->setConstructorArgs([
$this->appName,
@@ -2326,7 +2326,7 @@ class ShareAPIControllerTest extends TestCase {
$share = \OC::$server->getShareManager()->newShare();
$this->shareManager->method('newShare')->willReturn($share);
- /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */
+ /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */
$ocs = $this->getMockBuilder(ShareAPIController::class)
->setConstructorArgs([
$this->appName,
diff --git a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
index f43ca13a674..9ea93b9900a 100644
--- a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
@@ -41,7 +41,7 @@ class ShareInfoControllerTest extends TestCase {
/** @var ShareInfoController */
private $controller;
- /** @var ShareManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ShareManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
index d3fb914f404..8baf4f26b0c 100644
--- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
@@ -55,13 +55,13 @@ class ShareesAPIControllerTest extends TestCase {
/** @var string */
protected $uid;
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
protected $request;
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
protected $shareManager;
- /** @var ISearch|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ISearch|\PHPUnit\Framework\MockObject\MockObject */
protected $collaboratorSearch;
protected function setUp(): void {
@@ -71,10 +71,10 @@ class ShareesAPIControllerTest extends TestCase {
$this->request = $this->createMock(IRequest::class);
$this->shareManager = $this->createMock(IManager::class);
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $configMock */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $configMock */
$configMock = $this->createMock(IConfig::class);
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGeneratorMock */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGeneratorMock */
$urlGeneratorMock = $this->createMock(IURLGenerator::class);
$this->collaboratorSearch = $this->createMock(ISearch::class);
@@ -236,7 +236,7 @@ class ShareesAPIControllerTest extends TestCase {
$perPage = isset($getData['perPage']) ? $getData['perPage'] : 200;
$shareType = isset($getData['shareType']) ? $getData['shareType'] : null;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
$config = $this->createMock(IConfig::class);
$config->expects($this->exactly(1))
->method('getAppValue')
@@ -251,12 +251,12 @@ class ShareesAPIControllerTest extends TestCase {
/** @var string */
$uid = 'test123';
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */
$request = $this->createMock(IRequest::class);
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGenerator */
$urlGenerator = $this->createMock(IURLGenerator::class);
- /** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
$sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController')
->setConstructorArgs([
$uid,
@@ -339,19 +339,19 @@ class ShareesAPIControllerTest extends TestCase {
$page = isset($getData['page']) ? $getData['page'] : 1;
$perPage = isset($getData['perPage']) ? $getData['perPage'] : 200;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */
$config = $this->createMock(IConfig::class);
$config->expects($this->never())
->method('getAppValue');
/** @var string */
$uid = 'test123';
- /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+ /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */
$request = $this->createMock(IRequest::class);
- /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */
+ /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGenerator */
$urlGenerator = $this->createMock(IURLGenerator::class);
- /** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
$sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController')
->setConstructorArgs([
$uid,
diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php
index a7ec79e9c2a..c8ae7a64831 100644
--- a/apps/files_sharing/tests/External/ManagerTest.php
+++ b/apps/files_sharing/tests/External/ManagerTest.php
@@ -53,25 +53,25 @@ use Test\Traits\UserTrait;
class ManagerTest extends TestCase {
use UserTrait;
- /** @var Manager|\PHPUnit_Framework_MockObject_MockObject **/
+ /** @var Manager|\PHPUnit\Framework\MockObject\MockObject **/
private $manager;
/** @var \OC\Files\Mount\Manager */
private $mountManager;
- /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
private $clientService;
- /** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICloudFederationProviderManager|\PHPUnit\Framework\MockObject\MockObject */
private $cloudFederationProviderManager;
- /** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ICloudFederationFactory|\PHPUnit\Framework\MockObject\MockObject */
private $cloudFederationFactory;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IGroupManager */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IGroupManager */
private $groupManager;
- /** @var \PHPUnit_Framework_MockObject_MockObject|IUserManager */
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IUserManager */
private $userManager;
private $uid;
diff --git a/apps/files_sharing/tests/External/ScannerTest.php b/apps/files_sharing/tests/External/ScannerTest.php
index 9cfcf54b484..15a023f1b96 100644
--- a/apps/files_sharing/tests/External/ScannerTest.php
+++ b/apps/files_sharing/tests/External/ScannerTest.php
@@ -29,9 +29,9 @@ use Test\TestCase;
class ScannerTest extends TestCase {
/** @var \OCA\Files_Sharing\External\Scanner */
protected $scanner;
- /** @var \OCA\Files_Sharing\External\Storage|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OCA\Files_Sharing\External\Storage|\PHPUnit\Framework\MockObject\MockObject */
protected $storage;
- /** @var \OC\Files\Cache\Cache|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \OC\Files\Cache\Cache|\PHPUnit\Framework\MockObject\MockObject */
protected $cache;
protected function setUp(): void {
diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
index e7457b4096b..32be9e3212f 100644
--- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
@@ -39,7 +39,7 @@ use OCP\Share\IManager;
*/
class OCSShareAPIMiddlewareTest extends \Test\TestCase {
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
/** @var IL10N */
private $l;
diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
index c290183d046..deab3f07e2f 100644
--- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
@@ -35,7 +35,7 @@ use Test\TestCase;
class ShareInfoMiddlewareTest extends TestCase {
- /** @var ShareManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var ShareManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
/** @var ShareInfoMiddleware */
diff --git a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
index 2c33f5617b7..9b5f61e81ad 100644
--- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
@@ -46,19 +46,19 @@ use OCP\Share\IShare;
*/
class SharingCheckMiddlewareTest extends \Test\TestCase {
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
private $appManager;
/** @var SharingCheckMiddleware */
private $sharingCheckMiddleware;
- /** @var Controller|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Controller|\PHPUnit\Framework\MockObject\MockObject */
private $controllerMock;
- /** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */
private $reflector;
- /** @var IManager | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
- /** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest | \PHPUnit\Framework\MockObject\MockObject */
private $request;
protected function setUp(): void {
@@ -197,7 +197,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
}
-
+
public function testBeforeControllerWithSharingDisabled() {
$this->expectException(\OCP\Files\NotFoundException::class);
$this->expectExceptionMessage('Sharing is disabled.');
@@ -211,7 +211,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
}
-
+
public function testAfterExceptionWithRegularException() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('My Exception message');
diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
index cdba86863f1..ec529c64066 100644
--- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
+++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
@@ -40,7 +40,7 @@ class SetPasswordColumnTest extends TestCase {
/** @var \OCP\IDBConnection */
private $connection;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
/** @var SetPasswordColumn */
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index 60c622ec4a4..ce916998372 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -46,19 +46,19 @@ class MountProviderTest extends \Test\TestCase {
/** @var MountProvider */
private $provider;
- /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
- /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
private $user;
- /** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */
private $loader;
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
private $shareManager;
- /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */
+ /** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */
private $logger;
protected function setUp(): void {