diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-08-11 22:32:18 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-08-12 14:55:19 +0300 |
| commit | 234b510652d117bb3ef9ef3b6315db3a2c2eb91b (patch) | |
| tree | 880cec2bf4fe4846eff9fa5aa68d2671fb0495be /apps | |
| parent | 138f47a1b980aaceb116b256b8ccf14f523e7e67 (diff) | |
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps')
182 files changed, 970 insertions, 980 deletions
diff --git a/apps/admin_audit/tests/Actions/SecurityTest.php b/apps/admin_audit/tests/Actions/SecurityTest.php index 63453ca0ea0..611f7a3edcb 100644 --- a/apps/admin_audit/tests/Actions/SecurityTest.php +++ b/apps/admin_audit/tests/Actions/SecurityTest.php @@ -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 { diff --git a/apps/comments/tests/Unit/Activity/ListenerTest.php b/apps/comments/tests/Unit/Activity/ListenerTest.php index 9b73e80f03b..576cc7d9a25 100644 --- a/apps/comments/tests/Unit/Activity/ListenerTest.php +++ b/apps/comments/tests/Unit/Activity/ListenerTest.php @@ -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'); diff --git a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php index 3127cd3b9d0..103d21d76a3 100644 --- a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php +++ b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php @@ -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; diff --git a/apps/comments/tests/Unit/Controller/NotificationsTest.php b/apps/comments/tests/Unit/Controller/NotificationsTest.php index cba183a9497..99cdd27a1c8 100644 --- a/apps/comments/tests/Unit/Controller/NotificationsTest.php +++ b/apps/comments/tests/Unit/Controller/NotificationsTest.php @@ -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 { diff --git a/apps/comments/tests/Unit/EventHandlerTest.php b/apps/comments/tests/Unit/EventHandlerTest.php index bb1d660af1e..daf638aa3d1 100644 --- a/apps/comments/tests/Unit/EventHandlerTest.php +++ b/apps/comments/tests/Unit/EventHandlerTest.php @@ -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(); diff --git a/apps/comments/tests/Unit/Notification/ListenerTest.php b/apps/comments/tests/Unit/Notification/ListenerTest.php index 8fb717e4257..71380c06fec 100644 --- a/apps/comments/tests/Unit/Notification/ListenerTest.php +++ b/apps/comments/tests/Unit/Notification/ListenerTest.php @@ -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()) diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php index dbb79176320..4f400ae7ffe 100644 --- a/apps/comments/tests/Unit/Notification/NotifierTest.php +++ b/apps/comments/tests/Unit/Notification/NotifierTest.php @@ -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') diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php index cce30d75fd2..8a0e9a2d026 100644 --- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php index de81e903667..d47e6d167f0 100644 --- a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php @@ -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()); diff --git a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php index e97ef8adfda..b5e849b6f51 100644 --- a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php b/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php index 2bd142fb086..f80518bed65 100644 --- a/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php index b7d907e5ce5..a36df7d710a 100644 --- a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php +++ b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php b/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php index cc960b4e5d2..7c099f07362 100644 --- a/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php index 79da92148af..c7371761266 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php @@ -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 */ diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php index 1e0fbe7b984..d5023ac91c5 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php index a44c9b5abbf..0462928eef2 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php index 645eaa8b2f8..0f4b64fc727 100644 --- a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php +++ b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 4e343340f25..ee08719f9bc 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -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); diff --git a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php index 6f35b09014a..d78f2a54cd8 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php @@ -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); diff --git a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php index efd9353d1dc..f84934a6029 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php b/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php index b4095990e50..a04bc1afdc7 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php @@ -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') diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index da3a6f9e55c..e143820daeb 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -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') diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index c70ec6e17f3..985da38133c 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php @@ -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; diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php index 5710a1793c6..446452ae6c0 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php @@ -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); diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php index cf30df723cf..70731878a41 100644 --- a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php +++ b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php index e614da37f4c..d4649fccd29 100644 --- a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index 242106fbcc9..2d8c9cb10ab 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -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( [ diff --git a/apps/dav/tests/unit/CardDAV/AddressBookTest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php index 0121df9c8d5..cddbd5164dc 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookTest.php @@ -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 = [ diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php index 8885637aee6..ee73c6437f5 100644 --- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php @@ -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]) diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index 0e507bc6b3d..6b90096c57f 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -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(); diff --git a/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php index ef2652121cb..63c1413eec0 100644 --- a/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php +++ b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php @@ -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'], diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php index d502783ba41..8b4125c6c68 100644 --- a/apps/dav/tests/unit/CardDAV/ConverterTest.php +++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php @@ -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(); diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php index 1fbcea4f3f6..649249659c7 100644 --- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php +++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php @@ -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 { diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php index 48d9479c999..146ead4ed3f 100644 --- a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php @@ -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); diff --git a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php index 87e239cfa5e..0a474d649bc 100644 --- a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php @@ -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]) diff --git a/apps/dav/tests/unit/Command/MoveCalendarTest.php b/apps/dav/tests/unit/Command/MoveCalendarTest.php index 750863175a2..25c283b8964 100644 --- a/apps/dav/tests/unit/Command/MoveCalendarTest.php +++ b/apps/dav/tests/unit/Command/MoveCalendarTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php index 2416ec6978f..296cec48bce 100644 --- a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php +++ b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php @@ -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); diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php index 6bb0033ecb8..b9633c7e10a 100644 --- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php +++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php @@ -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; diff --git a/apps/dav/tests/unit/Comments/EntityCollectionTest.php b/apps/dav/tests/unit/Comments/EntityCollectionTest.php index b7e8f3c5e5d..f8f3990fbac 100644 --- a/apps/dav/tests/unit/Comments/EntityCollectionTest.php +++ b/apps/dav/tests/unit/Comments/EntityCollectionTest.php @@ -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); diff --git a/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php index c7833395b0d..dcdc8608c67 100644 --- a/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php +++ b/apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php @@ -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); diff --git a/apps/dav/tests/unit/Comments/RootCollectionTest.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php index 68098f2aebc..8df7dd70dd3 100644 --- a/apps/dav/tests/unit/Comments/RootCollectionTest.php +++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php @@ -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); diff --git a/apps/dav/tests/unit/Connector/PublicAuthTest.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php index d3d17b03673..b8b59546eca 100644 --- a/apps/dav/tests/unit/Connector/PublicAuthTest.php +++ b/apps/dav/tests/unit/Connector/PublicAuthTest.php @@ -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; diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php index 0001f7913b1..7ab7f463a9f 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php @@ -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); diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php index d2f2d8f2d4c..97eb3301d3b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php @@ -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()) diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index 69b2dd5877e..00ec8b17837 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php index e9a483d7e49..239b6c72f76 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php @@ -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() { diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php index 52b94f63811..7770239fe55 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -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); diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index 9ce2837332f..15007689b64 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -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( diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php index ae678c7e9df..2a6bd96c543 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php @@ -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); diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php index 0f2305be23b..117707eaf2a 100644 --- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index 194f9375f68..a4edbe6d942 100644 --- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -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 = '') { diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php index 1e2cef4e37b..6dd5525dc7b 100644 --- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php +++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Controller/DirectControllerTest.php b/apps/dav/tests/unit/Controller/DirectControllerTest.php index bfafbed7611..72a0cebff0f 100644 --- a/apps/dav/tests/unit/Controller/DirectControllerTest.php +++ b/apps/dav/tests/unit/Controller/DirectControllerTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php index 6e3a562e801..2fbfbedf461 100644 --- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php +++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php @@ -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 { diff --git a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php index 0343902ee65..370852abdad 100644 --- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php +++ b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php @@ -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(); diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php index da812016f21..5c813c0cfe7 100644 --- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php @@ -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 { diff --git a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php index faf4fba7ee2..7011d00e3b4 100644 --- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php +++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php @@ -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); diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 836e66cd0d6..c094bc2f860 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -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(); diff --git a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php index 22fbf737793..038e0f9e7bf 100644 --- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php @@ -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); diff --git a/apps/dav/tests/unit/Direct/DirectFileTest.php b/apps/dav/tests/unit/Direct/DirectFileTest.php index 22dc555c186..2bf7eee908d 100644 --- a/apps/dav/tests/unit/Direct/DirectFileTest.php +++ b/apps/dav/tests/unit/Direct/DirectFileTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Direct/DirectHomeTest.php b/apps/dav/tests/unit/Direct/DirectHomeTest.php index 2cefd09c819..b3b1754ec0f 100644 --- a/apps/dav/tests/unit/Direct/DirectHomeTest.php +++ b/apps/dav/tests/unit/Direct/DirectHomeTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php index 733de9ea1e9..53a733d2503 100644 --- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php +++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php index 1143fd8192d..0281f98858f 100644 --- a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php +++ b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php @@ -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 { diff --git a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php index 293a7abf45e..2365c94736c 100644 --- a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php +++ b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php @@ -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(), diff --git a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php index 6856915961f..60f96271aaa 100644 --- a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php +++ b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php index ef7f2580941..15e0ea71066 100644 --- a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php +++ b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php index 75ca0c28cc2..83d618938bd 100644 --- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php +++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php @@ -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.'); diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php index 3ca8d588475..93ae1b41ae2 100644 --- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php +++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php index c9bdb2627c5..50cb46df694 100644 --- a/apps/dav/tests/unit/ServerTest.php +++ b/apps/dav/tests/unit/ServerTest.php @@ -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, '/'); diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php index 195930e1c67..82148e10dc3 100644 --- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php +++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php @@ -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 */ diff --git a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php index c0b8c92964f..b4bad9e29b9 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php @@ -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); diff --git a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php index 27d6cbf7e85..465bdf58eda 100644 --- a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php +++ b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php @@ -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 { diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index b8db72938a5..ebaf477ddc5 100644 --- a/apps/encryption/tests/Command/TestEnableMasterKey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -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 { diff --git a/apps/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index 27d67a12dfa..d92cfebf295 100644 --- a/apps/encryption/tests/Controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -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() { diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index f0935f1b788..0c50491857b 100644 --- a/apps/encryption/tests/Controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -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 { diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index 5028fefbbe0..4c1c59bccf7 100644 --- a/apps/encryption/tests/Controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -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 */ diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index 6f7b0cc2765..4af41a9aac0 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -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( [ diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php index b4d846bfd5a..2721a6e8b53 100644 --- a/apps/encryption/tests/Crypto/DecryptAllTest.php +++ b/apps/encryption/tests/Crypto/DecryptAllTest.php @@ -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 { diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index bdc05035ea4..10d667bb4a8 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -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( [ diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index dee1118a992..c14ee22e879 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -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.'); diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php index dcd82fe7e0f..74e2e7716d6 100644 --- a/apps/encryption/tests/Hooks/UserHooksTest.php +++ b/apps/encryption/tests/Hooks/UserHooksTest.php @@ -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( [ diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php index da5777d75ab..78c506a18d0 100644 --- a/apps/encryption/tests/KeyManagerTest.php +++ b/apps/encryption/tests/KeyManagerTest.php @@ -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( [ diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php index df5dc3241c0..a5b531e51f4 100644 --- a/apps/encryption/tests/RecoveryTest.php +++ b/apps/encryption/tests/RecoveryTest.php @@ -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; /** diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php index 19425cc8531..079f906d1d6 100644 --- a/apps/encryption/tests/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -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); diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php index 44bb2e55e86..779bb5d82ea 100644 --- a/apps/encryption/tests/Users/SetupTest.php +++ b/apps/encryption/tests/Users/SetupTest.php @@ -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; /** diff --git a/apps/encryption/tests/UtilTest.php b/apps/encryption/tests/UtilTest.php index 27c1469b031..5a573f278e4 100644 --- a/apps/encryption/tests/UtilTest.php +++ b/apps/encryption/tests/UtilTest.php @@ -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 */ diff --git a/apps/federatedfilesharing/tests/AddressHandlerTest.php b/apps/federatedfilesharing/tests/AddressHandlerTest.php index 300622f1c00..6cfe9d60e1d 100644 --- a/apps/federatedfilesharing/tests/AddressHandlerTest.php +++ b/apps/federatedfilesharing/tests/AddressHandlerTest.php @@ -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 */ diff --git a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php index 1d885bb601d..11dd585f662 100644 --- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php @@ -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 */ diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index b192b466d59..1b02d8d0b7b 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -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') diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index e3e13f05867..aed08424475 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -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 { diff --git a/apps/federatedfilesharing/tests/NotificationsTest.php b/apps/federatedfilesharing/tests/NotificationsTest.php index 32ceedd45c0..29826c1e1b4 100644 --- a/apps/federatedfilesharing/tests/NotificationsTest.php +++ b/apps/federatedfilesharing/tests/NotificationsTest.php @@ -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)) { diff --git a/apps/federatedfilesharing/tests/Settings/AdminTest.php b/apps/federatedfilesharing/tests/Settings/AdminTest.php index 4f53b3cd741..0285739cfea 100644 --- a/apps/federatedfilesharing/tests/Settings/AdminTest.php +++ b/apps/federatedfilesharing/tests/Settings/AdminTest.php @@ -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 { diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php index 50479654752..9d8dd676e79 100644 --- a/apps/federatedfilesharing/tests/TokenHandlerTest.php +++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php @@ -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 */ diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index 691b9fb19a4..435503e9d38 100644 --- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php @@ -50,31 +50,31 @@ use OCP\OCS\IDiscoveryService; */ class GetSharedSecretTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|IClient */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IClient */ private $httpClient; - /** @var \PHPUnit_Framework_MockObject_MockObject|IClientService */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IClientService */ private $httpClientService; - /** @var \PHPUnit_Framework_MockObject_MockObject|IJobList */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IJobList */ private $jobList; - /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator */ private $urlGenerator; - /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */ private $trustedServers; - /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject|IResponse */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IResponse */ private $response; - /** @var \PHPUnit_Framework_MockObject_MockObject|IDiscoveryService */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IDiscoveryService */ private $discoverService; - /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */ private $timeFactory; /** @var GetSharedSecret */ @@ -115,7 +115,7 @@ class GetSharedSecretTest extends TestCase { * @param bool $retainBackgroundJob */ public function testExecute($isTrustedServer, $retainBackgroundJob) { - /** @var GetSharedSecret |\PHPUnit_Framework_MockObject_MockObject $getSharedSecret */ + /** @var GetSharedSecret |\PHPUnit\Framework\MockObject\MockObject $getSharedSecret */ $getSharedSecret = $this->getMockBuilder('OCA\Federation\BackgroundJob\GetSharedSecret') ->setConstructorArgs( [ diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php index 2ef6fd4250d..8bf06d87c0f 100644 --- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -42,31 +42,31 @@ use Test\TestCase; class RequestSharedSecretTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|IClientService */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IClientService */ private $httpClientService; - /** @var \PHPUnit_Framework_MockObject_MockObject|IClient */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IClient */ private $httpClient; - /** @var \PHPUnit_Framework_MockObject_MockObject|IJobList */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IJobList */ private $jobList; - /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator */ private $urlGenerator; - /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */ private $trustedServers; - /** @var \PHPUnit_Framework_MockObject_MockObject|IResponse */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IResponse */ private $response; - /** @var \PHPUnit_Framework_MockObject_MockObject|IDiscoveryService */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IDiscoveryService */ private $discoveryService; - /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */ private $timeFactory; /** @var RequestSharedSecret */ @@ -107,7 +107,7 @@ class RequestSharedSecretTest extends TestCase { * @param bool $retainBackgroundJob */ public function testExecute($isTrustedServer, $retainBackgroundJob) { - /** @var RequestSharedSecret |\PHPUnit_Framework_MockObject_MockObject $requestSharedSecret */ + /** @var RequestSharedSecret |\PHPUnit\Framework\MockObject\MockObject $requestSharedSecret */ $requestSharedSecret = $this->getMockBuilder('OCA\Federation\BackgroundJob\RequestSharedSecret') ->setConstructorArgs( [ diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php index 3617e4c2467..96987e52d72 100644 --- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php +++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php @@ -39,25 +39,25 @@ use Test\TestCase; class OCSAuthAPIControllerTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|IRequest */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IRequest */ private $request; - /** @var \PHPUnit_Framework_MockObject_MockObject|ISecureRandom */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ISecureRandom */ private $secureRandom; - /** @var \PHPUnit_Framework_MockObject_MockObject|JobList */ + /** @var \PHPUnit\Framework\MockObject\MockObject|JobList */ private $jobList; - /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers */ private $trustedServers; - /** @var \PHPUnit_Framework_MockObject_MockObject|DbHandler */ + /** @var \PHPUnit\Framework\MockObject\MockObject|DbHandler */ private $dbHandler; - /** @var \PHPUnit_Framework_MockObject_MockObject|ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */ private $timeFactory; @@ -146,7 +146,7 @@ class OCSAuthAPIControllerTest extends TestCase { $url = 'url'; $token = 'token'; - /** @var OCSAuthAPIController | \PHPUnit_Framework_MockObject_MockObject $ocsAuthApi */ + /** @var OCSAuthAPIController | \PHPUnit\Framework\MockObject\MockObject $ocsAuthApi */ $ocsAuthApi = $this->getMockBuilder('OCA\Federation\Controller\OCSAuthAPIController') ->setConstructorArgs( [ diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php index 90db0b58035..8677d4bdab2 100644 --- a/apps/federation/tests/Controller/SettingsControllerTest.php +++ b/apps/federation/tests/Controller/SettingsControllerTest.php @@ -35,13 +35,13 @@ class SettingsControllerTest extends TestCase { /** @var SettingsController */ private $controller; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IRequest */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IRequest */ private $request; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IL10N */ private $l10n; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Federation\TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCA\Federation\TrustedServers */ private $trustedServers; protected function setUp(): void { diff --git a/apps/federation/tests/DAV/FedAuthTest.php b/apps/federation/tests/DAV/FedAuthTest.php index 6e91f147a84..46cd6d96659 100644 --- a/apps/federation/tests/DAV/FedAuthTest.php +++ b/apps/federation/tests/DAV/FedAuthTest.php @@ -36,7 +36,7 @@ class FedAuthTest extends TestCase { * @param string $password */ public function testFedAuth($expected, $user, $password) { - /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $db */ + /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $db */ $db = $this->getMockBuilder('OCA\Federation\DbHandler')->disableOriginalConstructor()->getMock(); $db->method('auth')->willReturn(true); $auth = new FedAuth($db); diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php index 7256333f9b4..8e8dbc4becd 100644 --- a/apps/federation/tests/DbHandlerTest.php +++ b/apps/federation/tests/DbHandlerTest.php @@ -40,7 +40,7 @@ class DbHandlerTest extends TestCase { /** @var DbHandler */ private $dbHandler; - /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ private $il10n; /** @var IDBConnection */ diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php index afb6b2408f9..c44081064c1 100644 --- a/apps/federation/tests/HooksTest.php +++ b/apps/federation/tests/HooksTest.php @@ -30,7 +30,7 @@ use Test\TestCase; class HooksTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */ private $trustedServers; /** @var Hooks */ diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php index 41116d40cc8..35fecf2f0e4 100644 --- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php +++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php @@ -37,16 +37,16 @@ use Test\TestCase; class AddServerMiddlewareTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject | ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IL10N */ private $l10n; /** @var AddServerMiddleware */ private $middleware; - /** @var \PHPUnit_Framework_MockObject_MockObject | SettingsController */ + /** @var \PHPUnit\Framework\MockObject\MockObject | SettingsController */ private $controller; protected function setUp(): void { diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php index fa6e3a575e1..c71556ebf0c 100644 --- a/apps/federation/tests/SyncFederationAddressbooksTest.php +++ b/apps/federation/tests/SyncFederationAddressbooksTest.php @@ -37,7 +37,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase { /** @var array */ private $callBacks = []; - /** @var \PHPUnit_Framework_MockObject_MockObject | DiscoveryService */ + /** @var \PHPUnit\Framework\MockObject\MockObject | DiscoveryService */ private $discoveryService; protected function setUp(): void { @@ -49,7 +49,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase { } public function testSync() { - /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */ + /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $dbHandler */ $dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')-> disableOriginalConstructor()-> getMock(); @@ -79,7 +79,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase { } public function testException() { - /** @var DbHandler | \PHPUnit_Framework_MockObject_MockObject $dbHandler */ + /** @var DbHandler | \PHPUnit\Framework\MockObject\MockObject $dbHandler */ $dbHandler = $this->getMockBuilder('OCA\Federation\DbHandler')-> disableOriginalConstructor()-> getMock(); diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index dc91e9057f1..0073fdcf7c9 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -42,37 +42,37 @@ use Test\TestCase; class TrustedServersTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */ private $trustedServers; - /** @var \PHPUnit_Framework_MockObject_MockObject | DbHandler */ + /** @var \PHPUnit\Framework\MockObject\MockObject | DbHandler */ private $dbHandler; - /** @var \PHPUnit_Framework_MockObject_MockObject | IClientService */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */ private $httpClientService; - /** @var \PHPUnit_Framework_MockObject_MockObject | IClient */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IClient */ private $httpClient; - /** @var \PHPUnit_Framework_MockObject_MockObject | IResponse */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IResponse */ private $response; - /** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject | ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject | IJobList */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IJobList */ private $jobList; - /** @var \PHPUnit_Framework_MockObject_MockObject | ISecureRandom */ + /** @var \PHPUnit\Framework\MockObject\MockObject | ISecureRandom */ private $secureRandom; - /** @var \PHPUnit_Framework_MockObject_MockObject | IConfig */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IConfig */ private $config; - /** @var \PHPUnit_Framework_MockObject_MockObject | EventDispatcherInterface */ + /** @var \PHPUnit\Framework\MockObject\MockObject | EventDispatcherInterface */ private $dispatcher; - /** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ITimeFactory */ private $timeFactory; protected function setUp(): void { @@ -109,7 +109,7 @@ class TrustedServersTest extends TestCase { * @param bool $success */ public function testAddServer($success) { - /** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers $trustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject|TrustedServers $trustedServers */ $trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers') ->setConstructorArgs( [ @@ -269,7 +269,7 @@ class TrustedServersTest extends TestCase { public function testIsOwnCloudServer($statusCode, $isValidOwnCloudVersion, $expected) { $server = 'server1'; - /** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServers */ + /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers $trustedServers */ $trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers') ->setConstructorArgs( [ diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php index d347cffdd81..bf3ca5e5a87 100644 --- a/apps/files/tests/Controller/ApiControllerTest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php @@ -57,7 +57,7 @@ class ApiControllerTest extends TestCase { private $request; /** @var TagService */ private $tagService; - /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */ private $preview; /** @var ApiController */ private $apiController; @@ -65,7 +65,7 @@ class ApiControllerTest extends TestCase { private $shareManager; /** @var \OCP\IConfig */ private $config; - /** @var Folder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Folder|\PHPUnit\Framework\MockObject\MockObject */ private $userFolder; protected function setUp(): void { diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 50eb40079a0..c17c2ea3575 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -56,27 +56,27 @@ use Test\TestCase; * @package OCA\Files\Tests\Controller */ class ViewControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; /** @var IL10N */ private $l10n; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var EventDispatcherInterface */ private $eventDispatcher; - /** @var ViewController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ViewController|\PHPUnit\Framework\MockObject\MockObject */ private $viewController; /** @var IUser */ private $user; /** @var IUserSession */ private $userSession; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; - /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ private $activityHelper; protected function setUp(): void { diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php index ca6d98909ed..e9c55400493 100644 --- a/apps/files/tests/Service/TagServiceTest.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -48,10 +48,10 @@ class TagServiceTest extends \Test\TestCase { */ private $user; - /** @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 $activityManager; /** @@ -59,11 +59,11 @@ class TagServiceTest extends \Test\TestCase { */ private $root; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ private $dispatcher; /** - * @var \OCA\Files\Service\TagService|\PHPUnit_Framework_MockObject_MockObject + * @var \OCA\Files\Service\TagService|\PHPUnit\Framework\MockObject\MockObject */ private $tagService; @@ -98,7 +98,7 @@ class TagServiceTest extends \Test\TestCase { /** * @param array $methods - * @return TagService|\PHPUnit_Framework_MockObject_MockObject + * @return TagService|\PHPUnit\Framework\MockObject\MockObject */ protected function getTagService(array $methods = []) { return $this->getMockBuilder(TagService::class) diff --git a/apps/files_external/tests/Auth/Password/GlobalAuth.php b/apps/files_external/tests/Auth/Password/GlobalAuth.php index 8edf7358ed8..2abeef4936e 100644 --- a/apps/files_external/tests/Auth/Password/GlobalAuth.php +++ b/apps/files_external/tests/Auth/Password/GlobalAuth.php @@ -32,12 +32,12 @@ use Test\TestCase; class GlobalAuthTest extends TestCase { /** - * @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject + * @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; /** - * @var \OCP\Security\ICredentialsManager|\PHPUnit_Framework_MockObject_MockObject + * @var \OCP\Security\ICredentialsManager|\PHPUnit\Framework\MockObject\MockObject */ private $credentialsManager; @@ -54,7 +54,7 @@ class GlobalAuthTest extends TestCase { } private function getStorageConfig($type, $config = []) { - /** @var \OCA\Files_External\Lib\StorageConfig|\PHPUnit_Framework_MockObject_MockObject $storageConfig */ + /** @var \OCA\Files_External\Lib\StorageConfig|\PHPUnit\Framework\MockObject\MockObject $storageConfig */ $storageConfig = $this->createMock(StorageConfig::class); $storageConfig->expects($this->any()) ->method('getType') @@ -106,7 +106,7 @@ class GlobalAuthTest extends TestCase { ], $storage->getBackendOptions()); } - + public function testNoCredentialsPersonal() { $this->expectException(\OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException::class); diff --git a/apps/files_external/tests/Command/ApplicableTest.php b/apps/files_external/tests/Command/ApplicableTest.php index 668be67dc8b..1479d53244e 100644 --- a/apps/files_external/tests/Command/ApplicableTest.php +++ b/apps/files_external/tests/Command/ApplicableTest.php @@ -30,9 +30,9 @@ use OCP\IUserManager; class ApplicableTest extends CommandTest { private function getInstance($storageService) { - /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject $userManager */ + /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject $userManager */ $userManager = $this->createMock(IUserManager::class); - /** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject $groupManager */ + /** @var \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject $groupManager */ $groupManager = $this->createMock(IGroupManager::class); $userManager->expects($this->any()) diff --git a/apps/files_external/tests/Command/CommandTest.php b/apps/files_external/tests/Command/CommandTest.php index 27ceb67beba..4f0c2501ef0 100644 --- a/apps/files_external/tests/Command/CommandTest.php +++ b/apps/files_external/tests/Command/CommandTest.php @@ -35,7 +35,7 @@ use Test\TestCase; abstract class CommandTest extends TestCase { /** * @param StorageConfig[] $mounts - * @return \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject + * @return \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit\Framework\MockObject\MockObject */ protected function getGlobalStorageService(array $mounts = []) { $mock = $this->getMockBuilder('OCA\Files_External\Service\GlobalStoragesService') @@ -48,10 +48,10 @@ abstract class CommandTest extends TestCase { } /** - * @param \PHPUnit_Framework_MockObject_MockObject $mock + * @param \PHPUnit\Framework\MockObject\MockObject $mock * @param StorageConfig[] $mounts */ - protected function bindMounts(\PHPUnit_Framework_MockObject_MockObject $mock, array $mounts) { + protected function bindMounts(\PHPUnit\Framework\MockObject\MockObject $mock, array $mounts) { $mock->expects($this->any()) ->method('getStorage') ->willReturnCallback(function ($id) use ($mounts) { diff --git a/apps/files_external/tests/Command/ListCommandTest.php b/apps/files_external/tests/Command/ListCommandTest.php index 15631301648..c46470021d4 100644 --- a/apps/files_external/tests/Command/ListCommandTest.php +++ b/apps/files_external/tests/Command/ListCommandTest.php @@ -40,21 +40,20 @@ use OCP\ISession; use OCP\IUserManager; use OCP\IUserSession; use OCP\Security\ICrypto; -use PHPUnit_Framework_MockObject_MockObject; use Symfony\Component\Console\Output\BufferedOutput; class ListCommandTest extends CommandTest { /** - * @return ListCommand|PHPUnit_Framework_MockObject_MockObject + * @return ListCommand|\PHPUnit\Framework\MockObject\MockObject */ private function getInstance() { - /** @var GlobalStoragesService|PHPUnit_Framework_MockObject_MockObject $globalService */ + /** @var GlobalStoragesService|\PHPUnit\Framework\MockObject\MockObject $globalService */ $globalService = $this->createMock(GlobalStoragesService::class); - /** @var UserStoragesService|PHPUnit_Framework_MockObject_MockObject $userService */ + /** @var UserStoragesService|\PHPUnit\Framework\MockObject\MockObject $userService */ $userService = $this->createMock(UserStoragesService::class); - /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject $userManager */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject $userManager */ $userManager = $this->createMock(IUserManager::class); - /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject $userSession */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject $userSession */ $userSession = $this->createMock(IUserSession::class); return new ListCommand($globalService, $userService, $userSession, $userManager); diff --git a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php index 5fc03cad9e4..0c8e990125a 100644 --- a/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php +++ b/apps/files_external/tests/Config/UserPlaceholderHandlerTest.php @@ -34,19 +34,19 @@ use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IManager; class UserPlaceholderHandlerTest extends \Test\TestCase { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ protected $user; - /** @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 */ private $shareManager; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; /** @var UserPlaceholderHandler */ diff --git a/apps/files_external/tests/Service/BackendServiceTest.php b/apps/files_external/tests/Service/BackendServiceTest.php index 0964f48572b..6d120cc9e16 100644 --- a/apps/files_external/tests/Service/BackendServiceTest.php +++ b/apps/files_external/tests/Service/BackendServiceTest.php @@ -36,7 +36,7 @@ use OCP\IConfig; class BackendServiceTest extends \Test\TestCase { - /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; protected function setUp(): void { @@ -46,7 +46,7 @@ class BackendServiceTest extends \Test\TestCase { /** * @param string $class * - * @return \OCA\Files_External\Lib\Backend\Backend|\PHPUnit_Framework_MockObject_MockObject + * @return \OCA\Files_External\Lib\Backend\Backend|\PHPUnit\Framework\MockObject\MockObject */ protected function getBackendMock($class) { $backend = $this->getMockBuilder(Backend::class) @@ -60,7 +60,7 @@ class BackendServiceTest extends \Test\TestCase { /** * @param string $class * - * @return \OCA\Files_External\Lib\Auth\AuthMechanism|\PHPUnit_Framework_MockObject_MockObject + * @return \OCA\Files_External\Lib\Auth\AuthMechanism|\PHPUnit\Framework\MockObject\MockObject */ protected function getAuthMechanismMock($class) { $backend = $this->getMockBuilder(AuthMechanism::class) @@ -76,7 +76,7 @@ class BackendServiceTest extends \Test\TestCase { $backend = $this->getBackendMock('\Foo\Bar'); - /** @var \OCA\Files_External\Lib\Backend\Backend|\PHPUnit_Framework_MockObject_MockObject $backendAlias */ + /** @var \OCA\Files_External\Lib\Backend\Backend|\PHPUnit\Framework\MockObject\MockObject $backendAlias */ $backendAlias = $this->getMockBuilder(Backend::class) ->disableOriginalConstructor() ->getMock(); @@ -105,7 +105,7 @@ class BackendServiceTest extends \Test\TestCase { $backend1 = $this->getBackendMock('\Foo\Bar'); $backend2 = $this->getBackendMock('\Bar\Foo'); - /** @var IBackendProvider|\PHPUnit_Framework_MockObject_MockObject $providerMock */ + /** @var IBackendProvider|\PHPUnit\Framework\MockObject\MockObject $providerMock */ $providerMock = $this->createMock(IBackendProvider::class); $providerMock->expects($this->once()) ->method('getBackends') @@ -124,7 +124,7 @@ class BackendServiceTest extends \Test\TestCase { $backend1 = $this->getAuthMechanismMock('\Foo\Bar'); $backend2 = $this->getAuthMechanismMock('\Bar\Foo'); - /** @var IAuthMechanismProvider|\PHPUnit_Framework_MockObject_MockObject $providerMock */ + /** @var IAuthMechanismProvider|\PHPUnit\Framework\MockObject\MockObject $providerMock */ $providerMock = $this->createMock(IAuthMechanismProvider::class); $providerMock->expects($this->once()) ->method('getAuthMechanisms') @@ -145,13 +145,13 @@ class BackendServiceTest extends \Test\TestCase { $backend2 = $this->getBackendMock('\Dead\Beef'); - /** @var IBackendProvider|\PHPUnit_Framework_MockObject_MockObject $provider1Mock */ + /** @var IBackendProvider|\PHPUnit\Framework\MockObject\MockObject $provider1Mock */ $provider1Mock = $this->createMock(IBackendProvider::class); $provider1Mock->expects($this->once()) ->method('getBackends') ->willReturn([$backend1a, $backend1b]); $service->registerBackendProvider($provider1Mock); - /** @var IBackendProvider|\PHPUnit_Framework_MockObject_MockObject $provider2Mock */ + /** @var IBackendProvider|\PHPUnit\Framework\MockObject\MockObject $provider2Mock */ $provider2Mock = $this->createMock(IBackendProvider::class); $provider2Mock->expects($this->once()) ->method('getBackends') diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php index 76f0a09c14b..5f10a9b9498 100644 --- a/apps/files_external/tests/Service/StoragesServiceTest.php +++ b/apps/files_external/tests/Service/StoragesServiceTest.php @@ -89,7 +89,7 @@ abstract class StoragesServiceTest extends \Test\TestCase { protected static $hookCalls; /** - * @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Files\Config\IUserMountCache + * @var \PHPUnit\Framework\MockObject\MockObject|\OCP\Files\Config\IUserMountCache */ protected $mountCache; diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index f99b25a9fc7..457808bff73 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -42,7 +42,7 @@ use Test\Traits\UserTrait; class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest { use UserTrait; - /** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject groupManager */ + /** @var \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject groupManager */ protected $groupManager; /** @@ -67,7 +67,7 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest { $this->globalStoragesService = $this->service; $this->user = new \OC\User\User(self::USER_ID, null, \OC::$server->getEventDispatcher()); - /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */ + /** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject $userSession */ $userSession = $this->createMock(IUserSession::class); $userSession ->expects($this->any()) diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php index 9dd4a570c33..290b48c86c0 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -60,7 +60,7 @@ class UserStoragesServiceTest extends StoragesServiceTest { $this->createUser($this->userId, $this->userId); $this->user = \OC::$server->getUserManager()->get($this->userId); - /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */ + /** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject $userSession */ $userSession = $this->createMock(IUserSession::class); $userSession ->expects($this->any()) diff --git a/apps/files_external/tests/Settings/AdminTest.php b/apps/files_external/tests/Settings/AdminTest.php index f8d6bce1d62..4d6a0ef6f8f 100644 --- a/apps/files_external/tests/Settings/AdminTest.php +++ b/apps/files_external/tests/Settings/AdminTest.php @@ -35,13 +35,13 @@ use Test\TestCase; class AdminTest extends TestCase { /** @var Admin */ private $admin; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $encryptionManager; - /** @var GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var GlobalStoragesService|\PHPUnit\Framework\MockObject\MockObject */ private $globalStoragesService; - /** @var BackendService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var BackendService|\PHPUnit\Framework\MockObject\MockObject */ private $backendService; - /** @var GlobalAuth|\PHPUnit_Framework_MockObject_MockObject */ + /** @var GlobalAuth|\PHPUnit\Framework\MockObject\MockObject */ private $globalAuth; protected function setUp(): void { diff --git a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php index 1efd99706c2..9b5924c9dec 100644 --- a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php +++ b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php @@ -34,11 +34,11 @@ use OCP\Share\IManager; use Test\TestCase; class ShareRecipientSorterTest extends TestCase { - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $shareManager; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ protected $rootFolder; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $userSession; /** @var ShareRecipientSorter */ protected $sorter; @@ -60,7 +60,7 @@ class ShareRecipientSorterTest extends TestCase { public function testSort($data) { $node = $this->createMock(Node::class); - /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $folder */ + /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $folder */ $folder = $this->createMock(Folder::class); $this->rootFolder->expects($this->any()) ->method('getUserFolder') @@ -99,7 +99,7 @@ class ShareRecipientSorterTest extends TestCase { } public function testSortNoNodes() { - /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $folder */ + /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $folder */ $folder = $this->createMock(Folder::class); $this->rootFolder->expects($this->any()) ->method('getUserFolder') diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php index fb6014be9b6..6fa0ad7efc2 100644 --- a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php +++ b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php @@ -45,9 +45,9 @@ use Test\TestCase; class PublicPreviewControllerTest extends TestCase { - /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */ private $previewManager; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; /** @var ITimeFactory|MockObject */ private $timeFactory; diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index e186092f0bf..4da51f7e5e9 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -68,40 +68,40 @@ class ShareAPIControllerTest extends TestCase { /** @var string */ private $appName = 'files_sharing'; - /** @var \OC\Share20\Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Share20\Manager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var string|\PHPUnit_Framework_MockObject_MockObject */ + /** @var string|\PHPUnit\Framework\MockObject\MockObject */ private $currentUser; /** @var ShareAPIController */ private $ocs; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ private $serverContainer; protected function setUp(): void { @@ -146,7 +146,7 @@ class ShareAPIControllerTest extends TestCase { } /** - * @return ShareAPIController|\PHPUnit_Framework_MockObject_MockObject + * @return ShareAPIController|\PHPUnit\Framework\MockObject\MockObject */ private function mockFormatShare() { return $this->getMockBuilder(ShareAPIController::class) @@ -701,7 +701,7 @@ class ShareAPIControllerTest extends TestCase { * @dataProvider dataGetShare */ public function testGetShare(\OCP\Share\IShare $share, array $result) { - /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */ + /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */ $ocs = $this->getMockBuilder(ShareAPIController::class) ->setConstructorArgs([ $this->appName, @@ -1763,7 +1763,7 @@ class ShareAPIControllerTest extends TestCase { $share = $this->newShare(); $this->shareManager->method('newShare')->willReturn($share); - /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */ + /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */ $ocs = $this->getMockBuilder(ShareAPIController::class) ->setConstructorArgs([ $this->appName, @@ -2326,7 +2326,7 @@ class ShareAPIControllerTest extends TestCase { $share = \OC::$server->getShareManager()->newShare(); $this->shareManager->method('newShare')->willReturn($share); - /** @var ShareAPIController|\PHPUnit_Framework_MockObject_MockObject $ocs */ + /** @var ShareAPIController|\PHPUnit\Framework\MockObject\MockObject $ocs */ $ocs = $this->getMockBuilder(ShareAPIController::class) ->setConstructorArgs([ $this->appName, diff --git a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php index f43ca13a674..9ea93b9900a 100644 --- a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php @@ -41,7 +41,7 @@ class ShareInfoControllerTest extends TestCase { /** @var ShareInfoController */ private $controller; - /** @var ShareManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ShareManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php index d3fb914f404..8baf4f26b0c 100644 --- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php @@ -55,13 +55,13 @@ class ShareesAPIControllerTest extends TestCase { /** @var string */ protected $uid; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $shareManager; - /** @var ISearch|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISearch|\PHPUnit\Framework\MockObject\MockObject */ protected $collaboratorSearch; protected function setUp(): void { @@ -71,10 +71,10 @@ class ShareesAPIControllerTest extends TestCase { $this->request = $this->createMock(IRequest::class); $this->shareManager = $this->createMock(IManager::class); - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $configMock */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $configMock */ $configMock = $this->createMock(IConfig::class); - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGeneratorMock */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGeneratorMock */ $urlGeneratorMock = $this->createMock(IURLGenerator::class); $this->collaboratorSearch = $this->createMock(ISearch::class); @@ -236,7 +236,7 @@ class ShareesAPIControllerTest extends TestCase { $perPage = isset($getData['perPage']) ? $getData['perPage'] : 200; $shareType = isset($getData['shareType']) ? $getData['shareType'] : null; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); $config->expects($this->exactly(1)) ->method('getAppValue') @@ -251,12 +251,12 @@ class ShareesAPIControllerTest extends TestCase { /** @var string */ $uid = 'test123'; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */ $request = $this->createMock(IRequest::class); - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGenerator */ $urlGenerator = $this->createMock(IURLGenerator::class); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */ $sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController') ->setConstructorArgs([ $uid, @@ -339,19 +339,19 @@ class ShareesAPIControllerTest extends TestCase { $page = isset($getData['page']) ? $getData['page'] : 1; $perPage = isset($getData['perPage']) ? $getData['perPage'] : 200; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); $config->expects($this->never()) ->method('getAppValue'); /** @var string */ $uid = 'test123'; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */ $request = $this->createMock(IRequest::class); - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGenerator */ $urlGenerator = $this->createMock(IURLGenerator::class); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */ $sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController') ->setConstructorArgs([ $uid, diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php index a7ec79e9c2a..c8ae7a64831 100644 --- a/apps/files_sharing/tests/External/ManagerTest.php +++ b/apps/files_sharing/tests/External/ManagerTest.php @@ -53,25 +53,25 @@ use Test\Traits\UserTrait; class ManagerTest extends TestCase { use UserTrait; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject **/ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject **/ private $manager; /** @var \OC\Files\Mount\Manager */ private $mountManager; - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ private $clientService; - /** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICloudFederationProviderManager|\PHPUnit\Framework\MockObject\MockObject */ private $cloudFederationProviderManager; - /** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICloudFederationFactory|\PHPUnit\Framework\MockObject\MockObject */ private $cloudFederationFactory; - /** @var \PHPUnit_Framework_MockObject_MockObject|IGroupManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IGroupManager */ private $groupManager; - /** @var \PHPUnit_Framework_MockObject_MockObject|IUserManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IUserManager */ private $userManager; private $uid; diff --git a/apps/files_sharing/tests/External/ScannerTest.php b/apps/files_sharing/tests/External/ScannerTest.php index 9cfcf54b484..15a023f1b96 100644 --- a/apps/files_sharing/tests/External/ScannerTest.php +++ b/apps/files_sharing/tests/External/ScannerTest.php @@ -29,9 +29,9 @@ use Test\TestCase; class ScannerTest extends TestCase { /** @var \OCA\Files_Sharing\External\Scanner */ protected $scanner; - /** @var \OCA\Files_Sharing\External\Storage|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Files_Sharing\External\Storage|\PHPUnit\Framework\MockObject\MockObject */ protected $storage; - /** @var \OC\Files\Cache\Cache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\Cache\Cache|\PHPUnit\Framework\MockObject\MockObject */ protected $cache; protected function setUp(): void { diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php index e7457b4096b..32be9e3212f 100644 --- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php @@ -39,7 +39,7 @@ use OCP\Share\IManager; */ class OCSShareAPIMiddlewareTest extends \Test\TestCase { - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; /** @var IL10N */ private $l; diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php index c290183d046..deab3f07e2f 100644 --- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php @@ -35,7 +35,7 @@ use Test\TestCase; class ShareInfoMiddlewareTest extends TestCase { - /** @var ShareManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ShareManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; /** @var ShareInfoMiddleware */ diff --git a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php index 2c33f5617b7..9b5f61e81ad 100644 --- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php @@ -46,19 +46,19 @@ use OCP\Share\IShare; */ class SharingCheckMiddlewareTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; /** @var SharingCheckMiddleware */ private $sharingCheckMiddleware; - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject */ private $controllerMock; - /** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */ private $reflector; - /** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ private $shareManager; - /** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest | \PHPUnit\Framework\MockObject\MockObject */ private $request; protected function setUp(): void { @@ -197,7 +197,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { $this->sharingCheckMiddleware->beforeController($controller, 'myMethod'); } - + public function testBeforeControllerWithSharingDisabled() { $this->expectException(\OCP\Files\NotFoundException::class); $this->expectExceptionMessage('Sharing is disabled.'); @@ -211,7 +211,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { $this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod'); } - + public function testAfterExceptionWithRegularException() { $this->expectException(\Exception::class); $this->expectExceptionMessage('My Exception message'); diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php index cdba86863f1..ec529c64066 100644 --- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php +++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php @@ -40,7 +40,7 @@ class SetPasswordColumnTest extends TestCase { /** @var \OCP\IDBConnection */ private $connection; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var SetPasswordColumn */ diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index 60c622ec4a4..ce916998372 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -46,19 +46,19 @@ class MountProviderTest extends \Test\TestCase { /** @var MountProvider */ private $provider; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ private $user; - /** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */ private $loader; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; - /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */ private $logger; protected function setUp(): void { diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php index 18ea42e78cc..f9510ac8a5f 100644 --- a/apps/files_trashbin/tests/Command/CleanUpTest.php +++ b/apps/files_trashbin/tests/Command/CleanUpTest.php @@ -46,10 +46,10 @@ class CleanUpTest extends TestCase { /** @var CleanUp */ protected $cleanup; - /** @var \PHPUnit_Framework_MockObject_MockObject | Manager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | Manager */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | IRootFolder */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IRootFolder */ protected $rootFolder; /** @var \OC\DB\Connection */ diff --git a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php index 25d12563429..a07aa46c4d1 100644 --- a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php +++ b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php @@ -42,28 +42,28 @@ use OCP\IUserSession; use Test\TestCase; class PreviewControllerTest extends TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; /** @var string */ private $userId; - /** @var IMimeTypeDetector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMimeTypeDetector|\PHPUnit\Framework\MockObject\MockObject */ private $mimeTypeDetector; - /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */ private $previewManager; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $time; /** @var PreviewController */ private $controller; - /** @var ITrashManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITrashManager|\PHPUnit\Framework\MockObject\MockObject */ private $trashManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; protected function setUp(): void { diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index 36628cb08b9..6ca8124bff3 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -476,7 +476,7 @@ class StorageTest extends \Test\TestCase { */ public function testSingleStorageDeleteFileFail() { /** - * @var \OC\Files\Storage\Temporary | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Temporary | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') ->setConstructorArgs([[]]) @@ -513,7 +513,7 @@ class StorageTest extends \Test\TestCase { */ public function testSingleStorageDeleteFolderFail() { /** - * @var \OC\Files\Storage\Temporary | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Temporary | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') ->setConstructorArgs([[]]) diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php index 89474954161..5afa2312d1f 100644 --- a/apps/files_versions/tests/Command/CleanupTest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php @@ -42,10 +42,10 @@ class CleanupTest extends TestCase { /** @var CleanUp */ protected $cleanup; - /** @var \PHPUnit_Framework_MockObject_MockObject | Manager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | Manager */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | IRootFolder */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IRootFolder */ protected $rootFolder; protected function setUp(): void { diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php index 64732ac8633..408b69d1c45 100644 --- a/apps/files_versions/tests/Controller/PreviewControllerTest.php +++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php @@ -43,25 +43,25 @@ use Test\TestCase; class PreviewControllerTest extends TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; /** @var string */ private $userId; - /** @var IMimeTypeDetector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMimeTypeDetector|\PHPUnit\Framework\MockObject\MockObject */ private $mimeTypeDetector; - /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */ private $previewManager; - /** @var PreviewController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var PreviewController|\PHPUnit\Framework\MockObject\MockObject */ private $controller; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IVersionManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IVersionManager|\PHPUnit\Framework\MockObject\MockObject */ private $versionManager; protected function setUp(): void { diff --git a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php index 8ed4afaf27b..6b3c85b0d82 100644 --- a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php +++ b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php @@ -41,13 +41,13 @@ use Test\TestCase; * @group DB */ class LoginRedirectorControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var ClientMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ClientMapper|\PHPUnit\Framework\MockObject\MockObject */ private $clientMapper; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; /** @var LoginRedirectorController */ private $loginRedirectorController; diff --git a/apps/oauth2/tests/Controller/OauthApiControllerTest.php b/apps/oauth2/tests/Controller/OauthApiControllerTest.php index cf4fdbce328..7d7c3719bc3 100644 --- a/apps/oauth2/tests/Controller/OauthApiControllerTest.php +++ b/apps/oauth2/tests/Controller/OauthApiControllerTest.php @@ -46,21 +46,21 @@ use OCP\Security\ISecureRandom; use Test\TestCase; class OauthApiControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */ private $crypto; - /** @var AccessTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AccessTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $accessTokenMapper; - /** @var ClientMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ClientMapper|\PHPUnit\Framework\MockObject\MockObject */ private $clientMapper; - /** @var TokenProvider|\PHPUnit_Framework_MockObject_MockObject */ + /** @var TokenProvider|\PHPUnit\Framework\MockObject\MockObject */ private $tokenProvider; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $time; - /** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */ private $throttler; /** @var OauthApiController */ private $oauthApiController; diff --git a/apps/oauth2/tests/Controller/SettingsControllerTest.php b/apps/oauth2/tests/Controller/SettingsControllerTest.php index 1c486f2a437..25e507f9013 100644 --- a/apps/oauth2/tests/Controller/SettingsControllerTest.php +++ b/apps/oauth2/tests/Controller/SettingsControllerTest.php @@ -39,15 +39,15 @@ use OCP\Security\ISecureRandom; use Test\TestCase; class SettingsControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ClientMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ClientMapper|\PHPUnit\Framework\MockObject\MockObject */ private $clientMapper; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var AccessTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AccessTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $accessTokenMapper; - /** @var DefaultTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var DefaultTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $defaultTokenMapper; /** @var SettingsController */ private $settingsController; diff --git a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php index 22172ed711f..6cb08e968c0 100644 --- a/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php +++ b/apps/provisioning_api/tests/Controller/AppConfigControllerTest.php @@ -40,9 +40,9 @@ use Test\TestCase; */ class AppConfigControllerTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IAppConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */ private $appConfig; protected function setUp(): void { @@ -54,7 +54,7 @@ class AppConfigControllerTest extends TestCase { /** * @param string[] $methods - * @return AppConfigController|\PHPUnit_Framework_MockObject_MockObject + * @return AppConfigController|\PHPUnit\Framework\MockObject\MockObject */ protected function getInstance(array $methods = []) { $request = $this->createMock(IRequest::class); diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 367a54465bc..1973e6f8b6a 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -46,24 +46,24 @@ use OCP\UserInterface; class GroupsControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $userSession; - /** @var AccountManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AccountManager|\PHPUnit\Framework\MockObject\MockObject */ protected $accountManager; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var SubAdmin|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SubAdmin|\PHPUnit\Framework\MockObject\MockObject */ protected $subAdminManager; - /** @var GroupsController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var GroupsController|\PHPUnit\Framework\MockObject\MockObject */ protected $api; @@ -103,7 +103,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @param string $gid - * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject + * @return \OCP\IGroup|\PHPUnit\Framework\MockObject\MockObject */ private function createGroup($gid) { $group = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); @@ -131,7 +131,7 @@ class GroupsControllerTest extends \Test\TestCase { /** * @param string $uid - * @return \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject + * @return \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject */ private function createUser($uid) { $user = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); @@ -534,7 +534,7 @@ class GroupsControllerTest extends \Test\TestCase { ->method('getUserGroups') ->willReturn([$group]); - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ $this->subAdminManager->expects($this->any()) ->method('isSubAdminOfGroup') ->willReturn(false); @@ -580,7 +580,7 @@ class GroupsControllerTest extends \Test\TestCase { ->method('getUserGroups') ->willReturn([$group]); - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ $this->subAdminManager->expects($this->any()) ->method('isSubAdminOfGroup') ->willReturn(false); diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index ceb84cbed4e..b025236c26c 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -63,36 +63,35 @@ use OCP\Security\Events\GenerateSecurePasswordEvent; use OCP\Security\ISecureRandom; use OCP\UserInterface; use PHPUnit\Framework\MockObject\MockObject; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class UsersControllerTest extends TestCase { - /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|MockObject */ protected $userManager; - /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|MockObject */ protected $config; - /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|MockObject */ protected $appManager; - /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|MockObject */ protected $groupManager; - /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|MockObject */ protected $userSession; - /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|MockObject */ protected $logger; - /** @var UsersController|PHPUnit_Framework_MockObject_MockObject */ + /** @var UsersController|MockObject */ protected $api; - /** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var AccountManager|MockObject */ protected $accountManager; - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|MockObject */ protected $request; - /** @var IFactory|PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|MockObject */ private $l10nFactory; - /** @var NewUserMailHelper|PHPUnit_Framework_MockObject_MockObject */ + /** @var NewUserMailHelper|MockObject */ private $newUserMailHelper; - /** @var FederatedShareProviderFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FederatedShareProviderFactory|MockObject */ private $federatedShareProviderFactory; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|MockObject */ private $secureRandom; /** @var RemoteWipe|MockObject */ private $remoteWipe; @@ -3156,7 +3155,7 @@ class UsersControllerTest extends TestCase { $this->userSession->expects($this->once())->method('getUser') ->willReturn($user); - /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */ + /** @var UsersController | MockObject $api */ $api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') ->setConstructorArgs([ 'provisioning_api', @@ -3221,7 +3220,7 @@ class UsersControllerTest extends TestCase { public function testGetUser() { - /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */ + /** @var UsersController | MockObject $api */ $api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') ->setConstructorArgs([ 'provisioning_api', diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php index b3b2184b2ba..90a480c18ad 100644 --- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php +++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php @@ -32,7 +32,7 @@ use Test\TestCase; class ProvisioningApiMiddlewareTest extends TestCase { - /** @var IControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */ private $reflector; protected function setUp(): void { diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php index 271427d455a..ff3a43ae2a4 100644 --- a/apps/settings/tests/Controller/CheckSetupControllerTest.php +++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php @@ -65,33 +65,33 @@ use Test\TestCase; * @package Tests\Settings\Controller */ class CheckSetupControllerTest extends TestCase { - /** @var CheckSetupController | \PHPUnit_Framework_MockObject_MockObject */ + /** @var CheckSetupController | \PHPUnit\Framework\MockObject\MockObject */ private $checkSetupController; - /** @var IRequest | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest | \PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IClientService | \PHPUnit_Framework_MockObject_MockObject*/ + /** @var IClientService | \PHPUnit\Framework\MockObject\MockObject*/ private $clientService; - /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ private $l10n; /** @var ILogger */ private $logger; - /** @var Checker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Checker|\PHPUnit\Framework\MockObject\MockObject */ private $checker; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ private $dispatcher; - /** @var Connection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Connection|\PHPUnit\Framework\MockObject\MockObject */ private $db; - /** @var ILockingProvider|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILockingProvider|\PHPUnit\Framework\MockObject\MockObject */ private $lockingProvider; - /** @var IDateTimeFormatter|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */ private $dateTimeFormatter; /** @var MemoryInfo|MockObject */ private $memoryInfo; - /** @var SecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; /** diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php index 7611d6bcf68..a4e6a3b7d99 100644 --- a/apps/settings/tests/Controller/MailSettingsControllerTest.php +++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php @@ -44,13 +44,13 @@ use OCP\Mail\IMailer; */ class MailSettingsControllerTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */ private $mailer; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; /** @var MailSettingsController */ @@ -63,7 +63,7 @@ class MailSettingsControllerTest extends \Test\TestCase { $this->config = $this->createMock(IConfig::class); $this->userSession = $this->createMock(IUserSession::class); $this->mailer = $this->createMock(IMailer::class); - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */ $request = $this->createMock(IRequest::class); $this->mailController = new MailSettingsController( 'settings', diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php index 9029b1af396..8cfb149188c 100644 --- a/apps/settings/tests/Controller/UsersControllerTest.php +++ b/apps/settings/tests/Controller/UsersControllerTest.php @@ -55,39 +55,39 @@ use OCP\Security\ISecureRandom; */ class UsersControllerTest extends \Test\TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */ private $mailer; - /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ private $l10nFactory; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ private $avatarManager; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; - /** @var AccountManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var AccountManager | \PHPUnit\Framework\MockObject\MockObject */ private $accountManager; - /** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom | \PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var \OCA\Settings\Mailer\NewUserMailHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\Settings\Mailer\NewUserMailHelper|\PHPUnit\Framework\MockObject\MockObject */ private $newUserMailHelper; - /** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IJobList | \PHPUnit\Framework\MockObject\MockObject */ private $jobList; - /** @var \OC\Security\IdentityProof\Manager |\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Security\IdentityProof\Manager |\PHPUnit\Framework\MockObject\MockObject */ private $securityManager; - /** @var IManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionManager; - /** @var IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IEncryptionModule | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionModule; protected function setUp(): void { @@ -120,7 +120,7 @@ class UsersControllerTest extends \Test\TestCase { /** * @param bool $isAdmin - * @return UsersController | \PHPUnit_Framework_MockObject_MockObject + * @return UsersController | \PHPUnit\Framework\MockObject\MockObject */ protected function getController($isAdmin = false, $mockedMethods = []) { if (empty($mockedMethods)) { diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php index aa3a80dcc26..fdb5da3bb54 100644 --- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php +++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php @@ -47,21 +47,21 @@ use OCP\Security\ISecureRandom; use Test\TestCase; class NewUserMailHelperTest extends TestCase { - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var IMailer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */ private $mailer; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */ private $crypto; /** @var \OCA\Settings\Mailer\NewUserMailHelper */ private $newUserMailHelper; @@ -137,7 +137,7 @@ class NewUserMailHelperTest extends TestCase { ->expects($this->once()) ->method('getTime') ->willReturn('12345'); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->any()) @@ -390,7 +390,7 @@ EOF; ->with('/') ->willReturn('https://example.com/'); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->any()) @@ -621,7 +621,7 @@ EOF; ->with('/') ->willReturn('https://example.com/'); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->any()) @@ -833,7 +833,7 @@ EOF; } public function testSendMail() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->at(0)) @@ -843,7 +843,7 @@ EOF; ->expects($this->at(1)) ->method('getDisplayName') ->willReturn('John Doe'); - /** @var IEMailTemplate|\PHPUnit_Framework_MockObject_MockObject $emailTemplate */ + /** @var IEMailTemplate|\PHPUnit\Framework\MockObject\MockObject $emailTemplate */ $emailTemplate = $this->createMock(IEMailTemplate::class); $message = $this->createMock(Message::class); $message diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php index 72e5034d517..b1b3527f335 100644 --- a/apps/settings/tests/Settings/Admin/SharingTest.php +++ b/apps/settings/tests/Settings/Admin/SharingTest.php @@ -43,9 +43,9 @@ class SharingTest extends TestCase { private $admin; /** @var IConfig */ private $config; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $shareManager; protected function setUp(): void { diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index 628487b2aee..5dde34870d8 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -51,7 +51,6 @@ use OCP\Security\IHasher; use OCP\Security\ISecureRandom; use OCP\Share\IManager; use OCP\Share\IShare; -use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; /** @@ -68,40 +67,40 @@ class ShareByMailProviderTest extends TestCase { /** @var IManager */ private $shareManager; - /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N | \PHPUnit\Framework\MockObject\MockObject */ private $l; - /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @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 ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom | \PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var IMailer | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IMailer | \PHPUnit\Framework\MockObject\MockObject */ private $mailer; - /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var IShare | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IShare | \PHPUnit\Framework\MockObject\MockObject */ private $share; - /** @var \OCP\Activity\IManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Activity\IManager | \PHPUnit\Framework\MockObject\MockObject */ private $activityManager; - /** @var SettingsManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var SettingsManager | \PHPUnit\Framework\MockObject\MockObject */ private $settingsManager; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var IHasher | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IHasher | \PHPUnit\Framework\MockObject\MockObject */ private $hasher; /** @var IEventDispatcher */ @@ -138,7 +137,7 @@ class ShareByMailProviderTest extends TestCase { * get instance of Mocked ShareByMailProvider * * @param array $mockedMethods internal methods which should be mocked - * @return \PHPUnit_Framework_MockObject_MockObject | ShareByMailProvider + * @return \PHPUnit\Framework\MockObject\MockObject | ShareByMailProvider */ private function getInstance(array $mockedMethods = []) { $instance = $this->getMockBuilder('OCA\ShareByMail\ShareByMailProvider') diff --git a/apps/systemtags/tests/Activity/SettingTest.php b/apps/systemtags/tests/Activity/SettingTest.php index 9f543031964..cbb2e5da2ce 100644 --- a/apps/systemtags/tests/Activity/SettingTest.php +++ b/apps/systemtags/tests/Activity/SettingTest.php @@ -30,7 +30,7 @@ use OCP\IL10N; use Test\TestCase; class SettingTest extends TestCase { - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; /** @var Setting */ private $setting; @@ -63,15 +63,15 @@ class SettingTest extends TestCase { public function testCanChangeStream() { $this->assertSame(true, $this->setting->canChangeStream()); } - + public function testIsDefaultEnabledStream() { $this->assertSame(true, $this->setting->isDefaultEnabledStream()); } - + public function testCanChangeMail() { $this->assertSame(true, $this->setting->canChangeMail()); } - + public function testIsDefaultEnabledMail() { $this->assertSame(false, $this->setting->isDefaultEnabledMail()); } diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php index 3ad31f029ed..1a11421ce1d 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -44,16 +44,16 @@ use Test\TestCase; * @package OCA\Theming\Tests */ class CapabilitiesTest extends TestCase { - /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ protected $theming; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $url; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var Util|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Util|\PHPUnit\Framework\MockObject\MockObject */ protected $util; /** @var Capabilities */ diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index 05b74c58e79..6cd35be4fa4 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -43,19 +43,19 @@ use OCP\IRequest; use Test\TestCase; class IconControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ private $themingDefaults; /** @var \OCP\AppFramework\Utility\ITimeFactory */ private $timeFactory; - /** @var IconController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IconController|\PHPUnit\Framework\MockObject\MockObject */ private $iconController; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IconBuilder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IconBuilder|\PHPUnit\Framework\MockObject\MockObject */ private $iconBuilder; - /** @var FileAccessHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FileAccessHelper|\PHPUnit\Framework\MockObject\MockObject */ private $fileAccessHelper; /** @var ImageManager */ private $imageManager; diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index edaf1a451b5..cb00251419a 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -57,25 +57,25 @@ use OCP\IURLGenerator; use Test\TestCase; class ThemingControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ private $themingDefaults; /** @var \OCP\AppFramework\Utility\ITimeFactory */ private $timeFactory; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; /** @var ThemingController */ private $themingController; /** @var ITempManager */ private $tempManager; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; - /** @var ImageManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ImageManager|\PHPUnit\Framework\MockObject\MockObject */ private $imageManager; /** @var SCSSCacher */ private $scssCacher; diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index 1187ecf0365..a14924db049 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -40,17 +40,17 @@ use Test\TestCase; class ImageManagerTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; /** @var ImageManager */ protected $imageManager; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ private $cacheFactory; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; protected function setUp(): void { @@ -83,7 +83,7 @@ class ImageManagerTest extends TestCase { } public function mockGetImage($key, $file) { - /** @var \PHPUnit_Framework_MockObject_MockObject $folder */ + /** @var \PHPUnit\Framework\MockObject\MockObject $folder */ $folder = $this->createMock(ISimpleFolder::class); if ($file === null) { $folder->expects($this->once()) @@ -185,7 +185,7 @@ class ImageManagerTest extends TestCase { $this->assertEquals($file, $this->imageManager->getImage('logo', false)); } - + public function testGetImageUnset() { $this->expectException(\OCP\Files\NotFoundException::class); @@ -240,7 +240,7 @@ class ImageManagerTest extends TestCase { $this->assertEquals($expected, $this->imageManager->getCachedImage('filename')); } - + public function testGetCachedImageNotFound() { $this->expectException(\OCP\Files\NotFoundException::class); diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php index 93ca2070f79..5ba9fc6b650 100644 --- a/apps/theming/tests/Settings/SectionTest.php +++ b/apps/theming/tests/Settings/SectionTest.php @@ -29,9 +29,9 @@ use OCP\IURLGenerator; use Test\TestCase; class SectionTest extends TestCase { - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $url; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; /** @var Section */ private $section; diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index e5b6fb72db0..fecde372622 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -50,29 +50,29 @@ use OCP\IURLGenerator; use Test\TestCase; class ThemingDefaultsTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var \OC_Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC_Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ private $cacheFactory; /** @var ThemingDefaults */ private $template; - /** @var Util|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Util|\PHPUnit\Framework\MockObject\MockObject */ private $util; - /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ private $cache; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var ImageManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ImageManager|\PHPUnit\Framework\MockObject\MockObject */ private $imageManager; - /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INavigationManager|\PHPUnit\Framework\MockObject\MockObject */ private $navigationManager; protected function setUp(): void { diff --git a/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php index dbfc6fa70e1..e7f89f04ecf 100644 --- a/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php +++ b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php @@ -41,7 +41,7 @@ class BackupCodeStorageTest extends TestCase { /** @var string */ private $testUID = 'test123456789'; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $notificationManager; protected function setUp(): void { diff --git a/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php index 464b65dbebb..8f56cc2fd59 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php @@ -32,18 +32,17 @@ use OCP\Activity\IManager; use OCP\IL10N; use OCP\IURLGenerator; use OCP\L10N\IFactory; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ProviderTest extends TestCase { - /** @var IFactory|PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var IURLGenerator|PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var IManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $activityManager; /** @var Provider */ diff --git a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php index 1ced1dbf684..a05e2cccc22 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php @@ -35,13 +35,13 @@ use Test\TestCase; class SettingsControllerTest extends TestCase { - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var BackupCodeStorage|PHPUnit_Framework_MockObject_MockObject */ + /** @var BackupCodeStorage|\PHPUnit\Framework\MockObject\MockObject */ private $storage; - /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; /** @var SettingsController */ diff --git a/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php b/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php index bfcab556669..1c7faf6210f 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php @@ -69,11 +69,11 @@ class NotifierTest extends TestCase { ); } - + public function testPrepareWrongApp() { $this->expectException(\InvalidArgumentException::class); - /** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->createMock(INotification::class); $notification->expects($this->once()) ->method('getApp') @@ -84,11 +84,11 @@ class NotifierTest extends TestCase { $this->notifier->prepare($notification, 'en'); } - + public function testPrepareWrongSubject() { $this->expectException(\InvalidArgumentException::class); - /** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->createMock(INotification::class); $notification->expects($this->once()) ->method('getApp') @@ -101,7 +101,7 @@ class NotifierTest extends TestCase { } public function testPrepare() { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->createMock(INotification::class); $notification->expects($this->once()) diff --git a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php index 1c33cca2cb6..d0d22bbcb5b 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php @@ -31,7 +31,6 @@ use OCP\IInitialStateService; use OCP\IL10N; use OCP\IUser; use OCP\Template; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class BackupCodesProviderTest extends TestCase { @@ -39,16 +38,16 @@ class BackupCodesProviderTest extends TestCase { /** @var string */ private $appName; - /** @var BackupCodeStorage|PHPUnit_Framework_MockObject_MockObject */ + /** @var BackupCodeStorage|\PHPUnit\Framework\MockObject\MockObject */ private $storage; - /** @var IL10N|PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var AppManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var AppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IInitialStateService|PHPUnit_Framework_MockObject_MockObject */ + /** @var IInitialStateService|\PHPUnit\Framework\MockObject\MockObject */ private $initialState; /** @var BackupCodesProvider */ diff --git a/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php index 20cad61530d..ef17459cb06 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php @@ -32,21 +32,20 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; use OCP\Security\IHasher; use OCP\Security\ISecureRandom; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class BackupCodeStorageTest extends TestCase { - /** @var BackupCodeMapper|PHPUnit_Framework_MockObject_MockObject */ + /** @var BackupCodeMapper|\PHPUnit\Framework\MockObject\MockObject */ private $mapper; - /** @var ISecureRandom|PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $random; - /** @var IHasher|PHPUnit_Framework_MockObject_MockObject */ + /** @var IHasher|\PHPUnit\Framework\MockObject\MockObject */ private $hasher; - /** @var IEventDispatcher|PHPUnit_Framework_MockObject_MockObject */ + /** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */ private $eventDispatcher; /** @var BackupCodeStorage */ diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index e40364cce09..ae048392712 100644 --- a/apps/updatenotification/tests/Controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php @@ -39,19 +39,19 @@ use OCP\Security\ISecureRandom; use Test\TestCase; class AdminControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */ private $jobList; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $secureRandom; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var AdminController */ private $adminController; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; protected function setUp(): void { diff --git a/apps/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php index 768000c70e6..09b1cb06d5a 100644 --- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php +++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php @@ -43,17 +43,17 @@ use Test\TestCase; class BackgroundJobTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ protected $appManager; - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected $client; - /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Installer|\PHPUnit\Framework\MockObject\MockObject */ protected $installer; protected function setUp(): void { @@ -69,7 +69,7 @@ class BackgroundJobTest extends TestCase { /** * @param array $methods - * @return BackgroundJob|\PHPUnit_Framework_MockObject_MockObject + * @return BackgroundJob|\PHPUnit\Framework\MockObject\MockObject */ protected function getJob(array $methods = []) { if (empty($methods)) { @@ -427,7 +427,7 @@ class BackgroundJobTest extends TestCase { /** * @param string[] $userIds - * @return IUser[]|\PHPUnit_Framework_MockObject_MockObject[] + * @return IUser[]|\PHPUnit\Framework\MockObject\MockObject[] */ protected function getUsers(array $userIds): array { $users = []; @@ -443,7 +443,7 @@ class BackgroundJobTest extends TestCase { /** * @param string $gid - * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject + * @return \OCP\IGroup|\PHPUnit\Framework\MockObject\MockObject */ protected function getGroup(string $gid) { $group = $this->createMock(IGroup::class); diff --git a/apps/updatenotification/tests/Notification/NotifierTest.php b/apps/updatenotification/tests/Notification/NotifierTest.php index c00bcf842c3..fa7b4a6feca 100644 --- a/apps/updatenotification/tests/Notification/NotifierTest.php +++ b/apps/updatenotification/tests/Notification/NotifierTest.php @@ -40,17 +40,17 @@ use Test\TestCase; class NotifierTest extends TestCase { - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $urlGenerator; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $l10nFactory; - /** @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; protected function setUp(): void { @@ -66,7 +66,7 @@ class NotifierTest extends TestCase { /** * @param array $methods - * @return Notifier|\PHPUnit_Framework_MockObject_MockObject + * @return Notifier|\PHPUnit\Framework\MockObject\MockObject */ protected function getNotifier(array $methods = []) { if (empty($methods)) { diff --git a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php index 0de038c5768..36e0ddf374d 100644 --- a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php +++ b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php @@ -33,9 +33,9 @@ use OCP\IConfig; use Test\TestCase; class ResetTokenBackgroundJobTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; /** @var ResetTokenBackgroundJob */ private $resetTokenBackgroundJob; diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php index faed2c23a8e..78afc6a3ac0 100644 --- a/apps/updatenotification/tests/Settings/AdminTest.php +++ b/apps/updatenotification/tests/Settings/AdminTest.php @@ -43,19 +43,19 @@ use OCP\Util; use Test\TestCase; class AdminTest extends TestCase { - /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $l10nFactory; /** @var Admin */ private $admin; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var UpdateChecker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UpdateChecker|\PHPUnit\Framework\MockObject\MockObject */ private $updateChecker; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; - /** @var IDateTimeFormatter|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IDateTimeFormatter|\PHPUnit\Framework\MockObject\MockObject */ private $dateTimeFormatter; - /** @var IRegistry|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */ private $subscriptionRegistry; protected function setUp(): void { diff --git a/apps/updatenotification/tests/UpdateCheckerTest.php b/apps/updatenotification/tests/UpdateCheckerTest.php index b5f7cee60ce..ba5f8341bb0 100644 --- a/apps/updatenotification/tests/UpdateCheckerTest.php +++ b/apps/updatenotification/tests/UpdateCheckerTest.php @@ -34,9 +34,9 @@ use OCA\UpdateNotification\UpdateChecker; use Test\TestCase; class UpdateCheckerTest extends TestCase { - /** @var ChangesCheck|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ChangesCheck|\PHPUnit\Framework\MockObject\MockObject */ protected $changesChecker; - /** @var VersionCheck|\PHPUnit_Framework_MockObject_MockObject */ + /** @var VersionCheck|\PHPUnit\Framework\MockObject\MockObject */ private $updater; /** @var UpdateChecker */ private $updateChecker; diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 5aec76eb385..549f6600b4d 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -62,19 +62,19 @@ use Test\TestCase; * @package OCA\User_LDAP\Tests */ class AccessTest extends TestCase { - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $userMapper; - /** @var Connection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Connection|\PHPUnit\Framework\MockObject\MockObject */ private $connection; - /** @var LDAP|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LDAP|\PHPUnit\Framework\MockObject\MockObject */ private $ldap; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ private $helper; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $ncUserManager; /** @var Access */ private $access; @@ -231,7 +231,7 @@ class AccessTest extends TestCase { */ public function testStringResemblesDN($case) { list($lw, $con, $um, $helper) = $this->getConnectorAndLdapMock(); - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); $access = new Access($con, $lw, $um, $helper, $config, $this->ncUserManager); @@ -253,7 +253,7 @@ class AccessTest extends TestCase { */ public function testStringResemblesDNLDAPmod($case) { list(, $con, $um, $helper) = $this->getConnectorAndLdapMock(); - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); $lw = new LDAP(); $access = new Access($con, $lw, $um, $helper, $config, $this->ncUserManager); @@ -281,7 +281,7 @@ class AccessTest extends TestCase { ->method('getAttributes') ->willReturn(['displayname' => ['bar', 'count' => 1]]); - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject $mapperMock */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject $mapperMock */ $mapperMock = $this->createMock(UserMapping::class); $mapperMock->expects($this->any()) ->method('getNameByDN') @@ -326,7 +326,7 @@ class AccessTest extends TestCase { } public function testBatchApplyUserAttributesSkipped() { - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject $mapperMock */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject $mapperMock */ $mapperMock = $this->createMock(UserMapping::class); $mapperMock->expects($this->any()) ->method('getNameByDN') @@ -367,7 +367,7 @@ class AccessTest extends TestCase { } public function testBatchApplyUserAttributesDontSkip() { - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject $mapperMock */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject $mapperMock */ $mapperMock = $this->createMock(UserMapping::class); $mapperMock->expects($this->any()) ->method('getNameByDN') @@ -423,7 +423,7 @@ class AccessTest extends TestCase { */ public function testSanitizeDN($attribute) { list($lw, $con, $um, $helper) = $this->getConnectorAndLdapMock(); - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); $dnFromServer = 'cn=Mixed Cases,ou=Are Sufficient To,ou=Test,dc=example,dc=org'; @@ -687,7 +687,7 @@ class AccessTest extends TestCase { ->with('detta') ->willReturnOnConsecutiveCalls($offlineUserMock, $regularUserMock); - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject $mapperMock */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject $mapperMock */ $mapperMock = $this->createMock(UserMapping::class); $mapperMock->expects($this->any()) ->method('getNameByDN') diff --git a/apps/user_ldap/tests/ConnectionTest.php b/apps/user_ldap/tests/ConnectionTest.php index 721966025f0..a4fcf030083 100644 --- a/apps/user_ldap/tests/ConnectionTest.php +++ b/apps/user_ldap/tests/ConnectionTest.php @@ -41,7 +41,7 @@ use OCA\User_LDAP\ILDAPWrapper; * @package OCA\User_LDAP\Tests */ class ConnectionTest extends \Test\TestCase { - /** @var \OCA\User_LDAP\ILDAPWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCA\User_LDAP\ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject */ protected $ldap; /** @var Connection */ diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php index 5aace2c5c91..1822c27a1cd 100644 --- a/apps/user_ldap/tests/HelperTest.php +++ b/apps/user_ldap/tests/HelperTest.php @@ -30,7 +30,7 @@ use OCP\IConfig; class HelperTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var Helper */ diff --git a/apps/user_ldap/tests/Jobs/SyncTest.php b/apps/user_ldap/tests/Jobs/SyncTest.php index 0971e31ae85..cfe6bda5977 100644 --- a/apps/user_ldap/tests/Jobs/SyncTest.php +++ b/apps/user_ldap/tests/Jobs/SyncTest.php @@ -45,29 +45,29 @@ class SyncTest extends TestCase { /** @var array */ protected $arguments; - /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ protected $helper; - /** @var LDAP|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LDAP|\PHPUnit\Framework\MockObject\MockObject */ protected $ldapWrapper; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $mapper; /** @var Sync */ protected $sync; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ protected $avatarManager; - /** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ protected $dbc; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $ncUserManager; - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var ConnectionFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ConnectionFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $connectionFactory; - /** @var AccessFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AccessFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $accessFactory; protected function setUp(): void { @@ -182,7 +182,7 @@ class SyncTest extends TestCase { return null; }); - /** @var Access|\PHPUnit_Framework_MockObject_MockObject $access */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject $access */ $access = $this->createMock(Access::class); $this->accessFactory->expects($this->any()) ->method('get') @@ -356,7 +356,7 @@ class SyncTest extends TestCase { return null; }); - /** @var Access|\PHPUnit_Framework_MockObject_MockObject $access */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject $access */ $access = $this->createMock(Access::class); $this->accessFactory->expects($this->any()) ->method('get') diff --git a/apps/user_ldap/tests/LDAPTest.php b/apps/user_ldap/tests/LDAPTest.php index de2d7c0d3a7..aa2d4f2a6ec 100644 --- a/apps/user_ldap/tests/LDAPTest.php +++ b/apps/user_ldap/tests/LDAPTest.php @@ -30,7 +30,7 @@ use OCA\User_LDAP\LDAP; use Test\TestCase; class LDAPTest extends TestCase { - /** @var LDAP|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LDAP|\PHPUnit\Framework\MockObject\MockObject */ private $ldap; protected function setUp(): void { diff --git a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php index a1048609e69..68b6338e5be 100644 --- a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php +++ b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php @@ -35,25 +35,25 @@ use OCP\IConfig; use Test\TestCase; abstract class AbstractUUIDFixTest extends TestCase { - /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ protected $helper; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var LDAP|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LDAP|\PHPUnit\Framework\MockObject\MockObject */ protected $ldap; - /** @var UserMapping|GroupMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserMapping|GroupMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $mapper; /** @var UUIDFixUser */ protected $job; - /** @var User_Proxy|\PHPUnit_Framework_MockObject_MockObject */ + /** @var User_Proxy|\PHPUnit\Framework\MockObject\MockObject */ protected $proxy; - /** @var Access|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject */ protected $access; /** @var bool */ diff --git a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php index 6d0fb5ad6e8..5e39b974fa8 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php @@ -33,16 +33,16 @@ use OCP\Migration\IOutput; use Test\TestCase; class UUIDFixInsertTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $userMapper; - /** @var GroupMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var GroupMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $groupMapper; - /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */ protected $jobList; /** @var UUIDFixInsert */ diff --git a/apps/user_ldap/tests/Settings/SectionTest.php b/apps/user_ldap/tests/Settings/SectionTest.php index d8f18da623c..510b94e4b61 100644 --- a/apps/user_ldap/tests/Settings/SectionTest.php +++ b/apps/user_ldap/tests/Settings/SectionTest.php @@ -31,9 +31,9 @@ use OCP\IURLGenerator; use Test\TestCase; class SectionTest extends TestCase { - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $url; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; /** @var Section */ private $section; diff --git a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php index 06378289934..d9847725c7b 100644 --- a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php +++ b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php @@ -47,7 +47,7 @@ class DeletedUsersIndexTest extends \Test\TestCase { /** @var IDBConnection */ protected $db; - /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserMapping|\PHPUnit\Framework\MockObject\MockObject */ protected $mapping; protected function setUp(): void { diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index 98365bbfdb5..18499da9a86 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -51,34 +51,34 @@ use OCP\Notification\IManager as INotificationManager; * @package OCA\User_LDAP\Tests\User */ class ManagerTest extends \Test\TestCase { - /** @var Access|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject */ protected $access; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var FilesystemHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FilesystemHelper|\PHPUnit\Framework\MockObject\MockObject */ protected $fileSystemHelper; - /** @var LogWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LogWrapper|\PHPUnit\Framework\MockObject\MockObject */ protected $log; - /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ protected $avatarManager; - /** @var Image|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Image|\PHPUnit\Framework\MockObject\MockObject */ protected $image; - /** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ protected $dbc; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $ncUserManager; - /** @var INotificationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INotificationManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var ILDAPWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject */ protected $ldapWrapper; /** @var Connection */ diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 373f5cc9326..12991835daf 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -52,23 +52,23 @@ use OCP\Notification\INotification; * @package OCA\User_LDAP\Tests\User */ class UserTest extends \Test\TestCase { - /** @var Access|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject */ protected $access; - /** @var Connection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Connection|\PHPUnit\Framework\MockObject\MockObject */ protected $connection; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var FilesystemHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FilesystemHelper|\PHPUnit\Framework\MockObject\MockObject */ protected $filesystemhelper; - /** @var INotificationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INotificationManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var Image|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Image|\PHPUnit\Framework\MockObject\MockObject */ protected $image; - /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ protected $avatarManager; - /** @var LogWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var LogWrapper|\PHPUnit\Framework\MockObject\MockObject */ protected $log; /** @var string */ protected $uid = 'alice'; @@ -1007,7 +1007,7 @@ class UserTest extends \Test\TestCase { 'updateExtStorageHome', ]; - /** @var User|\PHPUnit_Framework_MockObject_MockObject $userMock */ + /** @var User|\PHPUnit\Framework\MockObject\MockObject $userMock */ $userMock = $this->getMockBuilder(User::class) ->setConstructorArgs([ $this->uid, diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index bfdaa99ac00..1c10e9955b3 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -60,21 +60,21 @@ use Test\TestCase; class User_LDAPTest extends TestCase { /** @var User_LDAP */ protected $backend; - /** @var Access|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject */ protected $access; - /** @var OfflineUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OfflineUser|\PHPUnit\Framework\MockObject\MockObject */ protected $offlineUser; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var INotificationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INotificationManager|\PHPUnit\Framework\MockObject\MockObject */ protected $notificationManager; - /** @var Session|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Session|\PHPUnit\Framework\MockObject\MockObject */ protected $session; - /** @var UserPluginManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserPluginManager|\PHPUnit\Framework\MockObject\MockObject */ protected $pluginManager; - /** @var Connection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Connection|\PHPUnit\Framework\MockObject\MockObject */ protected $connection; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; protected function setUp(): void { diff --git a/apps/user_ldap/tests/User_ProxyTest.php b/apps/user_ldap/tests/User_ProxyTest.php index 7d2f0c60a82..6cb37d5294a 100644 --- a/apps/user_ldap/tests/User_ProxyTest.php +++ b/apps/user_ldap/tests/User_ProxyTest.php @@ -37,17 +37,17 @@ use OCP\Notification\IManager as INotificationManager; use Test\TestCase; class User_ProxyTest extends TestCase { - /** @var ILDAPWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject */ private $ldapWrapper; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var INotificationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INotificationManager|\PHPUnit\Framework\MockObject\MockObject */ private $notificationManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var User_Proxy|\PHPUnit_Framework_MockObject_MockObject */ + /** @var User_Proxy|\PHPUnit\Framework\MockObject\MockObject */ private $proxy; - /** @var UserPluginManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var UserPluginManager|\PHPUnit\Framework\MockObject\MockObject */ private $userPluginManager; protected function setUp(): void { diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index 5595ff30440..da3239cb8f8 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -67,16 +67,16 @@ class WizardTest extends TestCase { $connMethods = get_class_methods('\OCA\User_LDAP\Connection'); $accMethods = get_class_methods('\OCA\User_LDAP\Access'); } - /** @var ILDAPWrapper|\PHPUnit_Framework_MockObject_MockObject $lw */ + /** @var ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject $lw */ $lw = $this->createMock(ILDAPWrapper::class); - /** @var Configuration|\PHPUnit_Framework_MockObject_MockObject $conf */ + /** @var Configuration|\PHPUnit\Framework\MockObject\MockObject $conf */ $conf = $this->getMockBuilder(Configuration::class) ->setMethods($confMethods) ->setConstructorArgs([$lw, null, null]) ->getMock(); - /** @var Access|\PHPUnit_Framework_MockObject_MockObject $access */ + /** @var Access|\PHPUnit\Framework\MockObject\MockObject $access */ $access = $this->createMock(Access::class); return [new Wizard($conf, $lw, $access), $conf, $lw, $access]; diff --git a/apps/workflowengine/tests/Check/RequestRemoteAddressTest.php b/apps/workflowengine/tests/Check/RequestRemoteAddressTest.php index c986a2daab5..92513996ae1 100644 --- a/apps/workflowengine/tests/Check/RequestRemoteAddressTest.php +++ b/apps/workflowengine/tests/Check/RequestRemoteAddressTest.php @@ -26,11 +26,11 @@ use OCP\IRequest; class RequestRemoteAddressTest extends \Test\TestCase { - /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; /** - * @return \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject + * @return \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ protected function getL10NMock() { $l = $this->getMockBuilder(IL10N::class) diff --git a/apps/workflowengine/tests/Check/RequestTimeTest.php b/apps/workflowengine/tests/Check/RequestTimeTest.php index d8628b7c6f8..7c29006b33d 100644 --- a/apps/workflowengine/tests/Check/RequestTimeTest.php +++ b/apps/workflowengine/tests/Check/RequestTimeTest.php @@ -25,11 +25,11 @@ use OCP\IL10N; class RequestTimeTest extends \Test\TestCase { - /** @var \OCP\AppFramework\Utility\ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\AppFramework\Utility\ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; /** - * @return \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject + * @return \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ protected function getL10NMock() { $l = $this->getMockBuilder(IL10N::class) diff --git a/apps/workflowengine/tests/Check/RequestUserAgentTest.php b/apps/workflowengine/tests/Check/RequestUserAgentTest.php index 7ea5aad2a6e..12987d4064b 100644 --- a/apps/workflowengine/tests/Check/RequestUserAgentTest.php +++ b/apps/workflowengine/tests/Check/RequestUserAgentTest.php @@ -28,7 +28,7 @@ use Test\TestCase; class RequestUserAgentTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; /** @var RequestUserAgent */ @@ -38,7 +38,7 @@ class RequestUserAgentTest extends TestCase { parent::setUp(); $this->request = $this->createMock(IRequest::class); - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject $l */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l */ $l = $this->getMockBuilder(IL10N::class) ->disableOriginalConstructor() ->getMock(); |