Signed-off-by: Morris Jobke <hey@morrisjobke.de>tags/v20.0.0beta1
@@ -32,13 +32,13 @@ use OCP\IUser; | |||
use Test\TestCase; | |||
class SecurityTest extends TestCase { | |||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $logger; | |||
/** @var Security */ | |||
private $security; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $user; | |||
protected function setUp(): void { |
@@ -46,22 +46,22 @@ class ListenerTest extends TestCase { | |||
/** @var Listener */ | |||
protected $listener; | |||
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $activityManager; | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $session; | |||
/** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $appManager; | |||
/** @var IMountProviderCollection|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IMountProviderCollection|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $mountProviderCollection; | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $rootFolder; | |||
/** @var IShareHelper|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IShareHelper|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $shareHelper; | |||
protected function setUp(): void { | |||
@@ -95,7 +95,7 @@ class ListenerTest extends TestCase { | |||
->method('getObjectType') | |||
->willReturn('files'); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->createMock(CommentsEvent::class); | |||
$event->expects($this->any()) | |||
->method('getComment') | |||
@@ -104,13 +104,13 @@ class ListenerTest extends TestCase { | |||
->method('getEvent') | |||
->willReturn(CommentsEvent::EVENT_ADD); | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $ownerUser */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $ownerUser */ | |||
$ownerUser = $this->createMock(IUser::class); | |||
$ownerUser->expects($this->any()) | |||
->method('getUID') | |||
->willReturn('937393'); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject $mount */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject $mount */ | |||
$mount = $this->createMock(ICachedMountFileInfo::class); | |||
$mount->expects($this->any()) | |||
->method('getUser') | |||
@@ -152,7 +152,7 @@ class ListenerTest extends TestCase { | |||
->method('getUser') | |||
->willReturn($ownerUser); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject $activity */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject $activity */ | |||
$activity = $this->createMock(IEvent::class); | |||
$activity->expects($this->exactly(count($al['users']))) | |||
->method('setAffectedUser'); |
@@ -31,7 +31,7 @@ use OCP\Comments\ICommentsManager; | |||
use Test\TestCase; | |||
class CommentersSorterTest extends TestCase { | |||
/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @var CommentersSorter */ | |||
protected $sorter; |
@@ -47,19 +47,19 @@ class NotificationsTest extends TestCase { | |||
/** @var Notifications */ | |||
protected $notificationsController; | |||
/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @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 $session; | |||
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $notificationManager; | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $urlGenerator; | |||
protected function setUp(): void { |
@@ -35,10 +35,10 @@ class EventHandlerTest extends TestCase { | |||
/** @var EventHandler */ | |||
protected $eventHandler; | |||
/** @var ActivityListener|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ActivityListener|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $activityListener; | |||
/** @var NotificationListener|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var NotificationListener|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $notificationListener; | |||
protected function setUp(): void { | |||
@@ -56,13 +56,13 @@ class EventHandlerTest extends TestCase { | |||
} | |||
public function testNotFiles() { | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */ | |||
$comment = $this->getMockBuilder(IComment::class)->getMock(); | |||
$comment->expects($this->once()) | |||
->method('getObjectType') | |||
->willReturn('smiles'); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->getMockBuilder(CommentsEvent::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -89,13 +89,13 @@ class EventHandlerTest extends TestCase { | |||
* @param string $eventType | |||
*/ | |||
public function testHandled($eventType) { | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */ | |||
$comment = $this->getMockBuilder(IComment::class)->getMock(); | |||
$comment->expects($this->once()) | |||
->method('getObjectType') | |||
->willReturn('files'); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->getMockBuilder(CommentsEvent::class) | |||
->disableOriginalConstructor() | |||
->getMock(); |
@@ -36,13 +36,13 @@ use OCP\Notification\INotification; | |||
use Test\TestCase; | |||
class ListenerTest extends TestCase { | |||
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $notificationManager; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $urlGenerator; | |||
/** @var Listener */ | |||
@@ -75,7 +75,7 @@ class ListenerTest extends TestCase { | |||
* @param string $notificationMethod | |||
*/ | |||
public function testEvaluate($eventType, $notificationMethod) { | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */ | |||
$comment = $this->getMockBuilder(IComment::class)->getMock(); | |||
$comment->expects($this->any()) | |||
->method('getObjectType') | |||
@@ -97,7 +97,7 @@ class ListenerTest extends TestCase { | |||
->method('getId') | |||
->willReturn('1234'); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->getMockBuilder(CommentsEvent::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -108,7 +108,7 @@ class ListenerTest extends TestCase { | |||
->method(('getEvent')) | |||
->willReturn($eventType); | |||
/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ | |||
/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ | |||
$notification = $this->getMockBuilder(INotification::class)->getMock(); | |||
$notification->expects($this->any()) | |||
->method($this->anything()) | |||
@@ -143,7 +143,7 @@ class ListenerTest extends TestCase { | |||
* @param string $eventType | |||
*/ | |||
public function testEvaluateNoMentions($eventType) { | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */ | |||
$comment = $this->getMockBuilder(IComment::class)->getMock(); | |||
$comment->expects($this->any()) | |||
->method('getObjectType') | |||
@@ -155,7 +155,7 @@ class ListenerTest extends TestCase { | |||
->method('getMentions') | |||
->willReturn([]); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->getMockBuilder(CommentsEvent::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -180,7 +180,7 @@ class ListenerTest extends TestCase { | |||
} | |||
public function testEvaluateUserDoesNotExist() { | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */ | |||
$comment = $this->getMockBuilder(IComment::class)->getMock(); | |||
$comment->expects($this->any()) | |||
->method('getObjectType') | |||
@@ -195,7 +195,7 @@ class ListenerTest extends TestCase { | |||
->method('getId') | |||
->willReturn('1234'); | |||
/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */ | |||
/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */ | |||
$event = $this->getMockBuilder(CommentsEvent::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -206,7 +206,7 @@ class ListenerTest extends TestCase { | |||
->method(('getEvent')) | |||
->willReturn(CommentsEvent::EVENT_ADD); | |||
/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ | |||
/** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ | |||
$notification = $this->getMockBuilder(INotification::class)->getMock(); | |||
$notification->expects($this->any()) | |||
->method($this->anything()) |
@@ -46,21 +46,21 @@ class NotifierTest extends TestCase { | |||
/** @var Notifier */ | |||
protected $notifier; | |||
/** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $l10nFactory; | |||
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $l; | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $folder; | |||
/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $url; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var INotification|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var INotification|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $notification; | |||
/** @var IComment|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IComment|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $comment; | |||
/** @var string */ | |||
protected $lc = 'tlh_KX'; | |||
@@ -98,15 +98,15 @@ class NotifierTest extends TestCase { | |||
$displayName = 'Huraga'; | |||
$message = '@Huraga mentioned you in a comment on “Gre\'thor.odp”'; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ | |||
$user = $this->createMock(IUser::class); | |||
$user->expects($this->once()) | |||
->method('getDisplayName') | |||
->willReturn($displayName); | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $you */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $you */ | |||
$you = $this->createMock(IUser::class); | |||
/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createMock(Node::class); | |||
$node | |||
->expects($this->atLeastOnce()) | |||
@@ -227,10 +227,10 @@ class NotifierTest extends TestCase { | |||
$fileName = 'Gre\'thor.odp'; | |||
$message = 'You were mentioned on “Gre\'thor.odp”, in a comment by a user that has since been deleted'; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $you */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $you */ | |||
$you = $this->createMock(IUser::class); | |||
/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createMock(Node::class); | |||
$node | |||
->expects($this->atLeastOnce()) | |||
@@ -342,7 +342,7 @@ class NotifierTest extends TestCase { | |||
$this->notifier->prepare($this->notification, $this->lc); | |||
} | |||
public function testPrepareDifferentApp() { | |||
$this->expectException(\InvalidArgumentException::class); | |||
@@ -379,7 +379,7 @@ class NotifierTest extends TestCase { | |||
$this->notifier->prepare($this->notification, $this->lc); | |||
} | |||
public function testPrepareNotFound() { | |||
$this->expectException(\InvalidArgumentException::class); | |||
@@ -417,13 +417,13 @@ class NotifierTest extends TestCase { | |||
$this->notifier->prepare($this->notification, $this->lc); | |||
} | |||
public function testPrepareDifferentSubject() { | |||
$this->expectException(\InvalidArgumentException::class); | |||
$displayName = 'Huraga'; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ | |||
$user = $this->createMock(IUser::class); | |||
$user->expects($this->once()) | |||
->method('getDisplayName') | |||
@@ -480,13 +480,13 @@ class NotifierTest extends TestCase { | |||
$this->notifier->prepare($this->notification, $this->lc); | |||
} | |||
public function testPrepareNotFiles() { | |||
$this->expectException(\InvalidArgumentException::class); | |||
$displayName = 'Huraga'; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ | |||
$user = $this->createMock(IUser::class); | |||
$user->expects($this->once()) | |||
->method('getDisplayName') | |||
@@ -544,13 +544,13 @@ class NotifierTest extends TestCase { | |||
$this->notifier->prepare($this->notification, $this->lc); | |||
} | |||
public function testPrepareUnresolvableFileID() { | |||
$this->expectException(\OCP\Notification\AlreadyProcessedException::class); | |||
$displayName = 'Huraga'; | |||
/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ | |||
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ | |||
$user = $this->createMock(IUser::class); | |||
$user->expects($this->once()) | |||
->method('getDisplayName') |
@@ -37,7 +37,7 @@ class AvatarHomeTest extends TestCase { | |||
/** @var AvatarHome */ | |||
private $home; | |||
/** @var IAvatarManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IAvatarManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $avatarManager; | |||
protected function setUp(): void { |
@@ -28,14 +28,14 @@ use Test\TestCase; | |||
class AvatarNodeTest extends TestCase { | |||
public function testGetName() { | |||
/** @var IAvatar | \PHPUnit_Framework_MockObject_MockObject $a */ | |||
/** @var IAvatar | \PHPUnit\Framework\MockObject\MockObject $a */ | |||
$a = $this->createMock(IAvatar::class); | |||
$n = new AvatarNode(1024, 'png', $a); | |||
$this->assertEquals('1024.png', $n->getName()); | |||
} | |||
public function testGetContentType() { | |||
/** @var IAvatar | \PHPUnit_Framework_MockObject_MockObject $a */ | |||
/** @var IAvatar | \PHPUnit\Framework\MockObject\MockObject $a */ | |||
$a = $this->createMock(IAvatar::class); | |||
$n = new AvatarNode(1024, 'png', $a); | |||
$this->assertEquals('image/png', $n->getContentType()); |
@@ -37,10 +37,10 @@ use Test\TestCase; | |||
class CleanupInvitationTokenJobTest extends TestCase { | |||
/** @var IDBConnection | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $dbConnection; | |||
/** @var ITimeFactory | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var \OCA\DAV\BackgroundJob\GenerateBirthdayCalendarBackgroundJob */ |
@@ -32,10 +32,10 @@ use Test\TestCase; | |||
class GenerateBirthdayCalendarBackgroundJobTest extends TestCase { | |||
/** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var BirthdayService | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $birthdayService; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var \OCA\DAV\BackgroundJob\GenerateBirthdayCalendarBackgroundJob */ |
@@ -36,16 +36,16 @@ use Test\TestCase; | |||
class RegisterRegenerateBirthdayCalendarsTest extends TestCase { | |||
/** @var ITimeFactory | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $time; | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $jobList; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var RegisterRegenerateBirthdayCalendars */ |
@@ -42,13 +42,13 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase { | |||
/** @var UpdateCalendarResourcesRoomsBackgroundJob */ | |||
private $backgroundJob; | |||
/** @var IResourceManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IResourceManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $resourceManager; | |||
/** @var IRoomManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRoomManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $roomManager; | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $calDavBackend; | |||
protected function setUp(): void { |
@@ -55,13 +55,13 @@ abstract class AbstractCalDavBackend extends TestCase { | |||
/** @var CalDavBackend */ | |||
protected $backend; | |||
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Principal | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $principal; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $groupManager; | |||
/** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $dispatcher; | |||
/** @var ISecureRandom */ |
@@ -34,10 +34,10 @@ use Test\TestCase; | |||
class CalendarTest extends TestCase { | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $url; | |||
/** @var IFilter|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IFilter|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $filter; | |||
protected function setUp(): void { |
@@ -33,10 +33,10 @@ use Test\TestCase; | |||
class TodoTest extends TestCase { | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $url; | |||
/** @var IFilter|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IFilter|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $filter; | |||
protected function setUp(): void { |
@@ -34,13 +34,13 @@ use Test\TestCase; | |||
class EnablePluginTest extends TestCase { | |||
/** @var \Sabre\DAV\Server|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\DAV\Server|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $server; | |||
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $config; | |||
/** @var BirthdayService |\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var BirthdayService |\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $birthdayService; | |||
/** @var \OCA\DAV\CalDAV\BirthdayCalendar\EnablePlugin $plugin */ |
@@ -125,7 +125,7 @@ class CalDavBackendTest extends AbstractCalDavBackend { | |||
*/ | |||
public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add) { | |||
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject $l10n */ | |||
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */ | |||
$l10n = $this->createMock(IL10N::class); | |||
$l10n | |||
->expects($this->any()) | |||
@@ -506,7 +506,7 @@ EOD; | |||
$calendarInfo = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER)[0]; | |||
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject $l10n */ | |||
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */ | |||
$l10n = $this->createMock(IL10N::class); | |||
$config = $this->createMock(IConfig::class); | |||
@@ -37,7 +37,7 @@ use Test\TestCase; | |||
class CalendarHomeTest extends TestCase { | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
/** @var array */ | |||
@@ -69,7 +69,7 @@ class CalendarHomeTest extends TestCase { | |||
} | |||
public function testCreateCalendarValidName() { | |||
/** @var MkCol | \PHPUnit_Framework_MockObject_MockObject $mkCol */ | |||
/** @var MkCol | \PHPUnit\Framework\MockObject\MockObject $mkCol */ | |||
$mkCol = $this->createMock(MkCol::class); | |||
$mkCol->method('getResourceType') | |||
@@ -89,7 +89,7 @@ class CalendarHomeTest extends TestCase { | |||
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class); | |||
$this->expectExceptionMessage('The resource you tried to create has a reserved name'); | |||
/** @var MkCol | \PHPUnit_Framework_MockObject_MockObject $mkCol */ | |||
/** @var MkCol | \PHPUnit\Framework\MockObject\MockObject $mkCol */ | |||
$mkCol = $this->createMock(MkCol::class); | |||
$this->calendarHome->createExtendedCollection('contact_birthdays', $mkCol); | |||
@@ -99,7 +99,7 @@ class CalendarHomeTest extends TestCase { | |||
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class); | |||
$this->expectExceptionMessage('The resource you tried to create has a reserved name'); | |||
/** @var MkCol | \PHPUnit_Framework_MockObject_MockObject $mkCol */ | |||
/** @var MkCol | \PHPUnit\Framework\MockObject\MockObject $mkCol */ | |||
$mkCol = $this->createMock(MkCol::class); | |||
$this->calendarHome->createExtendedCollection('app-generated--example--foo-1', $mkCol); |
@@ -34,13 +34,13 @@ class CalendarImplTest extends \Test\TestCase { | |||
/** @var CalendarImpl */ | |||
private $calendarImpl; | |||
/** @var Calendar | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Calendar | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $calendar; | |||
/** @var array */ | |||
private $calendarInfo; | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
protected function setUp(): void { |
@@ -36,13 +36,13 @@ use OCP\IL10N; | |||
class CalendarManagerTest extends \Test\TestCase { | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10n; | |||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var CalendarManager */ | |||
@@ -66,7 +66,7 @@ class CalendarManagerTest extends \Test\TestCase { | |||
['id' => 456, 'uri' => 'blablub2'], | |||
]); | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $calendarManager */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject $calendarManager */ | |||
$calendarManager = $this->createMock(Manager::class); | |||
$calendarManager->expects($this->at(0)) | |||
->method('registerCalendar') |
@@ -60,7 +60,7 @@ class CalendarTest extends TestCase { | |||
} | |||
public function testDelete() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->once())->method('updateShares'); | |||
$backend->expects($this->any())->method('getShares')->willReturn([ | |||
@@ -80,7 +80,7 @@ class CalendarTest extends TestCase { | |||
public function testDeleteFromGroup() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->never())->method('updateShares'); | |||
$backend->expects($this->any())->method('getShares')->willReturn([ | |||
@@ -97,7 +97,7 @@ class CalendarTest extends TestCase { | |||
} | |||
public function testDeleteOwn() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->createMock(CalDavBackend::class); | |||
$backend->expects($this->never())->method('updateShares'); | |||
$backend->expects($this->never())->method('getShares'); | |||
@@ -118,7 +118,7 @@ class CalendarTest extends TestCase { | |||
} | |||
public function testDeleteBirthdayCalendar() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->createMock(CalDavBackend::class); | |||
$backend->expects($this->once())->method('deleteCalendar') | |||
->with(666); | |||
@@ -169,7 +169,7 @@ class CalendarTest extends TestCase { | |||
* @dataProvider dataPropPatch | |||
*/ | |||
public function testPropPatch($ownerPrincipal, $principalUri, $mutations, $shared) { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$calendarInfo = [ | |||
'{http://owncloud.org/ns}owner-principal' => $ownerPrincipal, | |||
@@ -193,7 +193,7 @@ class CalendarTest extends TestCase { | |||
* @dataProvider providesReadOnlyInfo | |||
*/ | |||
public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet, $uri = 'default') { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1); | |||
$calendarInfo = [ | |||
@@ -300,7 +300,7 @@ class CalendarTest extends TestCase { | |||
$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL]; | |||
$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('getCalendarObjects')->willReturn([ | |||
$calObject0, $calObject1, $calObject2 | |||
@@ -387,7 +387,7 @@ EOD; | |||
$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'calendardata' => $calData]; | |||
$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('getCalendarObjects')->willReturn([ | |||
$calObject0, $calObject1, $calObject2 | |||
@@ -554,7 +554,7 @@ EOD; | |||
'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL, | |||
'calendardata' => $confidentialObjectData]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->createMock(CalDavBackend::class); | |||
$backend->expects($this->any()) | |||
->method('getCalendarObjects') |
@@ -60,11 +60,11 @@ class PublicCalendarRootTest extends TestCase { | |||
private $publicCalendarRoot; | |||
/** @var IL10N */ | |||
private $l10n; | |||
/** @var Principal|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Principal|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $principal; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $groupManager; | |||
/** @var IConfig */ | |||
protected $config; |
@@ -42,7 +42,7 @@ class PublicCalendarTest extends CalendarTest { | |||
$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL]; | |||
$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('getCalendarObjects')->willReturn([ | |||
$calObject0, $calObject1, $calObject2 | |||
@@ -62,7 +62,7 @@ class PublicCalendarTest extends CalendarTest { | |||
'id' => 666, | |||
'uri' => 'cal', | |||
]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | IConfig $config */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | IConfig $config */ | |||
$config = $this->createMock(IConfig::class); | |||
$c = new PublicCalendar($backend, $calendarInfo, $this->l10n, $config); | |||
@@ -129,7 +129,7 @@ EOD; | |||
$calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL, 'calendardata' => $calData]; | |||
$calObject2 = ['uri' => 'event-2', 'classification' => CalDavBackend::CLASSIFICATION_PRIVATE]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CalDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('getCalendarObjects')->willReturn([ | |||
$calObject0, $calObject1, $calObject2 | |||
@@ -149,7 +149,7 @@ EOD; | |||
'id' => 666, | |||
'uri' => 'cal', | |||
]; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | IConfig $config */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | IConfig $config */ | |||
$config = $this->createMock(IConfig::class); | |||
$c = new PublicCalendar($backend, $calendarInfo, $this->l10n, $config); | |||
@@ -43,11 +43,11 @@ class PluginTest extends TestCase { | |||
private $plugin; | |||
/** @var Server */ | |||
private $server; | |||
/** @var Calendar | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Calendar | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $book; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $urlGenerator; | |||
protected function setUp(): void { |
@@ -39,16 +39,16 @@ abstract class AbstractPrincipalBackendTest extends TestCase { | |||
/** @var \OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend|\OCA\DAV\CalDAV\ResourceBooking\RoomPrincipalBackend */ | |||
protected $principalBackend; | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userSession; | |||
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $groupManager; | |||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $logger; | |||
/** @var ProxyMapper|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ProxyMapper|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $proxyMapper; | |||
/** @var string */ |
@@ -44,16 +44,16 @@ class AddressBookImplTest extends TestCase { | |||
/** @var array */ | |||
private $addressBookInfo; | |||
/** @var AddressBook | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var AddressBook | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $addressBook; | |||
/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $urlGenerator; | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
/** @var VCard | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var VCard | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $vCard; | |||
protected function setUp(): void { | |||
@@ -92,7 +92,7 @@ class AddressBookImplTest extends TestCase { | |||
public function testSearch() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | AddressBookImpl $addressBookImpl */ | |||
$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -138,7 +138,7 @@ class AddressBookImplTest extends TestCase { | |||
public function testCreate($properties) { | |||
$uid = 'uid'; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | AddressBookImpl $addressBookImpl */ | |||
$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -178,7 +178,7 @@ class AddressBookImplTest extends TestCase { | |||
$uri = 'bla.vcf'; | |||
$properties = ['URI' => $uri, 'UID' => $uid, 'FN' => 'John Doe']; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | AddressBookImpl $addressBookImpl */ | |||
$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -261,7 +261,7 @@ class AddressBookImplTest extends TestCase { | |||
} | |||
public function testCreateUid() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | AddressBookImpl $addressBookImpl */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | AddressBookImpl $addressBookImpl */ | |||
$addressBookImpl = $this->getMockBuilder(AddressBookImpl::class) | |||
->setConstructorArgs( | |||
[ |
@@ -34,7 +34,7 @@ use Test\TestCase; | |||
class AddressBookTest extends TestCase { | |||
public function testDelete() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CardDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->once())->method('updateShares'); | |||
$backend->expects($this->any())->method('getShares')->willReturn([ | |||
@@ -52,11 +52,11 @@ class AddressBookTest extends TestCase { | |||
$c->delete(); | |||
} | |||
public function testDeleteFromGroup() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CardDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->never())->method('updateShares'); | |||
$backend->expects($this->any())->method('getShares')->willReturn([ | |||
@@ -74,11 +74,11 @@ class AddressBookTest extends TestCase { | |||
$c->delete(); | |||
} | |||
public function testPropPatch() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CardDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$calendarInfo = [ | |||
'{http://owncloud.org/ns}owner-principal' => 'user1', | |||
@@ -96,7 +96,7 @@ class AddressBookTest extends TestCase { | |||
* @dataProvider providesReadOnlyInfo | |||
*/ | |||
public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet) { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | CardDavBackend $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->any())->method('applyShareAcl')->willReturnArgument(1); | |||
$calendarInfo = [ |
@@ -41,17 +41,17 @@ class BirthdayServiceTest extends TestCase { | |||
/** @var BirthdayService */ | |||
private $service; | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $calDav; | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $cardDav; | |||
/** @var GroupPrincipalBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var GroupPrincipalBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $groupPrincipalBackend; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var IDBConnection | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $dbConnection; | |||
/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10n; | |||
protected function setUp(): void { | |||
@@ -209,7 +209,7 @@ class BirthdayServiceTest extends TestCase { | |||
$this->cardDav->expects($this->once())->method('getShares')->willReturn([]); | |||
$this->calDav->expects($this->never())->method('getCalendarByUri'); | |||
/** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject $service */ | |||
/** @var BirthdayService | \PHPUnit\Framework\MockObject\MockObject $service */ | |||
$service = $this->getMockBuilder(BirthdayService::class) | |||
->setMethods(['buildDateFromContact', 'birthdayEvenChanged']) | |||
->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincipalBackend, $this->config, $this->dbConnection, $this->l10n]) | |||
@@ -245,7 +245,7 @@ class BirthdayServiceTest extends TestCase { | |||
]); | |||
$this->cardDav->expects($this->once())->method('getShares')->willReturn([]); | |||
/** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject $service */ | |||
/** @var BirthdayService | \PHPUnit\Framework\MockObject\MockObject $service */ | |||
$service = $this->getMockBuilder(BirthdayService::class) | |||
->setMethods(['buildDateFromContact', 'birthdayEvenChanged']) | |||
->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincipalBackend, $this->config, $this->dbConnection, $this->l10n]) |
@@ -66,16 +66,16 @@ class CardDavBackendTest extends TestCase { | |||
/** @var CardDavBackend */ | |||
private $backend; | |||
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Principal | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $principal; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $groupManager; | |||
/** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $dispatcher; | |||
/** @var IDBConnection */ | |||
@@ -239,7 +239,7 @@ class CardDavBackendTest extends TestCase { | |||
public function testCardOperations() { | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class) | |||
->setConstructorArgs([$this->db, $this->principal, $this->userManager, $this->groupManager, $this->dispatcher]) | |||
->setMethods(['updateProperties', 'purgeProperties'])->getMock(); |
@@ -35,11 +35,11 @@ use Test\TestCase; | |||
class ContactsManagerTest extends TestCase { | |||
public function test() { | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject $cm */ | |||
$cm = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock(); | |||
$cm->expects($this->exactly(2))->method('registerAddressBook'); | |||
$urlGenerator = $this->getMockBuilder(IURLGenerator::class)->disableOriginalConstructor()->getMock(); | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backEnd */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $backEnd */ | |||
$backEnd = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backEnd->method('getAddressBooksForUser')->willReturn([ | |||
['{DAV:}displayname' => 'Test address book', 'uri' => 'default'], |
@@ -31,12 +31,11 @@ use OC\Accounts\AccountManager; | |||
use OCA\DAV\CardDAV\Converter; | |||
use OCP\IImage; | |||
use OCP\IUser; | |||
use PHPUnit_Framework_MockObject_MockObject; | |||
use Test\TestCase; | |||
class ConverterTest extends TestCase { | |||
/** @var AccountManager | PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var AccountManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $accountManager; | |||
protected function setUp(): void { | |||
@@ -201,7 +200,7 @@ class ConverterTest extends TestCase { | |||
* @param $displayName | |||
* @param $eMailAddress | |||
* @param $cloudId | |||
* @return IUser | PHPUnit_Framework_MockObject_MockObject | |||
* @return IUser | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
protected function getUserMock($displayName, $eMailAddress, $cloudId) { | |||
$image0 = $this->getMockBuilder(IImage::class)->disableOriginalConstructor()->getMock(); |
@@ -40,17 +40,17 @@ use Test\TestCase; | |||
class ImageExportPluginTest extends TestCase { | |||
/** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $response; | |||
/** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var RequestInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var ImageExportPlugin|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ImageExportPlugin|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $plugin; | |||
/** @var Server */ | |||
private $server; | |||
/** @var Tree|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Tree|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $tree; | |||
/** @var PhotoCache|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var PhotoCache|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cache; | |||
protected function setUp(): void { |
@@ -43,13 +43,13 @@ class PluginTest extends TestCase { | |||
private $plugin; | |||
/** @var Server */ | |||
private $server; | |||
/** @var IShareable | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IShareable | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $book; | |||
protected function setUp(): void { | |||
parent::setUp(); | |||
/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */ | |||
/** @var Auth | \PHPUnit\Framework\MockObject\MockObject $authBackend */ | |||
$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock(); | |||
$authBackend->method('isDavAuthenticated')->willReturn(true); | |||
@@ -72,7 +72,7 @@ class SyncServiceTest extends TestCase { | |||
} | |||
public function testEnsureSystemAddressBookExists() { | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$backend->expects($this->exactly(1))->method('createAddressBook'); | |||
$backend->expects($this->at(0))->method('getAddressBooksByUri')->willReturn(null); | |||
@@ -103,7 +103,7 @@ class SyncServiceTest extends TestCase { | |||
* @return void | |||
*/ | |||
public function testUpdateAndDeleteUser($activated, $createCalls, $updateCalls, $deleteCalls) { | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $backend */ | |||
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock(); | |||
$logger = $this->getMockBuilder(ILogger::class)->disableOriginalConstructor()->getMock(); | |||
@@ -119,10 +119,10 @@ class SyncServiceTest extends TestCase { | |||
->with('principals/system/system', 'system') | |||
->willReturn(['id' => -1]); | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject $userManager */ | |||
$userManager = $this->getMockBuilder(IUserManager::class)->disableOriginalConstructor()->getMock(); | |||
/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */ | |||
/** @var IUser | \PHPUnit\Framework\MockObject\MockObject $user */ | |||
$user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); | |||
$user->method('getBackendClassName')->willReturn('unittest'); | |||
$user->method('getUID')->willReturn('test-user'); | |||
@@ -181,7 +181,7 @@ class SyncServiceTest extends TestCase { | |||
* @param int $createCount | |||
* @param int $updateCount | |||
* @param int $deleteCount | |||
* @return \PHPUnit_Framework_MockObject_MockObject | |||
* @return \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private function getBackendMock($createCount, $updateCount, $deleteCount) { | |||
$backend = $this->getMockBuilder(CardDavBackend::class) | |||
@@ -196,13 +196,13 @@ class SyncServiceTest extends TestCase { | |||
/** | |||
* @param $backend | |||
* @param $response | |||
* @return SyncService|\PHPUnit_Framework_MockObject_MockObject | |||
* @return SyncService|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private function getSyncServiceMock($backend, $response) { | |||
$userManager = $this->getMockBuilder(IUserManager::class)->disableOriginalConstructor()->getMock(); | |||
$logger = $this->getMockBuilder(ILogger::class)->disableOriginalConstructor()->getMock(); | |||
$accountManager = $this->getMockBuilder(AccountManager::class)->disableOriginalConstructor()->getMock(); | |||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */ | |||
/** @var SyncService | \PHPUnit\Framework\MockObject\MockObject $ss */ | |||
$ss = $this->getMockBuilder(SyncService::class) | |||
->setMethods(['ensureSystemAddressBookExists', 'requestSyncReport', 'download', 'getCertPath']) | |||
->setConstructorArgs([$backend, $userManager, $logger, $accountManager]) |
@@ -50,16 +50,16 @@ class MoveCalendarTest extends TestCase { | |||
/** @var \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject $groupManager */ | |||
private $groupManager; | |||
/** @var \OCP\Share\IManager|\PHPUnit_Framework_MockObject_MockObject $shareManager */ | |||
/** @var \OCP\Share\IManager|\PHPUnit\Framework\MockObject\MockObject $shareManager */ | |||
private $shareManager; | |||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $l10n */ | |||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $l10n */ | |||
private $config; | |||
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject $l10n */ | |||
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */ | |||
private $l10n; | |||
/** @var CalDavBackend|\PHPUnit_Framework_MockObject_MockObject $l10n */ | |||
/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject $l10n */ | |||
private $calDav; | |||
/** @var MoveCalendar */ |
@@ -50,10 +50,10 @@ class RemoveInvalidSharesTest extends TestCase { | |||
public function test() { | |||
$db = \OC::$server->getDatabaseConnection(); | |||
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject $principal */ | |||
/** @var Principal | \PHPUnit\Framework\MockObject\MockObject $principal */ | |||
$principal = $this->createMock(Principal::class); | |||
/** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $output */ | |||
/** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $output */ | |||
$output = $this->createMock(IOutput::class); | |||
$repair = new RemoveInvalidShares($db, $principal); |
@@ -39,7 +39,7 @@ use Sabre\DAV\PropPatch; | |||
class CommentsNodeTest extends \Test\TestCase { | |||
/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
protected $comment; |
@@ -35,15 +35,15 @@ use OCP\IUserSession; | |||
class EntityCollectionTest extends \Test\TestCase { | |||
/** @var \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\Comments\ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $logger; | |||
/** @var EntityCollection */ | |||
protected $collection; | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userSession; | |||
protected function setUp(): void { | |||
@@ -90,7 +90,7 @@ class EntityCollectionTest extends \Test\TestCase { | |||
$this->assertTrue($node instanceof \OCA\DAV\Comments\CommentNode); | |||
} | |||
public function testGetChildException() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
@@ -33,15 +33,15 @@ use OCP\IUserSession; | |||
class EntityTypeCollectionTest extends \Test\TestCase { | |||
/** @var ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $logger; | |||
/** @var \OCA\DAV\Comments\EntityTypeCollection */ | |||
protected $collection; | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userSession; | |||
protected $childMap = []; | |||
@@ -92,14 +92,14 @@ class EntityTypeCollectionTest extends \Test\TestCase { | |||
$this->assertTrue($ec instanceof EntityCollectionImplemantation); | |||
} | |||
public function testGetChildException() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
$this->collection->getChild('17'); | |||
} | |||
public function testGetChildren() { | |||
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class); | |||
@@ -39,19 +39,19 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; | |||
class RootCollectionTest extends \Test\TestCase { | |||
/** @var \OCP\Comments\ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\Comments\ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $commentsManager; | |||
/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $logger; | |||
/** @var \OCA\DAV\Comments\RootCollection */ | |||
protected $collection; | |||
/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userSession; | |||
/** @var EventDispatcherInterface */ | |||
protected $dispatcher; | |||
/** @var \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $user; | |||
protected function setUp(): void { | |||
@@ -107,14 +107,14 @@ class RootCollectionTest extends \Test\TestCase { | |||
}); | |||
} | |||
public function testCreateFile() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
$this->collection->createFile('foo'); | |||
} | |||
public function testCreateDirectory() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
@@ -127,7 +127,7 @@ class RootCollectionTest extends \Test\TestCase { | |||
$this->assertTrue($etc instanceof EntityTypeCollectionImplementation); | |||
} | |||
public function testGetChildInvalid() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
@@ -135,7 +135,7 @@ class RootCollectionTest extends \Test\TestCase { | |||
$this->collection->getChild('robots'); | |||
} | |||
public function testGetChildNoAuth() { | |||
$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class); | |||
@@ -151,7 +151,7 @@ class RootCollectionTest extends \Test\TestCase { | |||
} | |||
} | |||
public function testGetChildrenNoAuth() { | |||
$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class); | |||
@@ -168,14 +168,14 @@ class RootCollectionTest extends \Test\TestCase { | |||
$this->assertFalse($this->collection->childExists('robots')); | |||
} | |||
public function testChildExistsNoAuth() { | |||
$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class); | |||
$this->collection->childExists('files'); | |||
} | |||
public function testDelete() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
@@ -186,7 +186,7 @@ class RootCollectionTest extends \Test\TestCase { | |||
$this->assertSame('comments', $this->collection->getName()); | |||
} | |||
public function testSetName() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
@@ -42,11 +42,11 @@ use OCP\Share\IShare; | |||
*/ | |||
class PublicAuthTest extends \Test\TestCase { | |||
/** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $session; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var \OCA\DAV\Connector\PublicAuth */ | |||
private $auth; |
@@ -37,11 +37,11 @@ use Test\TestCase; | |||
* @group DB | |||
*/ | |||
class BearerAuthTest extends TestCase { | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSession; | |||
/** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $session; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var BearerAuth */ | |||
private $bearerAuth; | |||
@@ -87,9 +87,9 @@ class BearerAuthTest extends TestCase { | |||
} | |||
public function testChallenge() { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject|RequestInterface $request */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject|RequestInterface $request */ | |||
$request = $this->createMock(RequestInterface::class); | |||
/** @var \PHPUnit_Framework_MockObject_MockObject|ResponseInterface $response */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject|ResponseInterface $response */ | |||
$response = $this->createMock(ResponseInterface::class); | |||
$result = $this->bearerAuth->challenge($request, $response); | |||
$this->assertEmpty($result); |
@@ -29,7 +29,6 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; | |||
use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; | |||
use OCP\IConfig; | |||
use PHPUnit_Framework_MockObject_MockObject; | |||
use Test\TestCase; | |||
/** | |||
@@ -38,7 +37,7 @@ use Test\TestCase; | |||
* @package OCA\DAV\Tests\unit\Connector\Sabre | |||
*/ | |||
class BlockLegacyClientPluginTest extends TestCase { | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var BlockLegacyClientPlugin */ | |||
private $blockLegacyClientVersionPlugin; | |||
@@ -73,7 +72,7 @@ class BlockLegacyClientPluginTest extends TestCase { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
$this->expectExceptionMessage('Unsupported client version.'); | |||
/** @var \Sabre\HTTP\RequestInterface | PHPUnit_Framework_MockObject_MockObject $request */ | |||
/** @var \Sabre\HTTP\RequestInterface | \PHPUnit\Framework\MockObject\MockObject $request */ | |||
$request = $this->createMock('\Sabre\HTTP\RequestInterface'); | |||
$request | |||
->expects($this->once()) | |||
@@ -108,7 +107,7 @@ class BlockLegacyClientPluginTest extends TestCase { | |||
* @param string $userAgent | |||
*/ | |||
public function testBeforeHandlerSuccess($userAgent) { | |||
/** @var \Sabre\HTTP\RequestInterface | PHPUnit_Framework_MockObject_MockObject $request */ | |||
/** @var \Sabre\HTTP\RequestInterface | \PHPUnit\Framework\MockObject\MockObject $request */ | |||
$request = $this->createMock('\Sabre\HTTP\RequestInterface'); | |||
$request | |||
->expects($this->once()) | |||
@@ -126,7 +125,7 @@ class BlockLegacyClientPluginTest extends TestCase { | |||
} | |||
public function testBeforeHandlerNoUserAgent() { | |||
/** @var \Sabre\HTTP\RequestInterface | PHPUnit_Framework_MockObject_MockObject $request */ | |||
/** @var \Sabre\HTTP\RequestInterface | \PHPUnit\Framework\MockObject\MockObject $request */ | |||
$request = $this->createMock('\Sabre\HTTP\RequestInterface'); | |||
$request | |||
->expects($this->once()) |
@@ -71,9 +71,9 @@ class TestViewDirectory extends \OC\Files\View { | |||
*/ | |||
class DirectoryTest extends \Test\TestCase { | |||
/** @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $view; | |||
/** @var \OC\Files\FileInfo | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OC\Files\FileInfo | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $info; | |||
protected function setUp(): void { |
@@ -32,7 +32,6 @@ use OC\Log; | |||
use OC\SystemConfig; | |||
use OCA\DAV\Connector\Sabre\Exception\InvalidPath; | |||
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin as PluginToTest; | |||
use PHPUnit_Framework_MockObject_MockObject; | |||
use Sabre\DAV\Exception\NotFound; | |||
use Sabre\DAV\Exception\ServiceUnavailable; | |||
use Sabre\DAV\Server; | |||
@@ -56,7 +55,7 @@ class ExceptionLoggerPluginTest extends TestCase { | |||
/** @var PluginToTest */ | |||
private $plugin; | |||
/** @var TestLogger | PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var TestLogger | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $logger; | |||
private function init() { |
@@ -61,7 +61,7 @@ class FileTest extends TestCase { | |||
*/ | |||
private $user; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $config; | |||
protected function setUp(): void { | |||
@@ -89,7 +89,7 @@ class FileTest extends TestCase { | |||
} | |||
/** | |||
* @return \PHPUnit_Framework_MockObject_MockObject|Storage | |||
* @return \PHPUnit\Framework\MockObject\MockObject|Storage | |||
*/ | |||
private function getMockStorage() { | |||
$storage = $this->getMockBuilder(Storage::class) | |||
@@ -177,7 +177,7 @@ class FileTest extends TestCase { | |||
->setConstructorArgs([['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]]) | |||
->getMock(); | |||
\OC\Files\Filesystem::mount($storage, [], $this->user . '/'); | |||
/** @var View | \PHPUnit_Framework_MockObject_MockObject $view */ | |||
/** @var View | \PHPUnit\Framework\MockObject\MockObject $view */ | |||
$view = $this->getMockBuilder(View::class) | |||
->setMethods(['getRelativePath', 'resolvePath']) | |||
->getMock(); | |||
@@ -323,7 +323,7 @@ class FileTest extends TestCase { | |||
null | |||
); | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit_Framework_MockObject_MockObject $file */ | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit\Framework\MockObject\MockObject $file */ | |||
$file = $this->getMockBuilder(\OCA\DAV\Connector\Sabre\File::class) | |||
->setConstructorArgs([$view, $info, null, $request]) | |||
->setMethods(['header']) | |||
@@ -837,7 +837,7 @@ class FileTest extends TestCase { | |||
$file->setName('/super*star.txt'); | |||
} | |||
public function testUploadAbort() { | |||
// setup | |||
$view = $this->getMockBuilder(View::class) | |||
@@ -881,7 +881,7 @@ class FileTest extends TestCase { | |||
$this->assertEmpty($this->listPartFiles($view, ''), 'No stray part files'); | |||
} | |||
public function testDeleteWhenAllowed() { | |||
// setup | |||
$view = $this->getMockBuilder(View::class) | |||
@@ -901,7 +901,7 @@ class FileTest extends TestCase { | |||
$file->delete(); | |||
} | |||
public function testDeleteThrowsWhenDeletionNotAllowed() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
@@ -919,7 +919,7 @@ class FileTest extends TestCase { | |||
$file->delete(); | |||
} | |||
public function testDeleteThrowsWhenDeletionFailed() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
@@ -942,7 +942,7 @@ class FileTest extends TestCase { | |||
$file->delete(); | |||
} | |||
public function testDeleteThrowsWhenDeletionThrows() { | |||
$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class); | |||
@@ -1112,7 +1112,7 @@ class FileTest extends TestCase { | |||
]; | |||
} | |||
public function testGetFopenFails() { | |||
$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class); | |||
@@ -1132,7 +1132,7 @@ class FileTest extends TestCase { | |||
$file->get(); | |||
} | |||
public function testGetFopenThrows() { | |||
$this->expectException(\OCA\DAV\Connector\Sabre\Exception\Forbidden::class); | |||
@@ -1152,7 +1152,7 @@ class FileTest extends TestCase { | |||
$file->get(); | |||
} | |||
public function testGetThrowsIfNoPermission() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
@@ -69,12 +69,12 @@ class FilesPluginTest extends TestCase { | |||
public const HAS_PREVIEW_PROPERTYNAME = FilesPlugin::HAS_PREVIEW_PROPERTYNAME; | |||
/** | |||
* @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $server; | |||
/** | |||
* @var \Sabre\DAV\Tree | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \Sabre\DAV\Tree | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $tree; | |||
@@ -84,17 +84,17 @@ class FilesPluginTest extends TestCase { | |||
private $plugin; | |||
/** | |||
* @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\IConfig | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $config; | |||
/** | |||
* @var \OCP\IRequest | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\IRequest | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $request; | |||
/** | |||
* @var \OCP\IPreview | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\IPreview | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $previewManager; | |||
@@ -135,7 +135,7 @@ class FilesPluginTest extends TestCase { | |||
/** | |||
* @param string $class | |||
* @return \PHPUnit_Framework_MockObject_MockObject | |||
* @return \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private function createTestNode($class, $path = '/dummypath') { | |||
$node = $this->getMockBuilder($class) | |||
@@ -177,7 +177,7 @@ class FilesPluginTest extends TestCase { | |||
} | |||
public function testGetPropertiesForFile() { | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File'); | |||
$propFind = new PropFind( | |||
@@ -232,7 +232,7 @@ class FilesPluginTest extends TestCase { | |||
} | |||
public function testGetPropertiesStorageNotAvailable() { | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File'); | |||
$propFind = new PropFind( | |||
@@ -274,7 +274,7 @@ class FilesPluginTest extends TestCase { | |||
0 | |||
); | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\File | \PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File'); | |||
$node->expects($this->any()) | |||
->method('getDavPermissions') | |||
@@ -289,7 +289,7 @@ class FilesPluginTest extends TestCase { | |||
} | |||
public function testGetPropertiesForDirectory() { | |||
/** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory'); | |||
$propFind = new PropFind( | |||
@@ -324,7 +324,7 @@ class FilesPluginTest extends TestCase { | |||
} | |||
public function testGetPropertiesForRootDirectory() { | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->getMockBuilder(Directory::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -360,7 +360,7 @@ class FilesPluginTest extends TestCase { | |||
// But we still want to load the directory list, so this is okay for us. | |||
// $this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->getMockBuilder(Directory::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -509,7 +509,7 @@ class FilesPluginTest extends TestCase { | |||
$this->plugin->checkMove('FolderA/test.txt', 'test.txt'); | |||
} | |||
public function testMoveSrcNotExist() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
$this->expectExceptionMessage('FolderA/test.txt does not exist'); | |||
@@ -584,7 +584,7 @@ class FilesPluginTest extends TestCase { | |||
} | |||
public function testHasPreview() { | |||
/** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit_Framework_MockObject_MockObject $node */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit\Framework\MockObject\MockObject $node */ | |||
$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory'); | |||
$propFind = new PropFind( |
@@ -50,19 +50,19 @@ use Sabre\DAV\Tree; | |||
use Sabre\HTTP\ResponseInterface; | |||
class FilesReportPluginTest extends \Test\TestCase { | |||
/** @var \Sabre\DAV\Server|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\DAV\Server|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $server; | |||
/** @var \Sabre\DAV\Tree|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\DAV\Tree|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $tree; | |||
/** @var ISystemTagObjectMapper|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISystemTagObjectMapper|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $tagMapper; | |||
/** @var ISystemTagManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $tagManager; | |||
/** @var ITags|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITags|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $privateTags; | |||
/** @var \OCP\IUserSession */ | |||
@@ -71,19 +71,19 @@ class FilesReportPluginTest extends \Test\TestCase { | |||
/** @var FilesReportPluginImplementation */ | |||
private $plugin; | |||
/** @var View|\PHPUnit_Framework_MockObject_MockObject **/ | |||
/** @var View|\PHPUnit\Framework\MockObject\MockObject **/ | |||
private $view; | |||
/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject **/ | |||
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject **/ | |||
private $groupManager; | |||
/** @var Folder|\PHPUnit_Framework_MockObject_MockObject **/ | |||
/** @var Folder|\PHPUnit\Framework\MockObject\MockObject **/ | |||
private $userFolder; | |||
/** @var IPreview|\PHPUnit_Framework_MockObject_MockObject * */ | |||
/** @var IPreview|\PHPUnit\Framework\MockObject\MockObject * */ | |||
private $previewManager; | |||
/** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject * */ | |||
/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject * */ | |||
private $appManager; | |||
protected function setUp(): void { | |||
@@ -307,7 +307,7 @@ class FilesReportPluginTest extends \Test\TestCase { | |||
->with('222') | |||
->willReturn([$filesNode2]); | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $reportTargetNode */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit\Framework\MockObject\MockObject $reportTargetNode */ | |||
$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']); | |||
$this->assertCount(2, $result); | |||
@@ -358,7 +358,7 @@ class FilesReportPluginTest extends \Test\TestCase { | |||
->with('222') | |||
->willReturn([$filesNode2]); | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $reportTargetNode */ | |||
/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit\Framework\MockObject\MockObject $reportTargetNode */ | |||
$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']); | |||
$this->assertCount(2, $result); | |||
@@ -604,7 +604,7 @@ class FilesReportPluginTest extends \Test\TestCase { | |||
$this->assertEquals(['222'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules]))); | |||
} | |||
public function testProcessFilterRulesInvisibleTagAsUser() { | |||
$this->expectException(\OCP\SystemTag\TagNotFoundException::class); | |||
@@ -46,28 +46,28 @@ use Test\TestCase; | |||
class PrincipalTest extends TestCase { | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var \OCA\DAV\Connector\Sabre\Principal */ | |||
private $connector; | |||
/** @var IGroupManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $groupManager; | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var IUserSession | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSession; | |||
/** @var IAppManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IAppManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $appManager; | |||
/** @var ProxyMapper | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ProxyMapper | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $proxyMapper; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
protected function setUp(): void { |
@@ -42,10 +42,10 @@ use Test\TestCase; | |||
*/ | |||
class QuotaPluginTest extends TestCase { | |||
/** @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $server; | |||
/** @var \OCA\DAV\Connector\Sabre\QuotaPlugin | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\DAV\Connector\Sabre\QuotaPlugin | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $plugin; | |||
private function init($quota, $checkedPath = '') { |
@@ -39,25 +39,25 @@ use Test\TestCase; | |||
class BirthdayCalendarControllerTest extends TestCase { | |||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $db; | |||
/** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $jobList; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var CalDavBackend|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $caldav; | |||
/** @var BirthdayCalendarController|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var BirthdayCalendarController|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $controller; | |||
protected function setUp(): void { |
@@ -44,19 +44,19 @@ use Test\TestCase; | |||
class DirectControllerTest extends TestCase { | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $rootFolder; | |||
/** @var DirectMapper|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var DirectMapper|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $directMapper; | |||
/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $random; | |||
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $urlGenerator; | |||
/** @var DirectController */ |
@@ -44,16 +44,16 @@ class InvitationResponseControllerTest extends TestCase { | |||
/** @var InvitationResponseController */ | |||
private $controller; | |||
/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $dbConnection; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var InvitationResponseServer|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var InvitationResponseServer|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $responseServer; | |||
protected function setUp(): void { |
@@ -25,7 +25,6 @@ | |||
namespace OCA\DAV\Tests\unit\DAV; | |||
use OCA\DAV\Files\BrowserErrorPagePlugin; | |||
use PHPUnit_Framework_MockObject_MockObject; | |||
use Sabre\DAV\Exception\NotFound; | |||
use Sabre\HTTP\Response; | |||
@@ -37,11 +36,11 @@ class BrowserErrorPagePluginTest extends \Test\TestCase { | |||
* @param $exception | |||
*/ | |||
public function test($expectedCode, $exception) { | |||
/** @var BrowserErrorPagePlugin | PHPUnit_Framework_MockObject_MockObject $plugin */ | |||
/** @var BrowserErrorPagePlugin | \PHPUnit\Framework\MockObject\MockObject $plugin */ | |||
$plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->setMethods(['sendResponse', 'generateBody'])->getMock(); | |||
$plugin->expects($this->once())->method('generateBody')->willReturn(':boom:'); | |||
$plugin->expects($this->once())->method('sendResponse'); | |||
/** @var \Sabre\DAV\Server | PHPUnit_Framework_MockObject_MockObject $server */ | |||
/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject $server */ | |||
$server = $this->getMockBuilder('Sabre\DAV\Server')->disableOriginalConstructor()->getMock(); | |||
$server->expects($this->once())->method('on'); | |||
$httpResponse = $this->getMockBuilder(Response::class)->disableOriginalConstructor()->getMock(); |
@@ -39,16 +39,16 @@ use Test\TestCase; | |||
*/ | |||
class CustomPropertiesBackendTest extends TestCase { | |||
/** @var Tree | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Tree | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $tree; | |||
/** @var IDBConnection */ | |||
private $dbConnection; | |||
/** @var IUser | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUser | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $user; | |||
/** @var CustomPropertiesBackend | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CustomPropertiesBackend | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
protected function setUp(): void { |
@@ -39,13 +39,13 @@ use Sabre\DAV\PropPatch; | |||
class GroupPrincipalTest extends \Test\TestCase { | |||
/** @var IGroupManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IGroupManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $groupManager; | |||
/** @var IUserSession | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSession; | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var GroupPrincipalBackend */ | |||
@@ -176,7 +176,7 @@ class GroupPrincipalTest extends \Test\TestCase { | |||
$this->assertSame([], $response); | |||
} | |||
public function testSetGroupMembership() { | |||
$this->expectException(\Sabre\DAV\Exception::class); | |||
$this->expectExceptionMessage('Setting members of the group is not supported yet'); | |||
@@ -312,7 +312,7 @@ class GroupPrincipalTest extends \Test\TestCase { | |||
} | |||
/** | |||
* @return Group|\PHPUnit_Framework_MockObject_MockObject | |||
* @return Group|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private function mockGroup($gid) { | |||
$fooGroup = $this->createMock(Group::class); |
@@ -44,7 +44,7 @@ class HookManagerTest extends TestCase { | |||
/** @var IL10N */ | |||
private $l10n; | |||
/** @var EventDispatcherInterface | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var EventDispatcherInterface | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $eventDispatcher; | |||
protected function setUp(): void { | |||
@@ -65,17 +65,17 @@ class HookManagerTest extends TestCase { | |||
->getMock(); | |||
$user->expects($this->once())->method('getUID')->willReturn('newUser'); | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject $userManager */ | |||
$userManager = $this->getMockBuilder(IUserManager::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ | |||
/** @var SyncService | \PHPUnit\Framework\MockObject\MockObject $syncService */ | |||
$syncService = $this->getMockBuilder(SyncService::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject $cal */ | |||
$cal = $this->getMockBuilder(CalDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -84,7 +84,7 @@ class HookManagerTest extends TestCase { | |||
'principals/users/newUser', | |||
'personal', ['{DAV:}displayname' => 'Personal']); | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $card */ | |||
$card = $this->getMockBuilder(CardDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -103,24 +103,24 @@ class HookManagerTest extends TestCase { | |||
->getMock(); | |||
$user->expects($this->once())->method('getUID')->willReturn('newUser'); | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject $userManager */ | |||
$userManager = $this->getMockBuilder(IUserManager::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ | |||
/** @var SyncService | \PHPUnit\Framework\MockObject\MockObject $syncService */ | |||
$syncService = $this->getMockBuilder(SyncService::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject $cal */ | |||
$cal = $this->getMockBuilder(CalDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
$cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1); | |||
$cal->expects($this->never())->method('createCalendar'); | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $card */ | |||
$card = $this->getMockBuilder(CardDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -137,17 +137,17 @@ class HookManagerTest extends TestCase { | |||
->getMock(); | |||
$user->expects($this->once())->method('getUID')->willReturn('newUser'); | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject $userManager */ | |||
$userManager = $this->getMockBuilder(IUserManager::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ | |||
/** @var SyncService | \PHPUnit\Framework\MockObject\MockObject $syncService */ | |||
$syncService = $this->getMockBuilder(SyncService::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject $cal */ | |||
$cal = $this->getMockBuilder(CalDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -156,7 +156,7 @@ class HookManagerTest extends TestCase { | |||
'principals/users/newUser', | |||
'personal', ['{DAV:}displayname' => 'Personal']); | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $card */ | |||
$card = $this->getMockBuilder(CardDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -174,20 +174,20 @@ class HookManagerTest extends TestCase { | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject $userManager */ | |||
$userManager = $this->getMockBuilder(IUserManager::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
$userManager->expects($this->once())->method('get')->willReturn($user); | |||
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ | |||
/** @var SyncService | \PHPUnit\Framework\MockObject\MockObject $syncService */ | |||
$syncService = $this->getMockBuilder(SyncService::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
$syncService->expects($this->once()) | |||
->method('deleteUser'); | |||
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ | |||
/** @var CalDavBackend | \PHPUnit\Framework\MockObject\MockObject $cal */ | |||
$cal = $this->getMockBuilder(CalDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); | |||
@@ -197,7 +197,7 @@ class HookManagerTest extends TestCase { | |||
$cal->expects($this->once())->method('deleteCalendar'); | |||
$cal->expects($this->once())->method('deleteAllSharesByUser'); | |||
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ | |||
/** @var CardDavBackend | \PHPUnit\Framework\MockObject\MockObject $card */ | |||
$card = $this->getMockBuilder(CardDavBackend::class) | |||
->disableOriginalConstructor() | |||
->getMock(); |
@@ -43,13 +43,13 @@ class PluginTest extends TestCase { | |||
private $plugin; | |||
/** @var Server */ | |||
private $server; | |||
/** @var IShareable | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IShareable | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $book; | |||
protected function setUp(): void { | |||
parent::setUp(); | |||
/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */ | |||
/** @var Auth | \PHPUnit\Framework\MockObject\MockObject $authBackend */ | |||
$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock(); | |||
$authBackend->method('isDavAuthenticated')->willReturn(true); | |||
@@ -39,13 +39,13 @@ class DirectFileTest extends TestCase { | |||
/** @var Direct */ | |||
private $direct; | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $rootFolder; | |||
/** @var Folder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userFolder; | |||
/** @var File|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var File|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $file; | |||
/** @var DirectFile */ |
@@ -42,16 +42,16 @@ use Test\TestCase; | |||
class DirectHomeTest extends TestCase { | |||
/** @var DirectMapper|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var DirectMapper|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $directMapper; | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $rootFolder; | |||
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $throttler; | |||
/** @var IRequest */ |
@@ -47,28 +47,28 @@ use SearchDAV\Query\Query; | |||
use Test\TestCase; | |||
class FileSearchBackendTest extends TestCase { | |||
/** @var CachingTree|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CachingTree|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $tree; | |||
/** @var IUser */ | |||
private $user; | |||
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $rootFolder; | |||
/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var View|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var View|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $view; | |||
/** @var Folder|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $searchFolder; | |||
/** @var FileSearchBackend */ | |||
private $search; | |||
/** @var Directory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Directory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $davFolder; | |||
protected function setUp(): void { |
@@ -35,19 +35,19 @@ use Test\TestCase; | |||
class FilesDropPluginTest extends TestCase { | |||
/** @var View|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var View|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $view; | |||
/** @var Server|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Server|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $server; | |||
/** @var FilesDropPlugin */ | |||
private $plugin; | |||
/** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var RequestInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $response; | |||
protected function setUp(): void { |
@@ -40,13 +40,13 @@ use Test\TestCase; | |||
*/ | |||
class CalDAVRemoveEmptyValueTest extends TestCase { | |||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $logger; | |||
/** @var CalDavBackend|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var CalDavBackend|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $backend; | |||
/** @var IOutput|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IOutput|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $output; | |||
/** @var string */ | |||
@@ -63,7 +63,7 @@ UID:1234567890@example.com | |||
DTSTAMP:20151214T091032Z | |||
STATUS:CONFIRMED | |||
SEQUENCE:0 | |||
SUMMARY:Ein Geburtstag | |||
SUMMARY:Ein Geburtstag | |||
DTSTART;VALUE=:20151223T173000Z | |||
X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC | |||
CREATED;VALUE=:20151214T091032Z | |||
@@ -84,7 +84,7 @@ UID:1234567890@example.com | |||
DTSTAMP:20151214T091032Z | |||
STATUS:CONFIRMED | |||
SEQUENCE:0 | |||
SUMMARY:Ein Geburtstag | |||
SUMMARY:Ein Geburtstag | |||
DTSTART:20151223T173000Z | |||
X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC | |||
CREATED:20151214T091032Z | |||
@@ -100,7 +100,7 @@ END:VCALENDAR'; | |||
} | |||
public function testRunAllValid() { | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit_Framework_MockObject_MockObject $step */ | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */ | |||
$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class) | |||
->setConstructorArgs([ | |||
\OC::$server->getDatabaseConnection(), | |||
@@ -124,7 +124,7 @@ END:VCALENDAR'; | |||
} | |||
public function testRunInvalid() { | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit_Framework_MockObject_MockObject $step */ | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */ | |||
$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class) | |||
->setConstructorArgs([ | |||
\OC::$server->getDatabaseConnection(), | |||
@@ -167,7 +167,7 @@ END:VCALENDAR'; | |||
} | |||
public function testRunValid() { | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit_Framework_MockObject_MockObject $step */ | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */ | |||
$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class) | |||
->setConstructorArgs([ | |||
\OC::$server->getDatabaseConnection(), | |||
@@ -209,7 +209,7 @@ END:VCALENDAR'; | |||
} | |||
public function testRunStillInvalid() { | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit_Framework_MockObject_MockObject $step */ | |||
/** @var CalDAVRemoveEmptyValue|\PHPUnit\Framework\MockObject\MockObject $step */ | |||
$step = $this->getMockBuilder(CalDAVRemoveEmptyValue::class) | |||
->setConstructorArgs([ | |||
\OC::$server->getDatabaseConnection(), |
@@ -35,10 +35,10 @@ use Test\TestCase; | |||
class RefreshWebcalJobRegistrarTest extends TestCase { | |||
/** @var IDBConnection | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $db; | |||
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $jobList; | |||
/** @var RefreshWebcalJobRegistrar */ |
@@ -34,10 +34,10 @@ use Test\TestCase; | |||
class RegenerateBirthdayCalendarsTest extends TestCase { | |||
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $jobList; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var RegenerateBirthdayCalendars */ |
@@ -31,7 +31,7 @@ use Test\TestCase; | |||
class AppleProvisioningNodeTest extends TestCase { | |||
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $timeFactory; | |||
/** @var AppleProvisioningNode */ | |||
@@ -48,7 +48,7 @@ class AppleProvisioningNodeTest extends TestCase { | |||
$this->assertEquals('apple-provisioning.mobileconfig', $this->node->getName()); | |||
} | |||
public function testSetName() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
$this->expectExceptionMessage('Renaming apple-provisioning.mobileconfig is forbidden'); | |||
@@ -60,7 +60,7 @@ class AppleProvisioningNodeTest extends TestCase { | |||
$this->assertEquals(null, $this->node->getLastModified()); | |||
} | |||
public function testDelete() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
$this->expectExceptionMessage('apple-provisioning.mobileconfig may not be deleted'); | |||
@@ -79,7 +79,7 @@ class AppleProvisioningNodeTest extends TestCase { | |||
], $this->node->getProperties([])); | |||
} | |||
public function testGetPropPatch() { | |||
$this->expectException(\Sabre\DAV\Exception\Forbidden::class); | |||
$this->expectExceptionMessage('apple-provisioning.mobileconfig\'s properties may not be altered.'); |
@@ -37,28 +37,28 @@ use Test\TestCase; | |||
class AppleProvisioningPluginTest extends TestCase { | |||
/** @var \Sabre\DAV\Server|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\DAV\Server|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $server; | |||
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userSession; | |||
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $urlGenerator; | |||
/** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $themingDefaults; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $request; | |||
/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $l10n; | |||
/** @var \Sabre\HTTP\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\HTTP\RequestInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $sabreRequest; | |||
/** @var \Sabre\HTTP\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Sabre\HTTP\ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $sabreResponse; | |||
/** @var AppleProvisioningPlugin */ |
@@ -42,7 +42,7 @@ class ServerTest extends \Test\TestCase { | |||
* @dataProvider providesUris | |||
*/ | |||
public function test($uri, array $plugins) { | |||
/** @var IRequest | \PHPUnit_Framework_MockObject_MockObject $r */ | |||
/** @var IRequest | \PHPUnit\Framework\MockObject\MockObject $r */ | |||
$r = $this->createMock(IRequest::class); | |||
$r->expects($this->any())->method('getRequestUri')->willReturn($uri); | |||
$s = new Server($r, '/'); |
@@ -31,7 +31,7 @@ use Test\TestCase; | |||
class CalDAVSettingsTest extends TestCase { | |||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var CalDAVSettings */ |
@@ -37,7 +37,7 @@ use Sabre\DAV\Exception\Forbidden; | |||
class SystemTagNodeTest extends \Test\TestCase { | |||
/** | |||
* @var \OCP\SystemTag\ISystemTagManager|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\SystemTag\ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $tagManager; | |||
@@ -81,7 +81,7 @@ class SystemTagNodeTest extends \Test\TestCase { | |||
$this->assertEquals($tag, $node->getSystemTag()); | |||
} | |||
public function testSetName() { | |||
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class); | |||
@@ -198,7 +198,7 @@ class SystemTagNodeTest extends \Test\TestCase { | |||
$this->assertInstanceOf($expectedException, $thrown); | |||
} | |||
public function testUpdateTagAlreadyExists() { | |||
$this->expectException(\Sabre\DAV\Exception\Conflict::class); | |||
@@ -218,7 +218,7 @@ class SystemTagNodeTest extends \Test\TestCase { | |||
$this->getTagNode(false, $tag)->update('Renamed', true, true); | |||
} | |||
public function testUpdateTagNotFound() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
@@ -286,7 +286,7 @@ class SystemTagNodeTest extends \Test\TestCase { | |||
$this->getTagNode(false, $tag)->delete(); | |||
} | |||
public function testDeleteTagNotFound() { | |||
$this->expectException(\Sabre\DAV\Exception\NotFound::class); | |||
@@ -37,12 +37,12 @@ class ChunkingPluginTest extends TestCase { | |||
/** | |||
* @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $server; | |||
/** | |||
* @var \Sabre\DAV\Tree | \PHPUnit_Framework_MockObject_MockObject | |||
* @var \Sabre\DAV\Tree | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $tree; | |||
@@ -50,9 +50,9 @@ class ChunkingPluginTest extends TestCase { | |||
* @var ChunkingPlugin | |||
*/ | |||
private $plugin; | |||
/** @var RequestInterface | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var RequestInterface | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var ResponseInterface | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ResponseInterface | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $response; | |||
protected function setUp(): void { |
@@ -38,19 +38,19 @@ class TestEnableMasterKey extends TestCase { | |||
/** @var EnableMasterKey */ | |||
protected $enableMasterKey; | |||
/** @var Util | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Util | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $util; | |||
/** @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $config; | |||
/** @var \Symfony\Component\Console\Helper\QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Symfony\Component\Console\Helper\QuestionHelper | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $questionHelper; | |||
/** @var \Symfony\Component\Console\Output\OutputInterface | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Symfony\Component\Console\Output\OutputInterface | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $output; | |||
/** @var \Symfony\Component\Console\Input\InputInterface | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \Symfony\Component\Console\Input\InputInterface | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $input; | |||
protected function setUp(): void { |
@@ -37,13 +37,13 @@ use Test\TestCase; | |||
class RecoveryControllerTest extends TestCase { | |||
/** @var RecoveryController */ | |||
private $controller; | |||
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $requestMock; | |||
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $configMock; | |||
/** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10nMock; | |||
/** @var \OCA\Encryption\Recovery|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Recovery|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $recoveryMock; | |||
public function adminRecoveryProvider() { |
@@ -46,33 +46,33 @@ class SettingsControllerTest extends TestCase { | |||
/** @var SettingsController */ | |||
private $controller; | |||
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $requestMock; | |||
/** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10nMock; | |||
/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManagerMock; | |||
/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSessionMock; | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $keyManagerMock; | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cryptMock; | |||
/** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $sessionMock; | |||
/** @var MockObject|IUser */ | |||
private $user; | |||
/** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ISession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $ocSessionMock; | |||
/** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Util|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $utilMock; | |||
protected function setUp(): void { |
@@ -36,16 +36,16 @@ use Test\TestCase; | |||
class StatusControllerTest extends TestCase { | |||
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $requestMock; | |||
/** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10nMock; | |||
/** @var \OCA\Encryption\Session | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Session | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $sessionMock; | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $encryptionManagerMock; | |||
/** @var StatusController */ |
@@ -37,16 +37,16 @@ use Test\TestCase; | |||
class CryptTest extends TestCase { | |||
/** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $logger; | |||
/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSession; | |||
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $config; | |||
/** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $l; | |||
/** @var Crypt */ | |||
@@ -385,7 +385,7 @@ class CryptTest extends TestCase { | |||
* @dataProvider dataTestDecryptPrivateKey | |||
*/ | |||
public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected) { | |||
/** @var \OCA\Encryption\Crypto\Crypt | \PHPUnit_Framework_MockObject_MockObject $crypt */ | |||
/** @var \OCA\Encryption\Crypto\Crypt | \PHPUnit\Framework\MockObject\MockObject $crypt */ | |||
$crypt = $this->getMockBuilder(Crypt::class) | |||
->setConstructorArgs( | |||
[ |
@@ -38,19 +38,19 @@ class DecryptAllTest extends TestCase { | |||
/** @var DecryptAll */ | |||
protected $instance; | |||
/** @var Util | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Util | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $util; | |||
/** @var KeyManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var KeyManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $keyManager; | |||
/** @var Crypt | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Crypt | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $crypt; | |||
/** @var Session | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Session | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $session; | |||
/** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var QuestionHelper | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $questionHelper; | |||
protected function setUp(): void { |
@@ -49,43 +49,43 @@ use Test\TestCase; | |||
class EncryptAllTest extends TestCase { | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\KeyManager */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\KeyManager */ | |||
protected $keyManager; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\Util */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\Util */ | |||
protected $util; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IUserManager */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IUserManager */ | |||
protected $userManager; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\Users\Setup */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Encryption\Users\Setup */ | |||
protected $setupUser; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\View */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Files\View */ | |||
protected $view; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ | |||
protected $config; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Mail\IMailer */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Mail\IMailer */ | |||
protected $mailer; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IL10N */ | |||
protected $l; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Helper\QuestionHelper */ | |||
protected $questionHelper; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Input\InputInterface */ | |||
protected $inputInterface; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Output\OutputInterface */ | |||
protected $outputInterface; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\UserInterface */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\UserInterface */ | |||
protected $userInterface; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Security\ISecureRandom */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Security\ISecureRandom */ | |||
protected $secureRandom; | |||
/** @var EncryptAll */ | |||
@@ -144,7 +144,7 @@ class EncryptAllTest extends TestCase { | |||
} | |||
public function testEncryptAll() { | |||
/** @var EncryptAll | \PHPUnit_Framework_MockObject_MockObject $encryptAll */ | |||
/** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */ | |||
$encryptAll = $this->getMockBuilder(EncryptAll::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -172,7 +172,7 @@ class EncryptAllTest extends TestCase { | |||
} | |||
public function testEncryptAllWithMasterKey() { | |||
/** @var EncryptAll | \PHPUnit_Framework_MockObject_MockObject $encryptAll */ | |||
/** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */ | |||
$encryptAll = $this->getMockBuilder(EncryptAll::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -201,7 +201,7 @@ class EncryptAllTest extends TestCase { | |||
} | |||
public function testCreateKeyPairs() { | |||
/** @var EncryptAll | \PHPUnit_Framework_MockObject_MockObject $encryptAll */ | |||
/** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */ | |||
$encryptAll = $this->getMockBuilder(EncryptAll::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -250,7 +250,7 @@ class EncryptAllTest extends TestCase { | |||
} | |||
public function testEncryptAllUsersFiles() { | |||
/** @var EncryptAll | \PHPUnit_Framework_MockObject_MockObject $encryptAll */ | |||
/** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */ | |||
$encryptAll = $this->getMockBuilder(EncryptAll::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -282,7 +282,7 @@ class EncryptAllTest extends TestCase { | |||
} | |||
public function testEncryptUsersFiles() { | |||
/** @var EncryptAll | \PHPUnit_Framework_MockObject_MockObject $encryptAll */ | |||
/** @var EncryptAll | \PHPUnit\Framework\MockObject\MockObject $encryptAll */ | |||
$encryptAll = $this->getMockBuilder(EncryptAll::class) | |||
->setConstructorArgs( | |||
[ |
@@ -47,31 +47,31 @@ class EncryptionTest extends TestCase { | |||
/** @var Encryption */ | |||
private $instance; | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $keyManagerMock; | |||
/** @var \OCA\Encryption\Crypto\EncryptAll|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Crypto\EncryptAll|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $encryptAllMock; | |||
/** @var \OCA\Encryption\Crypto\DecryptAll|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Crypto\DecryptAll|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $decryptAllMock; | |||
/** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $sessionMock; | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cryptMock; | |||
/** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Util|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $utilMock; | |||
/** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $loggerMock; | |||
/** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10nMock; | |||
/** @var \OCP\Files\Storage|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\Files\Storage|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $storageMock; | |||
protected function setUp(): void { | |||
@@ -428,7 +428,7 @@ class EncryptionTest extends TestCase { | |||
]; | |||
} | |||
public function testDecrypt() { | |||
$this->expectException(\OC\Encryption\Exceptions\DecryptionFailedException::class); | |||
$this->expectExceptionMessage('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.'); |
@@ -50,32 +50,32 @@ use Test\TestCase; | |||
*/ | |||
class UserHooksTest extends TestCase { | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $utilMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $recoveryMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $sessionMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $keyManagerMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $userManagerMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $userSetupMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $userSessionMock; | |||
/** | |||
@@ -83,11 +83,11 @@ class UserHooksTest extends TestCase { | |||
*/ | |||
private $user; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $cryptMock; | |||
/** | |||
* @var \PHPUnit_Framework_MockObject_MockObject | |||
* @var \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $loggerMock; | |||
/** | |||
@@ -162,7 +162,7 @@ class UserHooksTest extends TestCase { | |||
*/ | |||
public function testPreSetPassphrase($canChange) { | |||
/** @var UserHooks | \PHPUnit_Framework_MockObject_MockObject $instance */ | |||
/** @var UserHooks | \PHPUnit\Framework\MockObject\MockObject $instance */ | |||
$instance = $this->getMockBuilder(UserHooks::class) | |||
->setConstructorArgs( | |||
[ |
@@ -58,25 +58,25 @@ class KeyManagerTest extends TestCase { | |||
/** @var string */ | |||
private $systemKeyId; | |||
/** @var \OCP\Encryption\Keys\IStorage|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\Encryption\Keys\IStorage|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $keyStorageMock; | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cryptMock; | |||
/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userMock; | |||
/** @var \OCA\Encryption\Session|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $sessionMock; | |||
/** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $logMock; | |||
/** @var \OCA\Encryption\Util|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\Encryption\Util|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $utilMock; | |||
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $configMock; | |||
protected function setUp(): void { | |||
@@ -220,7 +220,7 @@ class KeyManagerTest extends TestCase { | |||
]; | |||
} | |||
public function testUserHasKeysMissingPrivateKey() { | |||
$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class); | |||
@@ -236,7 +236,7 @@ class KeyManagerTest extends TestCase { | |||
$this->instance->userHasKeys($this->userId); | |||
} | |||
public function testUserHasKeysMissingPublicKey() { | |||
$this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class); | |||
@@ -259,7 +259,7 @@ class KeyManagerTest extends TestCase { | |||
*/ | |||
public function testInit($useMasterKey) { | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject $instance */ | |||
/** @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject $instance */ | |||
$instance = $this->getMockBuilder(KeyManager::class) | |||
->setConstructorArgs( | |||
[ | |||
@@ -532,7 +532,7 @@ class KeyManagerTest extends TestCase { | |||
); | |||
} | |||
public function testGetMasterKeyPasswordException() { | |||
$this->expectException(\Exception::class); | |||
@@ -549,7 +549,7 @@ class KeyManagerTest extends TestCase { | |||
*/ | |||
public function testValidateMasterKey($masterKey) { | |||
/** @var \OCA\Encryption\KeyManager | \PHPUnit_Framework_MockObject_MockObject $instance */ | |||
/** @var \OCA\Encryption\KeyManager | \PHPUnit\Framework\MockObject\MockObject $instance */ | |||
$instance = $this->getMockBuilder(KeyManager::class) | |||
->setConstructorArgs( | |||
[ |
@@ -42,15 +42,15 @@ use Test\TestCase; | |||
class RecoveryTest extends TestCase { | |||
private static $tempStorage = []; | |||
/** | |||
* @var \OCP\Encryption\IFile|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\Encryption\IFile|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $fileMock; | |||
/** | |||
* @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OC\Files\View|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $viewMock; | |||
/** | |||
* @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $userSessionMock; | |||
/** | |||
@@ -58,15 +58,15 @@ class RecoveryTest extends TestCase { | |||
*/ | |||
private $user; | |||
/** | |||
* @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $keyManagerMock; | |||
/** | |||
* @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $configMock; | |||
/** | |||
* @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $cryptMock; | |||
/** |
@@ -37,10 +37,10 @@ class SessionTest extends TestCase { | |||
* @var Session | |||
*/ | |||
private $instance; | |||
/** @var \OCP\ISession|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\ISession|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $sessionMock; | |||
public function testThatGetPrivateKeyThrowsExceptionWhenNotSet() { | |||
$this->expectException(\OCA\Encryption\Exceptions\PrivateKeyMissingException::class); | |||
$this->expectExceptionMessage('Private Key missing for user: please try to log-out and log-in again'); | |||
@@ -119,7 +119,7 @@ class SessionTest extends TestCase { | |||
$this->instance->getDecryptAllKey(); | |||
} | |||
public function testSetAndGetStatusWillSetAndReturn() { | |||
// Check if get status will return 0 if it has not been set before | |||
$this->assertEquals(0, $this->instance->getStatus()); | |||
@@ -141,7 +141,7 @@ class SessionTest extends TestCase { | |||
* @param bool $expected | |||
*/ | |||
public function testIsReady($status, $expected) { | |||
/** @var Session | \PHPUnit_Framework_MockObject_MockObject $instance */ | |||
/** @var Session | \PHPUnit\Framework\MockObject\MockObject $instance */ | |||
$instance = $this->getMockBuilder(Session::class) | |||
->setConstructorArgs([$this->sessionMock]) | |||
->setMethods(['getStatus'])->getMock(); | |||
@@ -186,7 +186,7 @@ class SessionTest extends TestCase { | |||
return null; | |||
} | |||
public function testClearWillRemoveValues() { | |||
$this->instance->setPrivateKey('privateKey'); | |||
$this->instance->setStatus('initStatus'); | |||
@@ -196,7 +196,7 @@ class SessionTest extends TestCase { | |||
$this->assertEmpty(self::$tempStorage); | |||
} | |||
protected function setUp(): void { | |||
parent::setUp(); | |||
$this->sessionMock = $this->createMock(ISession::class); |
@@ -35,11 +35,11 @@ use Test\TestCase; | |||
class SetupTest extends TestCase { | |||
/** | |||
* @var \OCA\Encryption\KeyManager|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCA\Encryption\KeyManager|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $keyManagerMock; | |||
/** | |||
* @var \OCA\Encryption\Crypto\Crypt|\PHPUnit_Framework_MockObject_MockObject | |||
* @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private $cryptMock; | |||
/** |
@@ -44,16 +44,16 @@ use Test\TestCase; | |||
class UtilTest extends TestCase { | |||
private static $tempStorage = []; | |||
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $configMock; | |||
/** @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OC\Files\View|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $filesMock; | |||
/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManagerMock; | |||
/** @var \OCP\Files\Mount\IMountPoint|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\Files\Mount\IMountPoint|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $mountMock; | |||
/** @var Util */ |
@@ -37,10 +37,10 @@ class AddressHandlerTest extends \Test\TestCase { | |||
/** @var AddressHandler */ | |||
private $addressHandler; | |||
/** @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 $il10n; | |||
/** @var CloudIdManager */ |
@@ -50,34 +50,34 @@ class MountPublicLinkControllerTest extends \Test\TestCase { | |||
/** @var MountPublicLinkController */ | |||
private $controller; | |||
/** @var \OCP\IRequest | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\IRequest | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var FederatedShareProvider | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var FederatedShareProvider | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $federatedShareProvider; | |||
/** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var AddressHandler | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var AddressHandler | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $addressHandler; | |||
/** @var IRootFolder | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $rootFolder; | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var ISession | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISession | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $session; | |||
/** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $l10n; | |||
/** @var IUserSession | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserSession | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $userSession; | |||
/** @var IClientService | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IClientService | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $clientService; | |||
/** @var IShare */ |
@@ -59,46 +59,46 @@ class RequestHandlerControllerTest extends \Test\TestCase { | |||
/** @var RequestHandlerController */ | |||
private $requestHandler; | |||
/** @var \OCA\FederatedFileSharing\FederatedShareProvider|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\FederatedFileSharing\FederatedShareProvider|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $federatedShareProvider; | |||
/** @var \OCA\FederatedFileSharing\Notifications|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\FederatedFileSharing\Notifications|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $notifications; | |||
/** @var \OCA\FederatedFileSharing\AddressHandler|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCA\FederatedFileSharing\AddressHandler|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $addressHandler; | |||
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $userManager; | |||
/** @var IShare|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IShare|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $share; | |||
/** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cloudIdManager; | |||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $logger; | |||
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $request; | |||
/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $connection; | |||
/** @var Share\IManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Share\IManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $shareManager; | |||
/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICloudFederationFactory|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cloudFederationFactory; | |||
/** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICloudFederationProviderManager|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cloudFederationProviderManager; | |||
/** @var ICloudFederationProvider|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICloudFederationProvider|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cloudFederationProvider; | |||
/** @var ICloudFederationShare|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ICloudFederationShare|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $cloudFederationShare; | |||
protected function setUp(): void { | |||
@@ -172,7 +172,7 @@ class RequestHandlerControllerTest extends \Test\TestCase { | |||
'file' | |||
)->willReturn($this->cloudFederationShare); | |||
/** @var ICloudFederationProvider|\PHPUnit_Framework_MockObject_MockObject $provider */ | |||
/** @var ICloudFederationProvider|\PHPUnit\Framework\MockObject\MockObject $provider */ | |||
$this->cloudFederationProviderManager->expects($this->once()) | |||
->method('getCloudFederationProvider') | |||
->with('file') |
@@ -57,23 +57,23 @@ class FederatedShareProviderTest extends \Test\TestCase { | |||
/** @var IDBConnection */ | |||
protected $connection; | |||
/** @var AddressHandler | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var AddressHandler | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $addressHandler; | |||
/** @var Notifications | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var Notifications | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $notifications; | |||
/** @var TokenHandler|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var TokenHandler|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $tokenHandler; | |||
/** @var IL10N */ | |||
protected $l; | |||
/** @var ILogger */ | |||
protected $logger; | |||
/** @var IRootFolder | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IRootFolder | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $rootFolder; | |||
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $config; | |||
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject */ | |||
protected $userManager; | |||
/** @var \OCP\GlobalScale\IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var \OCP\GlobalScale\IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
protected $gsConfig; | |||
/** @var IManager */ | |||
@@ -84,7 +84,7 @@ class FederatedShareProviderTest extends \Test\TestCase { | |||
/** @var ICloudIdManager */ | |||
private $cloudIdManager; | |||
/** @var \PHPUnit_Framework_MockObject_MockObject|ICloudFederationProviderManager */ | |||
/** @var \PHPUnit\Framework\MockObject\MockObject|ICloudFederationProviderManager */ | |||
private $cloudFederationProviderManager; | |||
protected function setUp(): void { |
@@ -35,25 +35,25 @@ use OCP\OCS\IDiscoveryService; | |||
class NotificationsTest extends \Test\TestCase { | |||
/** @var AddressHandler | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var AddressHandler | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $addressHandler; | |||
/** @var IClientService | \PHPUnit_Framework_MockObject_MockObject*/ | |||
/** @var IClientService | \PHPUnit\Framework\MockObject\MockObject*/ | |||
private $httpClientService; | |||
/** @var IDiscoveryService | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IDiscoveryService | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $discoveryService; | |||
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $jobList; | |||
/** @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 IEventDispatcher|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $eventDispatcher; | |||
protected function setUp(): void { | |||
@@ -73,7 +73,7 @@ class NotificationsTest extends \Test\TestCase { | |||
* get instance of Notifications class | |||
* | |||
* @param array $mockedMethods methods which should be mocked | |||
* @return Notifications | \PHPUnit_Framework_MockObject_MockObject | |||
* @return Notifications | \PHPUnit\Framework\MockObject\MockObject | |||
*/ | |||
private function getInstance(array $mockedMethods = []) { | |||
if (empty($mockedMethods)) { |
@@ -36,7 +36,7 @@ class AdminTest extends TestCase { | |||
private $admin; | |||
/** @var \OCA\FederatedFileSharing\FederatedShareProvider */ | |||
private $federatedShareProvider; | |||
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ | |||
private $gsConfig; | |||
protected function setUp(): void { |
@@ -32,7 +32,7 @@ class TokenHandlerTest extends \Test\TestCase { | |||
/** @var TokenHandler */ | |||
private $tokenHandler; | |||
/** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */ | |||
/** @var ISecureRandom | \PHPUnit\Framework\MockObject\MockObject */ | |||
private $secureRandom; | |||
/** @var int */ |
@@ -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( | |||
[ |
@@ -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( | |||
[ |
@@ -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( | |||
[ |
@@ -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 { |
@@ -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); |
@@ -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 */ |