diff options
371 files changed, 1976 insertions, 1888 deletions
diff --git a/apps/accessibility/l10n/nl.js b/apps/accessibility/l10n/nl.js index 9f28593d1ee..b0e360f42d8 100644 --- a/apps/accessibility/l10n/nl.js +++ b/apps/accessibility/l10n/nl.js @@ -14,8 +14,8 @@ OC.L10N.register( "Accessibility options for nextcloud" : "Toegankelijkheidsopties voor Nextcloud", "Provides multiple accessibilities options to ease your use of Nextcloud" : "Biedt verschillende opties om de toegankelijkheid van Nextcloud te verbeteren", "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universele toegang is heel belangrijk voor ons. We volgen webstandaarden en controleren dat alles ook zonder muis en met ondersteunende software zoals schermlezers bruikbaar is. We streven om de {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 op AA-niveau te volgen, en met het hoge contrast thema zelfs op AAA-niveau.", - "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mocht je eventuele problemen vinden, aarzel dan niet om ze te melden op {issuetracker}onze issue tracker{linkend}. En mocht je mee willen helpen, wordt dan lid van {designteam} ons ontwikkelteam{linkend}!", - "High contrast theme" : "Hoog contrast-thema", + "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mocht je eventuele problemen vinden, aarzel dan niet om ze te melden op {issuetracker}onze issue tracker{linkend}. En mocht je mee willen helpen, wordt dan lid van {designteam}ons ontwerpteam{linkend}!", + "High contrast theme" : "Hoog contrast thema", "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Een thema met hoog contrast dat de navigatie vergemakkelijkt. De visuele kwaliteit vermindert, maar de duidelijkheid neemt toe.", "Web Content Accessibility Guidelines" : "Richtlijnen voor toegankelijkheid van webcontent (WCAG)", "our issue tracker" : "onze issue tracker", diff --git a/apps/accessibility/l10n/nl.json b/apps/accessibility/l10n/nl.json index 73a98b4f9ef..2f0c2b5428e 100644 --- a/apps/accessibility/l10n/nl.json +++ b/apps/accessibility/l10n/nl.json @@ -12,8 +12,8 @@ "Accessibility options for nextcloud" : "Toegankelijkheidsopties voor Nextcloud", "Provides multiple accessibilities options to ease your use of Nextcloud" : "Biedt verschillende opties om de toegankelijkheid van Nextcloud te verbeteren", "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universele toegang is heel belangrijk voor ons. We volgen webstandaarden en controleren dat alles ook zonder muis en met ondersteunende software zoals schermlezers bruikbaar is. We streven om de {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 op AA-niveau te volgen, en met het hoge contrast thema zelfs op AAA-niveau.", - "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mocht je eventuele problemen vinden, aarzel dan niet om ze te melden op {issuetracker}onze issue tracker{linkend}. En mocht je mee willen helpen, wordt dan lid van {designteam} ons ontwikkelteam{linkend}!", - "High contrast theme" : "Hoog contrast-thema", + "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mocht je eventuele problemen vinden, aarzel dan niet om ze te melden op {issuetracker}onze issue tracker{linkend}. En mocht je mee willen helpen, wordt dan lid van {designteam}ons ontwerpteam{linkend}!", + "High contrast theme" : "Hoog contrast thema", "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Een thema met hoog contrast dat de navigatie vergemakkelijkt. De visuele kwaliteit vermindert, maar de duidelijkheid neemt toe.", "Web Content Accessibility Guidelines" : "Richtlijnen voor toegankelijkheid van webcontent (WCAG)", "our issue tracker" : "onze issue tracker", 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/l10n/fi.js b/apps/dav/l10n/fi.js index eef514477b7..c2b5ff66429 100644 --- a/apps/dav/l10n/fi.js +++ b/apps/dav/l10n/fi.js @@ -75,6 +75,7 @@ OC.L10N.register( "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "%s tulee asettaa käyttämään HTTPS-yhteyttä, jotta CalDAVia ja CardDAVia voi käyttää iOSilla tai macOS:llä.", "Configures a CalDAV account" : "Määrittää CalDAV-tilin", "Configures a CardDAV account" : "Määrittää CardDAV-tilin", + "Events" : "Tapahtumat", "Tasks" : "Tehtävät", "Untitled task" : "Nimetön tehtävä", "WebDAV" : "WebDAV", diff --git a/apps/dav/l10n/fi.json b/apps/dav/l10n/fi.json index dcb6953eefb..ce53f3b47d2 100644 --- a/apps/dav/l10n/fi.json +++ b/apps/dav/l10n/fi.json @@ -73,6 +73,7 @@ "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "%s tulee asettaa käyttämään HTTPS-yhteyttä, jotta CalDAVia ja CardDAVia voi käyttää iOSilla tai macOS:llä.", "Configures a CalDAV account" : "Määrittää CalDAV-tilin", "Configures a CardDAV account" : "Määrittää CardDAV-tilin", + "Events" : "Tapahtumat", "Tasks" : "Tehtävät", "Untitled task" : "Nimetön tehtävä", "WebDAV" : "WebDAV", 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/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index e990f5a510e..7723b63a66b 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -189,7 +189,7 @@ class Crypt { $this->getCipher()); // Create a signature based on the key as well as the current version - $sig = $this->createSignature($encryptedContent, $passPhrase.$version.$position); + $sig = $this->createSignature($encryptedContent, $passPhrase.'_'.$version.'_'.$position); // combine content to encrypt the IV identifier and actual IV $catFile = $this->concatIV($encryptedContent, $iv); @@ -460,7 +460,13 @@ class Crypt { $catFile = $this->splitMetaData($keyFileContents, $cipher); if ($catFile['signature'] !== false) { - $this->checkSignature($catFile['encrypted'], $passPhrase.$version.$position, $catFile['signature']); + try { + // First try the new format + $this->checkSignature($catFile['encrypted'], $passPhrase . '_' . $version . '_' . $position, $catFile['signature']); + } catch (GenericEncryptionException $e) { + // For compatibility with old files check the version without _ + $this->checkSignature($catFile['encrypted'], $passPhrase . $version . $position, $catFile['signature']); + } } return $this->decrypt($catFile['encrypted'], 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/l10n/fi.js b/apps/files/l10n/fi.js index 548123fe58e..d4fafe35929 100644 --- a/apps/files/l10n/fi.js +++ b/apps/files/l10n/fi.js @@ -60,6 +60,7 @@ OC.L10N.register( "Could not fetch file details \"{file}\"" : "Ei voitu hakea tiedoston tietoja \"{file}\"", "Error deleting file \"{fileName}\"." : "Virhe poistaessa tiedostoa \"{fileName}\".", "No search results in other folders for {tag}{filter}{endtag}" : "Ei hakutuloksia muissa kansioissa haulla {tag}{filter}{endtag}", + "Enter more than two characters to search in other folders" : "Kirjoita enemmän kuin kaksi merkkiä etsiäksesi muista kansioista", "Name" : "Nimi", "Size" : "Koko", "Modified" : "Muokattu", diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json index 8804f548c20..77f97ef0a14 100644 --- a/apps/files/l10n/fi.json +++ b/apps/files/l10n/fi.json @@ -58,6 +58,7 @@ "Could not fetch file details \"{file}\"" : "Ei voitu hakea tiedoston tietoja \"{file}\"", "Error deleting file \"{fileName}\"." : "Virhe poistaessa tiedostoa \"{fileName}\".", "No search results in other folders for {tag}{filter}{endtag}" : "Ei hakutuloksia muissa kansioissa haulla {tag}{filter}{endtag}", + "Enter more than two characters to search in other folders" : "Kirjoita enemmän kuin kaksi merkkiä etsiäksesi muista kansioista", "Name" : "Nimi", "Size" : "Koko", "Modified" : "Muokattu", 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/l10n/fi.js b/apps/files_sharing/l10n/fi.js index 51421c08999..a124d150f04 100644 --- a/apps/files_sharing/l10n/fi.js +++ b/apps/files_sharing/l10n/fi.js @@ -134,6 +134,7 @@ OC.L10N.register( "guest" : "vieras", "Internal link" : "Sisäinen linkki", "Link copied" : "Linkki kopioitu", + "Cannot copy, please copy the link manually" : "Kopioiminen ei onnistu. Kopioi linkki manuaalisesti", "Copy to clipboard" : "Kopioi leikepöydälle", "Only works for users with access to this folder" : "Toimii vain käyttäjille, joilla on oikeus tähän kansioon", "Password protection (enforced)" : "Salasanasuojaus (pakotettu)", @@ -154,6 +155,7 @@ OC.L10N.register( "Name or email address …" : "Nimi tai sähköpostiosoite…", "Name …" : "Nimi…", "Searching …" : "Haetaan…", + "No elements found." : "Elementtejä ei löytynyt.", "Search globally" : "Hae globaalisti", "Expires {relativetime}" : "Vanhenee {relativetime}", "Link to a file" : "Linkki tiedostoon", diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json index e2db32c671d..bad76edc242 100644 --- a/apps/files_sharing/l10n/fi.json +++ b/apps/files_sharing/l10n/fi.json @@ -132,6 +132,7 @@ "guest" : "vieras", "Internal link" : "Sisäinen linkki", "Link copied" : "Linkki kopioitu", + "Cannot copy, please copy the link manually" : "Kopioiminen ei onnistu. Kopioi linkki manuaalisesti", "Copy to clipboard" : "Kopioi leikepöydälle", "Only works for users with access to this folder" : "Toimii vain käyttäjille, joilla on oikeus tähän kansioon", "Password protection (enforced)" : "Salasanasuojaus (pakotettu)", @@ -152,6 +153,7 @@ "Name or email address …" : "Nimi tai sähköpostiosoite…", "Name …" : "Nimi…", "Searching …" : "Haetaan…", + "No elements found." : "Elementtejä ei löytynyt.", "Search globally" : "Hae globaalisti", "Expires {relativetime}" : "Vanhenee {relativetime}", "Link to a file" : "Linkki tiedostoon", 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/l10n/de.js b/apps/settings/l10n/de.js index d1de5f56e17..68fc175b5a0 100644 --- a/apps/settings/l10n/de.js +++ b/apps/settings/l10n/de.js @@ -102,7 +102,7 @@ OC.L10N.register( "Go to %s" : "%s aufrufen", "Install Client" : "Installiere den Client", "Logged in user must be a subadmin" : "Der angemeldete Benutzer muss ein Administrator sein", - "Apps" : "Benötigt keine Übersetzung. Für den Desktop wird nur die formelle Übersetzung verwendet (de_DE).", + "Apps" : "Apps", "Settings" : "Einstellungen", "Personal" : "Persönlich", "Administration" : "Verwaltung", diff --git a/apps/settings/l10n/de.json b/apps/settings/l10n/de.json index 2cb8723fefc..f3d8827f81b 100644 --- a/apps/settings/l10n/de.json +++ b/apps/settings/l10n/de.json @@ -100,7 +100,7 @@ "Go to %s" : "%s aufrufen", "Install Client" : "Installiere den Client", "Logged in user must be a subadmin" : "Der angemeldete Benutzer muss ein Administrator sein", - "Apps" : "Benötigt keine Übersetzung. Für den Desktop wird nur die formelle Übersetzung verwendet (de_DE).", + "Apps" : "Apps", "Settings" : "Einstellungen", "Personal" : "Persönlich", "Administration" : "Verwaltung", diff --git a/apps/settings/l10n/fi.js b/apps/settings/l10n/fi.js index e67e91b0635..85f567c2cd1 100644 --- a/apps/settings/l10n/fi.js +++ b/apps/settings/l10n/fi.js @@ -8,6 +8,7 @@ OC.L10N.register( "Sending…" : "Lähetetään…", "Email sent" : "Sähköposti lähetetty", "Private" : "Yksityinen", + "Don't synchronize to servers" : "Älä synkronoi palvelimille", "Trusted" : "Luotettu", "Only synchronize to trusted servers" : "Synkronoi vain luotetulle palvelimelle", "Public" : "Julkinen", @@ -40,6 +41,7 @@ OC.L10N.register( "{actor} changed your password" : "{actor} muutti salasanasi", "You changed your password" : "Muutit salasanasi", "Your password was reset by an administrator" : "Ylläpitäjä nollasi salasanasi", + "Your password was reset" : "Salasanasi nollattiin", "{actor} changed your email address" : "{actor} muutti sähköpostiosoitteesi", "You changed your email address" : "Muutit sähköpostiosoitteesi", "Your email address was changed by an administrator" : "Ylläpitäjä muutti sähköpostiosoitteesi", diff --git a/apps/settings/l10n/fi.json b/apps/settings/l10n/fi.json index 8542878a830..2b5480dd31e 100644 --- a/apps/settings/l10n/fi.json +++ b/apps/settings/l10n/fi.json @@ -6,6 +6,7 @@ "Sending…" : "Lähetetään…", "Email sent" : "Sähköposti lähetetty", "Private" : "Yksityinen", + "Don't synchronize to servers" : "Älä synkronoi palvelimille", "Trusted" : "Luotettu", "Only synchronize to trusted servers" : "Synkronoi vain luotetulle palvelimelle", "Public" : "Julkinen", @@ -38,6 +39,7 @@ "{actor} changed your password" : "{actor} muutti salasanasi", "You changed your password" : "Muutit salasanasi", "Your password was reset by an administrator" : "Ylläpitäjä nollasi salasanasi", + "Your password was reset" : "Salasanasi nollattiin", "{actor} changed your email address" : "{actor} muutti sähköpostiosoitteesi", "You changed your email address" : "Muutit sähköpostiosoitteesi", "Your email address was changed by an administrator" : "Ylläpitäjä muutti sähköpostiosoitteesi", 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/lib/Access.php b/apps/user_ldap/lib/Access.php index ef4b5c9434e..01818079802 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -46,6 +46,7 @@ namespace OCA\User_LDAP; +use DomainException; use OC\HintException; use OC\Hooks\PublicEmitter; use OC\ServerNotAvailableException; @@ -1518,11 +1519,11 @@ class Access extends LDAPUtility { * @param string[] $searchAttributes needs to have at least two attributes, * otherwise it does not make sense :) * @return string the final filter part to use in LDAP searches - * @throws \Exception + * @throws DomainException */ private function getAdvancedFilterPartForSearch($search, $searchAttributes) { if (!is_array($searchAttributes) || count($searchAttributes) < 2) { - throw new \Exception('searchAttributes must be an array with at least two string'); + throw new DomainException('searchAttributes must be an array with at least two string'); } $searchWords = explode(' ', trim($search)); $wordFilters = []; @@ -1553,12 +1554,8 @@ class Access extends LDAPUtility { if ($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) { try { return $this->getAdvancedFilterPartForSearch($search, $searchAttributes); - } catch (\Exception $e) { - \OCP\Util::writeLog( - 'user_ldap', - 'Creating advanced filter for search failed, falling back to simple method.', - ILogger::INFO - ); + } catch (DomainException $e) { + // Creating advanced filter for search failed, falling back to simple method. Edge case, but valid. } } diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index 81e33e6244f..5a7c732ab7b 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -45,6 +45,10 @@ class Configuration { public const AVATAR_PREFIX_NONE = 'none'; public const AVATAR_PREFIX_DATA_ATTRIBUTE = 'data:'; + public const LDAP_SERVER_FEATURE_UNKNOWN = 'unknown'; + public const LDAP_SERVER_FEATURE_AVAILABLE = 'available'; + public const LDAP_SERVER_FEATURE_UNAVAILABLE = 'unavailable'; + protected $configPrefix = null; protected $configRead = false; /** @@ -110,6 +114,7 @@ class Configuration { 'ldapDynamicGroupMemberURL' => null, 'ldapDefaultPPolicyDN' => null, 'ldapExtStorageHomeAttribute' => null, + 'ldapMatchingRuleInChainState' => self::LDAP_SERVER_FEATURE_UNKNOWN, ]; /** @@ -482,6 +487,7 @@ class Configuration { 'ldap_default_ppolicy_dn' => '', 'ldap_user_avatar_rule' => 'default', 'ldap_ext_storage_home_attribute' => '', + 'ldap_matching_rule_in_chain_state' => self::LDAP_SERVER_FEATURE_UNKNOWN, ]; } @@ -543,6 +549,7 @@ class Configuration { 'ldap_dynamic_group_member_url' => 'ldapDynamicGroupMemberURL', 'ldap_default_ppolicy_dn' => 'ldapDefaultPPolicyDN', 'ldap_ext_storage_home_attribute' => 'ldapExtStorageHomeAttribute', + 'ldap_matching_rule_in_chain_state' => 'ldapMatchingRuleInChainState', 'ldapIgnoreNamingRules' => 'ldapIgnoreNamingRules', // sysconfig ]; return $array; diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index 079429027c5..b7556bf236e 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -72,6 +72,7 @@ use OCP\ILogger; * @property string ldapGidNumber * @property int hasMemberOfFilterSupport * @property int useMemberOfToDetectMembership + * @property string ldapMatchingRuleInChainState */ class Connection extends LDAPUtility { private $ldapConnectionRes = null; diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 6bf1bd31ba0..3532188d9f0 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -246,6 +246,37 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I if ($groupMembers !== null) { return $groupMembers; } + + if ($this->access->connection->ldapNestedGroups + && $this->access->connection->useMemberOfToDetectMembership + && $this->access->connection->hasMemberOfFilterSupport + && $this->access->connection->ldapMatchingRuleInChainState !== Configuration::LDAP_SERVER_FEATURE_UNAVAILABLE + ) { + $attemptedLdapMatchingRuleInChain = true; + // compatibility hack with servers supporting :1.2.840.113556.1.4.1941:, and others) + $filter = $this->access->combineFilterWithAnd([ + $this->access->connection->ldapUserFilter, + $this->access->connection->ldapUserDisplayName . '=*', + 'memberof:1.2.840.113556.1.4.1941:=' . $dnGroup + ]); + $memberRecords = $this->access->fetchListOfUsers( + $filter, + $this->access->userManager->getAttributes(true) + ); + $result = array_reduce($memberRecords, function ($carry, $record) { + $carry[] = $record['dn'][0]; + return $carry; + }, []); + if ($this->access->connection->ldapMatchingRuleInChainState === Configuration::LDAP_SERVER_FEATURE_AVAILABLE) { + return $result; + } elseif (!empty($memberRecords)) { + $this->access->connection->ldapMatchingRuleInChainState = Configuration::LDAP_SERVER_FEATURE_AVAILABLE; + $this->access->connection->saveConfiguration(); + return $result; + } + // when feature availability is unknown, and the result is empty, continue and test with original approach + } + $seen[$dnGroup] = 1; $members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr); if (is_array($members)) { @@ -258,6 +289,13 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I $allMembers += $this->getDynamicGroupMembers($dnGroup); $this->access->connection->writeToCache($cacheKey, $allMembers); + if (isset($attemptedLdapMatchingRuleInChain) + && $this->access->connection->ldapMatchingRuleInChainState === Configuration::LDAP_SERVER_FEATURE_UNKNOWN + && !empty($allMembers) + ) { + $this->access->connection->ldapMatchingRuleInChainState = Configuration::LDAP_SERVER_FEATURE_UNAVAILABLE; + $this->access->connection->saveConfiguration(); + } return $allMembers; } 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/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index f8dd5af167f..4ddf9f5247c 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -73,6 +73,8 @@ class Group_LDAPTest extends TestCase { ->method('getConnection') ->willReturn($connector); + $access->userManager = $this->createMock(Manager::class); + return $access; } @@ -127,6 +129,10 @@ class Group_LDAPTest extends TestCase { ->method('countUsers') ->willReturn(2); + $access->userManager->expects($this->any()) + ->method('getAttributes') + ->willReturn(['displayName', 'mail']); + $groupBackend = new GroupLDAP($access, $pluginManager); $users = $groupBackend->countUsersInGroup('group'); @@ -170,6 +176,10 @@ class Group_LDAPTest extends TestCase { ->method('escapeFilterPart') ->willReturnArgument(0); + $access->userManager->expects($this->any()) + ->method('getAttributes') + ->willReturn(['displayName', 'mail']); + $groupBackend = new GroupLDAP($access, $pluginManager); $users = $groupBackend->countUsersInGroup('group', '3'); @@ -544,7 +554,10 @@ class Group_LDAPTest extends TestCase { $access->expects($this->any()) ->method('combineFilterWithAnd') ->willReturn('pseudo=filter'); - $access->userManager = $this->createMock(Manager::class); + + $access->userManager->expects($this->any()) + ->method('getAttributes') + ->willReturn(['displayName', 'mail']); $groupBackend = new GroupLDAP($access, $pluginManager); $users = $groupBackend->usersInGroup('foobar'); @@ -585,7 +598,10 @@ class Group_LDAPTest extends TestCase { $access->expects($this->any()) ->method('combineFilterWithAnd') ->willReturn('pseudo=filter'); - $access->userManager = $this->createMock(Manager::class); + + $access->userManager->expects($this->any()) + ->method('getAttributes') + ->willReturn(['displayName', 'mail']); $groupBackend = new GroupLDAP($access, $pluginManager); $users = $groupBackend->usersInGroup('foobar'); @@ -625,6 +641,10 @@ class Group_LDAPTest extends TestCase { ->method('isDNPartOfBase') ->willReturn(true); + $access->userManager->expects($this->any()) + ->method('getAttributes') + ->willReturn(['displayName', 'mail']); + $groupBackend = new GroupLDAP($access, $pluginManager); $users = $groupBackend->countUsersInGroup('foobar'); 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(); diff --git a/core/l10n/eu.js b/core/l10n/eu.js index d27d3c2b215..5bcbada36a3 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -1,7 +1,7 @@ OC.L10N.register( "core", { - "Please select a file." : "Aukeratu fitxategi bat mesedez.", + "Please select a file." : "Aukeratu fitxategi bat.", "File is too big" : "Fitxategia handiegia da", "The selected file is not an image." : "Aukeratutako fitxategia ez da irudi bat.", "The selected file cannot be read." : "Aukeratutako fitxategia ezin da irakurri.", @@ -165,6 +165,11 @@ OC.L10N.register( "Forgot password?" : "Pasahitza ahaztu duzu?", "Log in with a device" : "Hasi saioa gailu batekin", "Back" : "Atzera", + "No results for {query}" : " {query}-(r)entzako emaitzarik ez", + "Start typing to search" : "Hasi bilaketa idazten", + "Loading more results …" : "Emaitza gehiago kargatzen ...", + "Load more results" : "Kargatu emaitza gehiago ", + "Search {types} …" : "Bilatu {types} …", "Settings" : "Ezarpenak", "Could not load your contacts" : "Ezin izan dira zure kontaktuak kargatu", "Search contacts …" : "Bilatu kontaktuak...", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index 5dba42e2aa7..c9a7e9fea9f 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -1,5 +1,5 @@ { "translations": { - "Please select a file." : "Aukeratu fitxategi bat mesedez.", + "Please select a file." : "Aukeratu fitxategi bat.", "File is too big" : "Fitxategia handiegia da", "The selected file is not an image." : "Aukeratutako fitxategia ez da irudi bat.", "The selected file cannot be read." : "Aukeratutako fitxategia ezin da irakurri.", @@ -163,6 +163,11 @@ "Forgot password?" : "Pasahitza ahaztu duzu?", "Log in with a device" : "Hasi saioa gailu batekin", "Back" : "Atzera", + "No results for {query}" : " {query}-(r)entzako emaitzarik ez", + "Start typing to search" : "Hasi bilaketa idazten", + "Loading more results …" : "Emaitza gehiago kargatzen ...", + "Load more results" : "Kargatu emaitza gehiago ", + "Search {types} …" : "Bilatu {types} …", "Settings" : "Ezarpenak", "Could not load your contacts" : "Ezin izan dira zure kontaktuak kargatu", "Search contacts …" : "Bilatu kontaktuak...", diff --git a/core/l10n/fi.js b/core/l10n/fi.js index 4f258adcb4e..9bd5bb32088 100644 --- a/core/l10n/fi.js +++ b/core/l10n/fi.js @@ -129,6 +129,11 @@ OC.L10N.register( "Forgot password?" : "Unohditko salasanasi?", "Log in with a device" : "Kirjaudu laitteella", "Back" : "Takaisin", + "No results for {query}" : "Ei tuloksia haulle {query}", + "Start typing to search" : "Aloita kirjoittaminen hakeaksesi", + "Loading more results …" : "Ladataan lisää tuloksia…", + "Load more results" : "Lataa lisää tuloksia", + "_Please enter {minSearchLength} character or more to search_::_Please enter {minSearchLength} characters or more to search_" : ["Kirjoita vähintään {minSearchLength} merkki etsiäksesi","Kirjoita vähintään {minSearchLength} merkkiä etsiäksesi"], "Settings" : "Asetukset", "Could not load your contacts" : "Yhteystietojasi ei voitu ladata", "Search contacts …" : "Etsi yhteystietoja…", @@ -281,6 +286,7 @@ OC.L10N.register( "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Ota yhteys ylläpitoon, tai jos olet tämän palvelun ylläpitäjä, määritä \"trusted_domains\"-asetus config/config.php-tiedostossa. Esimerkkimääritys on tiedostossa config/config.sample.php.", "App update required" : "Sovelluksen päivittäminen vaaditaan", "%1$s will be updated to version %2$s" : "%1$s päivitetään versioon %2$s", + "The following apps will be updated:" : "Seuraavat sovellukset päivitetään:", "These incompatible apps will be disabled:" : "Nämä yhteensopimattomat sovellukset poistetaan käytöstä:", "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.", diff --git a/core/l10n/fi.json b/core/l10n/fi.json index 6b7b653924b..de8ae9fcd98 100644 --- a/core/l10n/fi.json +++ b/core/l10n/fi.json @@ -127,6 +127,11 @@ "Forgot password?" : "Unohditko salasanasi?", "Log in with a device" : "Kirjaudu laitteella", "Back" : "Takaisin", + "No results for {query}" : "Ei tuloksia haulle {query}", + "Start typing to search" : "Aloita kirjoittaminen hakeaksesi", + "Loading more results …" : "Ladataan lisää tuloksia…", + "Load more results" : "Lataa lisää tuloksia", + "_Please enter {minSearchLength} character or more to search_::_Please enter {minSearchLength} characters or more to search_" : ["Kirjoita vähintään {minSearchLength} merkki etsiäksesi","Kirjoita vähintään {minSearchLength} merkkiä etsiäksesi"], "Settings" : "Asetukset", "Could not load your contacts" : "Yhteystietojasi ei voitu ladata", "Search contacts …" : "Etsi yhteystietoja…", @@ -279,6 +284,7 @@ "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Ota yhteys ylläpitoon, tai jos olet tämän palvelun ylläpitäjä, määritä \"trusted_domains\"-asetus config/config.php-tiedostossa. Esimerkkimääritys on tiedostossa config/config.sample.php.", "App update required" : "Sovelluksen päivittäminen vaaditaan", "%1$s will be updated to version %2$s" : "%1$s päivitetään versioon %2$s", + "The following apps will be updated:" : "Seuraavat sovellukset päivitetään:", "These incompatible apps will be disabled:" : "Nämä yhteensopimattomat sovellukset poistetaan käytöstä:", "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.", diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js index 2b83550c8e5..68423d2fb51 100644 --- a/lib/l10n/fi.js +++ b/lib/l10n/fi.js @@ -13,8 +13,10 @@ OC.L10N.register( "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.", "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.", "%sbit or higher PHP required." : "%s-bit tai korkeampi PHP vaaditaan.", + "The following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s", "The command line tool %s could not be found" : "Komentorivityökalua %s ei löytynyt", "The library %s is not available." : "Kirjastoa %s ei ole käytettävissä.", + "The following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s", "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", @@ -71,6 +73,7 @@ OC.L10N.register( "%s enter the database username." : "%s anna tietokannan käyttäjätunnus.", "%s enter the database name." : "%s anna tietokannan nimi.", "%s you may not use dots in the database name" : "%s et voi käyttää pisteitä tietokannan nimessä", + "MySQL username and/or password not valid" : "MySQL-käyttäjätunnus ja/tai -salasana on väärin", "You need to enter details of an existing account." : "Anna olemassa olevan tilin tiedot.", "Oracle connection could not be established" : "Oracle-yhteyttä ei voitu muodostaa", "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin", diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json index 946a3d38863..ccfed60e041 100644 --- a/lib/l10n/fi.json +++ b/lib/l10n/fi.json @@ -11,8 +11,10 @@ "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.", "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.", "%sbit or higher PHP required." : "%s-bit tai korkeampi PHP vaaditaan.", + "The following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s", "The command line tool %s could not be found" : "Komentorivityökalua %s ei löytynyt", "The library %s is not available." : "Kirjastoa %s ei ole käytettävissä.", + "The following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s", "Server version %s or higher is required." : "Palvelinversio %s tai sitä uudempi vaaditaan.", "Server version %s or lower is required." : "Palvelinversio %s tai alhaisempi vaaditaan.", "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä", @@ -69,6 +71,7 @@ "%s enter the database username." : "%s anna tietokannan käyttäjätunnus.", "%s enter the database name." : "%s anna tietokannan nimi.", "%s you may not use dots in the database name" : "%s et voi käyttää pisteitä tietokannan nimessä", + "MySQL username and/or password not valid" : "MySQL-käyttäjätunnus ja/tai -salasana on väärin", "You need to enter details of an existing account." : "Anna olemassa olevan tilin tiedot.", "Oracle connection could not be established" : "Oracle-yhteyttä ei voitu muodostaa", "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin", diff --git a/tests/Core/Command/Config/App/DeleteConfigTest.php b/tests/Core/Command/Config/App/DeleteConfigTest.php index 442b9c5a8ef..2c9482b57f6 100644 --- a/tests/Core/Command/Config/App/DeleteConfigTest.php +++ b/tests/Core/Command/Config/App/DeleteConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteConfigTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/App/GetConfigTest.php b/tests/Core/Command/Config/App/GetConfigTest.php index 75e51a68b2f..521ecfbfb40 100644 --- a/tests/Core/Command/Config/App/GetConfigTest.php +++ b/tests/Core/Command/Config/App/GetConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class GetConfigTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/App/SetConfigTest.php b/tests/Core/Command/Config/App/SetConfigTest.php index 3077f74b369..88053f8c189 100644 --- a/tests/Core/Command/Config/App/SetConfigTest.php +++ b/tests/Core/Command/Config/App/SetConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SetConfigTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/ImportTest.php b/tests/Core/Command/Config/ImportTest.php index 2c0a6e3d8fd..c9cc256bea9 100644 --- a/tests/Core/Command/Config/ImportTest.php +++ b/tests/Core/Command/Config/ImportTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ImportTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/Core/Command/Config/ListConfigsTest.php index 2cab9500702..01d5f512494 100644 --- a/tests/Core/Command/Config/ListConfigsTest.php +++ b/tests/Core/Command/Config/ListConfigsTest.php @@ -30,14 +30,14 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ListConfigsTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $appConfig; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $systemConfig; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/System/DeleteConfigTest.php b/tests/Core/Command/Config/System/DeleteConfigTest.php index ee27fa587bc..b72f06b35bf 100644 --- a/tests/Core/Command/Config/System/DeleteConfigTest.php +++ b/tests/Core/Command/Config/System/DeleteConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteConfigTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $systemConfig; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/System/GetConfigTest.php b/tests/Core/Command/Config/System/GetConfigTest.php index 175a24eb354..3a6bb1acb50 100644 --- a/tests/Core/Command/Config/System/GetConfigTest.php +++ b/tests/Core/Command/Config/System/GetConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class GetConfigTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $systemConfig; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Config/System/SetConfigTest.php b/tests/Core/Command/Config/System/SetConfigTest.php index 0a446c5fd1e..a53607e8a39 100644 --- a/tests/Core/Command/Config/System/SetConfigTest.php +++ b/tests/Core/Command/Config/System/SetConfigTest.php @@ -28,12 +28,12 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SetConfigTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $systemConfig; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 1d33dc570b6..02cc824ee0c 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -38,28 +38,28 @@ class ChangeKeyStorageRootTest extends TestCase { /** @var ChangeKeyStorageRoot */ protected $changeKeyStorageRoot; - /** @var View | \PHPUnit_Framework_MockObject_MockObject */ + /** @var View | \PHPUnit\Framework\MockObject\MockObject */ protected $view; - /** @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 Util | \PHPUnit_Framework_MockObject_MockObject */ + /** @var Util | \PHPUnit\Framework\MockObject\MockObject */ protected $util; - /** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */ + /** @var QuestionHelper | \PHPUnit\Framework\MockObject\MockObject */ protected $questionHelper; - /** @var InputInterface | \PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface | \PHPUnit\Framework\MockObject\MockObject */ protected $inputInterface; - /** @var OutputInterface | \PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface | \PHPUnit\Framework\MockObject\MockObject */ protected $outputInterface; - /** @var \OCP\UserInterface | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\UserInterface | \PHPUnit\Framework\MockObject\MockObject */ protected $userInterface; protected function setUp(): void { @@ -362,7 +362,7 @@ class ChangeKeyStorageRootTest extends TestCase { ); } - + public function testTargetExistsException() { $this->expectException(\Exception::class); diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index 33140fa2644..12ace5fe371 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -32,25 +32,25 @@ use Test\TestCase; class DecryptAllTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Encryption\IManager */ protected $encryptionManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\App\IAppManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\App\IAppManager */ protected $appManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Input\InputInterface */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Output\OutputInterface */ protected $consoleOutput; - /** @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 | \OC\Encryption\DecryptAll */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Encryption\DecryptAll */ protected $decryptAll; protected function setUp(): void { @@ -178,7 +178,7 @@ class DecryptAllTest extends TestCase { ]; } - + public function testExecuteFailure() { $this->expectException(\Exception::class); diff --git a/tests/Core/Command/Encryption/DisableTest.php b/tests/Core/Command/Encryption/DisableTest.php index 4d088073380..bd29caafec3 100644 --- a/tests/Core/Command/Encryption/DisableTest.php +++ b/tests/Core/Command/Encryption/DisableTest.php @@ -28,11 +28,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DisableTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Encryption/EnableTest.php b/tests/Core/Command/Encryption/EnableTest.php index f76638c0ecf..c1656054ecd 100644 --- a/tests/Core/Command/Encryption/EnableTest.php +++ b/tests/Core/Command/Encryption/EnableTest.php @@ -29,13 +29,13 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EnableTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $manager; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index add57c0d9e5..68cd4971e4f 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -33,25 +33,25 @@ use Test\TestCase; class EncryptAllTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Encryption\IManager */ protected $encryptionManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\App\IAppManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\App\IAppManager */ protected $appManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Input\InputInterface */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \Symfony\Component\Console\Output\OutputInterface */ protected $consoleOutput; - /** @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 | \OCP\Encryption\IEncryptionModule */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\Encryption\IEncryptionModule */ protected $encryptionModule; /** @var EncryptAll */ @@ -125,7 +125,7 @@ class EncryptAllTest extends TestCase { ]; } - + public function testExecuteException() { $this->expectException(\Exception::class); diff --git a/tests/Core/Command/Encryption/SetDefaultModuleTest.php b/tests/Core/Command/Encryption/SetDefaultModuleTest.php index f2f1d1cfc67..015964e1357 100644 --- a/tests/Core/Command/Encryption/SetDefaultModuleTest.php +++ b/tests/Core/Command/Encryption/SetDefaultModuleTest.php @@ -29,13 +29,13 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SetDefaultModuleTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|IManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IManager */ protected $manager; - /** @var \PHPUnit_Framework_MockObject_MockObject|IConfig */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index 35449a9e3f4..65806fa538b 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -32,16 +32,16 @@ use Test\TestCase; class AddTest extends TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; /** @var Add */ private $command; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $input; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $output; protected function setUp(): void { diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index 3f7f811b7e8..08b2630b4b8 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -34,19 +34,19 @@ use Test\TestCase; class AddUserTest extends 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 AddUser */ private $command; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $input; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $output; protected function setUp(): void { diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 60d41d2e24c..3b29fb4e6ad 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -32,16 +32,16 @@ use Test\TestCase; class DeleteTest extends TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; /** @var Delete */ private $command; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $input; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $output; protected function setUp(): void { diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index 4c539728949..1c1dd3c95eb 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -33,16 +33,16 @@ use Test\TestCase; class ListCommandTest extends TestCase { - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; - /** @var ListCommand|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ListCommand|\PHPUnit\Framework\MockObject\MockObject */ private $command; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $input; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $output; protected function setUp(): void { diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index 906247d0896..141483861c4 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -34,19 +34,19 @@ use Test\TestCase; class RemoveUserTest extends 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 RemoveUser */ private $command; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $input; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ private $output; protected function setUp(): void { diff --git a/tests/Core/Command/Log/FileTest.php b/tests/Core/Command/Log/FileTest.php index 4ecbf8914b6..1a8a86759f5 100644 --- a/tests/Core/Command/Log/FileTest.php +++ b/tests/Core/Command/Log/FileTest.php @@ -28,11 +28,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class FileTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/Core/Command/Log/ManageTest.php index 2724bba64dd..6683291a9b8 100644 --- a/tests/Core/Command/Log/ManageTest.php +++ b/tests/Core/Command/Log/ManageTest.php @@ -28,11 +28,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ManageTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ @@ -86,14 +86,14 @@ class ManageTest extends TestCase { self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } - + public function testValidateBackend() { $this->expectException(\InvalidArgumentException::class); self::invokePrivate($this->command, 'validateBackend', ['notabackend']); } - + public function testValidateTimezone() { $this->expectException(\Exception::class); @@ -122,7 +122,7 @@ class ManageTest extends TestCase { ); } - + public function testConvertLevelStringInvalid() { $this->expectException(\InvalidArgumentException::class); @@ -148,7 +148,7 @@ class ManageTest extends TestCase { ); } - + public function testConvertLevelNumberInvalid() { $this->expectException(\InvalidArgumentException::class); diff --git a/tests/Core/Command/Maintenance/DataFingerprintTest.php b/tests/Core/Command/Maintenance/DataFingerprintTest.php index 5cc816627e6..185a8d1576a 100644 --- a/tests/Core/Command/Maintenance/DataFingerprintTest.php +++ b/tests/Core/Command/Maintenance/DataFingerprintTest.php @@ -29,13 +29,13 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DataFingerprintTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php index d7238921af5..bd08a5348a2 100644 --- a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php +++ b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php @@ -36,9 +36,9 @@ class UpdateDBTest extends TestCase { /** @var IMimeTypeLoader */ protected $loader; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php index bb6f5f45095..bf460b44d4e 100644 --- a/tests/Core/Command/Maintenance/UpdateTheme.php +++ b/tests/Core/Command/Maintenance/UpdateTheme.php @@ -39,9 +39,9 @@ class UpdateThemeTest extends TestCase { protected $cacheFactory; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/User/DeleteTest.php b/tests/Core/Command/User/DeleteTest.php index ec65984bef8..6ac0ed0353c 100644 --- a/tests/Core/Command/User/DeleteTest.php +++ b/tests/Core/Command/User/DeleteTest.php @@ -29,11 +29,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/User/DisableTest.php b/tests/Core/Command/User/DisableTest.php index 5fb4633dc00..0e1d1b72ac4 100644 --- a/tests/Core/Command/User/DisableTest.php +++ b/tests/Core/Command/User/DisableTest.php @@ -31,11 +31,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DisableTest extends TestCase { - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var Disable */ diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php index 4babe0d91c1..6ff82aac673 100644 --- a/tests/Core/Command/User/EnableTest.php +++ b/tests/Core/Command/User/EnableTest.php @@ -31,11 +31,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EnableTest extends TestCase { - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var InputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var Disable */ diff --git a/tests/Core/Command/User/LastSeenTest.php b/tests/Core/Command/User/LastSeenTest.php index 0a402a30119..f861c2e5f77 100644 --- a/tests/Core/Command/User/LastSeenTest.php +++ b/tests/Core/Command/User/LastSeenTest.php @@ -29,11 +29,11 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class LastSeenTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; /** @var \Symfony\Component\Console\Command\Command */ diff --git a/tests/Core/Command/User/SettingTest.php b/tests/Core/Command/User/SettingTest.php index 02a4dbfec09..768a79a746e 100644 --- a/tests/Core/Command/User/SettingTest.php +++ b/tests/Core/Command/User/SettingTest.php @@ -30,15 +30,15 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SettingTest extends TestCase { - /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \OCP\IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ protected $connection; - /** @var \Symfony\Component\Console\Input\InputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \Symfony\Component\Console\Input\InputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleInput; - /** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $consoleOutput; protected function setUp(): void { diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php index f2c104efbe0..91cf53bd585 100644 --- a/tests/Core/Controller/AppPasswordControllerTest.php +++ b/tests/Core/Controller/AppPasswordControllerTest.php @@ -59,7 +59,7 @@ class AppPasswordControllerTest extends TestCase { /** @var IRequest|MockObject */ private $request; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ private $eventDispatcher; /** @var AppPasswordController */ diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 38876f02681..f070897e1b1 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -59,28 +59,28 @@ use PHPUnit\Framework\MockObject\MockObject; class AvatarControllerTest extends \Test\TestCase { /** @var AvatarController */ private $avatarController; - /** @var IAvatar|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatar|\PHPUnit\Framework\MockObject\MockObject */ private $avatarMock; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ private $userMock; - /** @var File|\PHPUnit_Framework_MockObject_MockObject */ + /** @var File|\PHPUnit\Framework\MockObject\MockObject */ private $avatarFile; - /** @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ private $avatarManager; - /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ private $cache; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; - /** @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 TimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var TimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; /** @var IAccountManager|MockObject */ private $accountManager; diff --git a/tests/Core/Controller/CSRFTokenControllerTest.php b/tests/Core/Controller/CSRFTokenControllerTest.php index 557a6c5f6f0..875d5a79168 100644 --- a/tests/Core/Controller/CSRFTokenControllerTest.php +++ b/tests/Core/Controller/CSRFTokenControllerTest.php @@ -30,7 +30,6 @@ use OC\Security\CSRF\CsrfTokenManager; use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class CSRFTokenControllerTest extends TestCase { @@ -38,10 +37,10 @@ class CSRFTokenControllerTest extends TestCase { /** @var CSRFTokenController */ private $controller; - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var CsrfTokenManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var CsrfTokenManager|\PHPUnit\Framework\MockObject\MockObject */ private $tokenManager; protected function setUp(): void { diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php index 21a80b61063..dfd65aed47f 100644 --- a/tests/Core/Controller/ChangePasswordControllerTest.php +++ b/tests/Core/Controller/ChangePasswordControllerTest.php @@ -38,15 +38,15 @@ class ChangePasswordControllerTest extends \Test\TestCase { private $userId = 'currentUser'; /** @var string */ private $loginName = 'ua1337'; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var Session|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Session|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l; /** @var ChangePasswordController */ private $controller; @@ -61,7 +61,7 @@ class ChangePasswordControllerTest extends \Test\TestCase { $this->l = $this->createMock(IL10N::class); $this->l->method('t')->willReturnArgument(0); - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject $request */ $request = $this->createMock(IRequest::class); $this->controller = new ChangePasswordController( diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php index bc86c262d91..037147e01b7 100644 --- a/tests/Core/Controller/ClientFlowLoginControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php @@ -45,29 +45,29 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; class ClientFlowLoginControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var IProvider|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IProvider|\PHPUnit\Framework\MockObject\MockObject */ private $tokenProvider; - /** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ private $random; - /** @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 AccessTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AccessTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $accessTokenMapper; - /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */ private $crypto; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ private $eventDispatcher; diff --git a/tests/Core/Controller/ContactsMenuControllerTest.php b/tests/Core/Controller/ContactsMenuControllerTest.php index 24f1adb10f2..a702a155860 100644 --- a/tests/Core/Controller/ContactsMenuControllerTest.php +++ b/tests/Core/Controller/ContactsMenuControllerTest.php @@ -30,18 +30,17 @@ use OCP\Contacts\ContactsMenu\IEntry; use OCP\IRequest; use OCP\IUser; use OCP\IUserSession; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ContactsMenuControllerTest extends TestCase { - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $contactsManager; /** @var ContactsMenuController */ diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index 93151065b3c..1179bc0c070 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -39,10 +39,10 @@ use Test\TestCase; class CssControllerTest extends TestCase { - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var CssController */ @@ -51,7 +51,7 @@ class CssControllerTest extends TestCase { protected function setUp(): void { parent::setUp(); - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); $factory->expects($this->once()) @@ -59,7 +59,7 @@ class CssControllerTest extends TestCase { ->with('css') ->willReturn($this->appData); - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject $timeFactory */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */ $timeFactory = $this->createMock(ITimeFactory::class); $timeFactory->method('getTime') ->willReturn(1337); diff --git a/tests/Core/Controller/GuestAvatarControllerTest.php b/tests/Core/Controller/GuestAvatarControllerTest.php index dd8188b002f..8870faac4c7 100644 --- a/tests/Core/Controller/GuestAvatarControllerTest.php +++ b/tests/Core/Controller/GuestAvatarControllerTest.php @@ -21,27 +21,27 @@ class GuestAvatarControllerTest extends \Test\TestCase { private $guestAvatarController; /** - * @var IRequest|\PHPUnit_Framework_MockObject_MockObject + * @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** - * @var IAvatarManager|\PHPUnit_Framework_MockObject_MockObject + * @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */ private $avatarManager; /** - * @var IAvatar|\PHPUnit_Framework_MockObject_MockObject + * @var IAvatar|\PHPUnit\Framework\MockObject\MockObject */ private $avatar; /** - * @var \OCP\Files\File|\PHPUnit_Framework_MockObject_MockObject + * @var \OCP\Files\File|\PHPUnit\Framework\MockObject\MockObject */ private $file; /** - * @var ILogger|\PHPUnit_Framework_MockObject_MockObject + * @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 99f58d7e9d8..01228a6a93e 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -39,19 +39,19 @@ use Test\TestCase; class JsControllerTest extends TestCase { - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; /** @var JsController */ private $controller; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; protected function setUp(): void { parent::setUp(); - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); $factory->expects($this->once()) @@ -59,7 +59,7 @@ class JsControllerTest extends TestCase { ->with('js') ->willReturn($this->appData); - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject $timeFactory */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject $timeFactory */ $timeFactory = $this->createMock(ITimeFactory::class); $timeFactory->method('getTime') ->willReturn(1337); diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php index 09f224131f5..4742e7ae425 100644 --- a/tests/Core/Controller/LostControllerTest.php +++ b/tests/Core/Controller/LostControllerTest.php @@ -42,7 +42,6 @@ use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; -use PHPUnit_Framework_MockObject_MockObject; /** * Class LostControllerTest @@ -55,33 +54,33 @@ class LostControllerTest extends \Test\TestCase { private $lostController; /** @var IUser */ private $existingUser; - /** @var IURLGenerator | PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; /** @var IL10N */ private $l10n; - /** @var IUserManager | PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager | \PHPUnit\Framework\MockObject\MockObject */ private $userManager; /** @var Defaults */ private $defaults; - /** @var IConfig | PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @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 IManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $encryptionManager; - /** @var ITimeFactory | PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory | \PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var IRequest */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */ private $crypto; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $twofactorManager; - /** @var IInitialStateService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IInitialStateService|\PHPUnit\Framework\MockObject\MockObject */ private $initialStateService; protected function setUp(): void { @@ -762,7 +761,7 @@ class LostControllerTest extends \Test\TestCase { } public function testSetPasswordEncryptionDontProceedPerUserKey() { - /** @var IEncryptionModule|PHPUnit_Framework_MockObject_MockObject $encryptionModule */ + /** @var IEncryptionModule|\PHPUnit\Framework\MockObject\MockObject $encryptionModule */ $encryptionModule = $this->createMock(IEncryptionModule::class); $encryptionModule->expects($this->once())->method('needDetailedAccessList')->willReturn(true); $this->encryptionManager->expects($this->once())->method('getEncryptionModules') diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 254013a7350..e98d0e8ed40 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -33,13 +33,13 @@ use Test\TestCase; class NavigationControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INavigationManager|\PHPUnit\Framework\MockObject\MockObject */ private $navigationManager; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; /** @var NavigationController */ diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index c7cf601282b..cb1b9379a90 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -34,15 +34,15 @@ use OCP\IUserSession; use Test\TestCase; class OCSControllerTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var CapabilitiesManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var CapabilitiesManager|\PHPUnit\Framework\MockObject\MockObject */ private $capabilitiesManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $keyManager; /** @var OCSController */ private $controller; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index 65252561796..e1d1529c655 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -37,16 +37,16 @@ use OCP\IRequest; class PreviewControllerTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; /** @var string */ private $userId; - /** @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; protected function setUp(): void { diff --git a/tests/Core/Controller/SvgControllerTest.php b/tests/Core/Controller/SvgControllerTest.php index f6208d6f6c4..c8d0ea5f503 100644 --- a/tests/Core/Controller/SvgControllerTest.php +++ b/tests/Core/Controller/SvgControllerTest.php @@ -47,7 +47,7 @@ class SvgControllerTest extends TestCase { self::TEST_IMAGE_RECT, ]; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; /** diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index a7907343c24..1a2a4d8eaa5 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -38,27 +38,26 @@ use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserSession; use OCP\Template; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class TwoFactorChallengeControllerTest extends TestCase { - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $twoFactorManager; - /** @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 IURLGenerator|PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var TwoFactorChallengeController|PHPUnit_Framework_MockObject_MockObject */ + /** @var TwoFactorChallengeController|\PHPUnit\Framework\MockObject\MockObject */ private $controller; protected function setUp(): void { diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index 78112f09fd6..8b9c11ad4b1 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -32,7 +32,7 @@ use Test\TestCase; class UserControllerTest extends TestCase { - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; /** @var UserController */ diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index a0360404d72..d24afd475e4 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -35,13 +35,13 @@ use Test\TestCase; */ class HooksTest extends TestCase { - /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var AccountManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var AccountManager | \PHPUnit\Framework\MockObject\MockObject */ private $accountManager; - /** @var Hooks | \PHPUnit_Framework_MockObject_MockObject */ + /** @var Hooks | \PHPUnit\Framework\MockObject\MockObject */ private $hooks; protected function setUp(): void { diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php index f8552e5d45f..2235d63383b 100644 --- a/tests/lib/Activity/ManagerTest.php +++ b/tests/lib/Activity/ManagerTest.php @@ -35,13 +35,13 @@ class ManagerTest extends TestCase { /** @var \OC\Activity\Manager */ private $activityManager; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $session; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IValidator|\PHPUnit\Framework\MockObject\MockObject */ protected $validator; protected function setUp(): void { @@ -76,7 +76,7 @@ class ManagerTest extends TestCase { $this->assertNotEmpty($consumers); } - + public function testGetConsumersInvalidConsumer() { $this->expectException(\InvalidArgumentException::class); @@ -165,7 +165,7 @@ class ManagerTest extends TestCase { ->willReturn($mockUser); } - + public function testPublishExceptionNoApp() { $this->expectException(\BadMethodCallException::class); @@ -173,7 +173,7 @@ class ManagerTest extends TestCase { $this->activityManager->publish($event); } - + public function testPublishExceptionNoType() { $this->expectException(\BadMethodCallException::class); @@ -182,7 +182,7 @@ class ManagerTest extends TestCase { $this->activityManager->publish($event); } - + public function testPublishExceptionNoAffectedUser() { $this->expectException(\BadMethodCallException::class); @@ -192,7 +192,7 @@ class ManagerTest extends TestCase { $this->activityManager->publish($event); } - + public function testPublishExceptionNoSubject() { $this->expectException(\BadMethodCallException::class); diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/lib/App/AppStore/Bundles/BundleBase.php index dc7e1920896..a886cf9aec1 100644 --- a/tests/lib/App/AppStore/Bundles/BundleBase.php +++ b/tests/lib/App/AppStore/Bundles/BundleBase.php @@ -26,7 +26,7 @@ use OCP\IL10N; use Test\TestCase; abstract class BundleBase extends TestCase { - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ protected $l10n; /** @var Bundle */ protected $bundle; diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php index 5964220958c..55534cae699 100644 --- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php +++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php @@ -32,7 +32,7 @@ use OCP\IL10N; use Test\TestCase; class BundleFetcherTest extends TestCase { - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; /** @var BundleFetcher */ private $bundleFetcher; diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index 50b0fd04dfc..a0a03985c29 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -35,21 +35,20 @@ use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; use OCP\IConfig; use OCP\ILogger; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class AppFetcherTest extends TestCase { - /** @var IAppData|PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @var IClientService|PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected $clientService; - /** @var ITimeFactory|PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; - /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var CompareVersion|PHPUnit_Framework_MockObject_MockObject */ + /** @var CompareVersion|\PHPUnit\Framework\MockObject\MockObject */ protected $compareVersion; - /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; /** @var AppFetcher */ protected $fetcher; @@ -1838,7 +1837,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg== protected function setUp(): void { parent::setUp(); - /** @var Factory|PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); $factory->expects($this->once()) diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 199bcd4b59b..c3d9ec43cc4 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -37,17 +37,17 @@ use OCP\ILogger; use Test\TestCase; abstract class FetcherBase extends TestCase { - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject */ protected $appDataFactory; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected $clientService; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; /** @var Fetcher */ protected $fetcher; diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index a7d42d28baf..1e37948d783 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -17,7 +17,7 @@ use Test\TestCase; class DependencyAnalyzerTest extends TestCase { - /** @var Platform|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Platform|\PHPUnit\Framework\MockObject\MockObject */ private $platformMock; /** @var IL10N */ diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php index 3a4c16b3396..ff23454eb8b 100644 --- a/tests/lib/AppConfigTest.php +++ b/tests/lib/AppConfigTest.php @@ -308,7 +308,7 @@ class AppConfigTest extends TestCase { } public function testGetFilteredValues() { - /** @var \OC\AppConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var \OC\AppConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->getMockBuilder(\OC\AppConfig::class) ->setConstructorArgs([\OC::$server->getDatabaseConnection()]) ->setMethods(['getValues']) diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php index 4c79adcb4a7..c0aea813243 100644 --- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php @@ -32,14 +32,14 @@ use OCP\IURLGenerator; class AuthPublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var AuthPublicShareController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AuthPublicShareController|\PHPUnit\Framework\MockObject\MockObject */ private $controller; diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php index 521c45e47c6..f2a60a574af 100644 --- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php @@ -29,12 +29,12 @@ use OCP\ISession; class PublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var PublicShareController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var PublicShareController|\PHPUnit\Framework\MockObject\MockObject */ private $controller; diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index ba114433a4c..3004123b81b 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -37,7 +37,7 @@ use OCP\Security\ISecureRandom; */ class DIContainerTest extends \Test\TestCase { - /** @var DIContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var DIContainer|\PHPUnit\Framework\MockObject\MockObject */ private $container; protected function setUp(): void { diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php index 5ca7635614c..0a244a85754 100644 --- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php +++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php @@ -28,7 +28,7 @@ use OCP\AppFramework\Http\FileDisplayResponse; use OCP\Files\File; class FileDisplayResponseTest extends \Test\TestCase { - /** @var File|\PHPUnit_Framework_MockObject_MockObject */ + /** @var File|\PHPUnit\Framework\MockObject\MockObject */ private $file; /** @var FileDisplayResponse */ diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php index ed6d06d4bf5..7e7140971e4 100644 --- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php @@ -38,11 +38,11 @@ use OCP\IURLGenerator; class PublicShareMiddlewareTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var PublicShareMiddleware */ diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php index 55c874ccdb5..f8db85a9358 100644 --- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php @@ -30,11 +30,11 @@ use OCP\IRequest; use Test\TestCase; class BruteForceMiddlewareTest extends TestCase { - /** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */ private $reflector; - /** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */ private $throttler; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var BruteForceMiddleware */ private $bruteForceMiddleware; @@ -73,7 +73,7 @@ class BruteForceMiddlewareTest extends TestCase { ->method('sleepDelay') ->with('127.0.0.1', 'login'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->bruteForceMiddleware->beforeController($controller, 'testMethod'); } @@ -94,13 +94,13 @@ class BruteForceMiddlewareTest extends TestCase { ->expects($this->never()) ->method('sleepDelay'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->bruteForceMiddleware->beforeController($controller, 'testMethod'); } public function testAfterControllerWithAnnotationAndThrottledRequest() { - /** @var Response|\PHPUnit_Framework_MockObject_MockObject $response */ + /** @var Response|\PHPUnit\Framework\MockObject\MockObject $response */ $response = $this->createMock(Response::class); $this->reflector ->expects($this->once()) @@ -133,13 +133,13 @@ class BruteForceMiddlewareTest extends TestCase { ->method('registerAttempt') ->with('login', '127.0.0.1'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); } public function testAfterControllerWithAnnotationAndNotThrottledRequest() { - /** @var Response|\PHPUnit_Framework_MockObject_MockObject $response */ + /** @var Response|\PHPUnit\Framework\MockObject\MockObject $response */ $response = $this->createMock(Response::class); $this->reflector ->expects($this->once()) @@ -163,7 +163,7 @@ class BruteForceMiddlewareTest extends TestCase { ->expects($this->never()) ->method('registerAttempt'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); } @@ -184,9 +184,9 @@ class BruteForceMiddlewareTest extends TestCase { ->expects($this->never()) ->method('sleepDelay'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); - /** @var Response|\PHPUnit_Framework_MockObject_MockObject $response */ + /** @var Response|\PHPUnit\Framework\MockObject\MockObject $response */ $response = $this->createMock(Response::class); $this->bruteForceMiddleware->afterController($controller, 'testMethod' ,$response); } diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index a7bf2b14271..4853b527bf3 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -27,7 +27,7 @@ class CORSMiddlewareTest extends \Test\TestCase { /** @var ControllerMethodReflector */ private $reflector; - /** @var Session|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Session|\PHPUnit\Framework\MockObject\MockObject */ private $session; /** @var Throttler */ private $throttler; @@ -254,7 +254,7 @@ class CORSMiddlewareTest extends \Test\TestCase { $this->assertEquals($expected, $response); } - + public function testAfterExceptionWithRegularException() { $this->expectException(\Exception::class); $this->expectExceptionMessage('A regular exception'); diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php index 7a64b6cbcad..3153d7f0b08 100644 --- a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php @@ -36,17 +36,17 @@ use Test\TestCase; class PasswordConfirmationMiddlewareTest extends TestCase { /** @var ControllerMethodReflector */ private $reflector; - /** @var ISession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ private $user; /** @var PasswordConfirmationMiddleware */ private $middleware; /** @var Controller */ private $contoller; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; protected function setUp(): void { diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php index 3a06531eefd..0d27a9a070f 100644 --- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php @@ -34,13 +34,13 @@ use OCP\IUserSession; use Test\TestCase; class RateLimitingMiddlewareTest extends TestCase { - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ private $userSession; - /** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */ private $reflector; - /** @var Limiter|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Limiter|\PHPUnit\Framework\MockObject\MockObject */ private $limiter; /** @var RateLimitingMiddleware */ private $rateLimitingMiddleware; @@ -90,13 +90,13 @@ class RateLimitingMiddlewareTest extends TestCase { ->expects($this->never()) ->method('registerAnonRequest'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->rateLimitingMiddleware->beforeController($controller, 'testMethod'); } public function testBeforeControllerForAnon() { - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->request ->expects($this->once()) @@ -137,9 +137,9 @@ class RateLimitingMiddlewareTest extends TestCase { } public function testBeforeControllerForLoggedIn() { - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->userSession @@ -185,7 +185,7 @@ class RateLimitingMiddlewareTest extends TestCase { } public function testBeforeControllerAnonWithFallback() { - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->request ->expects($this->once()) @@ -229,19 +229,19 @@ class RateLimitingMiddlewareTest extends TestCase { $this->rateLimitingMiddleware->beforeController($controller, 'testMethod'); } - + public function testAfterExceptionWithOtherException() { $this->expectException(\Exception::class); $this->expectExceptionMessage('My test exception'); - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->rateLimitingMiddleware->afterException($controller, 'testMethod', new \Exception('My test exception')); } public function testAfterExceptionWithJsonBody() { - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->request ->expects($this->once()) @@ -260,7 +260,7 @@ class RateLimitingMiddlewareTest extends TestCase { } public function testAfterExceptionWithHtmlBody() { - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject $controller */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject $controller */ $controller = $this->createMock(Controller::class); $this->request ->expects($this->once()) diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index 6f3c3f32adc..61f5eeb5aea 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -37,10 +37,10 @@ class SameSiteCookieMiddlewareTest extends TestCase { /** @var SameSiteCookieMiddleware */ private $middleware; - /** @var Request|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Request|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ControllerMethodReflector|\PHPUnit\Framework\MockObject\MockObject */ private $reflector; protected function setUp(): void { diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 69f1aa5d547..680c3937836 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -47,27 +47,27 @@ use OCP\Security\ISecureRandom; class SecurityMiddlewareTest extends \Test\TestCase { - /** @var SecurityMiddleware|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SecurityMiddleware|\PHPUnit\Framework\MockObject\MockObject */ private $middleware; - /** @var Controller|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Controller|\PHPUnit\Framework\MockObject\MockObject */ private $controller; /** @var SecurityException */ private $secException; /** @var SecurityException */ private $secAjaxException; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ControllerMethodReflector */ private $reader; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var INavigationManager|\PHPUnit\Framework\MockObject\MockObject */ private $navigationManager; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; protected function setUp(): void { diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/lib/Authentication/LoginCredentials/StoreTest.php index e7b9cb5996f..ea490b76b8a 100644 --- a/tests/lib/Authentication/LoginCredentials/StoreTest.php +++ b/tests/lib/Authentication/LoginCredentials/StoreTest.php @@ -34,18 +34,17 @@ use OCP\Authentication\Exceptions\CredentialsUnavailableException; use OCP\ILogger; use OCP\ISession; use OCP\Session\Exceptions\SessionNotAvailableException; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class StoreTest extends TestCase { - /** @var ISession|PHPUnit_Framework_MockObject_MockObject */ + /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; - /** @var IProvider|PHPUnit_Framework_MockObject_MockObject */ + /** @var IProvider|\PHPUnit\Framework\MockObject\MockObject */ private $tokenProvider; - /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; /** @var Store */ diff --git a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php index 855e90ab6b9..6fdf5b9060e 100644 --- a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php @@ -145,7 +145,7 @@ class DefaultTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - + public function testGetInvalidToken() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); @@ -175,14 +175,14 @@ class DefaultTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - + public function testGetTokenByIdNotFound() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); $this->mapper->getTokenById(-1); } - + public function testGetInvalidTokenById() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); @@ -200,7 +200,7 @@ class DefaultTokenMapperTest extends TestCase { } public function testDeleteById() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $qb = $this->dbConnection->getQueryBuilder(); $qb->select('id') diff --git a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php index d95e4c0418d..00b7f0dee03 100644 --- a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php @@ -38,17 +38,17 @@ use Test\TestCase; class DefaultTokenProviderTest extends TestCase { - /** @var DefaultTokenProvider|\PHPUnit_Framework_MockObject_MockObject */ + /** @var DefaultTokenProvider|\PHPUnit\Framework\MockObject\MockObject */ private $tokenProvider; - /** @var DefaultTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var DefaultTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $mapper; - /** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICrypto|\PHPUnit\Framework\MockObject\MockObject */ private $crypto; - /** @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 ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; /** @var int */ private $time; @@ -131,7 +131,7 @@ class DefaultTokenProviderTest extends TestCase { $this->tokenProvider->updateTokenActivity($tk); } - + public function testGetTokenByUser() { $this->mapper->expects($this->once()) ->method('getTokenByUser') @@ -159,7 +159,7 @@ class DefaultTokenProviderTest extends TestCase { $this->assertEquals('passme', $actual); } - + public function testGetPasswordPasswordLessToken() { $this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class); @@ -170,7 +170,7 @@ class DefaultTokenProviderTest extends TestCase { $this->tokenProvider->getPassword($tk, $token); } - + public function testGetPasswordDeletesInvalidToken() { $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); @@ -222,7 +222,7 @@ class DefaultTokenProviderTest extends TestCase { $this->assertEquals('encryptedpassword', $token->getPassword()); } - + public function testSetPasswordInvalidToken() { $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index 5ba7fe7c40e..2f2af38851d 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -172,7 +172,7 @@ class PublicKeyTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - + public function testGetInvalidToken() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); @@ -204,14 +204,14 @@ class PublicKeyTokenMapperTest extends TestCase { $this->assertEquals($token, $dbToken); } - + public function testGetTokenByIdNotFound() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); $this->mapper->getTokenById(-1); } - + public function testGetInvalidTokenById() { $this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class); @@ -229,7 +229,7 @@ class PublicKeyTokenMapperTest extends TestCase { } public function testDeleteById() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $qb = $this->dbConnection->getQueryBuilder(); $qb->select('id') @@ -243,7 +243,7 @@ class PublicKeyTokenMapperTest extends TestCase { } public function testDeleteByIdWrongUser() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $id = 33; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php index 43ae0e9542c..c16ee7b818e 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php @@ -39,17 +39,17 @@ use Test\TestCase; class PublicKeyTokenProviderTest extends TestCase { - /** @var PublicKeyTokenProvider|\PHPUnit_Framework_MockObject_MockObject */ + /** @var PublicKeyTokenProvider|\PHPUnit\Framework\MockObject\MockObject */ private $tokenProvider; - /** @var PublicKeyTokenMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var PublicKeyTokenMapper|\PHPUnit\Framework\MockObject\MockObject */ private $mapper; /** @var ICrypto */ private $crypto; - /** @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 ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; /** @var int */ private $time; @@ -145,7 +145,7 @@ class PublicKeyTokenProviderTest extends TestCase { $this->assertSame($password, $this->tokenProvider->getPassword($actual, $token)); } - + public function testGetPasswordPasswordLessToken() { $this->expectException(\OC\Authentication\Exceptions\PasswordlessTokenException::class); @@ -156,7 +156,7 @@ class PublicKeyTokenProviderTest extends TestCase { $this->tokenProvider->getPassword($tk, $token); } - + public function testGetPasswordInvalidToken() { $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); @@ -205,7 +205,7 @@ class PublicKeyTokenProviderTest extends TestCase { $this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'token')); } - + public function testSetPasswordInvalidToken() { $this->expectException(\OC\Authentication\Exceptions\InvalidTokenException::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index b77bddcd5a4..378376a41f9 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -29,15 +29,14 @@ namespace lib\Authentication\TwoFactorAuth; use OC\Authentication\TwoFactorAuth\ProviderLoader; use OCP\App\IAppManager; use OCP\Authentication\TwoFactorAuth\IProvider; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ProviderLoaderTest extends TestCase { - /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IUser|PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject */ private $user; /** @var ProviderLoader */ @@ -52,7 +51,7 @@ class ProviderLoaderTest extends TestCase { $this->loader = new ProviderLoader($this->appManager); } - + public function testFailHardIfProviderCanNotBeLoaded() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Could not load two-factor auth provider \\OCA\\MyFaulty2faApp\\DoesNotExist'); diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php index 5351a1069fc..5a061cd10e9 100644 --- a/tests/lib/Avatar/AvatarManagerTest.php +++ b/tests/lib/Avatar/AvatarManagerTest.php @@ -38,17 +38,17 @@ use OCP\IUser; * Class AvatarManagerTest */ class AvatarManagerTest extends \Test\TestCase { - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var AvatarManager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var AvatarManager | \PHPUnit\Framework\MockObject\MockObject */ private $avatarManager; protected function setUp(): void { @@ -69,7 +69,7 @@ class AvatarManagerTest extends \Test\TestCase { ); } - + public function testGetAvatarInvalidUser() { $this->expectException(\Exception::class); $this->expectExceptionMessage('user does not exist'); diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index e3e0bd1d64e..cf0edad9502 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -19,16 +19,16 @@ use OCP\IL10N; use OCP\ILogger; class UserAvatarTest extends \Test\TestCase { - /** @var Folder | \PHPUnit_Framework_MockObject_MockObject */ + /** @var Folder | \PHPUnit\Framework\MockObject\MockObject */ private $folder; /** @var \OC\Avatar\UserAvatar */ private $avatar; - /** @var \OC\User\User | \PHPUnit_Framework_MockObject_MockObject $user */ + /** @var \OC\User\User | \PHPUnit\Framework\MockObject\MockObject $user */ private $user; - /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; protected function setUp(): void { @@ -278,7 +278,7 @@ class UserAvatarTest extends \Test\TestCase { } private function getUserAvatar($user) { - /** @var \OCP\IL10N | \PHPUnit_Framework_MockObject_MockObject $l */ + /** @var \OCP\IL10N | \PHPUnit\Framework\MockObject\MockObject $l */ $l = $this->createMock(IL10N::class); $l->method('t')->willReturnArgument(0); diff --git a/tests/lib/BackgroundJob/JobListTest.php b/tests/lib/BackgroundJob/JobListTest.php index 3013afdfa1d..20ba1e50016 100644 --- a/tests/lib/BackgroundJob/JobListTest.php +++ b/tests/lib/BackgroundJob/JobListTest.php @@ -27,10 +27,10 @@ class JobListTest extends TestCase { /** @var \OCP\IDBConnection */ protected $connection; - /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \OCP\AppFramework\Utility\ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\AppFramework\Utility\ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; protected function setUp(): void { diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index 3a2c10b6d62..e686e82adf0 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -42,7 +42,7 @@ class ManagerTest extends TestCase { * @dataProvider searchProvider */ public function testSearch($search1, $search2, $expected) { - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar1 */ $calendar1 = $this->createMock(ICalendar::class); $calendar1->method('getKey')->willReturn('simple:1'); $calendar1->expects($this->once()) @@ -50,7 +50,7 @@ class ManagerTest extends TestCase { ->with('', [], [], null, null) ->willReturn($search1); - /** @var ICalendar | PHPUnit_Framework_MockObject_MockObject $calendar2 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar2 */ $calendar2 = $this->createMock(ICalendar::class); $calendar2->method('getKey')->willReturn('simple:2'); $calendar2->expects($this->once()) @@ -69,7 +69,7 @@ class ManagerTest extends TestCase { * @dataProvider searchProvider */ public function testSearchOptions($search1, $search2, $expected) { - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar1 */ $calendar1 = $this->createMock(ICalendar::class); $calendar1->method('getKey')->willReturn('simple:1'); $calendar1->expects($this->once()) @@ -78,7 +78,7 @@ class ManagerTest extends TestCase { ['timerange' => ['start' => null, 'end' => null]], 5, 20) ->willReturn($search1); - /** @var ICalendar | PHPUnit_Framework_MockObject_MockObject $calendar2 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar2 */ $calendar2 = $this->createMock(ICalendar::class); $calendar2->method('getKey')->willReturn('simple:2'); $calendar2->expects($this->once()) @@ -150,11 +150,11 @@ class ManagerTest extends TestCase { } public function testRegisterUnregister() { - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar1 */ $calendar1 = $this->createMock(ICalendar::class); $calendar1->method('getKey')->willReturn('key1'); - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar2 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar2 */ $calendar2 = $this->createMock(ICalendar::class); $calendar2->method('getKey')->willReturn('key2'); @@ -174,11 +174,11 @@ class ManagerTest extends TestCase { } public function testGetCalendars() { - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar1 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar1 */ $calendar1 = $this->createMock(ICalendar::class); $calendar1->method('getKey')->willReturn('key1'); - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar2 */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar2 */ $calendar2 = $this->createMock(ICalendar::class); $calendar2->method('getKey')->willReturn('key2'); @@ -203,7 +203,7 @@ class ManagerTest extends TestCase { } public function testIfEnabledIfSo() { - /** @var ICalendar | \PHPUnit_Framework_MockObject_MockObject $calendar */ + /** @var ICalendar | \PHPUnit\Framework\MockObject\MockObject $calendar */ $calendar = $this->createMock(ICalendar::class); $this->manager->registerCalendar($calendar); diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php index 3f9e0900d15..2f7cd1061e9 100644 --- a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php @@ -35,13 +35,13 @@ use OCP\Share\IShare; use Test\TestCase; class GroupPluginTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $session; /** @var ISearchResult */ @@ -56,7 +56,7 @@ class GroupPluginTest extends TestCase { /** @var int */ protected $offset = 0; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ protected $user; protected function setUp(): void { @@ -101,7 +101,7 @@ class GroupPluginTest extends TestCase { * @param string $gid * @param null $displayName * @param bool $hide - * @return IGroup|\PHPUnit_Framework_MockObject_MockObject + * @return IGroup|\PHPUnit\Framework\MockObject\MockObject */ protected function getGroupMock($gid, $displayName = null, $hide = false) { $group = $this->createMock(IGroup::class); diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index 383dd0c39a2..0a1febe33a5 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -41,17 +41,17 @@ use Test\TestCase; class LookupPluginTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected $clientService; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $userSession; - /** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */ protected $cloudIdManager; /** @var LookupPlugin */ protected $plugin; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; protected function setUp(): void { @@ -108,7 +108,7 @@ class LookupPluginTest extends TestCase { $this->clientService->expects($this->never()) ->method('newClient'); - /** @var ISearchResult|\PHPUnit_Framework_MockObject_MockObject $searchResult */ + /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->plugin->search('foobar', 10, 0, $searchResult); @@ -132,7 +132,7 @@ class LookupPluginTest extends TestCase { $this->clientService->expects($this->never()) ->method('newClient'); - /** @var ISearchResult|\PHPUnit_Framework_MockObject_MockObject $searchResult */ + /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->plugin->search('foobar', 10, 0, $searchResult); @@ -145,7 +145,7 @@ class LookupPluginTest extends TestCase { public function testSearch(array $searchParams) { $type = new SearchResultType('lookup'); - /** @var ISearchResult|\PHPUnit_Framework_MockObject_MockObject $searchResult */ + /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $searchResult->expects($this->once()) ->method('addResultSet') @@ -207,7 +207,7 @@ class LookupPluginTest extends TestCase { public function testSearchEnableDisableLookupServer(array $searchParams, $GSEnabled, $LookupEnabled) { $type = new SearchResultType('lookup'); - /** @var ISearchResult|\PHPUnit_Framework_MockObject_MockObject $searchResult */ + /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->config->expects($this->once()) @@ -269,7 +269,7 @@ class LookupPluginTest extends TestCase { ->with('files_sharing', 'lookupServerEnabled', 'yes') ->willReturn('no'); - /** @var ISearchResult|\PHPUnit_Framework_MockObject_MockObject $searchResult */ + /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $searchResult->expects($this->never()) ->method('addResultSet'); diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php index 6e859b55358..54dec490a2d 100644 --- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php @@ -37,13 +37,13 @@ use OCP\Share\IShare; use Test\TestCase; class MailPluginTest 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 $contactsManager; - /** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */ protected $cloudIdManager; /** @var MailPlugin */ @@ -52,10 +52,10 @@ class MailPluginTest extends TestCase { /** @var SearchResult */ protected $searchResult; - /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $userSession; protected function setUp(): void { @@ -544,7 +544,7 @@ class MailPluginTest extends TestCase { $this->instantiatePlugin(); - /** @var \OCP\IUser | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUser | \PHPUnit\Framework\MockObject\MockObject */ $currentUser = $this->createMock('\OCP\IUser'); $currentUser->expects($this->any()) diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 531a8447bd2..c03f993508b 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -38,16 +38,16 @@ use Test\TestCase; class RemotePluginTest extends TestCase { - /** @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 IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $contactsManager; - /** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */ protected $cloudIdManager; /** @var RemotePlugin */ diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php index 84d270de547..98e454f2834 100644 --- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php @@ -31,7 +31,7 @@ use OCP\IContainer; use Test\TestCase; class SearchResultTest extends TestCase { - /** @var IContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IContainer|\PHPUnit\Framework\MockObject\MockObject */ protected $container; /** @var ISearch */ protected $search; diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/lib/Collaboration/Collaborators/SearchTest.php index ab731c05c21..0aebef72de0 100644 --- a/tests/lib/Collaboration/Collaborators/SearchTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchTest.php @@ -33,7 +33,7 @@ use OCP\Share\IShare; use Test\TestCase; class SearchTest extends TestCase { - /** @var IContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IContainer|\PHPUnit\Framework\MockObject\MockObject */ protected $container; /** @var ISearch */ protected $search; diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php index 8ca612f6069..6c4ffcc52d8 100644 --- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php @@ -36,16 +36,16 @@ use OCP\Share\IShare; use Test\TestCase; class UserPluginTest extends TestCase { - /** @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 IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $session; /** @var UserPlugin */ @@ -60,7 +60,7 @@ class UserPluginTest extends TestCase { /** @var int */ protected $offset = 0; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ protected $user; protected function setUp(): void { diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php index 6802542914f..fefed296a0c 100644 --- a/tests/lib/Command/Integrity/SignAppTest.php +++ b/tests/lib/Command/Integrity/SignAppTest.php @@ -30,13 +30,13 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SignAppTest extends TestCase { - /** @var Checker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Checker|\PHPUnit\Framework\MockObject\MockObject */ private $checker; /** @var SignApp */ private $signApp; - /** @var FileAccessHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FileAccessHelper|\PHPUnit\Framework\MockObject\MockObject */ private $fileAccessHelper; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; protected function setUp(): void { diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php index 27e4f66c242..3b7fe7f3a8b 100644 --- a/tests/lib/Command/Integrity/SignCoreTest.php +++ b/tests/lib/Command/Integrity/SignCoreTest.php @@ -29,9 +29,9 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class SignCoreTest extends TestCase { - /** @var Checker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Checker|\PHPUnit\Framework\MockObject\MockObject */ private $checker; - /** @var FileAccessHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FileAccessHelper|\PHPUnit\Framework\MockObject\MockObject */ private $fileAccessHelper; /** @var SignCore */ private $signCore; diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index e2bf6180709..def00fd0dcc 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -67,7 +67,7 @@ class ManagerTest extends TestCase { return $factory->getManager(); } - + public function testGetCommentNotFound() { $this->expectException(\OCP\Comments\NotFoundException::class); @@ -75,7 +75,7 @@ class ManagerTest extends TestCase { $manager->get('22'); } - + public function testGetCommentNotFoundInvalidInput() { $this->expectException(\InvalidArgumentException::class); @@ -125,7 +125,7 @@ class ManagerTest extends TestCase { $this->assertEquals($comment->getLatestChildDateTime(), $latestChildDT); } - + public function testGetTreeNotFound() { $this->expectException(\OCP\Comments\NotFoundException::class); @@ -133,7 +133,7 @@ class ManagerTest extends TestCase { $manager->getTree('22'); } - + public function testGetTreeNotFoundInvalidIpnut() { $this->expectException(\InvalidArgumentException::class); @@ -335,7 +335,7 @@ class ManagerTest extends TestCase { $this->addDatabaseEntry(0, 0, null, null, $fileIds[$i]); } $this->addDatabaseEntry(0, 0, (new \DateTime())->modify('-2 days'), null, $fileIds[0]); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->any()) ->method('getUID') @@ -437,7 +437,7 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getObjectId(), $objectId); } - + public function testDelete() { $this->expectException(\OCP\Comments\NotFoundException::class); @@ -498,7 +498,7 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getMessage(), $loadedComment->getMessage()); } - + public function testSaveUpdateException() { $this->expectException(\OCP\Comments\NotFoundException::class); @@ -517,7 +517,7 @@ class ManagerTest extends TestCase { $manager->save($comment); } - + public function testSaveIncomplete() { $this->expectException(\UnexpectedValueException::class); @@ -675,7 +675,7 @@ class ManagerTest extends TestCase { } public function testSetMarkRead() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->any()) ->method('getUID') @@ -692,7 +692,7 @@ class ManagerTest extends TestCase { } public function testSetMarkReadUpdate() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->any()) ->method('getUID') @@ -712,7 +712,7 @@ class ManagerTest extends TestCase { } public function testReadMarkDeleteUser() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->any()) ->method('getUID') @@ -730,7 +730,7 @@ class ManagerTest extends TestCase { } public function testReadMarkDeleteObject() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->any()) ->method('getUID') @@ -800,7 +800,7 @@ class ManagerTest extends TestCase { $this->assertSame('SOMBRERO', $manager->resolveDisplayName('galaxy', 'sombrero')); } - + public function testRegisterResolverDuplicate() { $this->expectException(\OutOfBoundsException::class); @@ -813,7 +813,7 @@ class ManagerTest extends TestCase { $manager->registerDisplayNameResolver('planet', $planetClosure); } - + public function testRegisterResolverInvalidType() { $this->expectException(\InvalidArgumentException::class); @@ -825,7 +825,7 @@ class ManagerTest extends TestCase { $manager->registerDisplayNameResolver(1337, $planetClosure); } - + public function testResolveDisplayNameUnregisteredType() { $this->expectException(\OutOfBoundsException::class); @@ -850,7 +850,7 @@ class ManagerTest extends TestCase { $this->assertTrue(is_string($manager->resolveDisplayName('planet', 'neptune'))); } - + public function testResolveDisplayNameInvalidType() { $this->expectException(\InvalidArgumentException::class); diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php index ee053ce40e5..f20df96f7a2 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php @@ -33,18 +33,17 @@ use OCP\Contacts\ContactsMenu\IProvider; use OCP\ILogger; use OCP\IServerContainer; use OCP\IUser; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ActionProviderStoreTest extends TestCase { - /** @var IServerContainer|PHPUnit_Framework_MockObject_MockObject */ + /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ private $serverContainer; - /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; /** @var ActionProviderStore */ @@ -114,7 +113,7 @@ class ActionProviderStoreTest extends TestCase { $this->assertInstanceOf(EMailProvider::class, $providers[0]); } - + public function testGetProvidersWithQueryException() { $this->expectException(\Exception::class); diff --git a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php index 245c89c3228..acfe83ac558 100644 --- a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php @@ -31,19 +31,18 @@ use OCP\IConfig; use OCP\IGroupManager; use OCP\IUser; use OCP\IUserManager; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ContactsStoreTest extends TestCase { /** @var ContactsStore */ private $contactsStore; - /** @var IManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $contactsManager; - /** @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 IConfig|PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; protected function setUp(): void { @@ -57,7 +56,7 @@ class ContactsStoreTest extends TestCase { } public function testGetContactsWithoutFilter() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -87,7 +86,7 @@ class ContactsStoreTest extends TestCase { } public function testGetContactsHidesOwnEntry() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -114,7 +113,7 @@ class ContactsStoreTest extends TestCase { } public function testGetContactsWithoutBinaryImage() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -143,7 +142,7 @@ class ContactsStoreTest extends TestCase { } public function testGetContactsWithoutAvatarURI() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -196,7 +195,7 @@ class ContactsStoreTest extends TestCase { ->with($this->equalTo('core'), $this->equalTo('shareapi_exclude_groups_list'), $this->equalTo('')) ->willReturn('["group1", "group5", "group6"]'); - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $currentUser */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $currentUser */ $currentUser = $this->createMock(IUser::class); $currentUser->expects($this->once()) ->method('getUID') @@ -246,7 +245,7 @@ class ContactsStoreTest extends TestCase { ->with($this->equalTo('core'), $this->equalTo('shareapi_only_share_with_group_members'), $this->equalTo('no')) ->willReturn('yes'); - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $currentUser */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $currentUser */ $currentUser = $this->createMock(IUser::class); $currentUser->expects($this->once()) ->method('getUID') @@ -332,7 +331,7 @@ class ContactsStoreTest extends TestCase { ->with($this->equalTo('core'), $this->equalTo('shareapi_only_share_with_group_members'), $this->equalTo('no')) ->willReturn('no'); - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $currentUser */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $currentUser */ $currentUser = $this->createMock(IUser::class); $currentUser->expects($this->once()) ->method('getUID') @@ -405,7 +404,7 @@ class ContactsStoreTest extends TestCase { ->with($this->equalTo('core'), $this->equalTo('shareapi_allow_share_dialog_user_enumeration'), $this->equalTo('yes')) ->willReturn('no'); - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->any()) ->method('search') @@ -489,7 +488,7 @@ class ContactsStoreTest extends TestCase { ->with($this->equalTo('core'), $this->equalTo('shareapi_allow_share_dialog_user_enumeration'), $this->equalTo('yes')) ->willReturn('yes'); - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -520,7 +519,7 @@ class ContactsStoreTest extends TestCase { } public function testFindOneEMail() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') @@ -551,7 +550,7 @@ class ContactsStoreTest extends TestCase { } public function testFindOneNotSupportedType() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $entry = $this->contactsStore->findOne($user, 42, 'darren@roner.au'); @@ -560,7 +559,7 @@ class ContactsStoreTest extends TestCase { } public function testFindOneNoMatches() { - /** @var IUser|PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $this->contactsManager->expects($this->once()) ->method('search') diff --git a/tests/lib/Contacts/ContactsMenu/ManagerTest.php b/tests/lib/Contacts/ContactsMenu/ManagerTest.php index 561051974b7..4cfbd9c7c90 100644 --- a/tests/lib/Contacts/ContactsMenu/ManagerTest.php +++ b/tests/lib/Contacts/ContactsMenu/ManagerTest.php @@ -32,21 +32,20 @@ use OCP\Contacts\ContactsMenu\IEntry; use OCP\Contacts\ContactsMenu\IProvider; use OCP\IConfig; use OCP\IUser; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var ContactsStore|PHPUnit_Framework_MockObject_MockObject */ + /** @var ContactsStore|\PHPUnit\Framework\MockObject\MockObject */ private $contactsStore; - /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ActionProviderStore|PHPUnit_Framework_MockObject_MockObject */ + /** @var ActionProviderStore|\PHPUnit\Framework\MockObject\MockObject */ private $actionProviderStore; /** @var Manager */ diff --git a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php index 157f8574fa4..c0052469aba 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php @@ -29,15 +29,14 @@ use OCP\Contacts\ContactsMenu\IActionFactory; use OCP\Contacts\ContactsMenu\IEntry; use OCP\Contacts\ContactsMenu\ILinkAction; use OCP\IURLGenerator; -use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; class EMailproviderTest extends TestCase { - /** @var IActionFactory|PHPUnit_Framework_MockObject_MockObject */ + /** @var IActionFactory|\PHPUnit\Framework\MockObject\MockObject */ private $actionFactory; - /** @var IURLGenerator|PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $urlGenerator; /** @var EMailProvider */ diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php index 4699d894e4b..841c510941f 100644 --- a/tests/lib/ContactsManagerTest.php +++ b/tests/lib/ContactsManagerTest.php @@ -63,7 +63,7 @@ class ContactsManagerTest extends \Test\TestCase { * @dataProvider searchProvider */ public function testSearch($search1, $search2, $expectedResult) { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook1 = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -94,10 +94,10 @@ class ContactsManagerTest extends \Test\TestCase { $result = $this->cm->search(''); $this->assertEquals($expectedResult, $result); } - + public function testDeleteHavePermission() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -117,7 +117,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testDeleteNoPermission() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -135,7 +135,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testDeleteNoAddressbook() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -149,7 +149,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testCreateOrUpdateHavePermission() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -168,7 +168,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testCreateOrUpdateNoPermission() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -186,7 +186,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testCreateOrUpdateNOAdressbook() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -205,7 +205,7 @@ class ContactsManagerTest extends \Test\TestCase { } public function testIsEnabledIfSo() { - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); @@ -217,7 +217,7 @@ class ContactsManagerTest extends \Test\TestCase { public function testAddressBookEnumeration() { // create mock for the addressbook - /** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IAddressBook $addressbook */ $addressbook = $this->getMockBuilder('\OCP\IAddressBook') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/DB/MDB2SchemaReaderTest.php b/tests/lib/DB/MDB2SchemaReaderTest.php index 2f987adb290..c57b0f22b6f 100644 --- a/tests/lib/DB/MDB2SchemaReaderTest.php +++ b/tests/lib/DB/MDB2SchemaReaderTest.php @@ -32,7 +32,7 @@ class MDB2SchemaReaderTest extends TestCase { * @return IConfig */ protected function getConfig() { - /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index c4e9b1857fb..9b6dec006d6 100644 --- a/tests/lib/DB/MigrationsTest.php +++ b/tests/lib/DB/MigrationsTest.php @@ -31,9 +31,9 @@ use OCP\Migration\IMigrationStep; */ class MigrationsTest extends \Test\TestCase { - /** @var MigrationService | \PHPUnit_Framework_MockObject_MockObject */ + /** @var MigrationService | \PHPUnit\Framework\MockObject\MockObject */ private $migrationService; - /** @var \PHPUnit_Framework_MockObject_MockObject | IDBConnection $db */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IDBConnection $db */ private $db; protected function setUp(): void { diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index 7b1fee38db3..faf06360e17 100644 --- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php @@ -43,10 +43,10 @@ class QueryBuilderTest extends \Test\TestCase { /** @var IDBConnection */ protected $connection; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; protected function setUp(): void { diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 3a16327ac18..a8c6f6caebb 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -44,22 +44,22 @@ use Test\TestCase; */ class DecryptAllTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | IUserManager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IUserManager */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | Manager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | Manager */ protected $encryptionManager; - /** @var \PHPUnit_Framework_MockObject_MockObject | View */ + /** @var \PHPUnit\Framework\MockObject\MockObject | View */ protected $view; - /** @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 DecryptAll */ @@ -112,7 +112,7 @@ class DecryptAllTest extends TestCase { } else { $this->userManager->expects($this->never())->method('userExists'); } - /** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject | $instance */ + /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject | $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( [ @@ -198,7 +198,7 @@ class DecryptAllTest extends TestCase { */ public function testDecryptAllUsersFiles($user) { - /** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject | $instance */ + /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject | $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( [ @@ -243,7 +243,7 @@ class DecryptAllTest extends TestCase { } public function testDecryptUsersFiles() { - /** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject $instance */ + /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( [ @@ -313,7 +313,7 @@ class DecryptAllTest extends TestCase { public function testDecryptFile($isEncrypted) { $path = 'test.txt'; - /** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject $instance */ + /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( [ @@ -353,7 +353,7 @@ class DecryptAllTest extends TestCase { public function testDecryptFileFailure() { $path = 'test.txt'; - /** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject $instance */ + /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( [ diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index 06d9116255f..20bcb6e7ca1 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -33,13 +33,13 @@ class EncryptionWrapperTest extends TestCase { /** @var EncryptionWrapper */ private $instance; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\ILogger */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\ILogger */ private $logger; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\Manager */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Encryption\Manager */ private $manager; - /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */ + /** @var \PHPUnit\Framework\MockObject\MockObject | \OC\Memcache\ArrayCache */ private $arrayCache; protected function setUp(): void { diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php index fd33077c78b..bd9bbdecdf1 100644 --- a/tests/lib/Encryption/Keys/StorageTest.php +++ b/tests/lib/Encryption/Keys/StorageTest.php @@ -33,13 +33,13 @@ class StorageTest extends TestCase { /** @var Storage */ protected $storage; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $util; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $view; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $config; protected function setUp(): void { diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index 47dd7fd01fb..81ac263cb93 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -17,22 +17,22 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; - /** @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 IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var View|\PHPUnit_Framework_MockObject_MockObject */ + /** @var View|\PHPUnit\Framework\MockObject\MockObject */ private $view; - /** @var Util|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Util|\PHPUnit\Framework\MockObject\MockObject */ private $util; - - /** @var ArrayCache|\PHPUnit_Framework_MockObject_MockObject */ + + /** @var ArrayCache|\PHPUnit\Framework\MockObject\MockObject */ private $arrayCache; protected function setUp(): void { @@ -100,7 +100,7 @@ class ManagerTest extends TestCase { $this->assertEmpty($this->manager->getEncryptionModules()); } - + public function testGetEncryptionModuleUnknown() { $this->expectException(\OC\Encryption\Exceptions\ModuleDoesNotExistsException::class); $this->expectExceptionMessage('Module with ID: unknown does not exist.'); diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php index d7aa24d1f67..08fb08bf797 100644 --- a/tests/lib/Encryption/UpdateTest.php +++ b/tests/lib/Encryption/UpdateTest.php @@ -34,22 +34,22 @@ class UpdateTest extends TestCase { /** @var string */ private $uid; - /** @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject */ private $view; - /** @var \OC\Encryption\Util | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Encryption\Util | \PHPUnit\Framework\MockObject\MockObject */ private $util; - /** @var \OC\Files\Mount\Manager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\Mount\Manager | \PHPUnit\Framework\MockObject\MockObject */ private $mountManager; - /** @var \OC\Encryption\Manager | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Encryption\Manager | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionManager; - /** @var \OCP\Encryption\IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Encryption\IEncryptionModule | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionModule; - /** @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Encryption\File | \PHPUnit\Framework\MockObject\MockObject */ private $fileHelper; protected function setUp(): void { @@ -212,7 +212,7 @@ class UpdateTest extends TestCase { * create mock of the update method * * @param array$methods methods which should be set - * @return \OC\Encryption\Update | \PHPUnit_Framework_MockObject_MockObject + * @return \OC\Encryption\Update | \PHPUnit\Framework\MockObject\MockObject */ protected function getUpdateMock($methods) { return $this->getMockBuilder('\OC\Encryption\Update') diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php index e1d898f5a86..84d81dd1cbb 100644 --- a/tests/lib/Encryption/UtilTest.php +++ b/tests/lib/Encryption/UtilTest.php @@ -17,16 +17,16 @@ class UtilTest extends TestCase { */ protected $headerSize = 8192; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $view; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $userManager; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ private $config; /** @var \OC\Encryption\Util */ @@ -94,7 +94,7 @@ class UtilTest extends TestCase { ]; } - + public function testCreateHeaderFailed() { $this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class); diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php index a03be9e45e9..d06d7a9a91e 100644 --- a/tests/lib/Files/AppData/AppDataTest.php +++ b/tests/lib/Files/AppData/AppDataTest.php @@ -33,10 +33,10 @@ use OCP\Files\Node; use OCP\Files\SimpleFS\ISimpleFolder; class AppDataTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ private $systemConfig; /** @var IAppData */ diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php index fec464d6e3a..8161bc515ec 100644 --- a/tests/lib/Files/AppData/FactoryTest.php +++ b/tests/lib/Files/AppData/FactoryTest.php @@ -28,10 +28,10 @@ use OC\SystemConfig; use OCP\Files\IRootFolder; class FactoryTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ private $systemConfig; /** @var Factory */ diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index 97663c16c02..a6d429798e8 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -532,7 +532,7 @@ class CacheTest extends \Test\TestCase { $folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e"; /** - * @var \OC\Files\Cache\Cache | \PHPUnit_Framework_MockObject_MockObject $cacheMock + * @var \OC\Files\Cache\Cache | \PHPUnit\Framework\MockObject\MockObject $cacheMock */ $cacheMock = $this->getMockBuilder(Cache::class) ->setMethods(['normalize']) diff --git a/tests/lib/Files/Cache/QuerySearchHelperTest.php b/tests/lib/Files/Cache/QuerySearchHelperTest.php index 464561681d0..8f97e0158fe 100644 --- a/tests/lib/Files/Cache/QuerySearchHelperTest.php +++ b/tests/lib/Files/Cache/QuerySearchHelperTest.php @@ -39,7 +39,7 @@ class QuerySearchHelperTest extends TestCase { /** @var IQueryBuilder */ private $builder; - /** @var IMimeTypeLoader|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IMimeTypeLoader|\PHPUnit\Framework\MockObject\MockObject */ private $mimetypeLoader; /** @var QuerySearchHelper */ diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php index 278872b8728..ea414679888 100644 --- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php @@ -12,13 +12,13 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { /** @var ObjectHomeMountProvider */ protected $provider; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ protected $user; - /** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $loader; protected function setUp(): void { @@ -216,7 +216,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { $this->user->method('getUID') ->willReturn('uid'); $this->loader->expects($this->never())->method($this->anything()); - + $mount = $this->provider->getHomeMountForUser($this->user, $this->loader); $this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount); } diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php index 3fa988c89d8..6b5aaabbc28 100644 --- a/tests/lib/Files/Node/FileTest.php +++ b/tests/lib/Files/Node/FileTest.php @@ -33,7 +33,7 @@ class FileTest extends NodeTest { } public function testGetContent() { - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); @@ -59,11 +59,11 @@ class FileTest extends NodeTest { $this->assertEquals('bar', $node->getContent()); } - + public function testGetContentNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); @@ -82,7 +82,7 @@ class FileTest extends NodeTest { } public function testPutContent() { - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); @@ -105,11 +105,11 @@ class FileTest extends NodeTest { $node->putContent('bar'); } - + public function testPutContentNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); @@ -124,7 +124,7 @@ class FileTest extends NodeTest { } public function testGetMimeType() { - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); @@ -213,7 +213,7 @@ class FileTest extends NodeTest { $this->assertEquals(2, $hooksCalled); } - + public function testFOpenReadNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -238,7 +238,7 @@ class FileTest extends NodeTest { $node->fopen('r'); } - + public function testFOpenReadWriteNoReadPermissions() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -263,7 +263,7 @@ class FileTest extends NodeTest { $node->fopen('w'); } - + public function testFOpenReadWriteNoWritePermissions() { $this->expectException(\OCP\Files\NotPermittedException::class); diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php index d2bbf65965a..1ba052b8de4 100644 --- a/tests/lib/Files/Node/FolderTest.php +++ b/tests/lib/Files/Node/FolderTest.php @@ -50,7 +50,7 @@ class FolderTest extends NodeTest { public function testGetDirectoryContent() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -82,7 +82,7 @@ class FolderTest extends NodeTest { public function testGet() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -103,7 +103,7 @@ class FolderTest extends NodeTest { public function testNodeExists() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -127,7 +127,7 @@ class FolderTest extends NodeTest { public function testNodeExistsNotExists() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -149,7 +149,7 @@ class FolderTest extends NodeTest { public function testNewFolder() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -175,13 +175,13 @@ class FolderTest extends NodeTest { $this->assertEquals($child, $result); } - + public function testNewFolderNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -203,7 +203,7 @@ class FolderTest extends NodeTest { public function testNewFile() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -229,13 +229,13 @@ class FolderTest extends NodeTest { $this->assertEquals($child, $result); } - + public function testNewFileNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -257,7 +257,7 @@ class FolderTest extends NodeTest { public function testGetFreeSpace() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -279,7 +279,7 @@ class FolderTest extends NodeTest { public function testSearch() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -330,7 +330,7 @@ class FolderTest extends NodeTest { public function testSearchInRoot() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -340,7 +340,7 @@ class FolderTest extends NodeTest { $root->expects($this->any()) ->method('getUser') ->willReturn($this->user); - /** @var \PHPUnit_Framework_MockObject_MockObject|Storage $storage */ + /** @var \PHPUnit\Framework\MockObject\MockObject|Storage $storage */ $storage = $this->createMock(Storage::class); $storage->method('getId')->willReturn(''); $cache = $this->getMockBuilder(Cache::class)->setConstructorArgs([$storage])->getMock(); @@ -383,7 +383,7 @@ class FolderTest extends NodeTest { public function testSearchInStorageRoot() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -434,7 +434,7 @@ class FolderTest extends NodeTest { public function testSearchSubStorages() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -517,7 +517,7 @@ class FolderTest extends NodeTest { public function testGetById() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -571,7 +571,7 @@ class FolderTest extends NodeTest { public function testGetByIdMountRoot() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -620,7 +620,7 @@ class FolderTest extends NodeTest { public function testGetByIdOutsideFolder() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -673,7 +673,7 @@ class FolderTest extends NodeTest { public function testGetByIdMultipleStorages() { $manager = $this->createMock(Manager::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -756,7 +756,7 @@ class FolderTest extends NodeTest { $manager = $this->createMock(Manager::class); $folderPath = '/bar/foo'; /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); $root = $this->getMockBuilder(Root::class) @@ -783,15 +783,15 @@ class FolderTest extends NodeTest { $manager = $this->createMock(Manager::class); $folderPath = '/bar/foo'; /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\Node\Root $root */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */ $root = $this->getMockBuilder(Root::class) ->setMethods(['getUser', 'getMountsIn', 'getMount']) ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */ $folderInfo = $this->getMockBuilder(FileInfo::class) ->disableOriginalConstructor()->getMock(); @@ -847,15 +847,15 @@ class FolderTest extends NodeTest { $manager = $this->createMock(Manager::class); $folderPath = '/bar/foo'; /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\Node\Root $root */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */ $root = $this->getMockBuilder(Root::class) ->setMethods(['getUser', 'getMountsIn', 'getMount']) ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */ $folderInfo = $this->getMockBuilder(FileInfo::class) ->disableOriginalConstructor()->getMock(); @@ -909,15 +909,15 @@ class FolderTest extends NodeTest { $manager = $this->createMock(Manager::class); $folderPath = '/bar/foo'; /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->createMock(View::class); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\Node\Root $root */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\Node\Root $root */ $root = $this->getMockBuilder(Root::class) ->setMethods(['getUser', 'getMountsIn', 'getMount']) ->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->getMock(); - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Files\FileInfo $folderInfo */ $folderInfo = $this->getMockBuilder(FileInfo::class) ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php index 86643617959..6ea5a6d7ffa 100644 --- a/tests/lib/Files/Node/NodeTest.php +++ b/tests/lib/Files/Node/NodeTest.php @@ -29,15 +29,15 @@ abstract class NodeTest extends \Test\TestCase { protected $user; /** @var \OC\Files\Mount\Manager */ protected $manager; - /** @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\View|\PHPUnit\Framework\MockObject\MockObject */ protected $view; - /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject */ protected $root; - /** @var \OCP\Files\Config\IUserMountCache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Files\Config\IUserMountCache|\PHPUnit\Framework\MockObject\MockObject */ protected $userMountCache; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; protected function setUp(): void { @@ -177,7 +177,7 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(2, $hooksRun); } - + public function testDeleteNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -307,7 +307,7 @@ abstract class NodeTest extends \Test\TestCase { ->method('getUser') ->willReturn($this->user); /** - * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Storage | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder('\OC\Files\Storage\Storage') ->disableOriginalConstructor() @@ -337,7 +337,7 @@ abstract class NodeTest extends \Test\TestCase { ->method('getUser') ->willReturn($this->user); /** - * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Storage | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder('\OC\Files\Storage\Storage') ->disableOriginalConstructor() @@ -434,7 +434,7 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(2, $hooksRun); } - + public function testTouchNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -451,7 +451,7 @@ abstract class NodeTest extends \Test\TestCase { $node->touch(100); } - + public function testInvalidPath() { $this->expectException(\OCP\Files\InvalidPathException::class); @@ -485,12 +485,12 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(3, $target->getId()); } - + public function testCopyNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); /** - * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Storage | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->createMock('\OC\Files\Storage\Storage'); @@ -516,7 +516,7 @@ abstract class NodeTest extends \Test\TestCase { $node->copy('/bar/asd'); } - + public function testCopyNoParent() { $this->expectException(\OCP\Files\NotFoundException::class); @@ -533,7 +533,7 @@ abstract class NodeTest extends \Test\TestCase { $node->copy('/bar/asd/foo'); } - + public function testCopyParentIsFile() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -590,7 +590,7 @@ abstract class NodeTest extends \Test\TestCase { * @param string $postHookName */ public function testMoveCopyHooks($operationMethod, $viewMethod, $preHookName, $postHookName) { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject $root */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject $root */ $root = $this->getMockBuilder('\OC\Files\Node\Root') ->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager]) ->setMethods(['get']) @@ -606,7 +606,7 @@ abstract class NodeTest extends \Test\TestCase { ->willReturn($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1])); /** - * @var \OC\Files\Node\File|\PHPUnit_Framework_MockObject_MockObject $node + * @var \OC\Files\Node\File|\PHPUnit\Framework\MockObject\MockObject $node */ $node = $this->createTestNode($root, $this->view, '/bar/foo'); $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); @@ -656,7 +656,7 @@ abstract class NodeTest extends \Test\TestCase { $this->assertEquals(4, $hooksRun); } - + public function testMoveNotPermitted() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -678,12 +678,12 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - + public function testMoveNoParent() { $this->expectException(\OCP\Files\NotFoundException::class); /** - * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage + * @var \OC\Files\Storage\Storage | \PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->createMock('\OC\Files\Storage\Storage'); @@ -700,7 +700,7 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - + public function testMoveParentIsFile() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -718,7 +718,7 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - + public function testMoveFailed() { $this->expectException(\OCP\Files\NotPermittedException::class); @@ -741,7 +741,7 @@ abstract class NodeTest extends \Test\TestCase { $node->move('/bar/asd'); } - + public function testCopyFailed() { $this->expectException(\OCP\Files\NotPermittedException::class); diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php index 6c006d1cf62..13fdcb65902 100644 --- a/tests/lib/Files/Node/RootTest.php +++ b/tests/lib/Files/Node/RootTest.php @@ -27,11 +27,11 @@ class RootTest extends \Test\TestCase { private $user; /** @var \OC\Files\Mount\Manager */ private $manager; - /** @var \OCP\Files\Config\IUserMountCache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Files\Config\IUserMountCache|\PHPUnit\Framework\MockObject\MockObject */ private $userMountCache; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; protected function setUp(): void { @@ -60,7 +60,7 @@ class RootTest extends \Test\TestCase { ->disableOriginalConstructor() ->getMock(); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() @@ -85,7 +85,7 @@ class RootTest extends \Test\TestCase { $this->assertInstanceOf('\OC\Files\Node\File', $node); } - + public function testGetNotFound() { $this->expectException(\OCP\Files\NotFoundException::class); @@ -96,7 +96,7 @@ class RootTest extends \Test\TestCase { ->disableOriginalConstructor() ->getMock(); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() @@ -119,12 +119,12 @@ class RootTest extends \Test\TestCase { $root->get('/bar/foo'); } - + public function testGetInvalidPath() { $this->expectException(\OCP\Files\NotPermittedException::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() @@ -141,12 +141,12 @@ class RootTest extends \Test\TestCase { $root->get('/../foo'); } - + public function testGetNoStorages() { $this->expectException(\OCP\Files\NotFoundException::class); /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view + * @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject $view */ $view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() @@ -182,7 +182,7 @@ class RootTest extends \Test\TestCase { ->method('get') ->with('MyUserId') ->willReturn($user); - /** @var CappedMemoryCache|\PHPUnit_Framework_MockObject_MockObject $cappedMemoryCache */ + /** @var CappedMemoryCache|\PHPUnit\Framework\MockObject\MockObject $cappedMemoryCache */ $cappedMemoryCache = $this->createMock(CappedMemoryCache::class); $cappedMemoryCache ->expects($this->once()) @@ -199,7 +199,7 @@ class RootTest extends \Test\TestCase { $this->assertEquals($folder, $root->getUserFolder('MyUserId')); } - + public function testGetUserFolderWithNoUserObj() { $this->expectException(\OC\User\NoUserException::class); $this->expectExceptionMessage('Backends provided no user object'); diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php index b9a47c4d6e2..def570edf99 100644 --- a/tests/lib/Files/SimpleFS/SimpleFileTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php @@ -29,7 +29,7 @@ use OCP\Files\Folder; use OCP\Files\NotFoundException; class SimpleFileTest extends \Test\TestCase { - /** @var File|\PHPUnit_Framework_MockObject_MockObject */ + /** @var File|\PHPUnit\Framework\MockObject\MockObject */ private $file; /** @var SimpleFile */ diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php index 73de60e3652..eccec7c28d5 100644 --- a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php +++ b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php @@ -37,72 +37,72 @@ class EncryptionTest extends Storage { private $sourceStorage; /** - * @var \OC\Files\Storage\Wrapper\Encryption | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Files\Storage\Wrapper\Encryption | \PHPUnit\Framework\MockObject\MockObject */ protected $instance; /** - * @var \OC\Encryption\Keys\Storage | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Encryption\Keys\Storage | \PHPUnit\Framework\MockObject\MockObject */ private $keyStore; /** - * @var \OC\Encryption\Util | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Encryption\Util | \PHPUnit\Framework\MockObject\MockObject */ private $util; /** - * @var \OC\Encryption\Manager | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Encryption\Manager | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionManager; /** - * @var \OCP\Encryption\IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject + * @var \OCP\Encryption\IEncryptionModule | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionModule; /** - * @var \OC\Encryption\Update | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Encryption\Update | \PHPUnit\Framework\MockObject\MockObject */ private $update; /** - * @var \OC\Files\Cache\Cache | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Files\Cache\Cache | \PHPUnit\Framework\MockObject\MockObject */ private $cache; /** - * @var \OC\Log | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Log | \PHPUnit\Framework\MockObject\MockObject */ private $logger; /** - * @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Encryption\File | \PHPUnit\Framework\MockObject\MockObject */ private $file; /** - * @var \OC\Files\Mount\MountPoint | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Files\Mount\MountPoint | \PHPUnit\Framework\MockObject\MockObject */ private $mount; /** - * @var \OC\Files\Mount\Manager | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Files\Mount\Manager | \PHPUnit\Framework\MockObject\MockObject */ private $mountManager; /** - * @var \OC\Group\Manager | \PHPUnit_Framework_MockObject_MockObject + * @var \OC\Group\Manager | \PHPUnit\Framework\MockObject\MockObject */ private $groupManager; /** - * @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject + * @var \OCP\IConfig | \PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var \OC\Memcache\ArrayCache | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Memcache\ArrayCache | \PHPUnit\Framework\MockObject\MockObject */ private $arrayCache; @@ -212,7 +212,7 @@ class EncryptionTest extends Storage { } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ protected function buildMockModule() { $this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') @@ -848,7 +848,7 @@ class EncryptionTest extends Storage { $mountPoint = '/mountPoint'; - /** @var \OC\Files\Storage\Wrapper\Encryption |\PHPUnit_Framework_MockObject_MockObject $instance */ + /** @var \OC\Files\Storage\Wrapper\Encryption |\PHPUnit\Framework\MockObject\MockObject $instance */ $instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption') ->setConstructorArgs( [ @@ -994,7 +994,7 @@ class EncryptionTest extends Storage { ->getMock(); if ($encryptionModule === true) { - /** @var IEncryptionModule|\PHPUnit_Framework_MockObject_MockObject $encryptionModule */ + /** @var IEncryptionModule|\PHPUnit\Framework\MockObject\MockObject $encryptionModule */ $encryptionModule = $this->createMock(IEncryptionModule::class); } diff --git a/tests/lib/Files/Stream/EncryptionTest.php b/tests/lib/Files/Stream/EncryptionTest.php index bedce1b6f6d..08264f07fcf 100644 --- a/tests/lib/Files/Stream/EncryptionTest.php +++ b/tests/lib/Files/Stream/EncryptionTest.php @@ -12,7 +12,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; class EncryptionTest extends \Test\TestCase { - /** @var \OCP\Encryption\IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Encryption\IEncryptionModule | \PHPUnit\Framework\MockObject\MockObject */ private $encryptionModule; /** @@ -325,7 +325,7 @@ class EncryptionTest extends \Test\TestCase { } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ protected function buildMockModule() { $encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index fad2217bfdb..139516ba374 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -1160,7 +1160,7 @@ class ViewTest extends \Test\TestCase { private function doTestCopyRenameFail($operation) { $storage1 = new Temporary([]); - /** @var \PHPUnit_Framework_MockObject_MockObject|Temporary $storage2 */ + /** @var \PHPUnit\Framework\MockObject\MockObject|Temporary $storage2 */ $storage2 = $this->getMockBuilder(TemporaryNoCross::class) ->setConstructorArgs([[]]) ->setMethods(['fopen']) @@ -1206,7 +1206,7 @@ class ViewTest extends \Test\TestCase { } public function testDeleteFailKeepCache() { - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setConstructorArgs([[]]) ->setMethods(['unlink']) @@ -1585,7 +1585,7 @@ class ViewTest extends \Test\TestCase { ->getMock(); } - /** @var IMountProvider|\PHPUnit_Framework_MockObject_MockObject $mountProvider */ + /** @var IMountProvider|\PHPUnit\Framework\MockObject\MockObject $mountProvider */ $mountProvider = $this->createMock(IMountProvider::class); $mountProvider->expects($this->any()) ->method('getMountsForUser') @@ -1822,7 +1822,7 @@ class ViewTest extends \Test\TestCase { ) { $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods([$operation]) ->getMock(); @@ -1872,7 +1872,7 @@ class ViewTest extends \Test\TestCase { $view = new View('/' . $this->user . '/files/'); $path = 'test_file_put_contents.txt'; - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods(['fopen']) ->getMock(); @@ -1911,7 +1911,7 @@ class ViewTest extends \Test\TestCase { $view = new View('/' . $this->user . '/files/'); $path = 'test_file_put_contents.txt'; - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods(['fopen']) ->getMock(); @@ -1966,7 +1966,7 @@ class ViewTest extends \Test\TestCase { } $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods([$operation]) ->getMock(); @@ -2048,7 +2048,7 @@ class ViewTest extends \Test\TestCase { ) { $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods([$operation]) ->getMock(); @@ -2087,7 +2087,7 @@ class ViewTest extends \Test\TestCase { public function testLockFileRename($operation, $expectedLockTypeSourceDuring) { $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods([$operation, 'getMetaData', 'filemtime']) ->getMock(); @@ -2153,7 +2153,7 @@ class ViewTest extends \Test\TestCase { $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods(['copy']) ->getMock(); @@ -2272,11 +2272,11 @@ class ViewTest extends \Test\TestCase { public function testLockFileRenameCrossStorage($viewOperation, $storageOperation, $expectedLockTypeSourceDuring) { $view = new View('/' . $this->user . '/files/'); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */ $storage = $this->getMockBuilder(Temporary::class) ->setMethods([$storageOperation]) ->getMock(); - /** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage2 */ + /** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage2 */ $storage2 = $this->getMockBuilder(Temporary::class) ->setMethods([$storageOperation, 'getMetaData', 'filemtime']) ->getMock(); @@ -2471,7 +2471,7 @@ class ViewTest extends \Test\TestCase { $mountPoint = '/' . $this->user . '/files/mount/'; // Mock the mount point - /** @var TestMoveableMountPoint|\PHPUnit_Framework_MockObject_MockObject $mount */ + /** @var TestMoveableMountPoint|\PHPUnit\Framework\MockObject\MockObject $mount */ $mount = $this->createMock(TestMoveableMountPoint::class); $mount->expects($this->once()) ->method('getMountPoint') diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index 2f2e1c21855..5689fd0fb1f 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -27,7 +27,7 @@ use Test\TestCase; class ConfigTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; protected function setUp(): void { @@ -38,7 +38,7 @@ class ConfigTest extends TestCase { /** * @param array $mockMethods - * @return Config|\PHPUnit_Framework_MockObject_MockObject + * @return Config|\PHPUnit\Framework\MockObject\MockObject */ public function getInstance($mockMethods = []) { if (!empty($mockMethods)) { diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index ff1d6e641ea..8b6be03615a 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -61,7 +61,7 @@ class ManagerTest extends TestCase { /** * @param null|int $implementedActions - * @return \PHPUnit_Framework_MockObject_MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ private function getTestBackend($implementedActions = null) { if ($implementedActions === null) { @@ -99,7 +99,7 @@ class ManagerTest extends TestCase { public function testGet() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->any()) @@ -123,7 +123,7 @@ class ManagerTest extends TestCase { public function testGetNotExists() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -151,7 +151,7 @@ class ManagerTest extends TestCase { public function testGetMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend1 */ $backend1 = $this->getTestBackend(); $backend1->expects($this->any()) @@ -160,7 +160,7 @@ class ManagerTest extends TestCase { ->willReturn(false); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend2 */ $backend2 = $this->getTestBackend(); $backend2->expects($this->any()) @@ -178,7 +178,7 @@ class ManagerTest extends TestCase { } public function testCreate() { - /**@var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ + /**@var \PHPUnit\Framework\MockObject\MockObject|\OC\Group\Backend $backend */ $backendGroupCreated = false; $backend = $this->getTestBackend(); $backend->expects($this->any()) @@ -202,7 +202,7 @@ class ManagerTest extends TestCase { } public function testCreateFailure() { - /**@var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ + /**@var \PHPUnit\Framework\MockObject\MockObject|\OC\Group\Backend $backend */ $backendGroupCreated = false; $backend = $this->getTestBackend( GroupInterface::ADD_TO_GROUP | @@ -231,7 +231,7 @@ class ManagerTest extends TestCase { } public function testCreateExists() { - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->any()) ->method('groupExists') @@ -249,7 +249,7 @@ class ManagerTest extends TestCase { public function testSearch() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -272,7 +272,7 @@ class ManagerTest extends TestCase { public function testSearchMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend1 */ $backend1 = $this->getTestBackend(); $backend1->expects($this->once()) @@ -284,7 +284,7 @@ class ManagerTest extends TestCase { ->willReturn(true); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend2 */ $backend2 = $this->getTestBackend(); $backend2->expects($this->once()) @@ -309,7 +309,7 @@ class ManagerTest extends TestCase { public function testSearchMultipleBackendsLimitAndOffset() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend1 */ $backend1 = $this->getTestBackend(); $backend1->expects($this->once()) @@ -321,7 +321,7 @@ class ManagerTest extends TestCase { ->willReturn(true); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend2 */ $backend2 = $this->getTestBackend(); $backend2->expects($this->once()) @@ -345,7 +345,7 @@ class ManagerTest extends TestCase { } public function testSearchResultExistsButGroupDoesNot() { - /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OC\Group\Backend $backend */ $backend = $this->createMock(Database::class); $backend->expects($this->once()) ->method('getGroups') @@ -368,7 +368,7 @@ class ManagerTest extends TestCase { public function testGetUserGroups() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -391,7 +391,7 @@ class ManagerTest extends TestCase { public function testGetUserGroupIds() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->method('getUserGroups') @@ -400,7 +400,7 @@ class ManagerTest extends TestCase { $manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger); $manager->addBackend($backend); - /** @var \OC\User\User|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var \OC\User\User|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $groups = $manager->getUserGroupIds($user); @@ -413,7 +413,7 @@ class ManagerTest extends TestCase { public function testGetUserGroupsWithDeletedGroup() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->createMock(Database::class); $backend->expects($this->once()) @@ -428,7 +428,7 @@ class ManagerTest extends TestCase { $manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger); $manager->addBackend($backend); - /** @var \OC\User\User|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var \OC\User\User|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user->expects($this->atLeastOnce()) ->method('getUID') @@ -440,7 +440,7 @@ class ManagerTest extends TestCase { public function testInGroup() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -459,7 +459,7 @@ class ManagerTest extends TestCase { public function testIsAdmin() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -478,7 +478,7 @@ class ManagerTest extends TestCase { public function testNotAdmin() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->once()) @@ -497,7 +497,7 @@ class ManagerTest extends TestCase { public function testGetUserGroupsMultipleBackends() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend1 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend1 */ $backend1 = $this->getTestBackend(); $backend1->expects($this->once()) @@ -509,7 +509,7 @@ class ManagerTest extends TestCase { ->willReturn(true); /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2 + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend2 */ $backend2 = $this->getTestBackend(); $backend2->expects($this->once()) @@ -534,7 +534,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackend() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -592,7 +592,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackendWithLimitSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -653,7 +653,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackendWithLimitAndOffsetSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -717,7 +717,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmpty() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -756,7 +756,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -795,7 +795,7 @@ class ManagerTest extends TestCase { public function testDisplayNamesInGroupWithOneUserBackendAndSearchEmptyAndLimitAndOffsetSpecified() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->exactly(1)) @@ -834,7 +834,7 @@ class ManagerTest extends TestCase { public function testGetUserGroupsWithAddUser() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $expectedGroups = []; @@ -871,7 +871,7 @@ class ManagerTest extends TestCase { public function testGetUserGroupsWithRemoveUser() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $expectedGroups = ['group1']; @@ -914,7 +914,7 @@ class ManagerTest extends TestCase { public function testGetUserIdGroups() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend(); $backend->expects($this->any()) @@ -931,7 +931,7 @@ class ManagerTest extends TestCase { public function testGroupDisplayName() { /** - * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend + * @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend */ $backend = $this->getTestBackend( GroupInterface::ADD_TO_GROUP | diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php index 9c3c40c267e..97f74cc2f8f 100644 --- a/tests/lib/InstallerTest.php +++ b/tests/lib/InstallerTest.php @@ -26,15 +26,15 @@ use OCP\ITempManager; class InstallerTest extends TestCase { private static $appid = 'testapp'; private $appstore; - /** @var AppFetcher|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AppFetcher|\PHPUnit\Framework\MockObject\MockObject */ private $appFetcher; - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ private $clientService; - /** @var ITempManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITempManager|\PHPUnit\Framework\MockObject\MockObject */ private $tempManager; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; protected function setUp(): void { diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index f1cd7467169..c79f192a7fb 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -34,21 +34,21 @@ use phpseclib\File\X509; use Test\TestCase; class CheckerTest extends TestCase { - /** @var EnvironmentHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EnvironmentHelper|\PHPUnit\Framework\MockObject\MockObject */ private $environmentHelper; - /** @var AppLocator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AppLocator|\PHPUnit\Framework\MockObject\MockObject */ private $appLocator; /** @var Checker */ private $checker; - /** @var FileAccessHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var FileAccessHelper|\PHPUnit\Framework\MockObject\MockObject */ private $fileAccessHelper; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ private $cacheFactory; - /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ private $appManager; - /** @var \OC\Files\Type\Detection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\Type\Detection|\PHPUnit\Framework\MockObject\MockObject */ private $mimeTypeDetector; protected function setUp(): void { @@ -82,7 +82,7 @@ class CheckerTest extends TestCase { ); } - + public function testWriteAppSignatureOfNotExistingApp() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Exception message'); @@ -107,7 +107,7 @@ class CheckerTest extends TestCase { $this->checker->writeAppSignature('NotExistingApp', $x509, $rsa); } - + public function testWriteAppSignatureWrongPermissions() { $this->expectException(\Exception::class); $this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/'); @@ -480,7 +480,7 @@ class CheckerTest extends TestCase { $this->assertSame([], $this->checker->verifyAppSignature('SomeApp')); } - + public function testWriteCoreSignatureWithException() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Exception message'); @@ -504,7 +504,7 @@ class CheckerTest extends TestCase { $this->checker->writeCoreSignature($x509, $rsa, __DIR__); } - + public function testWriteCoreSignatureWrongPermissions() { $this->expectException(\Exception::class); $this->expectExceptionMessageRegExp('/[a-zA-Z\\/_-]+ is not writable/'); @@ -996,7 +996,7 @@ class CheckerTest extends TestCase { ->method('getServerRoot') ->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified'); $signatureDataFile = '{ - "hashes": { + "hashes": { "mimetypelist.js": "dc48de7ad4baa030c5e563350c9a80b274bad783f6f5adbf1595ecef6c6a32e52890a24cb26cddb0aa20193ba52c001150c68d8bfb567f0aed566f4029a190a3" }, "signature": "dtNDyufRB1jOG3e\/\/Ng6O3ZPnX5wgt3rrD9SpRQ66cpWlixwvGaI6knH85MkWm3q1c+hTYBipJ\/o+nJxHWoxydMXm+F6mC5MvXWfESB\/ag4fvKe0fg25yKstzlrpIyWwcnmOhLE\/sd7D8LZOQXk72PXsIJw4vX2YPyf3peHLevlUkVhB+mfYGDQJfrtPHjJII0Do+TV2MA0qm42q7SO\/zf7Ly24nZP3AoY5bYDMewlrczS2xz9tMN2ikZZcDgHvmC2W4RkaFP9E8ZeAZphKVjyQn6HdSu7EDlJgJ1YtoqTetFzNy\/q7+ODiJDB0KUzKocEDcXF2n2cTKXKCrklB6tEhEnjADhhQNxQouq2soc0ouIujifyH2zBL0sawNxGje5wpuchhCPnWcvQnSJbK1oXnv\/0wSGsp0iSslvx9NXAZ+nQbJnIuodLBl7XuTxxPVa8jDwFdJ7mLrs79ZfN2Op4qF10PiFRoz5VztJm4KWcaWnm\/Xqxke\/6yxY+gU2c6aH\/plwzkcxhdDJjNI\/d+G+b6NSadfcrduO+gTeHK\/go68mx0k1XxCln4Qu31nPmJZcboTvAtHvHXoeqZVAzMpT+jrq+vZ3oVAvFfNpvH4CA3eZebfkV13wV4RaSETyz5QNbnBL24C26aAhkzdShKHJc4NSNV9XdFqN74XEzSZGoc=", diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index fb5286ebe65..db4dc4db865 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -24,13 +24,13 @@ use Test\TestCase; */ class FactoryTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ protected $request; - /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ protected $userSession; /** @var string */ @@ -57,7 +57,7 @@ class FactoryTest extends TestCase { /** * @param array $methods * @param bool $mockRequestGetHeaderMethod - * @return Factory|\PHPUnit_Framework_MockObject_MockObject + * @return Factory|\PHPUnit\Framework\MockObject\MockObject */ protected function getFactory(array $methods = [], $mockRequestGetHeaderMethod = false) { if ($mockRequestGetHeaderMethod) { diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/lib/L10N/LanguageIteratorTest.php index 9223db716f4..bbbbb145c75 100644 --- a/tests/lib/L10N/LanguageIteratorTest.php +++ b/tests/lib/L10N/LanguageIteratorTest.php @@ -29,9 +29,9 @@ use OCP\IUser; use Test\TestCase; class LanguageIteratorTest extends TestCase { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ protected $user; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; /** @var LanguageIterator */ protected $iterator; diff --git a/tests/lib/Log/LogFactoryTest.php b/tests/lib/Log/LogFactoryTest.php index e4725a3bc1a..91ff79369bf 100644 --- a/tests/lib/Log/LogFactoryTest.php +++ b/tests/lib/Log/LogFactoryTest.php @@ -39,13 +39,13 @@ use Test\TestCase; * @package Test\Log */ class LogFactoryTest extends TestCase { - /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ protected $c; /** @var LogFactory */ protected $factory; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $systemConfig; protected function setUp(): void { diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php index 5ed7b4c9b38..9e0e3c4b66e 100644 --- a/tests/lib/LoggerTest.php +++ b/tests/lib/LoggerTest.php @@ -14,10 +14,10 @@ use OCP\Log\IWriter; class LoggerTest extends TestCase implements IWriter { - /** @var \OC\SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var \OCP\Support\CrashReport\IRegistry|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Support\CrashReport\IRegistry|\PHPUnit\Framework\MockObject\MockObject */ private $registry; /** @var \OCP\ILogger */ diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php index a900b1fe47d..74f44051988 100644 --- a/tests/lib/Mail/EMailTemplateTest.php +++ b/tests/lib/Mail/EMailTemplateTest.php @@ -31,11 +31,11 @@ use OCP\L10N\IFactory; use Test\TestCase; class EMailTemplateTest 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 IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; /** @var EMailTemplate */ private $emailTemplate; diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index 9e7f6a4134c..3ec2e96dfab 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -26,15 +26,15 @@ use Test\TestCase; use Swift_SwiftException; class MailerTest extends TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @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 Mailer */ private $mailer; diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index 2172a327234..b0641ae332f 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -208,10 +208,10 @@ class MessageTest extends TestCase { } public function testPlainTextRenderOption() { - /** @var \PHPUnit_Framework_MockObject_MockObject|Swift_Message $swiftMessage */ + /** @var \PHPUnit\Framework\MockObject\MockObject|Swift_Message $swiftMessage */ $swiftMessage = $this->getMockBuilder('\Swift_Message') ->disableOriginalConstructor()->getMock(); - /** @var \PHPUnit_Framework_MockObject_MockObject|IEMailTemplate $template */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IEMailTemplate $template */ $template = $this->getMockBuilder('\OCP\Mail\IEMailTemplate') ->disableOriginalConstructor()->getMock(); @@ -231,10 +231,10 @@ class MessageTest extends TestCase { } public function testBothRenderingOptions() { - /** @var \PHPUnit_Framework_MockObject_MockObject|Swift_Message $swiftMessage */ + /** @var \PHPUnit\Framework\MockObject\MockObject|Swift_Message $swiftMessage */ $swiftMessage = $this->getMockBuilder('\Swift_Message') ->disableOriginalConstructor()->getMock(); - /** @var \PHPUnit_Framework_MockObject_MockObject|IEMailTemplate $template */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IEMailTemplate $template */ $template = $this->getMockBuilder('\OCP\Mail\IEMailTemplate') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index 8c467d58269..4e95915e624 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -56,16 +56,16 @@ class TestRepairStep implements IRepairStep { class BackgroundRepairTest extends TestCase { - /** @var \OC\BackgroundJob\JobList|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\BackgroundJob\JobList|\PHPUnit\Framework\MockObject\MockObject */ private $jobList; - /** @var BackgroundRepair|\PHPUnit_Framework_MockObject_MockObject */ + /** @var BackgroundRepair|\PHPUnit\Framework\MockObject\MockObject */ private $job; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject $dispatcher */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject $dispatcher */ private $dispatcher; protected function setUp(): void { diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php index a33a06635c9..012130792ac 100644 --- a/tests/lib/NavigationManagerTest.php +++ b/tests/lib/NavigationManagerTest.php @@ -25,17 +25,17 @@ use OCP\IUserSession; use OCP\L10N\IFactory; class NavigationManagerTest extends TestCase { - /** @var AppManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var AppManager|\PHPUnit\Framework\MockObject\MockObject */ protected $appManager; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $urlGenerator; - /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $l10nFac; - /** @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 IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; /** @var \OC\NavigationManager */ diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php index 57c7557e86c..cd0d4bd36c8 100644 --- a/tests/lib/Notification/ManagerTest.php +++ b/tests/lib/Notification/ManagerTest.php @@ -93,7 +93,7 @@ class ManagerTest extends TestCase { } public function testNotify() { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(INotification::class) ->disableOriginalConstructor() ->getMock(); @@ -116,11 +116,11 @@ class ManagerTest extends TestCase { $manager->notify($notification); } - + public function testNotifyInvalid() { $this->expectException(\InvalidArgumentException::class); - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(INotification::class) ->disableOriginalConstructor() ->getMock(); @@ -143,7 +143,7 @@ class ManagerTest extends TestCase { } public function testMarkProcessed() { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(INotification::class) ->disableOriginalConstructor() ->getMock(); @@ -164,7 +164,7 @@ class ManagerTest extends TestCase { } public function testGetCount() { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(INotification::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Notification/NotificationTest.php b/tests/lib/Notification/NotificationTest.php index f8d80a0ab56..1479e8841a2 100644 --- a/tests/lib/Notification/NotificationTest.php +++ b/tests/lib/Notification/NotificationTest.php @@ -32,7 +32,7 @@ use Test\TestCase; class NotificationTest extends TestCase { /** @var INotification */ protected $notification; - /** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IValidator|\PHPUnit\Framework\MockObject\MockObject */ protected $validator; protected function setUp(): void { @@ -403,7 +403,7 @@ class NotificationTest extends TestCase { } public function testAddAction() { - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) ->method('isValid') @@ -417,11 +417,11 @@ class NotificationTest extends TestCase { $this->assertEquals([], $this->notification->getParsedActions()); } - + public function testAddActionInvalid() { $this->expectException(\InvalidArgumentException::class); - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) ->method('isValid') @@ -433,7 +433,7 @@ class NotificationTest extends TestCase { } public function testAddActionSecondPrimary() { - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->exactly(2)) ->method('isValid') @@ -449,7 +449,7 @@ class NotificationTest extends TestCase { } public function testAddParsedAction() { - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) ->method('isValidParsed') @@ -463,11 +463,11 @@ class NotificationTest extends TestCase { $this->assertEquals([], $this->notification->getActions()); } - + public function testAddParsedActionInvalid() { $this->expectException(\InvalidArgumentException::class); - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->once()) ->method('isValidParsed') @@ -479,7 +479,7 @@ class NotificationTest extends TestCase { } public function testAddActionSecondParsedPrimary() { - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action = $this->createMock(IAction::class); $action->expects($this->exactly(2)) ->method('isValidParsed') @@ -495,7 +495,7 @@ class NotificationTest extends TestCase { } public function testAddActionParsedPrimaryEnd() { - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action1 = $this->createMock(IAction::class); $action1->expects($this->exactly(2)) ->method('isValidParsed') @@ -503,7 +503,7 @@ class NotificationTest extends TestCase { $action1->expects($this->exactly(2)) ->method('isPrimary') ->willReturn(false); - /** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */ + /** @var \OCP\Notification\IAction|\PHPUnit\Framework\MockObject\MockObject $action */ $action2 = $this->createMock(IAction::class); $action2->expects($this->once()) ->method('isValidParsed') @@ -536,7 +536,7 @@ class NotificationTest extends TestCase { * @param bool $expected */ public function testIsValid($isValidCommon, $subject, $expected) { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(Notification::class) ->setMethods([ 'isValidCommon', @@ -569,7 +569,7 @@ class NotificationTest extends TestCase { * @param bool $expected */ public function testIsParsedValid($isValidCommon, $subject, $expected) { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(Notification::class) ->setMethods([ 'isValidCommon', @@ -616,7 +616,7 @@ class NotificationTest extends TestCase { * @param bool $expected */ public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected) { - /** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */ + /** @var \OCP\Notification\INotification|\PHPUnit\Framework\MockObject\MockObject $notification */ $notification = $this->getMockBuilder(Notification::class) ->setMethods([ 'getApp', diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index d5baa1be2e2..195dac697e5 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -29,10 +29,10 @@ use Test\TestCase; class DiscoveryServiceTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject | ICacheFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject | ICacheFactory */ private $cacheFactory; - /** @var \PHPUnit_Framework_MockObject_MockObject | IClientService */ + /** @var \PHPUnit\Framework\MockObject\MockObject | IClientService */ private $clientService; /** @var IDiscoveryService */ diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index 5e9b9bcbb8d..d2bfcad9955 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -38,19 +38,19 @@ use Symfony\Component\EventDispatcher\GenericEvent; class GeneratorTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */ private $previewManager; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; - /** @var GeneratorHelper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var GeneratorHelper|\PHPUnit\Framework\MockObject\MockObject */ private $helper; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ private $eventDispatcher; /** @var Generator */ diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/lib/Repair/CleanTagsTest.php index b724891cda7..468b715e5e4 100644 --- a/tests/lib/Repair/CleanTagsTest.php +++ b/tests/lib/Repair/CleanTagsTest.php @@ -27,7 +27,7 @@ class CleanTagsTest extends \Test\TestCase { /** @var \OCP\IDBConnection */ protected $connection; - /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; /** @var int */ diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index 1d5af18a8a3..9bc61865235 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -68,7 +68,7 @@ class FixMountStoragesTest extends TestCase { $mount2 = $this->createMount($file2, 1337); $this->assertStorage($mount2, 1337); - /** @var IOutput|\PHPUnit_Framework_MockObject_MockObject $output */ + /** @var IOutput|\PHPUnit\Framework\MockObject\MockObject $output */ $output = $this->createMock(IOutput::class); $output->expects($this->at(0)) ->method('info') diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/lib/Repair/OldGroupMembershipSharesTest.php index dda23e8d3ab..adfba4a1ce7 100644 --- a/tests/lib/Repair/OldGroupMembershipSharesTest.php +++ b/tests/lib/Repair/OldGroupMembershipSharesTest.php @@ -27,13 +27,13 @@ class OldGroupMembershipSharesTest extends \Test\TestCase { /** @var \OCP\IDBConnection */ protected $connection; - /** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ protected $groupManager; protected function setUp(): void { parent::setUp(); - /** \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ + /** \OCP\IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ $this->groupManager = $this->getMockBuilder('OCP\IGroupManager') ->disableOriginalConstructor() ->getMock(); @@ -83,7 +83,7 @@ class OldGroupMembershipSharesTest extends \Test\TestCase { $this->assertEquals([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member], ['id' => $notAMember]], $rows); $result->closeCursor(); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php index 62471fbbe3a..9cba3e8e30a 100644 --- a/tests/lib/Repair/RepairCollationTest.php +++ b/tests/lib/Repair/RepairCollationTest.php @@ -84,7 +84,7 @@ class RepairCollationTest extends TestCase { $tables = $this->repair->getAllNonUTF8BinTables($this->connection); $this->assertGreaterThanOrEqual(1, count($tables)); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 748ca7a6048..64ae6322657 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -110,7 +110,7 @@ class RepairInvalidSharesTest extends TestCase { $this->assertEquals([['id' => $parent], ['id' => $validChild], ['id' => $invalidChild]], $rows); $result->closeCursor(); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); @@ -173,7 +173,7 @@ class RepairInvalidSharesTest extends TestCase { $shareId = $this->getLastShareId(); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index e6c6fdebf42..6f0791964b3 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -39,7 +39,7 @@ class RepairMimeTypesTest extends \Test\TestCase { $this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader(); $this->mimetypeLoader = \OC::$server->getMimeTypeLoader(); - /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); @@ -99,7 +99,7 @@ class RepairMimeTypesTest extends \Test\TestCase { private function renameMimeTypes($currentMimeTypes, $fixedMimeTypes) { $this->addEntries($currentMimeTypes); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Repair/RepairSqliteAutoincrementTest.php b/tests/lib/Repair/RepairSqliteAutoincrementTest.php index c740384fc0f..9db0d5630aa 100644 --- a/tests/lib/Repair/RepairSqliteAutoincrementTest.php +++ b/tests/lib/Repair/RepairSqliteAutoincrementTest.php @@ -78,7 +78,7 @@ class RepairSqliteAutoincrementTest extends \Test\TestCase { public function testConvertIdColumn() { $this->assertFalse($this->checkAutoincrement()); - /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + /** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/lib/Security/Bruteforce/CapabilitiesTest.php index 60873236e44..16c2b2caf15 100644 --- a/tests/lib/Security/Bruteforce/CapabilitiesTest.php +++ b/tests/lib/Security/Bruteforce/CapabilitiesTest.php @@ -30,10 +30,10 @@ class CapabilitiesTest extends TestCase { /** @var Capabilities */ private $capabilities; - /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; - /** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Throttler|\PHPUnit\Framework\MockObject\MockObject */ private $throttler; protected function setUp(): void { diff --git a/tests/lib/Security/Bruteforce/ThrottlerTest.php b/tests/lib/Security/Bruteforce/ThrottlerTest.php index 1c58849c9f8..b4a7016bc20 100644 --- a/tests/lib/Security/Bruteforce/ThrottlerTest.php +++ b/tests/lib/Security/Bruteforce/ThrottlerTest.php @@ -41,7 +41,7 @@ class ThrottlerTest extends TestCase { private $dbConnection; /** @var ILogger */ private $logger; - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; protected function setUp(): void { @@ -153,7 +153,7 @@ class ThrottlerTest extends TestCase { 'dead:beef:cafe::1111', [ 'whitelist_0' => 'dead:beef:cafe::1100/123', - + ], true, ], diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index d64c41c79e7..447ee8719c9 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -92,7 +92,7 @@ class CertificateManagerTest extends \Test\TestCase { $this->assertEqualsArrays($certificateStore, $this->certificateManager->listCertificates()); } - + public function testAddInvalidCertificate() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Certificate could not get parsed.'); @@ -156,7 +156,7 @@ class CertificateManagerTest extends \Test\TestCase { ->disableOriginalConstructor()->getMock(); $config = $this->createMock(IConfig::class); - /** @var CertificateManager | \PHPUnit_Framework_MockObject_MockObject $certificateManager */ + /** @var CertificateManager | \PHPUnit\Framework\MockObject\MockObject $certificateManager */ $certificateManager = $this->getMockBuilder('OC\Security\CertificateManager') ->setConstructorArgs([$uid, $view, $config, $this->createMock(ILogger::class), $this->random]) ->setMethods(['getFilemtimeOfCaBundle', 'getCertificateBundle']) diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php index 5fd1d709c2f..760c4911873 100644 --- a/tests/lib/Security/IdentityProof/ManagerTest.php +++ b/tests/lib/Security/IdentityProof/ManagerTest.php @@ -52,7 +52,7 @@ class ManagerTest extends TestCase { protected function setUp(): void { parent::setUp(); - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $this->factory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); $this->config = $this->createMock(IConfig::class); @@ -70,7 +70,7 @@ class ManagerTest extends TestCase { * create manager object * * @param array $setMethods - * @return Manager|\PHPUnit_Framework_MockObject_MockObject + * @return Manager|\PHPUnit\Framework\MockObject\MockObject */ protected function getManager($setMethods = []) { if (empty($setMethods)) { @@ -204,7 +204,7 @@ class ManagerTest extends TestCase { public function testGetSystemKey() { $manager = $this->getManager(['retrieveKey']); - /** @var Key|\PHPUnit_Framework_MockObject_MockObject $key */ + /** @var Key|\PHPUnit\Framework\MockObject\MockObject $key */ $key = $this->createMock(Key::class); $this->config->expects($this->once())->method('getSystemValue') @@ -217,13 +217,13 @@ class ManagerTest extends TestCase { } - + public function testGetSystemKeyFailure() { $this->expectException(\RuntimeException::class); $manager = $this->getManager(['retrieveKey']); - /** @var Key|\PHPUnit_Framework_MockObject_MockObject $key */ + /** @var Key|\PHPUnit\Framework\MockObject\MockObject $key */ $key = $this->createMock(Key::class); $this->config->expects($this->once())->method('getSystemValue') diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index 913ab7c15f5..3ce211d51e7 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -77,13 +77,13 @@ gQIDAQAB /** @var Key */ private $key; - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $keyManager; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; /** @var Signer */ diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php index e4df424c2ca..902c586dc13 100644 --- a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php +++ b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php @@ -28,11 +28,11 @@ use OCP\ICacheFactory; use Test\TestCase; class MemoryCacheTest extends TestCase { - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ private $cacheFactory; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ private $cache; /** @var MemoryCache */ private $memoryCache; diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/lib/Security/RateLimiting/LimiterTest.php index ea74f476f3c..76121a49bc1 100644 --- a/tests/lib/Security/RateLimiting/LimiterTest.php +++ b/tests/lib/Security/RateLimiting/LimiterTest.php @@ -28,9 +28,9 @@ use OCP\IUser; use Test\TestCase; class LimiterTest extends TestCase { - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; - /** @var IBackend|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IBackend|\PHPUnit\Framework\MockObject\MockObject */ private $backend; /** @var Limiter */ private $limiter; @@ -47,7 +47,7 @@ class LimiterTest extends TestCase { ); } - + public function testRegisterAnonRequestExceeded() { $this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class); $this->expectExceptionMessage('Rate limit exceeded'); @@ -91,12 +91,12 @@ class LimiterTest extends TestCase { $this->limiter->registerAnonRequest('MyIdentifier', 100, 100, '127.0.0.1'); } - + public function testRegisterUserRequestExceeded() { $this->expectException(\OC\Security\RateLimiting\Exception\RateLimitExceededException::class); $this->expectExceptionMessage('Rate limit exceeded'); - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->once()) @@ -116,7 +116,7 @@ class LimiterTest extends TestCase { } public function testRegisterUserRequestSuccess() { - /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */ + /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ $user = $this->createMock(IUser::class); $user ->expects($this->once()) diff --git a/tests/lib/Session/CryptoSessionDataTest.php b/tests/lib/Session/CryptoSessionDataTest.php index 6de44032530..10bc62e099c 100644 --- a/tests/lib/Session/CryptoSessionDataTest.php +++ b/tests/lib/Session/CryptoSessionDataTest.php @@ -25,7 +25,7 @@ use OC\Session\CryptoSessionData; use OCP\Security\ICrypto; class CryptoSessionDataTest extends Session { - /** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OCP\Security\ICrypto */ protected $crypto; /** @var \OCP\ISession */ diff --git a/tests/lib/Session/CryptoWrappingTest.php b/tests/lib/Session/CryptoWrappingTest.php index fac515c8f52..b8635b99120 100644 --- a/tests/lib/Session/CryptoWrappingTest.php +++ b/tests/lib/Session/CryptoWrappingTest.php @@ -26,10 +26,10 @@ use OCP\ISession; use Test\TestCase; class CryptoWrappingTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OCP\Security\ICrypto */ protected $crypto; - /** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\ISession */ + /** @var \PHPUnit\Framework\MockObject\MockObject|\OCP\ISession */ protected $wrappedSession; /** @var \OC\Session\CryptoSessionData */ diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php index a0d341266e8..3d967b2ed21 100644 --- a/tests/lib/Settings/ManagerTest.php +++ b/tests/lib/Settings/ManagerTest.php @@ -36,17 +36,17 @@ use Test\TestCase; class ManagerTest extends TestCase { - /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */ private $manager; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ private $logger; - /** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */ private $l10nFactory; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ private $url; - /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ private $container; protected function setUp(): void { diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 0890b70dfcd..696e1d69fbe 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -19,21 +19,21 @@ use OCP\Security\ISecureRandom; class SetupTest extends \Test\TestCase { - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var \bantu\IniGetWrapper\IniGetWrapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \bantu\IniGetWrapper\IniGetWrapper|\PHPUnit\Framework\MockObject\MockObject */ private $iniWrapper; - /** @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ private $defaults; - /** @var \OC\Setup|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Setup|\PHPUnit\Framework\MockObject\MockObject */ protected $setupClass; - /** @var \OCP\ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var \OCP\Security\ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\Security\ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ protected $random; - /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Installer|\PHPUnit\Framework\MockObject\MockObject */ protected $installer; protected function setUp(): void { @@ -120,7 +120,7 @@ class SetupTest extends \Test\TestCase { $this->assertSame($expectedResult, $result); } - + public function testGetSupportedDatabaseException() { $this->expectException(\Exception::class); $this->expectExceptionMessage('Supported databases are not properly configured.'); diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index b3de9d05a52..24474b11dcf 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -52,31 +52,31 @@ class DefaultShareProviderTest extends \Test\TestCase { /** @var IDBConnection */ protected $dbConn; - /** @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 IRootFolder | \PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder | \PHPUnit\Framework\MockObject\MockObject */ protected $rootFolder; /** @var DefaultShareProvider */ protected $provider; - /** @var \PHPUnit_Framework_MockObject_MockObject|IMailer */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IMailer */ protected $mailer; /** @var IFactory|MockObject */ protected $l10nFactory; - /** @var \PHPUnit_Framework_MockObject_MockObject|IL10N */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IL10N */ protected $l10n; - /** @var \PHPUnit_Framework_MockObject_MockObject|Defaults */ + /** @var \PHPUnit\Framework\MockObject\MockObject|Defaults */ protected $defaults; - /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator */ protected $urlGenerator; /** @var IConfig|MockObject */ diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index d2f5cd79284..b3e76735aaa 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -31,7 +31,7 @@ use Test\TestCase; class ShareHelperTest extends TestCase { - /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $manager; /** @var ShareHelper */ @@ -77,9 +77,9 @@ class ShareHelperTest extends TestCase { 'remote' => $remoteList, ]); - /** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ + /** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ $node = $this->createMock(Node::class); - /** @var ShareHelper|\PHPUnit_Framework_MockObject_MockObject $helper */ + /** @var ShareHelper|\PHPUnit\Framework\MockObject\MockObject $helper */ $helper = $this->getMockBuilder(ShareHelper::class) ->setConstructorArgs([$this->manager]) ->setMethods(['getPathsForUsers', 'getPathsForRemotes']) @@ -128,7 +128,7 @@ class ShareHelperTest extends TestCase { public function testGetPathsForUsers(array $users, array $nodes, array $expected) { $lastNode = null; foreach ($nodes as $nodeId => $nodeName) { - /** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ + /** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ $node = $this->createMock(Node::class); $node->expects($this->any()) ->method('getId') @@ -185,7 +185,7 @@ class ShareHelperTest extends TestCase { public function testGetPathsForRemotes(array $remotes, array $nodes, array $expected) { $lastNode = null; foreach ($nodes as $nodeId => $nodePath) { - /** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ + /** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ $node = $this->createMock(Node::class); $node->expects($this->any()) ->method('getId') @@ -221,7 +221,7 @@ class ShareHelperTest extends TestCase { * @param string $expected */ public function testGetMountedPath($path, $expected) { - /** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */ + /** @var Node|\PHPUnit\Framework\MockObject\MockObject $node */ $node = $this->createMock(Node::class); $node->expects($this->once()) ->method('getPath') diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index f7ea479350d..7d4dc6de2d6 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -31,7 +31,7 @@ use OCP\IUserManager; */ class ShareTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ protected $rootFolder; /** @var \OCP\Share\IShare */ protected $share; @@ -42,7 +42,7 @@ class ShareTest extends \Test\TestCase { $this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager); } - + public function testSetIdInvalid() { $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage('String expected.'); @@ -61,7 +61,7 @@ class ShareTest extends \Test\TestCase { $this->assertEquals('foo', $this->share->getId()); } - + public function testSetIdOnce() { $this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class); $this->expectExceptionMessage('Not allowed to assign a new internal id to a share'); @@ -70,7 +70,7 @@ class ShareTest extends \Test\TestCase { $this->share->setId('bar'); } - + public function testSetProviderIdInt() { $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage('String expected.'); @@ -85,7 +85,7 @@ class ShareTest extends \Test\TestCase { $this->assertEquals('foo:bar', $this->share->getFullId()); } - + public function testSetProviderIdOnce() { $this->expectException(\OCP\Share\Exceptions\IllegalIDChangeException::class); $this->expectExceptionMessage('Not allowed to assign a new provider id to a share'); diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php index 68159aa1b2b..c070f69ae66 100644 --- a/tests/lib/Support/Subscription/RegistryTest.php +++ b/tests/lib/Support/Subscription/RegistryTest.php @@ -75,7 +75,7 @@ class RegistryTest extends TestCase { } public function testDelegateHasValidSubscription() { - /* @var ISubscription|\PHPUnit_Framework_MockObject_MockObject $subscription */ + /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */ $subscription = $this->createMock(ISubscription::class); $subscription->expects($this->once()) ->method('hasValidSubscription') @@ -86,7 +86,7 @@ class RegistryTest extends TestCase { } public function testDelegateHasValidSubscriptionConfig() { - /* @var ISubscription|\PHPUnit_Framework_MockObject_MockObject $subscription */ + /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */ $this->config->expects($this->once()) ->method('getSystemValueBool') ->with('has_valid_subscription') @@ -96,7 +96,7 @@ class RegistryTest extends TestCase { } public function testDelegateHasExtendedSupport() { - /* @var ISubscription|\PHPUnit_Framework_MockObject_MockObject $subscription */ + /* @var ISubscription|\PHPUnit\Framework\MockObject\MockObject $subscription */ $subscription = $this->createMock(ISubscription::class); $subscription->expects($this->once()) ->method('hasExtendedSupport') @@ -108,7 +108,7 @@ class RegistryTest extends TestCase { public function testDelegateGetSupportedApps() { - /* @var ISupportedApps|\PHPUnit_Framework_MockObject_MockObject $subscription */ + /* @var ISupportedApps|\PHPUnit\Framework\MockObject\MockObject $subscription */ $subscription = $this->createMock(ISupportedApps::class); $subscription->expects($this->once()) ->method('getSupportedApps') diff --git a/tests/lib/Template/CSSResourceLocatorTest.php b/tests/lib/Template/CSSResourceLocatorTest.php index 8c2a50e97ca..42fa06a474d 100644 --- a/tests/lib/Template/CSSResourceLocatorTest.php +++ b/tests/lib/Template/CSSResourceLocatorTest.php @@ -37,21 +37,21 @@ use OCP\ILogger; use OCP\IURLGenerator; class CSSResourceLocatorTest extends \Test\TestCase { - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @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 ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ protected $themingDefaults; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $cacheFactory; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var IconsCacher|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IconsCacher|\PHPUnit\Framework\MockObject\MockObject */ protected $iconsCacher; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; protected function setUp(): void { @@ -68,7 +68,7 @@ class CSSResourceLocatorTest extends \Test\TestCase { } private function cssResourceLocator() { - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $factory->method('get')->with('css')->willReturn($this->appData); $scssCacher = new SCSSCacher( diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php index 4b5c6a73ef8..24b3c21052f 100644 --- a/tests/lib/Template/IconsCacherTest.php +++ b/tests/lib/Template/IconsCacherTest.php @@ -36,13 +36,13 @@ use OCP\ILogger; use OCP\IURLGenerator; class IconsCacherTest extends \Test\TestCase { - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $urlGenerator; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ private $timeFactory; protected function setUp(): void { @@ -50,7 +50,7 @@ class IconsCacherTest extends \Test\TestCase { $this->appData = $this->createMock(AppData::class); $this->timeFactory = $this->createMock(ITimeFactory::class); - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $factory->method('get')->with('css')->willReturn($this->appData); diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 0cdea95fd6f..87abff99123 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -36,19 +36,19 @@ use OCP\ILogger; use OCP\IURLGenerator; class JSCombinerTest extends \Test\TestCase { - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $urlGenerator; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ protected $depsCache; /** @var JSCombiner */ protected $jsCombiner; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $cacheFactory; protected function setUp(): void { diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index 3f5d157e7f5..cdc3606f020 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -32,15 +32,15 @@ use OCP\ILogger; use OCP\IURLGenerator; class JSResourceLocatorTest extends \Test\TestCase { - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */ protected $urlGenerator; - /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $cacheFactory; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; protected function setUp(): void { diff --git a/tests/lib/Template/ResourceLocatorTest.php b/tests/lib/Template/ResourceLocatorTest.php index 71f39a1179e..d23d17778d4 100644 --- a/tests/lib/Template/ResourceLocatorTest.php +++ b/tests/lib/Template/ResourceLocatorTest.php @@ -12,7 +12,7 @@ use OC\Template\ResourceNotFoundException; use OCP\ILogger; class ResourceLocatorTest extends \Test\TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ protected $logger; protected function setUp(): void { @@ -25,7 +25,7 @@ class ResourceLocatorTest extends \Test\TestCase { * @param array $core_map * @param array $party_map * @param array $appsRoots - * @return \PHPUnit_Framework_MockObject_MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ public function getResourceLocator($theme, $core_map, $party_map, $appsRoots) { return $this->getMockForAbstractClass('OC\Template\ResourceLocator', diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 9dfd8d20fea..1a77f789afe 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -40,25 +40,25 @@ use OCP\ILogger; use OCP\IURLGenerator; class SCSSCacherTest extends \Test\TestCase { - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; - /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ protected $appData; - /** @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 ThemingDefaults|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ThemingDefaults|\PHPUnit\Framework\MockObject\MockObject */ protected $themingDefaults; /** @var SCSSCacher */ protected $scssCacher; - /** @var ICache|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */ protected $depsCache; - /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $cacheFactory; - /** @var IconsCacher|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IconsCacher|\PHPUnit\Framework\MockObject\MockObject */ protected $iconsCacher; - /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */ protected $timeFactory; protected function setUp(): void { @@ -68,7 +68,7 @@ class SCSSCacherTest extends \Test\TestCase { $this->iconsCacher = $this->createMock(IconsCacher::class); $this->timeFactory = $this->createMock(ITimeFactory::class); - /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ + /** @var Factory|\PHPUnit\Framework\MockObject\MockObject $factory */ $factory = $this->createMock(Factory::class); $factory->method('get')->with('css')->willReturn($this->appData); diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index 38cfc4a1c8f..13a6fb0cf94 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -473,13 +473,13 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { require_once __DIR__.'/../../lib/private/legacy/template/functions.php'; $requestToken = 12345; - /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject $l10n */ + /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject $l10n */ $theme = $this->getMockBuilder('\OCP\Defaults') ->disableOriginalConstructor()->getMock(); $theme->expects($this->any()) ->method('getName') ->willReturn('Nextcloud'); - /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject $l10n */ + /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */ $l10n = $this->getMockBuilder(IL10N::class) ->disableOriginalConstructor()->getMock(); $l10n diff --git a/tests/lib/Traits/ClientServiceTrait.php b/tests/lib/Traits/ClientServiceTrait.php index cab28e76dba..e9e9787d734 100644 --- a/tests/lib/Traits/ClientServiceTrait.php +++ b/tests/lib/Traits/ClientServiceTrait.php @@ -26,9 +26,9 @@ use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; trait ClientServiceTrait { - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ private $clientService; - /** @var IClient|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClient|\PHPUnit\Framework\MockObject\MockObject */ private $client; private $expectedGetRequests = []; private $expectedPostRequests = []; @@ -37,7 +37,7 @@ trait ClientServiceTrait { * Wrapper to be forward compatible to phpunit 5.4+ * * @param string $originalClassName - * @return \PHPUnit_Framework_MockObject_MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ abstract protected function createMock($originalClassName); @@ -112,7 +112,7 @@ trait ClientServiceTrait { } /** - * @return IClientService|\PHPUnit_Framework_MockObject_MockObject + * @return IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected function getClientService() { return $this->clientService; diff --git a/tests/lib/Updater/ChangesCheckTest.php b/tests/lib/Updater/ChangesCheckTest.php index 4d7dce43ee1..1daff9ce1fb 100644 --- a/tests/lib/Updater/ChangesCheckTest.php +++ b/tests/lib/Updater/ChangesCheckTest.php @@ -37,16 +37,16 @@ use OCP\ILogger; use Test\TestCase; class ChangesCheckTest extends TestCase { - /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ protected $clientService; /** @var ChangesCheck */ protected $checker; - /** @var ChangesMapper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ChangesMapper|\PHPUnit\Framework\MockObject\MockObject */ protected $mapper; - /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; protected function setUp(): void { diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index 2f139319bbf..f4216ddb0a3 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -28,9 +28,9 @@ use OCP\IConfig; use OCP\Util; class VersionCheckTest extends \Test\TestCase { - /** @var IConfig| \PHPUnit_Framework_MockObject_MockObject */ + /** @var IConfig| \PHPUnit\Framework\MockObject\MockObject */ private $config; - /** @var VersionCheck | \PHPUnit_Framework_MockObject_MockObject*/ + /** @var VersionCheck | \PHPUnit\Framework\MockObject\MockObject*/ private $updater; protected function setUp(): void { diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 3ccf4c8b8c7..1affd6d020a 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -29,15 +29,15 @@ use OCP\IConfig; use OCP\ILogger; class UpdaterTest extends TestCase { - /** @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 Updater */ private $updater; - /** @var Checker | \PHPUnit_Framework_MockObject_MockObject */ + /** @var Checker | \PHPUnit\Framework\MockObject\MockObject */ private $checker; - /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Installer|\PHPUnit\Framework\MockObject\MockObject */ private $installer; protected function setUp(): void { diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 03f55ff2244..46508a217d8 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -18,11 +18,11 @@ use OCP\IURLGenerator; */ class UrlGeneratorTest extends \Test\TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject|IConfig */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ private $config; - /** @var \PHPUnit_Framework_MockObject_MockObject|ICacheFactory */ + /** @var \PHPUnit\Framework\MockObject\MockObject|ICacheFactory */ private $cacheFactory; - /** @var \PHPUnit_Framework_MockObject_MockObject|IRequest */ + /** @var \PHPUnit\Framework\MockObject\MockObject|IRequest */ private $request; /** @var IURLGenerator */ private $urlGenerator; diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 7cc42e81ba2..6037277932d 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -55,7 +55,7 @@ class ManagerTest extends TestCase { public function testUserExistsSingleBackendExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -71,7 +71,7 @@ class ManagerTest extends TestCase { public function testUserExistsSingleBackendNotExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -93,7 +93,7 @@ class ManagerTest extends TestCase { public function testUserExistsTwoBackendsSecondExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend1 */ $backend1 = $this->createMock(\Test\Util\User\Dummy::class); $backend1->expects($this->once()) @@ -102,7 +102,7 @@ class ManagerTest extends TestCase { ->willReturn(false); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend2 */ $backend2 = $this->createMock(\Test\Util\User\Dummy::class); $backend2->expects($this->once()) @@ -119,7 +119,7 @@ class ManagerTest extends TestCase { public function testUserExistsTwoBackendsFirstExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend1 */ $backend1 = $this->createMock(\Test\Util\User\Dummy::class); $backend1->expects($this->once()) @@ -128,7 +128,7 @@ class ManagerTest extends TestCase { ->willReturn(true); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend2 */ $backend2 = $this->createMock(\Test\Util\User\Dummy::class); $backend2->expects($this->never()) @@ -143,7 +143,7 @@ class ManagerTest extends TestCase { public function testCheckPassword() { /** - * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -170,7 +170,7 @@ class ManagerTest extends TestCase { public function testCheckPasswordNotSupported() { /** - * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->never()) @@ -188,7 +188,7 @@ class ManagerTest extends TestCase { public function testGetOneBackendExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -206,7 +206,7 @@ class ManagerTest extends TestCase { public function testGetOneBackendNotExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -222,7 +222,7 @@ class ManagerTest extends TestCase { public function testGetOneBackendDoNotTranslateLoginNames() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -240,7 +240,7 @@ class ManagerTest extends TestCase { public function testSearchOneBackend() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -263,7 +263,7 @@ class ManagerTest extends TestCase { public function testSearchTwoBackendLimitOffset() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend1 */ $backend1 = $this->createMock(\Test\Util\User\Dummy::class); $backend1->expects($this->once()) @@ -274,7 +274,7 @@ class ManagerTest extends TestCase { ->method('loginName2UserName'); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend2 */ $backend2 = $this->createMock(\Test\Util\User\Dummy::class); $backend2->expects($this->once()) @@ -330,7 +330,7 @@ class ManagerTest extends TestCase { * @dataProvider dataCreateUserInvalid */ public function testCreateUserInvalid($uid, $password, $exception) { - /** @var \Test\Util\User\Dummy|\PHPUnit_Framework_MockObject_MockObject $backend */ + /** @var \Test\Util\User\Dummy|\PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) ->method('implementsActions') @@ -347,7 +347,7 @@ class ManagerTest extends TestCase { public function testCreateUserSingleBackendNotExists() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->any()) @@ -377,7 +377,7 @@ class ManagerTest extends TestCase { $this->expectException(\Exception::class); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->any()) @@ -400,7 +400,7 @@ class ManagerTest extends TestCase { public function testCreateUserSingleBackendNotSupported() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->any()) @@ -430,9 +430,9 @@ class ManagerTest extends TestCase { $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage('Could not create user'); - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */ + /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject $config */ $config = $this->createMock(IConfig::class); - /** @var \Test\Util\User\Dummy|\PHPUnit_Framework_MockObject_MockObject $backend */ + /** @var \Test\Util\User\Dummy|\PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend ->expects($this->once()) @@ -449,7 +449,7 @@ class ManagerTest extends TestCase { $this->expectException(\Exception::class); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend1 */ $backend1 = $this->createMock(\Test\Util\User\Dummy::class); $backend1->expects($this->any()) @@ -465,7 +465,7 @@ class ManagerTest extends TestCase { ->willReturn(false); /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend2 */ $backend2 = $this->createMock(\Test\Util\User\Dummy::class); $backend2->expects($this->any()) @@ -497,7 +497,7 @@ class ManagerTest extends TestCase { public function testCountUsersOneBackend() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -526,7 +526,7 @@ class ManagerTest extends TestCase { public function testCountUsersTwoBackends() { /** - * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \Test\Util\User\Dummy | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend1 = $this->createMock(\Test\Util\User\Dummy::class); $backend1->expects($this->once()) diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index 4e527addc6e..3a9c7766e3c 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -41,7 +41,7 @@ class UserTest extends TestCase { public function testDisplayName() { /** - * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Backend::class); $backend->expects($this->once()) @@ -63,7 +63,7 @@ class UserTest extends TestCase { */ public function testDisplayNameEmpty() { /** - * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Backend::class); $backend->expects($this->once()) @@ -82,7 +82,7 @@ class UserTest extends TestCase { public function testDisplayNameNotSupported() { /** - * @var \OC\User\Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var \OC\User\Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Backend::class); $backend->expects($this->never()) @@ -99,7 +99,7 @@ class UserTest extends TestCase { public function testSetPassword() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -122,7 +122,7 @@ class UserTest extends TestCase { public function testSetPasswordNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->never()) @@ -138,7 +138,7 @@ class UserTest extends TestCase { public function testChangeAvatarSupportedYes() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(AvatarUserDummy::class); $backend->expects($this->once()) @@ -162,7 +162,7 @@ class UserTest extends TestCase { public function testChangeAvatarSupportedNo() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(AvatarUserDummy::class); $backend->expects($this->once()) @@ -186,7 +186,7 @@ class UserTest extends TestCase { public function testChangeAvatarNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(AvatarUserDummy::class); $backend->expects($this->never()) @@ -202,7 +202,7 @@ class UserTest extends TestCase { public function testDelete() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -215,7 +215,7 @@ class UserTest extends TestCase { public function testDeleteWithDifferentHome() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -247,7 +247,7 @@ class UserTest extends TestCase { public function testGetHome() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -278,7 +278,7 @@ class UserTest extends TestCase { public function testGetHomeNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->never()) @@ -305,7 +305,7 @@ class UserTest extends TestCase { public function testCanChangePassword() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -325,7 +325,7 @@ class UserTest extends TestCase { public function testCanChangePasswordNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -339,7 +339,7 @@ class UserTest extends TestCase { public function testCanChangeDisplayName() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -359,7 +359,7 @@ class UserTest extends TestCase { public function testCanChangeDisplayNameNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -373,7 +373,7 @@ class UserTest extends TestCase { public function testSetDisplayNameSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Database::class); @@ -402,7 +402,7 @@ class UserTest extends TestCase { */ public function testSetDisplayNameEmpty() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Database::class); @@ -423,7 +423,7 @@ class UserTest extends TestCase { public function testSetDisplayNameNotSupported() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\OC\User\Database::class); @@ -444,7 +444,7 @@ class UserTest extends TestCase { $test = $this; /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -497,7 +497,7 @@ class UserTest extends TestCase { $test = $this; /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $backend->expects($this->once()) @@ -574,7 +574,7 @@ class UserTest extends TestCase { public function testGetCloudId() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); $urlGenerator = $this->getMockBuilder('\OC\URLGenerator') @@ -591,7 +591,7 @@ class UserTest extends TestCase { public function testSetEMailAddressEmpty() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -627,7 +627,7 @@ class UserTest extends TestCase { public function testSetEMailAddress() { /** - * @var UserInterface | \PHPUnit_Framework_MockObject_MockObject $backend + * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -664,11 +664,11 @@ class UserTest extends TestCase { public function testSetEMailAddressNoChange() { /** - * @var UserInterface | \PHPUnit_Framework_MockObject_MockObject $backend + * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); - /** @var PublicEmitter|\PHPUnit_Framework_MockObject_MockObject $emitter */ + /** @var PublicEmitter|\PHPUnit\Framework\MockObject\MockObject $emitter */ $emitter = $this->createMock(PublicEmitter::class); $emitter->expects($this->never()) ->method('emit'); @@ -686,7 +686,7 @@ class UserTest extends TestCase { public function testSetQuota() { /** - * @var UserInterface | \PHPUnit_Framework_MockObject_MockObject $backend + * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -723,11 +723,11 @@ class UserTest extends TestCase { public function testSetQuotaAddressNoChange() { /** - * @var UserInterface | \PHPUnit_Framework_MockObject_MockObject $backend + * @var UserInterface | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); - /** @var PublicEmitter|\PHPUnit_Framework_MockObject_MockObject $emitter */ + /** @var PublicEmitter|\PHPUnit\Framework\MockObject\MockObject $emitter */ $emitter = $this->createMock(PublicEmitter::class); $emitter->expects($this->never()) ->method('emit'); @@ -745,7 +745,7 @@ class UserTest extends TestCase { public function testGetLastLogin() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -765,7 +765,7 @@ class UserTest extends TestCase { public function testSetEnabled() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -785,7 +785,7 @@ class UserTest extends TestCase { public function testSetDisabled() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -825,7 +825,7 @@ class UserTest extends TestCase { public function testSetDisabledAlreadyDisabled() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); @@ -855,7 +855,7 @@ class UserTest extends TestCase { public function testGetEMailAddress() { /** - * @var Backend | \PHPUnit_Framework_MockObject_MockObject $backend + * @var Backend | \PHPUnit\Framework\MockObject\MockObject $backend */ $backend = $this->createMock(\Test\Util\User\Dummy::class); diff --git a/tests/lib/UtilCheckServerTest.php b/tests/lib/UtilCheckServerTest.php index b5a05535009..9ddb1f8e45f 100644 --- a/tests/lib/UtilCheckServerTest.php +++ b/tests/lib/UtilCheckServerTest.php @@ -18,7 +18,7 @@ class UtilCheckServerTest extends \Test\TestCase { /** * @param array $systemOptions - * @return \OC\SystemConfig | \PHPUnit_Framework_MockObject_MockObject + * @return \OC\SystemConfig | \PHPUnit\Framework\MockObject\MockObject */ protected function getConfig($systemOptions) { $systemOptions['datadirectory'] = $this->datadir; |