]> source.dussan.org Git - nextcloud-server.git/commitdiff
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit... 22199/head
authorMorris Jobke <hey@morrisjobke.de>
Tue, 11 Aug 2020 19:32:18 +0000 (21:32 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Wed, 12 Aug 2020 11:55:19 +0000 (13:55 +0200)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
347 files changed:
apps/admin_audit/tests/Actions/SecurityTest.php
apps/comments/tests/Unit/Activity/ListenerTest.php
apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
apps/comments/tests/Unit/Controller/NotificationsTest.php
apps/comments/tests/Unit/EventHandlerTest.php
apps/comments/tests/Unit/Notification/ListenerTest.php
apps/comments/tests/Unit/Notification/NotifierTest.php
apps/dav/tests/unit/Avatars/AvatarHomeTest.php
apps/dav/tests/unit/Avatars/AvatarNodeTest.php
apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php
apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php
apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php
apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
apps/dav/tests/unit/CalDAV/Activity/Filter/CalendarTest.php
apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php
apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
apps/dav/tests/unit/CalDAV/CalendarImplTest.php
apps/dav/tests/unit/CalDAV/CalendarManagerTest.php
apps/dav/tests/unit/CalDAV/CalendarTest.php
apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
apps/dav/tests/unit/CalDAV/PublicCalendarTest.php
apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
apps/dav/tests/unit/CardDAV/AddressBookTest.php
apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
apps/dav/tests/unit/CardDAV/ContactsManagerTest.php
apps/dav/tests/unit/CardDAV/ConverterTest.php
apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
apps/dav/tests/unit/CardDAV/SyncServiceTest.php
apps/dav/tests/unit/Command/MoveCalendarTest.php
apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php
apps/dav/tests/unit/Comments/CommentsNodeTest.php
apps/dav/tests/unit/Comments/EntityCollectionTest.php
apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php
apps/dav/tests/unit/Comments/RootCollectionTest.php
apps/dav/tests/unit/Connector/PublicAuthTest.php
apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php
apps/dav/tests/unit/Connector/Sabre/FileTest.php
apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
apps/dav/tests/unit/Controller/DirectControllerTest.php
apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
apps/dav/tests/unit/DAV/GroupPrincipalTest.php
apps/dav/tests/unit/DAV/HookManagerTest.php
apps/dav/tests/unit/DAV/Sharing/PluginTest.php
apps/dav/tests/unit/Direct/DirectFileTest.php
apps/dav/tests/unit/Direct/DirectHomeTest.php
apps/dav/tests/unit/Files/FileSearchBackendTest.php
apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php
apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php
apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
apps/dav/tests/unit/ServerTest.php
apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
apps/dav/tests/unit/Upload/ChunkingPluginTest.php
apps/encryption/tests/Command/TestEnableMasterKey.php
apps/encryption/tests/Controller/RecoveryControllerTest.php
apps/encryption/tests/Controller/SettingsControllerTest.php
apps/encryption/tests/Controller/StatusControllerTest.php
apps/encryption/tests/Crypto/CryptTest.php
apps/encryption/tests/Crypto/DecryptAllTest.php
apps/encryption/tests/Crypto/EncryptAllTest.php
apps/encryption/tests/Crypto/EncryptionTest.php
apps/encryption/tests/Hooks/UserHooksTest.php
apps/encryption/tests/KeyManagerTest.php
apps/encryption/tests/RecoveryTest.php
apps/encryption/tests/SessionTest.php
apps/encryption/tests/Users/SetupTest.php
apps/encryption/tests/UtilTest.php
apps/federatedfilesharing/tests/AddressHandlerTest.php
apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
apps/federatedfilesharing/tests/FederatedShareProviderTest.php
apps/federatedfilesharing/tests/NotificationsTest.php
apps/federatedfilesharing/tests/Settings/AdminTest.php
apps/federatedfilesharing/tests/TokenHandlerTest.php
apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
apps/federation/tests/Controller/SettingsControllerTest.php
apps/federation/tests/DAV/FedAuthTest.php
apps/federation/tests/DbHandlerTest.php
apps/federation/tests/HooksTest.php
apps/federation/tests/Middleware/AddServerMiddlewareTest.php
apps/federation/tests/SyncFederationAddressbooksTest.php
apps/federation/tests/TrustedServersTest.php
apps/files/tests/Controller/ApiControllerTest.php
apps/files/tests/Controller/ViewControllerTest.php
apps/files/tests/Service/TagServiceTest.php
apps/files_external/tests/Auth/Password/GlobalAuth.php
apps/files_external/tests/Command/ApplicableTest.php
apps/files_external/tests/Command/CommandTest.php
apps/files_external/tests/Command/ListCommandTest.php
apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
apps/files_external/tests/Service/BackendServiceTest.php
apps/files_external/tests/Service/StoragesServiceTest.php
apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
apps/files_external/tests/Service/UserStoragesServiceTest.php
apps/files_external/tests/Settings/AdminTest.php
apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
apps/files_sharing/tests/Controller/ShareInfoControllerTest.php
apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
apps/files_sharing/tests/External/ManagerTest.php
apps/files_sharing/tests/External/ScannerTest.php
apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php
apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php
apps/files_sharing/tests/Migration/SetPasswordColumnTest.php
apps/files_sharing/tests/MountProviderTest.php
apps/files_trashbin/tests/Command/CleanUpTest.php
apps/files_trashbin/tests/Controller/PreviewControllerTest.php
apps/files_trashbin/tests/StorageTest.php
apps/files_versions/tests/Command/CleanupTest.php
apps/files_versions/tests/Controller/PreviewControllerTest.php
apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php
apps/oauth2/tests/Controller/OauthApiControllerTest.php
apps/oauth2/tests/Controller/SettingsControllerTest.php
apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
apps/provisioning_api/tests/Controller/GroupsControllerTest.php
apps/provisioning_api/tests/Controller/UsersControllerTest.php
apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php
apps/settings/tests/Controller/CheckSetupControllerTest.php
apps/settings/tests/Controller/MailSettingsControllerTest.php
apps/settings/tests/Controller/UsersControllerTest.php
apps/settings/tests/Mailer/NewUserMailHelperTest.php
apps/settings/tests/Settings/Admin/SharingTest.php
apps/sharebymail/tests/ShareByMailProviderTest.php
apps/systemtags/tests/Activity/SettingTest.php
apps/theming/tests/CapabilitiesTest.php
apps/theming/tests/Controller/IconControllerTest.php
apps/theming/tests/Controller/ThemingControllerTest.php
apps/theming/tests/ImageManagerTest.php
apps/theming/tests/Settings/SectionTest.php
apps/theming/tests/ThemingDefaultsTest.php
apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php
apps/twofactor_backupcodes/tests/Unit/Activity/ProviderTest.php
apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
apps/twofactor_backupcodes/tests/Unit/Notification/NotifierTest.php
apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
apps/updatenotification/tests/Controller/AdminControllerTest.php
apps/updatenotification/tests/Notification/BackgroundJobTest.php
apps/updatenotification/tests/Notification/NotifierTest.php
apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
apps/updatenotification/tests/Settings/AdminTest.php
apps/updatenotification/tests/UpdateCheckerTest.php
apps/user_ldap/tests/AccessTest.php
apps/user_ldap/tests/ConnectionTest.php
apps/user_ldap/tests/HelperTest.php
apps/user_ldap/tests/Jobs/SyncTest.php
apps/user_ldap/tests/LDAPTest.php
apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php
apps/user_ldap/tests/Migration/UUIDFixInsertTest.php
apps/user_ldap/tests/Settings/SectionTest.php
apps/user_ldap/tests/User/DeletedUsersIndexTest.php
apps/user_ldap/tests/User/ManagerTest.php
apps/user_ldap/tests/User/UserTest.php
apps/user_ldap/tests/User_LDAPTest.php
apps/user_ldap/tests/User_ProxyTest.php
apps/user_ldap/tests/WizardTest.php
apps/workflowengine/tests/Check/RequestRemoteAddressTest.php
apps/workflowengine/tests/Check/RequestTimeTest.php
apps/workflowengine/tests/Check/RequestUserAgentTest.php
tests/Core/Command/Config/App/DeleteConfigTest.php
tests/Core/Command/Config/App/GetConfigTest.php
tests/Core/Command/Config/App/SetConfigTest.php
tests/Core/Command/Config/ImportTest.php
tests/Core/Command/Config/ListConfigsTest.php
tests/Core/Command/Config/System/DeleteConfigTest.php
tests/Core/Command/Config/System/GetConfigTest.php
tests/Core/Command/Config/System/SetConfigTest.php
tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
tests/Core/Command/Encryption/DecryptAllTest.php
tests/Core/Command/Encryption/DisableTest.php
tests/Core/Command/Encryption/EnableTest.php
tests/Core/Command/Encryption/EncryptAllTest.php
tests/Core/Command/Encryption/SetDefaultModuleTest.php
tests/Core/Command/Group/AddTest.php
tests/Core/Command/Group/AddUserTest.php
tests/Core/Command/Group/DeleteTest.php
tests/Core/Command/Group/ListCommandTest.php
tests/Core/Command/Group/RemoveUserTest.php
tests/Core/Command/Log/FileTest.php
tests/Core/Command/Log/ManageTest.php
tests/Core/Command/Maintenance/DataFingerprintTest.php
tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php
tests/Core/Command/Maintenance/UpdateTheme.php
tests/Core/Command/User/DeleteTest.php
tests/Core/Command/User/DisableTest.php
tests/Core/Command/User/EnableTest.php
tests/Core/Command/User/LastSeenTest.php
tests/Core/Command/User/SettingTest.php
tests/Core/Controller/AppPasswordControllerTest.php
tests/Core/Controller/AvatarControllerTest.php
tests/Core/Controller/CSRFTokenControllerTest.php
tests/Core/Controller/ChangePasswordControllerTest.php
tests/Core/Controller/ClientFlowLoginControllerTest.php
tests/Core/Controller/ContactsMenuControllerTest.php
tests/Core/Controller/CssControllerTest.php
tests/Core/Controller/GuestAvatarControllerTest.php
tests/Core/Controller/JsControllerTest.php
tests/Core/Controller/LostControllerTest.php
tests/Core/Controller/NavigationControllerTest.php
tests/Core/Controller/OCSControllerTest.php
tests/Core/Controller/PreviewControllerTest.php
tests/Core/Controller/SvgControllerTest.php
tests/Core/Controller/TwoFactorChallengeControllerTest.php
tests/Core/Controller/UserControllerTest.php
tests/lib/Accounts/HooksTest.php
tests/lib/Activity/ManagerTest.php
tests/lib/App/AppStore/Bundles/BundleBase.php
tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
tests/lib/App/AppStore/Fetcher/FetcherBase.php
tests/lib/App/DependencyAnalyzerTest.php
tests/lib/AppConfigTest.php
tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
tests/lib/AppFramework/Controller/PublicShareControllerTest.php
tests/lib/AppFramework/DependencyInjection/DIContainerTest.php
tests/lib/AppFramework/Http/FileDisplayResponseTest.php
tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php
tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
tests/lib/Authentication/LoginCredentials/StoreTest.php
tests/lib/Authentication/Token/DefaultTokenMapperTest.php
tests/lib/Authentication/Token/DefaultTokenProviderTest.php
tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php
tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
tests/lib/Avatar/AvatarManagerTest.php
tests/lib/Avatar/UserAvatarTest.php
tests/lib/BackgroundJob/JobListTest.php
tests/lib/Calendar/ManagerTest.php
tests/lib/Collaboration/Collaborators/GroupPluginTest.php
tests/lib/Collaboration/Collaborators/LookupPluginTest.php
tests/lib/Collaboration/Collaborators/MailPluginTest.php
tests/lib/Collaboration/Collaborators/RemotePluginTest.php
tests/lib/Collaboration/Collaborators/SearchResultTest.php
tests/lib/Collaboration/Collaborators/SearchTest.php
tests/lib/Collaboration/Collaborators/UserPluginTest.php
tests/lib/Command/Integrity/SignAppTest.php
tests/lib/Command/Integrity/SignCoreTest.php
tests/lib/Comments/ManagerTest.php
tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php
tests/lib/Contacts/ContactsMenu/ManagerTest.php
tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php
tests/lib/ContactsManagerTest.php
tests/lib/DB/MDB2SchemaReaderTest.php
tests/lib/DB/MigrationsTest.php
tests/lib/DB/QueryBuilder/QueryBuilderTest.php
tests/lib/Encryption/DecryptAllTest.php
tests/lib/Encryption/EncryptionWrapperTest.php
tests/lib/Encryption/Keys/StorageTest.php
tests/lib/Encryption/ManagerTest.php
tests/lib/Encryption/UpdateTest.php
tests/lib/Encryption/UtilTest.php
tests/lib/Files/AppData/AppDataTest.php
tests/lib/Files/AppData/FactoryTest.php
tests/lib/Files/Cache/CacheTest.php
tests/lib/Files/Cache/QuerySearchHelperTest.php
tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
tests/lib/Files/Node/FileTest.php
tests/lib/Files/Node/FolderTest.php
tests/lib/Files/Node/NodeTest.php
tests/lib/Files/Node/RootTest.php
tests/lib/Files/SimpleFS/SimpleFileTest.php
tests/lib/Files/Storage/Wrapper/EncryptionTest.php
tests/lib/Files/Stream/EncryptionTest.php
tests/lib/Files/ViewTest.php
tests/lib/GlobalScale/ConfigTest.php
tests/lib/Group/ManagerTest.php
tests/lib/InstallerTest.php
tests/lib/IntegrityCheck/CheckerTest.php
tests/lib/L10N/FactoryTest.php
tests/lib/L10N/LanguageIteratorTest.php
tests/lib/Log/LogFactoryTest.php
tests/lib/LoggerTest.php
tests/lib/Mail/EMailTemplateTest.php
tests/lib/Mail/MailerTest.php
tests/lib/Mail/MessageTest.php
tests/lib/Migration/BackgroundRepairTest.php
tests/lib/NavigationManagerTest.php
tests/lib/Notification/ManagerTest.php
tests/lib/Notification/NotificationTest.php
tests/lib/OCS/DiscoveryServiceTest.php
tests/lib/Preview/GeneratorTest.php
tests/lib/Repair/CleanTagsTest.php
tests/lib/Repair/NC11/FixMountStoragesTest.php
tests/lib/Repair/OldGroupMembershipSharesTest.php
tests/lib/Repair/RepairCollationTest.php
tests/lib/Repair/RepairInvalidSharesTest.php
tests/lib/Repair/RepairMimeTypesTest.php
tests/lib/Repair/RepairSqliteAutoincrementTest.php
tests/lib/Security/Bruteforce/CapabilitiesTest.php
tests/lib/Security/Bruteforce/ThrottlerTest.php
tests/lib/Security/CertificateManagerTest.php
tests/lib/Security/IdentityProof/ManagerTest.php
tests/lib/Security/IdentityProof/SignerTest.php
tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php
tests/lib/Security/RateLimiting/LimiterTest.php
tests/lib/Session/CryptoSessionDataTest.php
tests/lib/Session/CryptoWrappingTest.php
tests/lib/Settings/ManagerTest.php
tests/lib/SetupTest.php
tests/lib/Share20/DefaultShareProviderTest.php
tests/lib/Share20/ShareHelperTest.php
tests/lib/Share20/ShareTest.php
tests/lib/Support/Subscription/RegistryTest.php
tests/lib/Template/CSSResourceLocatorTest.php
tests/lib/Template/IconsCacherTest.php
tests/lib/Template/JSCombinerTest.php
tests/lib/Template/JSResourceLocatorTest.php
tests/lib/Template/ResourceLocatorTest.php
tests/lib/Template/SCSSCacherTest.php
tests/lib/TestCase.php
tests/lib/Traits/ClientServiceTrait.php
tests/lib/Updater/ChangesCheckTest.php
tests/lib/Updater/VersionCheckTest.php
tests/lib/UpdaterTest.php
tests/lib/UrlGeneratorTest.php
tests/lib/User/ManagerTest.php
tests/lib/User/UserTest.php
tests/lib/UtilCheckServerTest.php

index 63453ca0ea0322c35c4026068df7eed2cfe406e6..611f7a3edcba1493784439a599aba84fd195f1a2 100644 (file)
@@ -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 {
index 9b73e80f03b2f5a3e47add66bc853aadd45af2c8..576cc7d9a25fbc8812692cfbe171775e96a50b7b 100644 (file)
@@ -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');
index 3127cd3b9d0484f7b053fea7a34db7c8a3358b2b..103d21d76a31f168a2ebc63cbb1edf04576abe49 100644 (file)
@@ -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;
index cba183a9497a57959d7f9d7dbc9ca345de04f5c4..99cdd27a1c88a3d6429a8686d38f670dd1084064 100644 (file)
@@ -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 {
index bb1d660af1ed33ffff609d17ffabbbaad5465970..daf638aa3d13d95930b8a3563b92f4a09afcf3b8 100644 (file)
@@ -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();
index 8fb717e4257aa8748829ab900b0fcd2488b2a69a..71380c06fecd88ed2d0e8d091327aef917baebfa 100644 (file)
@@ -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())
index dbb79176320683dcaccb7350c68c69809c1205c4..4f400ae7ffe702ecb699f8ad86765a7248f06d59 100644 (file)
@@ -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')
index cce30d75fd273d6fd4286838da6fb492aad2cc14..8a0e9a2d026939b43663760402fc331938707a2a 100644 (file)
@@ -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 {
index de81e90366753961d8ee0465fd7723aa5c3fe296..d47e6d167f01117c52897e38973b58392ec67edf 100644 (file)
@@ -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());
index e97ef8adfda35bffd7381af7f66a0d5b5c26609c..b5e849b6f5142da32dede7a95e00bbb7389c621b 100644 (file)
@@ -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 */
index 2bd142fb086415abd68cbc0456c39b31fb8584a5..f80518bed657b89627c75a675601572681caaec3 100644 (file)
@@ -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 */
index b7d907e5ce5f31f28b6ffe2e524730cc74f99ab2..a36df7d710a10d962eb0a02a7a614d40926e1941 100644 (file)
@@ -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 */
index cc960b4e5d2525d647d5f2495c2fca42614140e2..7c099f07362b1efe3c1ed1f82e6630e6fd3259f4 100644 (file)
@@ -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 {
index 79da92148affea45e91db3c4be617a34801cc2c4..c7371761266cac2050c5365de3f8d103d60ad1b3 100644 (file)
@@ -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 */
index 1e0fbe7b984144b33d270a6f3ade32830c9095c2..d5023ac91c520580abe5c2b592201d62d03212a3 100644 (file)
@@ -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 {
index a44c9b5abbf021cf91990037d661cc87b841609b..0462928eef22fd9ea81c0b49224569ee1c13fb66 100644 (file)
@@ -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 {
index 645eaa8b2f85b7e747bcf9e3e72339d6ec08beb2..0f4b64fc72751f09a9bcddfd7c6777f8e302f6e5 100644 (file)
@@ -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 */
index 4e343340f25fc2e5ec5720f3f8d26ed950bcb2b1..ee08719f9bc135f5fbe74c879b6d1ef7ec84bad2 100644 (file)
@@ -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);
 
index 6f35b09014a61da54577bf27effab1b16c4d9981..d78f2a54cd838f9ce7f3ce82beb9c6e368b60c26 100644 (file)
@@ -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);
index efd9353d1dc2bf10f7b2a40e47ca35c184794922..f84934a60299f3d8f6433caae78d74a8e0098710 100644 (file)
@@ -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 {
index b4095990e50818997089e39b89d626e3e0b55bc8..a04bc1afdc7eb3ee5e1f9d36e94f4d7049d3a32d 100644 (file)
@@ -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')
index da3a6f9e55cf58cc2f3c2ecfc9e78246b59e31bf..e143820daeb5518059a70fce8c1e24e125eb002e 100644 (file)
@@ -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')
index c70ec6e17f317050d785cc58c395babe05c5eba2..985da38133c6dd44ecd8607f1ee783d8ad810b7f 100644 (file)
@@ -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;
index 5710a1793c6d9909c07328058de5247635e06f3c..446452ae6c014fdd9b2eee48790e7246f8493f9f 100644 (file)
@@ -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);
 
index cf30df723cf01294f7486514a0353891006789df..70731878a41bec695281902e1af19e9b1e1e691d 100644 (file)
@@ -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 {
index e614da37f4c1caee686cc705c4049b7287feb123..d4649fccd29211c3de9b64f7d2cea8b34bdcb025 100644 (file)
@@ -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 */
index 242106fbcc99e1cb25f29d329e4257a36bc10806..2d8c9cb10ab07ca194d21e981fa8ea3257e7f5f3 100644 (file)
@@ -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(
                                [
index 0121df9c8d54bd0befafd088de83537ed1603baf..cddbd5164dce1284ef6c13ea16853305e2bf2a67 100644 (file)
@@ -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 = [
index 8885637aee679976be3a79da995dd9b9d4672330..ee73c6437f574e5c091755083cd6dfdf1de52cdf 100644 (file)
@@ -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])
index 0e507bc6b3db3fca3f1eef411d7294dcd92b90c2..6b90096c57f7d2b7c45845d11be6c82c3cef289e 100644 (file)
@@ -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();
index ef2652121cb4e231245f27d2ffc0f90a520dc6e3..63c1413eec0c8cf9851e6022a467e1690ac4d340 100644 (file)
@@ -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'],
index d502783ba416fd15e57b53d26fb4f42dd7e4b9ea..8b4125c6c68440a4b08213e8f7e790317770aa8c 100644 (file)
@@ -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();
index 1fbcea4f3f6be31c5406dda0e521f4b5f7b1182d..649249659c7ba482fad15e475d6fdb54c503b6d9 100644 (file)
@@ -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 {
index 48d9479c9991b78b8d136c65904b0aed41713055..146ead4ed3fc208a8dce0c8d536b35d036eb5480 100644 (file)
@@ -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);
 
index 87e239cfa5e32c25546e13b2a309f926616a55b1..0a474d649bc23d3011de0db99a0d83e611ad0098 100644 (file)
@@ -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])
index 750863175a2d6c8274900438aaa104f265d3b1f7..25c283b8964794f508dc3705d48cc248fbe539da 100644 (file)
@@ -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 */
index 2416ec6978f863929a98d8eb497ec5a79d1c322c..296cec48bcee9471862699b3c1466d3809b83ccc 100644 (file)
@@ -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);
index 6bb0033ecb897608669b44e1abf2b8bd207d7b3e..b9633c7e10ae8a02fa0cc44a40f19e2e7d3d915c 100644 (file)
@@ -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;
index b7e8f3c5e5d62cfc61364f34fe46c4caf1b80fdc..f8f3990fbac1f0ce9bcdd14bb34c2fbfc1b0e5bb 100644 (file)
@@ -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);
 
index c7833395b0dc977c8e0a659a989f5a75d6fefe92..dcdc8608c67505522865ea5765270359678e936d 100644 (file)
@@ -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);
 
index 68098f2aebc84dd5a4e75ca0408a30998277bee0..8df7dd70dd35c64baf19aed2cfc53454d19050e5 100644 (file)
@@ -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);
 
index d3d17b0367328664ba392f610db216fc10b89c3e..b8b59546eca9b882b66c9a3232e40c15b0da484b 100644 (file)
@@ -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;
index 0001f7913b1c4c11b0f4c019b54c6a3000893890..7ab7f463a9f4a2ac04044677f9eae9555cbaca33 100644 (file)
@@ -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);
index d2f2d8f2d4c75819a67ad94b3c279631da9cc999..97eb3301d3bdc1ece52328d34a33126fb59e7b45 100644 (file)
@@ -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())
index 69b2dd5877eaafbf7fdb73d00e1ae02392acba29..00ec8b17837f89538256f01ded5b6f7d7867e2cc 100644 (file)
@@ -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 {
index e9a483d7e49fa9c98d33224e2c27284b0ccda56f..239b6c72f76cd62cb9284b7da6df62ba0c0f07dc 100644 (file)
@@ -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() {
index 52b94f63811190ef8bdda86bee1a7261c543f3f0..7770239fe55e1dd4993500dab177299b0b3e0137 100644 (file)
@@ -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);
 
index 9ce2837332f6180a5d4cdddd9b85851e15857292..15007689b6481864db9167f9d43f39a929b3aeae 100644 (file)
@@ -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(
index ae678c7e9dfe917b116caa8ec7689af3ea449ea6..2a6bd96c543aea3859399b5ed16c3f38d4334b26 100644 (file)
@@ -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);
 
index 0f2305be23bd1fccb7812756dd57f6b9e996ed8f..117707eaf2a3b7e4914ec61dee63c698d3ca1e69 100644 (file)
@@ -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 {
index 194f9375f68b184d2c766653bdc391d17f8dd694..a4edbe6d942e782fe217b4f9197d6abe1734a598 100644 (file)
@@ -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 = '') {
index 1e2cef4e37ba557aaf87609b28afe5bc0fbb0519..6dd5525dc7b3f5fb37a3eaf83154f5ee3bb046d2 100644 (file)
@@ -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 {
index bfafbed7611bbfd2d28dc6ac5f2a4ace812890aa..72a0cebff0fa082c75da854338b14038b6ae5dbb 100644 (file)
@@ -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 */
index 6e3a562e801cb6e55369523e6680427daa69c54b..2fbfbedf4617d2ffbc0085d7ae27806b270d13cd 100644 (file)
@@ -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 {
index 0343902ee658606997f92ee18afe9dd3369db988..370852abdadf7daaeba24947748bcfcb34542e6e 100644 (file)
@@ -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();
index da812016f2118fc66bf45f251702a4b761c79203..5c813c0cfe72168d0e2b13a3fc184d2641a94397 100644 (file)
@@ -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 {
index faf4fba7ee2aeb29b384c034349bf0f22832032f..7011d00e3b4309a6c93ed79f5337013880f6ec37 100644 (file)
@@ -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);
index 836e66cd0d68d7bf5afc39e7e2713e021f9df4ea..c094bc2f860800a583740d5b05aa8bdf4a469fd0 100644 (file)
@@ -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();
index 22fbf737793df9f96438a7f4a192810f11b9a3ca..038e0f9e7bf324e81f8b5afb0b0aa577ec520ce2 100644 (file)
@@ -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);
 
index 22dc555c186e2ae0fbafcc60e13998090fc0a43b..2bf7eee908db6c74883fd8ef5928a659d96b834d 100644 (file)
@@ -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 */
index 2cefd09c819a21c581bd99195fbcf22520afe55c..b3b1754ec0ffec0b33778ea6653293d1e5ffc83b 100644 (file)
@@ -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 */
index 733de9ea1e953f9e09ed4c880acd3e8fbc476a6d..53a733d2503a80fe16fc4dbc2b25252938da7292 100644 (file)
@@ -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 {
index 1143fd8192d88223ed17b6734a289f152d2e6bc7..0281f98858f0f6cf6aeef5e471729f7947b34846 100644 (file)
@@ -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 {
index 293a7abf45e3dab812974f4fe296a4c327add79e..2365c94736c14dc21b092ff1e162fa52c9ada5a3 100644 (file)
@@ -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(),
index 6856915961f03b21298594f0ab0be2bf8ef37a72..60f96271aaa0dab36d9040b7b0e61447ca202e1c 100644 (file)
@@ -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 */
index ef7f2580941edb3c8dff1fb70b8f2ec341b8f9e6..15e0ea71066a8913a14acd749366e032694336f0 100644 (file)
@@ -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 */
index 75ca0c28cc2ca6041f9f6f2645ede178113ff843..83d618938bdb83ed68308485b0d7f9128129c755 100644 (file)
@@ -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.');
index 3ca8d588475007072fadb87bdaaf47d705ce08d4..93ae1b41ae2e0f2c350dbd1d044b278eb4eb13f0 100644 (file)
@@ -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 */
index c9bdb2627c507b7b92ba7bd1cd9182efa5d7f504..50cb46df69476629b93c14084a742ffb3d55a085 100644 (file)
@@ -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, '/');
index 195930e1c67f151ed18f9d4e8396f1fde212824f..82148e10dc318b76c1e63fca69d93b1224d51f1e 100644 (file)
@@ -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 */
index c0b8c92964f6a66985402860d28220569b97e620..b4bad9e29b99bc090d9f09caf3afcb239ca796d8 100644 (file)
@@ -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);
 
index 27d6cbf7e850bb1c83393d9d81d25fbbb68634e1..465bdf58edac616303fbb49a7e7662143e4c96b1 100644 (file)
@@ -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 {
index b8db72938a570aa3cfcb3e871ed2543dc487f620..ebaf477ddc56a7c40fff97be0e85f459489f9e27 100644 (file)
@@ -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 {
index 27d67a12dfa0ae192681c35be26e842ea997a641..d92cfebf295417128ff4d08894c72c4fd038cfd5 100644 (file)
@@ -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() {
index f0935f1b788d64a229b495049d59262ff5f3039c..0c50491857bba53cf685bf7570e7b94b0c9c0b1b 100644 (file)
@@ -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 {
index 5028fefbbe00b0f07904e23e1f8426e7f7be7d21..4c1c59bccf7cbddf5c9e22bae80ed45a1e758f36 100644 (file)
@@ -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 */
index 6f7b0cc2765a1508169f1feccbb83d0c62c3d09d..4af41a9aac00a96224801dd01e78347fbb31ee2c 100644 (file)
@@ -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(
                                [
index b4d846bfd5a8cb1cc59c1404bdb6c6fd3671058f..2721a6e8b53b220c344b4ddc553465c4d68a351d 100644 (file)
@@ -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 {
index bdc05035ea49065a7896f43e6e67ed4cf243c82c..10d667bb4a82145d2ee90d08e747c15f63edb97a 100644 (file)
@@ -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(
                                [
index dee1118a992db3b853cb50cd51fb05f572536da0..c14ee22e879e4d4cc7d7a1ed86e6d266183f6d45 100644 (file)
@@ -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.');
index dcd82fe7e0f1b7657582f74cf708a71a902e2cae..74e2e7716d613f87fb78f110bfef9ab16435f10b 100644 (file)
@@ -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(
                                [
index da5777d75ab3027bedc5e2a91bd9377241163f8f..78c506a18d0d2bd6d88046dd5069fa18187b3664 100644 (file)
@@ -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(
                                [
index df5dc3241c0e8fed24f9c74c3d569442fa5efef8..a5b531e51f43c2f93ce8b8bacb623596645e997c 100644 (file)
@@ -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;
        /**
index 19425cc8531b4a7ac4298e98759e507c402a3cc6..079f906d1d6cfbc473c822684d4c934d0c8518de 100644 (file)
@@ -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);
index 44bb2e55e8695142d1c01350858530c3ccc7f08b..779bb5d82ea45779d1314e884ce5efbe8c8afc69 100644 (file)
@@ -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;
        /**
index 27c1469b0315c151e44e321ba7e6958809bb2280..5a573f278e464244dc361b461e9bf65a1b172246 100644 (file)
@@ -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 */
index 300622f1c00a84d4655c2f4ca200ff8eddcba514..6cfe9d60e1d5a5a12773d8a931827441f988da5b 100644 (file)
@@ -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 */
index 1d885bb601de33015771ef128e9563ddaa3861c6..11dd585f66288ed05214f96d38be2a6ab614fc00 100644 (file)
@@ -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 */
index b192b466d592a9ae9e362e70c928aaddc007d19a..1b02d8d0b7b005567d56685dbca402b543257daf 100644 (file)
@@ -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')
index e3e13f05867570b02fe853b6b6234b9fe2b59aa1..aed08424475e0b6b037966129ed5440292843d5d 100644 (file)
@@ -57,23 +57,23 @@ class FederatedShareProviderTest extends \Test\TestCase {
 
        /** @var IDBConnection */
        protected $connection;
-       /** @var AddressHandler | \PHPUnit_Framework_MockObject_MockObject */
+       /** @var AddressHandler | \PHPUnit\Framework\MockObject\MockObject */
        protected $addressHandler;
-       /** @var Notifications | \PHPUnit_Framework_MockObject_MockObject */
+       /** @var Notifications | \PHPUnit\Framework\MockObject\MockObject */
        protected $notifications;
-       /** @var TokenHandler|\PHPUnit_Framework_MockObject_MockObject */
+       /** @var TokenHandler|\PHPUnit\Framework\MockObject\MockObject */
        protected $tokenHandler;
        /** @var IL10N */
        protected $l;
        /** @var ILogger */
        protected $logger;
-       /** @var IRootFolder | \PHPUnit_Framework_MockObject_MockObject */
+       /** @var IRootFolder | \PHPUnit\Framework\MockObject\MockObject */
        protected $rootFolder;
-       /** @var  IConfig | \PHPUnit_Framework_MockObject_MockObject */
+       /** @var  IConfig | \PHPUnit\Framework\MockObject\MockObject */
        protected $config;
-       /** @var  IUserManager | \PHPUnit_Framework_MockObject_MockObject */
+       /** @var  IUserManager | \PHPUnit\Framework\MockObject\MockObject */
        protected $userManager;
-       /** @var  \OCP\GlobalScale\IConfig|\PHPUnit_Framework_MockObject_MockObject */
+       /** @var  \OCP\GlobalScale\IConfig|\PHPUnit\Framework\MockObject\MockObject */
        protected $gsConfig;
 
        /** @var IManager */
@@ -84,7 +84,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
        /** @var  ICloudIdManager */
        private $cloudIdManager;
 
-       /** @var \PHPUnit_Framework_MockObject_MockObject|ICloudFederationProviderManager */
+       /** @var \PHPUnit\Framework\MockObject\MockObject|ICloudFederationProviderManager */
        private $cloudFederationProviderManager;
 
        protected function setUp(): void {
index 32ceedd45c0f377da637466277d8465b62f3d118..29826c1e1b4910a8a2d3c416a7825110f24ad95d 100644 (file)
@@ -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)) {
index 4f53b3cd741608698bf45bef287fdc901c1c42ba..0285739cfead119ada654d1f981269915ac56c49 100644 (file)
@@ -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 {
index 504796547529b4058cfc2b4fc920dead9e650050..9d8dd676e795e7a2c8540a218f81156a5aa4664d 100644 (file)
@@ -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 */
index 691b9fb19a41bae76c93d563c89b0da627df5032..435503e9d3884211c05ca47f4e8f62555dfd3be3 100644 (file)
@@ -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(
                                [
index 2ef6fd4250d6a7620d0ee24187c6261f3a3c06ac..8bf06d87c0fb5242780f87ab0bf520505bd4236e 100644 (file)
@@ -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(
                                [
index 3617e4c24678388b803be4e19e7bcb116a425fb5..96987e52d7225c6bd1d7c6be63db5100402027d7 100644 (file)
@@ -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(
                                [
index 90db0b58035626e989bf990cb88844d141cb7f15..8677d4bdab2d9fcac6ee7f001209796ede347708 100644 (file)
@@ -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 {
index 6e91f147a8413210f79625896dcd749c2022583a..46cd6d966596c999dd96921ba4cc1e642173c9c6 100644 (file)
@@ -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);
index 7256333f9b45f000ef70962e1ecdb20fa914becd..8e8dbc4becdbdbb0854747fb611e4ca0867ee3aa 100644 (file)
@@ -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 */
index afb6b2408f9ad02413261ca679b12a63604ee137..c44081064c1ccddd209b959d1b2b817dce1dd094 100644 (file)
@@ -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 */
index 41116d40cc879597f75e96ca2fa0e4f8aeaad4b1..35fecf2f0e4f90eb2994c9bc7e182f65754c5f74 100644 (file)
@@ -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 {
index fa6e3a575e1d330a10c298476d7823312175d617..c71556ebf0c671d1defbbc8842ffd30b28fef6ef 100644 (file)
@@ -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();
index dc91e9057f180dcc3698fbe89120b221dcf54451..0073fdcf7c987f025875c6adfc8d60130a625e42 100644 (file)
@@ -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(
                                [
index d347cffdd8183fde93b7c8137dc493597a877f7a..bf3ca5e5a87bc29becb47ce9ce83d123c98996ed 100644 (file)
@@ -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 {
index 50eb40079a08f519f396163d151a4ddebb57c658..c17c2ea3575a3704d907a2c26e2d78775b30faf8 100644 (file)
@@ -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 {
index ca6d98909ed8c75d03e229de6ee5fe5e76dc30ef..e9c55400493983ad2e1088c3c5134429c3381511 100644 (file)
@@ -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)
index 8edf7358ed86c90a975297b79abf16483462c5cb..2abeef4936ef16b74fec9f138bdb2a2c7f5c3563 100644 (file)
@@ -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);
 
index 668be67dc8b7c43b9d69043bd239970d197a7f5d..1479d53244e0c3e35fca9be449440695424b08e6 100644 (file)
@@ -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())
index 27ceb67beba7c4fb83f957a492f07752543ce862..4f0c2501ef0deec73ef52c428db65eb4461d54c9 100644 (file)
@@ -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) {
index 1563130164879d6d602333c73f0cd749be2feb26..c46470021d4ce70b6c57709607b34662a48833f7 100644 (file)
@@ -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);
index 5fc03cad9e40cd22b60b4e19ee98b373e065d247..0c8e990125a1e3a83ce7ad79320bde541434a313 100644 (file)
@@ -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 */
index 0964f48572b044b194122df6a0dec446548b0f36..6d120cc9e164a5daff1431878d4d1231c9fe201c 100644 (file)
@@ -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')
index 76f0a09c14bfc629cac19138c4ec1f5e04371765..5f10a9b9498757f1657c9f56b3efd186ce30530e 100644 (file)
@@ -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;
 
index f99b25a9fc71ded8484e2ae328e3074eed4b3152..457808bff7334a66473feae918fe9d6254633a0e 100644 (file)
@@ -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())
index 9dd4a570c334ba0141b969e61dc81b80aa17c461..290b48c86c03b4a37da4c29562583108a31a26b9 100644 (file)
@@ -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())
index f8d6bce1d62a1aa8c0694a3d9b030570ce8c90fc..4d6a0ef6f8f367c008f21c1efb4636531dddd430 100644 (file)
@@ -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 {
index 1efd99706c29c73af888310a5c6ca4edda0a79f0..9b5924c9decdd33b292f68ad6819fd151da8f900 100644 (file)
@@ -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')
index fb6014be9b6d0e560deb108dbe973102b67261a2..6fa0ad7efc219c7cab733e2d4d54ddc52570b6dd 100644 (file)
@@ -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;
index e186092f0bfb4b7e6d0fe5e4b0f5ba1cd4c6b7bb..4da51f7e5e9046f9061dd93df06da8143d1dac30 100644 (file)
@@ -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,
index f43ca13a6747c423178e0e4c585aaffedecaa3b3..9ea93b9900ab5ef8f3e863a847f8f940592c66c8 100644 (file)
@@ -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;
 
 
index d3fb914f4040f82109eb6b4c616ee4dff8bee456..8baf4f26b0c66c5cdac2c2c2101c05de69e22857 100644 (file)
@@ -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,
index a7ec79e9c2af0b86235f36ad1174a1b98d87c1c4..c8ae7a648313b92d3879f9a7a8aa207cec44147d 100644 (file)
@@ -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;
index 9cfcf54b484d26f2e237aa4bdf4694083621248a..15a023f1b96cec896afae99e71ed882a49b8c38c 100644 (file)
@@ -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 {
index e7457b4096ba2112087287f80545bf65894b0b0d..32be9e3212f2aa2a01b1a7affdf4e443d1864027 100644 (file)
@@ -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;
index c290183d0461558d9e56ae1f40e92dcaf25c5e40..deab3f07e2f27fcc35fdacde6f1c02a211e5b040 100644 (file)
@@ -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 */
index 2c33f5617b7b2e9e1dc689b5dd6a42e90b7459d5..9b5f61e81ad215fe3bf61bcf0073e68e98211cf1 100644 (file)
@@ -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');
index cdba86863f1bb95df6341a3fd62edd674fb740e0..ec529c6406643cce7f111a3d72b02cfa4b9f8764 100644 (file)
@@ -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 */
index 60c622ec4a42e076933fafaa9a9ff5200b99e74e..ce91699837204e1ef4dcb2a4dfe6430575c11a30 100644 (file)
@@ -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 {
index 18ea42e78cc1802b3535912ff05256e470ee6ced..f9510ac8a5ff002f7bc2a1ef3ff6019f9abf8ad7 100644 (file)
@@ -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 */
index 25d12563429806a79d0d7dc0064e6b2975df02b7..a07aa46c4d18f3958753d01b11694d63947d50ad 100644 (file)
@@ -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 {
index 36628cb08b9e6f0bcb1c0ff971d9daf8ac6ff883..6ca8124bff3badccebf9c4b22996f745d1611037 100644 (file)
@@ -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([[]])
index 89474954161da29cdf5170586e71713d1dff0587..5afa2312d1f88221fa99672268c3f750097e9c9c 100644 (file)
@@ -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 {
index 64732ac863376e9b49d95e0d06e8ab74c2cb613b..408b69d1c457a4b7e8ac2da144b34d0e3e7e844b 100644 (file)
@@ -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 {
index 8ed4afaf27b17815449df694e90b6122d2e991f5..6b3c85b0d822430ba10496488b5315c785f660f4 100644 (file)
@@ -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;
index cf4fdbce328c0ad1da912fd29782c6bde88a269a..7d7c3719bc30a6d26a4d1bc2469166f10742927d 100644 (file)
@@ -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;
index 1c486f2a43786b98492c3ff453934fcca935f311..25e507f9013607d55b1dda4a890f78ab951aae08 100644 (file)
@@ -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;
index 22172ed711f3d7d73762d138dd4eadbc838596b1..6cb08e968c06a9ebd929be2f3cff143de0edbb55 100644 (file)
@@ -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);
index 367a54465bc219109885ddc3928e13c2ec7b96d7..1973e6f8b6afca116b441ff63bffe7276b878029 100644 (file)
@@ -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);
index ceb84cbed4e1e3b5987a70667811daf512c118a3..b025236c26c7dcdffb5a1942d68ac000ad0b6c76 100644 (file)
@@ -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',
index b3b2184b2ba35a0b3438bb76c4c8479b18e2bae6..90a480c18ad5512f6232aeec2a5f8bcff320f8b9 100644 (file)
@@ -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 {
index 271427d455a4068d9e492fce548ffde7ccceeb54..ff3a43ae2a4f9bfeb0b149b98d97b37d9d2acaa6 100644 (file)
@@ -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;
 
        /**
index 7611d6bcf68d11af612364b45325f3c4d0faea81..a4e6a3b7d99cb58939563b3eea7643cdf148ef38 100644 (file)
@@ -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',
index 9029b1af3963ae763d9db290f8b6437fa95a2c76..8cfb149188ca95beddedfa958c62735532933162 100644 (file)
@@ -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)) {
index aa3a80dcc26fbc039dc23fb66488129638a4114d..fdb5da3bb548b328514ee5138a4fa43af7443d3b 100644 (file)
@@ -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
index 72e5034d51760fc6c0c9947fc075a111c87401a9..b1b3527f3354db620686d456ec42953015b9460a 100644 (file)
@@ -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 {
index 628487b2aeef722054390acb48a87265b13afd62..5dde34870d81938a49985af9c54d5beb9b05243f 100644 (file)
@@ -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')
index 9f543031964c5b05a9787013bfa079d55df1a257..cbb2e5da2ce8743e5cf356a96e571cb95450ff17 100644 (file)
@@ -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());
        }
index 3ad31f029edec608dea329cdb4df23470ccedba6..1a11421ce1d34693638d5e05614e00a7a6406b5f 100644 (file)
@@ -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 */
index 05b74c58e79d694aad9dbe1c7c04e4bb39328be8..6cd35be4fa4fc33eb8b7ab97880ff53c145001db 100644 (file)
@@ -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;
index edaf1a451b57d7868f2d3f4639e8edd17d38939f..cb00251419a135aa9b657f855734c6de8f8fe445 100644 (file)
@@ -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;
index 1187ecf036565c729ac0829f06c1737f7264a2d8..a14924db0493ce89c1ca75972e39d2baedc35b3c 100644 (file)
@@ -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);
 
index 93ca2070f790fa9e7afbce0990b9af5011ba166c..5ba9fc6b6504b1c81172b0e150683abbc3654603 100644 (file)
@@ -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;
index e5b6fb72db0c7ce0b63ec40af204d39ad8a21f02..fecde37262285a8623a41d98b2aa91b804cfc237 100644 (file)
@@ -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 {
index dbfc6fa70e1adf8b5ad9848beb0038e49083cd73..e7f89f04ecfde380dd559f0195dbac21c40dee0f 100644 (file)
@@ -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 {
index 464b65dbebbf4d9182e3aec67e733f4b99ef9a06..8f56cc2fd59bdd2c8f5f035b2f27ff6e4865945c 100644 (file)
@@ -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 */
index 1ced1dbf6842dd25a89cfc28ba53d75943667fa0..a05e2cccc224b4921ec938b86a336484b61daa95 100644 (file)
@@ -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 */
index bfcab55666931142ffbfdd2a2f0d23c48bfced0d..1c7faf6210fc586060dc7063af896b43b2a6ca8e 100644 (file)
@@ -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())
index 1c33cca2cb644b44d221d4f0efdcd65eb20eaa11..d0d22bbcb5bc3ab56e423250e89469fa7181fadc 100644 (file)
@@ -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 */
index 20cad61530d54f997655544f57cd6e1078119e88..ef17459cb06d39637a7f7daa47a052ec1f02d0d7 100644 (file)
@@ -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 */
index e40364cce09058f573e5c1877581f14c85195a4b..ae048392712331191644d7b04cbd0140b190147b 100644 (file)
@@ -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 {
index 768000c70e676413a27381ab3b5e41f0fb8b94f7..09b1cb06d5a0cac4b360f9f0519f61cf0f5e76af 100644 (file)
@@ -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);
index c00bcf842c3950a67c612ccc5905edce7572fc7f..fa7b4a6feca0323b4756563808f26541ea7385ad 100644 (file)
@@ -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)) {
index 0de038c5768f7bba1b4d8304202d5f8f7a8b94e2..36e0ddf374dabe02baf30527bfcaeb013009ca79 100644 (file)
@@ -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;
index faed2c23a8ed6934a9893726229ff0a62caf4562..78afc6a3ac08015f16981f52ec63b2446a404a72 100644 (file)
@@ -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 {
index b5f7cee60ce640426580f589162eb79a73c4c1c2..ba5f8341bb0a0839ca214b22a287f43625322c22 100644 (file)
@@ -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;
index 5aec76eb385e6e2de05a6265507fd56fa4a70a89..549f6600b4dbc96fed6d603a4aa0a09adf771ca1 100644 (file)
@@ -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')
index 721966025f0cf42b635357757a1ba00f4307b2b4..a4fcf0300837805b547a8da0f3860c8f98aeeb3b 100644 (file)
@@ -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 */
index 5aace2c5c916f0e09531c963a01db1736fa7e2a6..1822c27a1cdd85720f0a5a3c425ef0bc38669f35 100644 (file)
@@ -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 */
index 0971e31ae85c46b6ec9ccd6fba74215cbe790eef..cfe6bda5977c38ccfe34ac41543db0c09dfc241c 100644 (file)
@@ -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')
index de2d7c0d3a7ce889ff030faf989ca3a085c73ca2..aa2d4f2a6ec02e7b625243123672025df9b3c3c5 100644 (file)
@@ -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 {
index a1048609e692c5023e04837b82bc6af97e059af0..68b6338e5be9c1767e94ccbd0ba65633936968a9 100644 (file)
@@ -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 */
index 6d0fb5ad6e822623498355b8a6a2ed7ae5118239..5e39b974fa8938abc73f6a8a7022052ed814bc65 100644 (file)
@@ -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 */
index d8f18da623c857549f6e3e036a75d0b1669b4464..510b94e4b61d309ae5f2790a3ddf456e83907f11 100644 (file)
@@ -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;
index 06378289934b27cad4a0e266becaf05926d7d7a1..d9847725c7b73ed490c186c4269f93544f927160 100644 (file)
@@ -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 {
index 98365bbfdb55c39f0c8897c4dea06a6273152caf..18499da9a869974a4af160f22adf1bb5242bc48d 100644 (file)
@@ -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 */
index 373f5cc93263fc789082b6d1656e2a7153959dfb..12991835dafb3a6be08b6453e2c749165d8b2fdf 100644 (file)
@@ -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,
index bfdaa99ac008059d0721855e9ae0ee7969c1d7ef..1c10e9955b3fe3e7c8dae18c3ad1d92e72b2fe7e 100644 (file)
@@ -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 {
index 7d2f0c60a82f4d7286511392e365eb9305c4cb0b..6cb37d5294a8c7ae836b4c2d6800212e3f1d07f3 100644 (file)
@@ -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 {
index 5595ff304407734e2dec207cf685b92be649409f..da3239cb8f8d2a18f4e05da04479365e5c5074db 100644 (file)
@@ -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];
index c986a2daab58e71fb36974eb34d8f5b82401dda9..92513996ae1223e6073aeccc3c1931bdfb4848dd 100644 (file)
@@ -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)
index d8628b7c6f8ee4130363922dc77b3250a1f82434..7c29006b33d0877bebd267f524cfaf98ddc804f4 100644 (file)
@@ -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)
index 7ea5aad2a6e0a47d4060671024bcd5ea9b8f5fa6..12987d4064b86db63bb07949115718138d607ef0 100644 (file)
@@ -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();
index 442b9c5a8ef8414468f22e3aa41efe635ad70e25..2c9482b57f61e1953a60b3dccfe453ee0c1ec631 100644 (file)
@@ -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 */
index 75e51a68b2f9df0e1a38c1233630e602aeb44f42..521ecfbfb40b17b846ffde98a07a00169ce79814 100644 (file)
@@ -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 */
index 3077f74b369ea4cd7002ecb9f2a71bec40d3d722..88053f8c189585de849f7f948b25aeb40190fcb5 100644 (file)
@@ -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 */
index 2c0a6e3d8fd5fc7c0ceaa532bb96e9b8b94cbf7c..c9cc256bea97c54ced39f8da0c0c8777d99fb9bf 100644 (file)
@@ -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 */
index 2cab950070291721579167352921986db51eecad..01d5f51249480bd71046464edab69ea6e8deac87 100644 (file)
@@ -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 */
index ee27fa587bcfdc290f30fb0e3153a62dd4a73c77..b72f06b35bf851988d738ce110f1dcdaace10614 100644 (file)
@@ -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 */
index 175a24eb354af7df3ddae3e25e88f9c92a266db0..3a6bb1acb506e8205e6aff204998cc163e437b17 100644 (file)
@@ -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 */
index 0a446c5fd1e0867d9d7135d4079a6088c04ee28f..a53607e8a39cab0bcf1ee0098ef895d40ac52fdd 100644 (file)
@@ -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 */
index 1d33dc570b64d655b1f603b3f643e98ad2b721f4..02cc824ee0c88270c65f4b30bf55ea3b52bbaedf 100644 (file)
@@ -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);
 
index 33140fa26447394a3a024aaa067f0acf2afc8c29..12ace5fe37186b82be5d96ec7e06de99792c9abd 100644 (file)
@@ -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);
 
index 4d0880733800d8ee0811fb444b9a961a410a21c3..bd29caafec3606e291573ea7aa7d82e4d7b59d4d 100644 (file)
@@ -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 */
index f76638c0ecf0102900c965a362087d7d7b0189e4..c1656054ecda6d642be394c4fec735f6b2d9e425 100644 (file)
@@ -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 */
index add57c0d9e54d816a89f54f324cf264cfa179739..68cd4971e4f39630ed28ba2b25e0091d91daf649 100644 (file)
@@ -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);
 
index f2f1d1cfc674d1161ebc45138ae56a07f0cc7c95..015964e13575ebe64074006078416921d21bba51 100644 (file)
@@ -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 */
index 35449a9e3f455fde2d10ce3520930624d235d3c4..65806fa538ba43cc0f4f587c9a6bb304b433189e 100644 (file)
@@ -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 {
index 3f7f811b7e8f52df7ef7958a8079697a05d4b1aa..08b2630b4b87c7945c3d719391d7fb02a2daf09a 100644 (file)
@@ -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 {
index 60d41d2e24cad818f2d040f16ac0852ab00cdd87..3b29fb4e6ad362af396f1c0c228366aac85feaed 100644 (file)
@@ -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 {
index 4c5397289499c31f07d4b2aea4d5824a898c5f8f..1c1dd3c95eb71fe2cbed53351e38662eafb3e028 100644 (file)
@@ -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 {
index 906247d0896346c3c5c152c251cd2fd4711ef633..141483861c4e242a7b033c27f5c964356fe47d4c 100644 (file)
@@ -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 {
index 4ecbf8914b6b14a620981eda43013b933d63adf1..1a8a86759f53e27467613bc8855317e8dc11ee10 100644 (file)
@@ -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 */
index 2724bba64dd9d1df68b8e4bd646fb2cfc0218d7e..6683291a9b81711adad5da8be2b0d12b779fa1aa 100644 (file)
@@ -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);
 
index 5cc816627e692fe7cebbe3ae502f125ba2fbe345..185a8d1576a5fda203838b3003def39262cbe1de 100644 (file)
@@ -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 */
index d7238921af572e8c9bc9c4ac013666c9a3d94207..bd08a5348a22e5065abc27644dd223765ddee788 100644 (file)
@@ -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 */
index bb6f5f45095f309f84061352d578fd34af0c54c6..bf460b44d4e979d69a02012cf0dad1bf98c8c805 100644 (file)
@@ -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 */
index ec65984bef8ef7b5d44aba3dd76ffce1f6bf0f28..6ac0ed0353c57bea2837d1f2f34987d3998d3eea 100644 (file)
@@ -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 */
index 5fb4633dc00a558e7bc852c795aba3a71c82fa83..0e1d1b72ac44b2b7cf6607c89767f5e53883c75d 100644 (file)
@@ -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 */
index 4babe0d91c1bcb33e79f84bb18cc572d0e8e00e5..6ff82aac673b2cb8d8c30f017a18bf901816607b 100644 (file)
@@ -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 */
index 0a402a301198545af0f701f239280b5a4fe97604..f861c2e5f770fe29f24b5048280b819ab2a987db 100644 (file)
@@ -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 */
index 02a4dbfec0901fcab333ee378b68f080fa6bf995..768a79a746ebaf2926efe485db3f03994ad28886 100644 (file)
@@ -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 {
index f2c104efbe064f35d01e00049f21d8d642d8bb52..91cf53bd585fd183eb69185b440f8e4c348ce197 100644 (file)
@@ -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 */
index 38876f02681110a049e68cf82e58c4f9bc7eb472..f070897e1b1f8dd13d775603f5e59d88cff0ad2e 100644 (file)
@@ -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;
index 557a6c5f6f0af39a438b8ce44e880ce9484642d4..875d5a791683dbefb4a1fa8491072d9460021df0 100644 (file)
@@ -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 {
index 21a80b61063435feb2d6885c3319c47a91c56889..dfd65aed47facbc633bf8ecc52c423255e4363e8 100644 (file)
@@ -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(
index bc86c262d91fad4b181a3bd17b12e30d9f66c7d6..037147e01b739e1fb400608fb9a6f72a1bd9fdc4 100644 (file)
@@ -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;
 
 
index 24f1adb10f20c67b741aebf150370d21406d9182..a702a155860ad36134d50ccca25f577a17d758b1 100644 (file)
@@ -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 */
index 93151065b3c91b23ccb3ee1089def212a902848f..1179bc0c07074af1ba29328a38c35cfc255fc0d1 100644 (file)
@@ -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);
index dd8188b002f7e3d550e565575de98d91efa5c4ac..8870faac4c7a1eea5472247e8d5f62d8fdd3f2e4 100644 (file)
@@ -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;
 
index 99f58d7e9d81010ae014c8511abbe023b78d3b94..01228a6a93e7e3966b2915b4175f8dffed4c08e7 100644 (file)
@@ -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);
index 09f224131f5194e5a423f06d607652d0f4dee655..4742e7ae4250b4f39ed0aa30a8d5e00cacf6742a 100644 (file)
@@ -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')
index 254013a73506a69d3bff3c88abf1cbac8790dd79..e98d0e8ed40418f4bf830178784787ae2ec5146c 100644 (file)
@@ -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 */
index c7cf601282bb2b56dcbb3634a55a83c0da0cbbb3..cb1b9379a90d810e5d86014c0a32a8774a620f68 100644 (file)
@@ -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;
index 652525617963e7a288b3671374a9736977b26663..e1d1529c655f516ddfa9aa2f98334a36ffe13d75 100644 (file)
@@ -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 {
index f6208d6f6c44ba4e912d2d5cdfd3bedaaadf7e59..c8d0ea5f50378ee2244e37970d70176b40df3695 100644 (file)
@@ -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;
 
        /**
index a7907343c249325bafeef429cfd704a83d561143..1a2a4d8eaa509c3cb47e3b040f12b169b191d90e 100644 (file)
@@ -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 {
index 78112f09fd6cf884cbbfd0bff96ee8c85bc3fb84..8b9c11ad4b185b74fc61beb9e81fb0f6f646a7a1 100644 (file)
@@ -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 */
index a0360404d723247d7fec6b304ac382f7bbb94846..d24afd475e4f9948359eda504a68fdd218663e02 100644 (file)
@@ -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 {
index f8552e5d45fee6710c4a92747fbd5f143488bffa..2235d63383b5df43e668cf8f7dd8c26a1e562079 100644 (file)
@@ -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);
 
index dc7e1920896d96dd7438933231aa9fdadbb3dd6e..a886cf9aec13b69a28e120eea2f93bc3a53a5155 100644 (file)
@@ -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;
index 5964220958c9598651d18421dc34a1c383ffe4a6..55534cae6999e7d952b4aa82922fa8acfffca039 100644 (file)
@@ -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;
index 50b0fd04dfc522368d1ce9730650eefbf614830a..a0a03985c2959446cf332d22663d78587c9e4223 100644 (file)
@@ -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())
index 199bcd4b59b0d9ce54cc7cfeba145237a0690aa9..c3d9ec43cc4173e534c3584de33dbd61c17a1200 100644 (file)
@@ -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;
index a7d42d28baf2cfe2f43e35a9aec3cd38e1b7b922..1e37948d7834e5681a78df6c1b4e1059bf81b6c9 100644 (file)
@@ -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 */
index 3a4c16b33969b7af43da17d7e4d0ade05a0857f2..ff23454eb8bc6db9b8ed5d3d1bd2d8ccc609fe32 100644 (file)
@@ -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'])
index 4c79adcb4a70d22849e5bd634a8c1f14f506b39f..c0aea8132434b939e6de37dd4bc48cfac59373e2 100644 (file)
@@ -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;
 
 
index 521c45e47c60ac65d0cee81d8af2a512be83af3b..f2a60a574af9915627e7e5ffca2003a06063e756 100644 (file)
@@ -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;
 
 
index ba114433a4cc91f4fe554436fb3258afdd623bfe..3004123b81b4bb58b30d579235c2cd26da4cdca2 100644 (file)
@@ -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 {
index 5ca7635614c8a287f13986d3eea19ec6674e1798..0a244a8575449491ef58831b2db458197a2790a4 100644 (file)
@@ -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 */
index ed6d06d4bf5b7383f6e4774b0749c8f4d0b27a22..7e7140971e441cd652df40b2f1c0a44ec5690040 100644 (file)
@@ -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 */
index 55c874ccdb52bab8225993ed9f4267c8a47f31b6..f8db85a935815fe6ec88939d2e64de68eb396192 100644 (file)
@@ -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);
        }
index a7bf2b14271d850d8c34291871216f367fd2d00c..4853b527bf383356c92aa335c8631a04b018ce84 100644 (file)
@@ -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');
index 7a64b6cbcad21548952dacc86a5757468e29ef30..3153d7f0b084526e2773ff101158f3c5005dbaa9 100644 (file)
@@ -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 {
index 3a06531eefd67175b99f8f7fbfeaed6aae61f7ec..0d27a9a070f365066fc720d31ca4a551f254f19b 100644 (file)
@@ -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())
index 6f3c3f32adc0745098cf742486f36bed87cedbf3..61f5eeb5aea8cb327a4ecc8e22f4f270903394f5 100644 (file)
@@ -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 {
index 69f1aa5d5470cbc90d464d668e0e09549aeb8cee..680c39378369b005799d3cbb26ae349d7afcfa5f 100644 (file)
@@ -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 {
index e7b9cb5996f1060a5baf1e68cfe612eefe48d570..ea490b76b8a0e3b65a343e64997e48fa112c740c 100644 (file)
@@ -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 */
index 855e90ab6b979ad27994df2d42efb402b6cdcb29..6fdf5b9060e8f3d7b2f6a77e8ff1ad3b1345efdb 100644 (file)
@@ -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')
index d95e4c0418d17b2bb608f31805e4d0c77e425005..00b7f0dee032e7e59473a083f40ac5e9a255e476 100644 (file)
@@ -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);
 
index 5ba7fe7c40e753c00ddf806c29cd31fab4625ee9..2f2af38851dbe4040d56e6efb789f3570eef45bf 100644 (file)
@@ -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;
 
index 43ae0e9542c5ec84d008a938a85c68cae76b4563..c16ee7b818e4b60adce78e8e59e37e02b5b9ee25 100644 (file)
@@ -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);
 
index b77bddcd5a45cd2ff98f9dfdbd946ae6e0922ef0..378376a41f9261bfdbac6cbde2e723bb90988ae1 100644 (file)
@@ -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');
index 5351a1069fc8d1569a0f34cc671ceac616ffbe32..5a061cd10e9e43c00b2370c032fd078009e2f5fa 100644 (file)
@@ -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');
index e3e0bd1d64e12c118f8a16d5b7ac3c7734815b47..cf0edad95027714faf075b1cbeaa6772100cb98a 100644 (file)
@@ -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);
 
index 3013afdfa1d999cfcded1a362f55ac325e0afd8c..20ba1e50016076f82029324d25bbf223d433a425 100644 (file)
@@ -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 {
index 3a2c10b6d6238c76970ec5f83a9ac821489f730b..e686e82adf09c5e11965933e2f67b9d41e49ad3f 100644 (file)
@@ -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);
 
index 3f9e0900d15fd0c542b99427f9ac6bd6752cd5c7..2f7cd1061e908cff02ac6716591db9e5979bb4c9 100644 (file)
@@ -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);
index 383dd0c39a28daecff5f459552566daf5f089965..0a1febe33a57acb0ec12f19aaa466fa4f9837eaa 100644 (file)
@@ -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');
index 6e859b55358d765ffc1c2888fbfa17de3973c960..54dec490a2da23cbf6548bab0f4302ae0898bb7d 100644 (file)
@@ -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())
index 531a8447bd27753245f0d91b80cea87e3e32b677..c03f993508b2dcf3c630ae9b4381ae217de6a0cd 100644 (file)
@@ -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 */
index 84d270de547c2a0cba824af03739dc58a7976bda..98e454f2834c36400b7aa8bd4fba614f2d411a77 100644 (file)
@@ -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;
index ab731c05c2187822cbcf0cb7d7bced88f095c0a4..0aebef72de0aebd3479d09297e5307891fc365a7 100644 (file)
@@ -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;
index 8ca612f606988a80097bb72e7e6c53e14ddf4a6a..6c4ffcc52d82fcd4dd253e9f9c49dba7ae5259b9 100644 (file)
@@ -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 {
index 6802542914fe866922712c5756a8e7e206bcd5cf..fefed296a0c3840b6daa5bf18aad7cfc21ae863d 100644 (file)
@@ -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 {
index 27e4f66c24219d762a5284bd6c64f00e40bd07c5..3b7fe7f3a8b57e0606458ed4b5b3eab78567edc8 100644 (file)
@@ -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;
index e2bf618070922b089fc4b8d6e6910ce2ec9e39af..def00fd0dcc011474d4fdfd369e3f830e05b9e2a 100644 (file)
@@ -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);
 
index ee053ce40e56b3aaed1bad9d4fd46bfe454af536..f20df96f7a2a9b1bf5cf66292c6b2969625a43b3 100644 (file)
@@ -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);
 
index 245c89c3228a45f45419e23af96c5a967ac3172f..acfe83ac5585d3a14b95ec2e83b8b8d125002008 100644 (file)
@@ -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')
index 561051974b79e2349030f9324138724f4baa89c0..4cfbd9c7c908744214425b6ffd17bdaf25af4c8c 100644 (file)
@@ -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 */
index 157f8574fa428006f55635ba030c4421996d2f66..c0052469abacf5ce7721d7337b214bf6151af9f4 100644 (file)
@@ -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 */
index 4699d894e4b6f3e0822830931f0cc04eb70741de..841c510941f8de0d8b39c160ac1639b8b432683d 100644 (file)
@@ -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();
index 2f987adb290e5db936ce70003c5aeb81cb5f41c2..c57b0f22b6fc39f7d8d463fdf476a553047e4cb4 100644 (file)
@@ -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();
index c4e9b1857fbcbf3f012da6b1739aeea6aa1eb5ae..9b6dec006d69a01c5ef8540b2b344573055da157 100644 (file)
@@ -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 {
index 7b1fee38db3d399989ea4f81adb9d0faff2a7721..faf06360e17587cfb7cc21f054ee456617d013d4 100644 (file)
@@ -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 {
index 3a16327ac18560bbc2310af77cc73ec3c1ea1ee8..a8c6f6caebbdd888dc46cd37247dca2aec9c6d3d 100644 (file)
@@ -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(
                                [
index 06d9116255f3e2d4b0d284ecc958c321b0170577..20bcb6e7ca13ec943c79d2b6e1185967f449b160 100644 (file)
@@ -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 {
index fd33077c78bedc195ec62611675791c969e7a934..bd9bbdecdf1093f10a67290cb94fcaac3de6cef2 100644 (file)
@@ -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 {
index 47dd7fd01fbcb9940dbc8f6f6992edfaadb256b1..81ac263cb93b54e16b0c8f50f9a4a16f94bcec7a 100644 (file)
@@ -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.');
index d7aa24d1f6782b8e269fb87069d94237bcd56ed5..08fb08bf79740d7d67f552dd1ff478f564c35126 100644 (file)
@@ -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')
index e1d898f5a86651507f9274c4f895922693eb0118..84d81dd1cbb4bed1dc64ac4f36ff3306fa182f46 100644 (file)
@@ -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);
 
index a03be9e45e9c3161964ad4dd258aae7bea0329cb..d06d7a9a91e41779c55e48df8881b97a64f0c441 100644 (file)
@@ -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 */
index fec464d6e3a13c1936555686b4b9efd5e9414a18..8161bc515ec1fcaa63bdce1625ae2ae9bd27b5b1 100644 (file)
@@ -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 */
index 97663c16c02316054054bc17c41613782bd084b4..a6d429798e83918d412f20ef32d024801949578b 100644 (file)
@@ -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'])
index 464561681d05c98d3513b6ff131c5c940e858af9..8f97e0158fec9e1053c660e8705511bf7b4d6f8a 100644 (file)
@@ -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 */
index 278872b872896cb97e18dee37bf97fd19340814f..ea41467988863a216ab4a773046fc0a4d395befa 100644 (file)
@@ -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);
        }
index 3fa988c89d8e110963ec9d7ee554745b68470a46..6b5aaabbc28de3b3a45d3927f49e9a8a95b8d2a9 100644 (file)
@@ -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);
 
index d2bbf65965ab269a208fd5c4b46bf8500f27e147..1ba052b8de4b8d9d67e7908510a76f7ab745972a 100644 (file)
@@ -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();
 
index 86643617959a7bcf59305970db47c6ed59d14411..6ea5a6d7ffa5ea0cb72f6445583dc1a28782a85d 100644 (file)
@@ -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);
 
index 6c006d1cf627aca8500b5c06e204adb32be53225..13fdcb6590281e76c50ca21b885fda729760a54a 100644 (file)
@@ -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');
index b9a47c4d6e2882da1f8ca71e32f2def610ebcfd2..def570edf99d4e5dda2cae8c56f5f167606b731b 100644 (file)
@@ -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 */
index 73de60e3652495a42941de47b2cb88cc100bcec1..eccec7c28d5b0b3dbb76055603541ca2d5e0bf89 100644 (file)
@@ -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);
                }
 
index bedce1b6f6d7928a8d05ff8a448b9dbe67981462..08264f07fcf438d8ee953bb68563e42f964479be 100644 (file)
@@ -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')
index fad2217bfdbed55de632e7a2d32fca12257b26ae..139516ba374542043d61a8e1b30a37538b1819eb 100644 (file)
@@ -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')
index 2f2e1c218553e4550c4e87926e1a8a228a87b242..5689fd0fb1f4180ccef5c908a018086e164b2c8d 100644 (file)
@@ -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)) {
index ff1d6e641eab346f542cac8a7b0bb3d6c78946c3..8b6be03615a8af89f7c8ba4786c907dc023a59ed 100644 (file)
@@ -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 |
index 9c3c40c267e82300abb69d4b2d9912f3fe0d2476..97f74cc2f8fe35a7f13bb3be65d13eccd15920c5 100644 (file)
@@ -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 {
index f1cd7467169f696b9d4f950369f24faefad87c49..c79f192a7fbbbc0aa5701e3c94ce4dd770e71895 100644 (file)
@@ -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=",
index fb5286ebe65e6c6df9b618dbc55af5267935b528..db4dc4db8654fbb99bb1930ea79e6a8222288b6c 100644 (file)
@@ -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) {
index 9223db716f48acbafa553d259de84adafb3772c1..bbbbb145c754519a401de39454659dc4c741f48e 100644 (file)
@@ -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;
index e4725a3bc1a2b6f514a4804ea050f5eadaac1b6b..91ff79369bf3f1076a4624c5bb256aa2ec000f37 100644 (file)
@@ -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 {
index 5ed7b4c9b380da69c7988580ee399dd7b3057d0a..9e0e3c4b66e18cf0e5b2a94e853d3a7baa4af5e6 100644 (file)
@@ -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 */
index a900b1fe47d672192c500aaa387a623dfd561c4c..74f440519884e4e51a400bf598d44b67d1a1b171 100644 (file)
@@ -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;
index 9e7f6a4134c3bc27374a3af6801711585b307cec..3ec2e96dfab6239c4545713801669875c3abf945 100644 (file)
@@ -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;
index 2172a32723488f59304e3c39187bd8c78767e2c6..b0641ae332ff965f73fbf138d7d920f53134ae71 100644 (file)
@@ -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();
 
index 8c467d58269430fe27dd797783f52f3578e45701..4e95915e624973053a77f91103a9677d574ea0d7 100644 (file)
@@ -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 {
index a33a06635c9881874b867760087ef540dd009d81..012130792ac9efdc12b9cf42ce83db3cb2f04f07 100644 (file)
@@ -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 */
index 57c7557e86c7443fb9ce5cff14125e87cd700be6..cd0d4bd36c85bfae291db879db287b0b9b45b27b 100644 (file)
@@ -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();
index f8d80a0ab566ffe28c945afe337c01f4e83086e4..1479e8841a25049d44a9d5ce561dfd21dac07c1c 100644 (file)
@@ -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',
index d5baa1be2e27e617ac8fea2431f604586430c109..195dac697e5d7f0af3db82eb27d794a5181c7b45 100644 (file)
@@ -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 */
index 5e9b9bcbb8dab4973683c536fbeac580df69d7cc..d2bfcad9955f807ce37a039070c0cad7a9c2c2ba 100644 (file)
@@ -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 */
index b724891cda768fd243f85b947c04643d8eea9eaa..468b715e5e4262e0d855682edc01e03448d35d7f 100644 (file)
@@ -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 */
index 1d5af18a8a399d8bfec07b96268ddcfca7f497d1..9bc61865235211e9b817d3b747072edcb83a3e5c 100644 (file)
@@ -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')
index dda23e8d3ab20641e00be890ee4849bd59ef882a..adfba4a1ce71ee4be70f256ccc67e7b8d5caff76 100644 (file)
@@ -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();
index 62471fbbe3a9edf0c4593a87f3200f1e929b6944..9cba3e8e30a1a68919dac74f2ecfda0c9c2558df 100644 (file)
@@ -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();
index 748ca7a6048500d57ffab059717a217448aaf1b6..64ae632265732fc3067a1f5757d94ddcf649a23f 100644 (file)
@@ -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();
index e6c6fdebf4264800b28710a9912084ca07aefea8..6f0791964b32e1d5108e36e58de48d5f0ecadbdb 100644 (file)
@@ -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();
index c740384fc0feb16c7703c59aaf60ce0dd7a6aa24..9db0d5630aa2107bbe8f2e237ba946ea03a2faf3 100644 (file)
@@ -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();
index 60873236e44674fa1deb8a7c22d41d774600a329..16c2b2caf15406ff75dee8510f48043c693a4785 100644 (file)
@@ -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 {
index 1c58849c9f82c684ca0d07bb02c0a7e6dbf42317..b4a7016bc206ea35911255fbee367a8106c8412e 100644 (file)
@@ -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,
                        ],
index d64c41c79e70e890864b08f4145e8e4c886cfe4d..447ee8719c999499820bd76a26b0b8bdce8680f0 100644 (file)
@@ -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'])
index 5fd1d709c2f64ae4e8f8f311d00d39000b602a12..760c4911873753ce552f4bbf0df4938e7983dc85 100644 (file)
@@ -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')
index 913ab7c15f5b741bc6478c2ab419cb6390a5c39c..3ce211d51e772985e0ccf39ad71dd6566178b70d 100644 (file)
@@ -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 */
index e4df424c2ca2712a00e6869e0113f6c4de8f072a..902c586dc13179f397e3898cd7c16717153552f1 100644 (file)
@@ -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;
index ea74f476f3ce81a3fcdfb8c7e2b587fc7f03306d..76121a49bc164e5f1c98a8f01df49cb91bba02d9 100644 (file)
@@ -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())
index 6de44032530d0cad1eeaf5881b8f17ba10e9e8fa..10bc62e099ceb6e237647724289b033479163115 100644 (file)
@@ -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 */
index fac515c8f5267cccff495acc39edb596baeffaf3..b8635b991200dcf50fef49930ea74ca0f979566a 100644 (file)
@@ -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 */
index a0d341266e8a1f33f49dd06818235896ac4f8f9b..3d967b2ed21f1bde789ae9071c5134a8f74686e2 100644 (file)
@@ -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 {
index 0890b70dfcd2975fc14ba3196489562b22803bda..696e1d69fbec6fa70ea21fb64573acb6ce4cd4c0 100644 (file)
@@ -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.');
index b3de9d05a5211bb135184afde291b53587a9b210..24474b11dcf58ff770cc556f168bd470cd8a6562 100644 (file)
@@ -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 */
index d2f5cd7928484cf47d69b7f4cdfce377a8565261..b3e76735aaa45b4463ce4e0644730b9ee79148c7 100644 (file)
@@ -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')
index f7ea479350d8dbad869659c9d88c6daa25fda19a..7d4dc6de2d6daea6736e9c1fa8bb1c64f4b0f3d5 100644 (file)
@@ -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');
index 68159aa1b2bb68d0358b21afd49099ee2b77cd4d..c070f69ae66c7e71647e884ac4ed6b9a1090fb1c 100644 (file)
@@ -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')
index 8c2a50e97ca2063c00e6675f89ab3e30b182e55c..42fa06a474de92c80e86603ac87d4eb4f23d2027 100644 (file)
@@ -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(
index 4b5c6a73ef874b2f20891456a2684ac62d599380..24b3c21052ffeaaf3278ff07a2c1ef4af6b43f5c 100644 (file)
@@ -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);
 
index 0cdea95fd6fb0088e600dd04ecbe2383a7b23140..87abff991234e4c08ec2575957918ac9ed15320a 100644 (file)
@@ -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 {
index 3f5d157e7f539983e291dcf96112735e7e4b21eb..cdc3606f020692d5c90ba2401f1a676e47eca218 100644 (file)
@@ -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 {
index 71f39a1179ee8985dbcc1a68c770310871daf90d..d23d17778d4c98814836be9d4ff610ff0cc34848 100644 (file)
@@ -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',
index 9dfd8d20feafed66a00b1a3ceb89960a238170ca..1a77f789afe19d930cef1a9ac151adeaaff743df 100644 (file)
@@ -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);
 
index 38cfc4a1c8fde95659d763f6a134bf4bf5a0a678..13a6fb0cf944b9f5e1a3f5cfcf28a1e4a311bbd4 100644 (file)
@@ -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
index cab28e76dbad22e3d33aff8e395d924c5dd64fa4..e9e9787d734683416fbb229387fdf3501ccfd892 100644 (file)
@@ -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;
index 4d7dce43ee109f7c514d5c4aa4317e030f463a41..1daff9ce1fb129b4d41ed4aded5b88a497740581 100644 (file)
@@ -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 {
index 2f139319bbf1a8408e90b1dc2a9e4ae0be9e2264..f4216ddb0a3850745ad2e6504f88230301415bf9 100644 (file)
@@ -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 {
index 3ccf4c8b8c786290c13133d8c2b6fbea335ffaf1..1affd6d020a0f89e828d14763f825d85b4e881f4 100644 (file)
@@ -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 {
index 03f55ff2244416e217a28de9ffa6a5211143b296..46508a217d80e5863b4a08aee9760a1d81e8aaf9 100644 (file)
@@ -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;
index 7cc42e81ba22c0d3f62a957f6d40da7e38f5748f..6037277932dfd951c26a3032f3d141fc3163d4d7 100644 (file)
@@ -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())
index 4e527addc6e0ee059fec05eaba6dfc942b7acdf8..3a9c7766e3c974b8461200c852595e8e2291696e 100644 (file)
@@ -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);
 
index b5a05535009c0a009da1dc66ad70c0e3c54e78b5..9ddb1f8e45f6fb0fa6cba360c1460668ebdc6b6e 100644 (file)
@@ -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;