From f5c361cf44739058b79f322576a1bad2d8c142d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Fri, 20 Jan 2023 11:45:08 +0100 Subject: [PATCH] composer run cs:fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- build/OCPSinceChecker.php | 1 - .../integration/features/bootstrap/Avatar.php | 1 - .../features/bootstrap/BasicStructure.php | 1 - .../features/bootstrap/ContactsMenu.php | 1 - .../features/bootstrap/Download.php | 1 - build/integration/features/bootstrap/Mail.php | 1 - .../integration/features/bootstrap/Search.php | 1 - .../features/bootstrap/TalkContext.php | 1 - .../features/bootstrap/Trashbin.php | 1 - core/Command/App/ListApps.php | 4 +- core/Command/Config/ListConfigs.php | 4 +- core/Command/Maintenance/Install.php | 1 - core/Command/Upgrade.php | 8 +-- core/Controller/AvatarController.php | 16 ++--- core/Controller/WalledGardenController.php | 1 - core/Controller/WellKnownController.php | 1 - core/Controller/WhatsNewController.php | 1 - core/Controller/WipeController.php | 1 - core/Data/LoginFlowV2Tokens.php | 1 - core/Db/ProfileConfig.php | 1 - core/Middleware/TwoFactorMiddleware.php | 1 - .../Version13000Date20170718121200.php | 1 - .../Version13000Date20170814074715.php | 1 - .../Version13000Date20170919121250.php | 1 - .../Version13000Date20170926101637.php | 1 - .../Version14000Date20180404140050.php | 1 - .../Version14000Date20180516101403.php | 1 - .../Version14000Date20180712153140.php | 1 - .../Version15000Date20180926101451.php | 1 - .../Version15000Date20181015062942.php | 1 - .../Version15000Date20181029084625.php | 1 - .../Version16000Date20190207141427.php | 2 - .../Version16000Date20190427105638.php | 1 - .../Version16000Date20190428150708.php | 1 - .../Version17000Date20190514105811.php | 1 - .../Version18000Date20190920085628.php | 1 - .../Version18000Date20191014105105.php | 1 - .../Version18000Date20191204114856.php | 1 - .../Version20000Date20201109081918.php | 1 - .../Version20000Date20201109081919.php | 1 - .../Version23000Date20210721100600.php | 1 - .../Version23000Date20211213203940.php | 1 - .../Version24000Date20211210141942.php | 1 - .../Version25000Date20220602190540.php | 1 - .../Version25000Date20220905140840.php | 1 - core/ajax/update.php | 8 +-- core/register_command.php | 38 +++++------ core/templates/403.php | 4 +- core/templates/layout.guest.php | 4 +- core/templates/layout.noscript.warning.php | 8 +-- core/templates/layout.public.php | 22 +++--- core/templates/layout.user.php | 26 +++---- core/templates/publicshareauth.php | 2 +- core/templates/twofactorselectchallenge.php | 12 ++-- core/templates/twofactorsetupselection.php | 10 +-- core/templates/update.use-cli.php | 10 +-- lib/private/Accounts/AccountProperty.php | 1 - .../Accounts/AccountPropertyCollection.php | 1 - lib/private/Accounts/Hooks.php | 1 - lib/private/Activity/EventMerger.php | 1 - lib/private/App/AppManager.php | 1 - .../App/AppStore/Bundles/EducationBundle.php | 1 - .../App/AppStore/Bundles/EnterpriseBundle.php | 1 - .../App/AppStore/Bundles/GroupwareBundle.php | 1 - .../AppStore/Bundles/SocialSharingBundle.php | 1 - .../App/AppStore/Fetcher/AppFetcher.php | 17 +++-- lib/private/App/AppStore/Fetcher/Fetcher.php | 2 - lib/private/App/DependencyAnalyzer.php | 1 - lib/private/App/InfoParser.php | 2 +- lib/private/AppConfig.php | 2 - lib/private/AppFramework/App.php | 1 - .../AppFramework/Bootstrap/ARegistration.php | 1 - .../AppFramework/Bootstrap/BootContext.php | 1 - .../AppFramework/Bootstrap/Coordinator.php | 1 - .../Bootstrap/EventListenerRegistration.php | 1 - .../Bootstrap/FunctionInjector.php | 1 - .../Bootstrap/ParameterRegistration.php | 1 - .../Bootstrap/PreviewProviderRegistration.php | 1 - .../Bootstrap/RegistrationContext.php | 1 - .../Bootstrap/ServiceAliasRegistration.php | 1 - .../Bootstrap/ServiceFactoryRegistration.php | 1 - lib/private/AppFramework/Http/Dispatcher.php | 5 +- lib/private/AppFramework/Http/Request.php | 2 +- lib/private/AppFramework/Logger.php | 1 - .../Middleware/CompressionMiddleware.php | 1 - .../Middleware/MiddlewareDispatcher.php | 1 - .../AppFramework/Middleware/OCSMiddleware.php | 1 - .../PublicShare/PublicShareMiddleware.php | 1 - .../Middleware/Security/CORSMiddleware.php | 1 - .../Middleware/Security/CSPMiddleware.php | 1 - .../Security/FeaturePolicyMiddleware.php | 1 - .../Security/SameSiteCookieMiddleware.php | 1 - .../Security/SecurityMiddleware.php | 11 ++- .../Middleware/SessionMiddleware.php | 1 - .../AppFramework/Routing/RouteConfig.php | 1 - lib/private/AppFramework/ScopedPsrLogger.php | 1 - .../AppFramework/Services/AppConfig.php | 1 - .../AppFramework/Utility/SimpleContainer.php | 1 - .../AppFramework/Utility/TimeFactory.php | 2 - .../Events/ARemoteWipeEvent.php | 1 - .../Listeners/LoginFailedListener.php | 1 - .../Listeners/RemoteWipeActivityListener.php | 1 - .../Listeners/RemoteWipeEmailListener.php | 1 - .../RemoteWipeNotificationsListener.php | 1 - .../UserDeletedStoreCleanupListener.php | 1 - .../UserDeletedTokenCleanupListener.php | 1 - .../UserDeletedWebAuthnCleanupListener.php | 1 - .../Listeners/UserLoggedInListener.php | 1 - .../Authentication/Login/ALoginCommand.php | 1 - lib/private/Authentication/Login/Chain.php | 1 - .../Login/ClearLostPasswordTokensCommand.php | 1 - .../Login/CompleteLoginCommand.php | 1 - .../Login/CreateSessionTokenCommand.php | 1 - .../Login/EmailLoginCommand.php | 2 - .../Login/FinishRememberedLoginCommand.php | 1 - .../Login/LoggedInCheckCommand.php | 1 - .../Authentication/Login/LoginData.php | 1 - .../Authentication/Login/LoginResult.php | 1 - .../Login/PreLoginHookCommand.php | 1 - .../Login/SetUserTimezoneCommand.php | 1 - .../Authentication/Login/TwoFactorCommand.php | 1 - .../Authentication/Login/UidLoginCommand.php | 1 - .../UpdateLastPasswordConfirmCommand.php | 1 - .../Login/UserDisabledCheckCommand.php | 1 - .../Login/WebAuthnLoginCommand.php | 1 - .../LoginCredentials/Credentials.php | 1 - .../Authentication/LoginCredentials/Store.php | 1 - .../Authentication/Notifications/Notifier.php | 1 - .../Authentication/Token/IProvider.php | 2 - .../Authentication/Token/IWipeableToken.php | 1 - lib/private/Authentication/Token/Manager.php | 1 - .../Authentication/Token/RemoteWipe.php | 1 - .../TwoFactorAuth/EnforcementState.php | 1 - .../Authentication/TwoFactorAuth/Manager.php | 1 - .../TwoFactorAuth/MandatoryTwoFactor.php | 1 - .../TwoFactorAuth/ProviderManager.php | 1 - .../TwoFactorAuth/ProviderSet.php | 1 - .../Authentication/TwoFactorAuth/Registry.php | 1 - .../WebAuthn/CredentialRepository.php | 1 - .../WebAuthn/Db/PublicKeyCredentialEntity.php | 1 - .../Authentication/WebAuthn/Manager.php | 1 - lib/private/Avatar/AvatarManager.php | 1 - lib/private/Avatar/UserAvatar.php | 2 +- .../Broadcast/Events/BroadcastEvent.php | 1 - lib/private/Cache/File.php | 1 - lib/private/Calendar/CalendarQuery.php | 1 - lib/private/Calendar/Manager.php | 1 - lib/private/CapabilitiesManager.php | 1 - .../Collaborators/LookupPlugin.php | 1 - .../Collaboration/Resources/Collection.php | 1 - .../Resources/ProviderManager.php | 1 - .../Collaboration/Resources/Resource.php | 1 - lib/private/Comments/Comment.php | 4 +- lib/private/Comments/Manager.php | 1 - lib/private/Comments/ManagerFactory.php | 1 - .../Contacts/ContactsMenu/ActionFactory.php | 1 - lib/private/Contacts/ContactsMenu/Entry.php | 1 - lib/private/ContactsManager.php | 1 - lib/private/DB/Adapter.php | 1 - lib/private/DB/AdapterMySQL.php | 1 - lib/private/DB/AdapterSqlite.php | 1 - lib/private/DB/ConnectionAdapter.php | 1 - lib/private/DB/Exceptions/DbalException.php | 1 - lib/private/DB/MySqlTools.php | 1 - lib/private/DB/OracleMigrator.php | 3 +- lib/private/DB/PgSqlTools.php | 1 - lib/private/DB/PreparedStatement.php | 1 - .../MySqlExpressionBuilder.php | 1 - .../OCIExpressionBuilder.php | 1 - .../PgSqlExpressionBuilder.php | 1 - lib/private/DB/QueryBuilder/QueryBuilder.php | 1 - lib/private/DB/ResultAdapter.php | 1 - lib/private/DB/SQLiteMigrator.php | 1 - lib/private/DB/SchemaWrapper.php | 1 - lib/private/Dashboard/Manager.php | 1 - lib/private/Diagnostics/EventLogger.php | 1 - lib/private/DirectEditing/Token.php | 1 - lib/private/Encryption/DecryptAll.php | 2 - lib/private/Encryption/EncryptionWrapper.php | 1 - .../EncryptionHeaderKeyExistsException.php | 1 - .../ModuleAlreadyExistsException.php | 1 - lib/private/Encryption/File.php | 1 - lib/private/Encryption/Keys/Storage.php | 1 - lib/private/Encryption/Manager.php | 1 - lib/private/Encryption/Update.php | 1 - lib/private/Encryption/Util.php | 1 - .../EventDispatcher/EventDispatcher.php | 1 - .../EventDispatcher/ServiceEventListener.php | 1 - .../EventDispatcher/SymfonyAdapter.php | 1 - .../Federation/CloudFederationFactory.php | 1 - .../CloudFederationProviderManager.php | 1 - lib/private/Files/Cache/QuerySearchHelper.php | 1 - lib/private/Files/Cache/Scanner.php | 2 - lib/private/Files/Cache/SearchBuilder.php | 2 +- lib/private/Files/Filesystem.php | 1 - .../AppdataPreviewObjectStoreStorage.php | 1 - .../ObjectStore/HomeObjectStoreStorage.php | 1 - .../Files/ObjectStore/ObjectStoreStorage.php | 2 +- lib/private/Files/SetupManager.php | 8 +-- lib/private/Files/SimpleFS/SimpleFolder.php | 1 - lib/private/Files/Storage/Common.php | 1 - lib/private/Files/Storage/FailedStorage.php | 1 - .../Files/Storage/LocalTempFileTrait.php | 1 - lib/private/Files/Storage/Storage.php | 1 - .../Files/Storage/Wrapper/Encoding.php | 1 - .../Files/Storage/Wrapper/Encryption.php | 3 - lib/private/Files/Stream/Encryption.php | 4 +- lib/private/Files/Type/Detection.php | 1 - lib/private/Files/Type/Loader.php | 3 +- lib/private/Files/View.php | 6 +- .../FullTextSearch/FullTextSearchManager.php | 2 - .../FullTextSearch/Model/DocumentAccess.php | 2 - .../FullTextSearch/Model/IndexDocument.php | 2 - .../FullTextSearch/Model/SearchOption.php | 2 - .../Model/SearchRequestSimpleQuery.php | 2 - .../FullTextSearch/Model/SearchTemplate.php | 2 - lib/private/GlobalScale/Config.php | 1 - lib/private/Group/Database.php | 19 +++--- lib/private/Hooks/EmitterTrait.php | 1 - lib/private/Http/WellKnown/RequestManager.php | 1 - lib/private/InitialStateService.php | 1 - lib/private/IntegrityCheck/Checker.php | 18 ++--- lib/private/KnownUser/KnownUser.php | 1 - lib/private/L10N/Factory.php | 1 - lib/private/L10N/L10N.php | 1 - lib/private/L10N/LanguageIterator.php | 14 ++-- lib/private/L10N/LazyL10N.php | 1 - lib/private/Lock/NoopLockingProvider.php | 1 - lib/private/Log.php | 1 - lib/private/Log/Errorlog.php | 1 - lib/private/Log/LogDetails.php | 1 - lib/private/Log/LogFactory.php | 2 +- lib/private/Log/PsrLoggerAdapter.php | 1 - lib/private/Log/Systemdlog.php | 4 +- lib/private/Mail/Attachment.php | 1 - lib/private/Memcache/APCu.php | 4 +- lib/private/Migration/ConsoleOutput.php | 1 - lib/private/Notification/Action.php | 1 - lib/private/OCS/CoreCapabilities.php | 1 - lib/private/OCS/DiscoveryService.php | 1 - lib/private/OCS/Exception.php | 1 - lib/private/OCS/Result.php | 1 - lib/private/Preview/Bitmap.php | 1 - lib/private/Preview/Generator.php | 1 - lib/private/Preview/GeneratorHelper.php | 1 - lib/private/Preview/Image.php | 1 - lib/private/Preview/Movie.php | 1 - lib/private/Preview/WatcherConnector.php | 1 - lib/private/Profile/Actions/EmailAction.php | 1 - lib/private/Profile/Actions/PhoneAction.php | 1 - lib/private/Profile/Actions/TwitterAction.php | 1 - lib/private/Profile/Actions/WebsiteAction.php | 1 - lib/private/Profile/ProfileManager.php | 1 - lib/private/Repair.php | 1 - .../Repair/AddBruteForceCleanupJob.php | 1 - .../Repair/AddCleanupUpdaterBackupsJob.php | 1 - lib/private/Repair/CleanTags.php | 1 - lib/private/Repair/ClearFrontendCaches.php | 1 - lib/private/Repair/MoveUpdaterStepFile.php | 1 - lib/private/Repair/NC11/FixMountStorages.php | 1 - lib/private/Repair/NC13/AddLogRotateJob.php | 1 - .../NC14/AddPreviewBackgroundCleanupJob.php | 1 - .../AddClenupLoginFlowV2BackgroundJob.php | 1 - .../Repair/NC16/CleanupCardDAVPhotoCache.php | 1 - .../NC16/ClearCollectionsAccessCache.php | 1 - .../Repair/NC18/ResetGeneratedAvatarFlag.php | 1 - .../Repair/NC20/EncryptionLegacyCipher.php | 1 - .../Repair/NC20/EncryptionMigration.php | 1 - .../Repair/NC20/ShippedDashboardEnable.php | 1 - .../NC21/AddCheckForUserCertificatesJob.php | 1 - .../Repair/NC21/ValidatePhoneNumber.php | 1 - .../Repair/OldGroupMembershipShares.php | 1 - lib/private/Repair/Owncloud/CleanPreviews.php | 1 - .../Repair/Owncloud/DropAccountTermsTable.php | 1 - .../Repair/Owncloud/MigrateOauthTables.php | 1 - lib/private/Repair/Owncloud/MoveAvatars.php | 1 - .../Owncloud/MoveAvatarsBackgroundJob.php | 1 - lib/private/RichObjectStrings/Validator.php | 1 - lib/private/Search/Provider/File.php | 1 - lib/private/Search/Result/Audio.php | 1 - lib/private/Search/Result/File.php | 1 - lib/private/Search/Result/Folder.php | 1 - lib/private/Search/Result/Image.php | 1 - lib/private/Search/SearchComposer.php | 1 - .../Security/Bruteforce/CleanupJob.php | 1 - lib/private/Server.php | 1 - lib/private/Session/Session.php | 1 - lib/private/Settings/AuthorizedGroup.php | 1 - lib/private/Settings/Manager.php | 1 - lib/private/Setup/AbstractDatabase.php | 1 - lib/private/Share/Constants.php | 1 - lib/private/Share/Helper.php | 13 ++-- lib/private/Share/Share.php | 1 - lib/private/Share20/DefaultShareProvider.php | 8 +-- lib/private/Share20/LegacyHooks.php | 1 - lib/private/Share20/Manager.php | 2 - lib/private/Share20/ProviderFactory.php | 1 - lib/private/Share20/Share.php | 1 - lib/private/Share20/ShareAttributes.php | 1 - lib/private/Share20/ShareHelper.php | 1 - lib/private/Share20/UserRemovedListener.php | 1 - lib/private/Streamer.php | 1 - lib/private/SubAdmin.php | 1 - lib/private/Support/CrashReport/Registry.php | 1 - lib/private/SystemConfig.php | 1 - lib/private/SystemTag/ManagerFactory.php | 1 - lib/private/SystemTag/SystemTag.php | 1 - lib/private/Template/JSCombiner.php | 1 - lib/private/Template/JSResourceLocator.php | 1 - lib/private/TemplateLayout.php | 1 - lib/private/Updater.php | 1 - lib/private/Updater/VersionCheck.php | 1 - lib/private/User/User.php | 1 - lib/private/UserStatus/Manager.php | 1 - lib/private/legacy/OC_API.php | 1 - lib/private/legacy/OC_App.php | 1 - lib/private/legacy/OC_Hook.php | 1 - lib/private/legacy/OC_Image.php | 49 +++++++------ lib/private/legacy/OC_JSON.php | 1 - lib/private/legacy/OC_Template.php | 2 - lib/private/legacy/OC_User.php | 8 +-- lib/private/legacy/OC_Util.php | 12 ++-- lib/public/Accounts/IAccount.php | 1 - lib/public/Accounts/IAccountManager.php | 1 - lib/public/Accounts/IAccountProperty.php | 1 - .../Accounts/IAccountPropertyCollection.php | 1 - .../PropertyDoesNotExistException.php | 1 - lib/public/Activity/IEventMerger.php | 1 - lib/public/Activity/IFilter.php | 1 - lib/public/Activity/ISetting.php | 1 - lib/public/App/IAppManager.php | 1 - lib/public/AppFramework/App.php | 1 - .../AuthPublicShareController.php | 1 - .../AppFramework/Bootstrap/IBootContext.php | 1 - .../AppFramework/Bootstrap/IBootstrap.php | 1 - .../Bootstrap/IRegistrationContext.php | 1 - lib/public/AppFramework/Controller.php | 1 - .../AppFramework/Db/DoesNotExistException.php | 1 - .../Db/MultipleObjectsReturnedException.php | 1 - lib/public/AppFramework/Db/QBMapper.php | 1 - lib/public/AppFramework/Db/TTransactional.php | 1 - .../AppFramework/Http/DataDisplayResponse.php | 1 - lib/public/AppFramework/Http/DataResponse.php | 1 - .../AppFramework/Http/EmptyFeaturePolicy.php | 1 - .../AppFramework/Http/FileDisplayResponse.php | 1 - .../AppFramework/Http/ICallbackResponse.php | 1 - lib/public/AppFramework/Http/IOutput.php | 1 - lib/public/AppFramework/Http/JSONResponse.php | 1 - .../AppFramework/Http/NotFoundResponse.php | 1 - lib/public/AppFramework/Http/Response.php | 1 - .../Http/StrictEvalContentSecurityPolicy.php | 1 - .../StrictInlineContentSecurityPolicy.php | 1 - .../Http/Template/ExternalShareMenuAction.php | 1 - .../Http/Template/IMenuAction.php | 1 - .../Http/Template/LinkMenuAction.php | 1 - .../Http/Template/SimpleMenuAction.php | 1 - .../Http/TooManyRequestsResponse.php | 1 - lib/public/AppFramework/IAppContainer.php | 1 - lib/public/AppFramework/Middleware.php | 2 - lib/public/AppFramework/OCSController.php | 2 +- .../AppFramework/PublicShareController.php | 1 - .../AppFramework/Services/IInitialState.php | 1 - .../Services/InitialStateProvider.php | 1 - .../Utility/IControllerMethodReflector.php | 1 - .../AppFramework/Utility/ITimeFactory.php | 1 - .../Events/LoginFailedEvent.php | 1 - .../Authentication/IAlternativeLogin.php | 1 - lib/public/Authentication/IApacheBackend.php | 1 - .../IProvideUserSecretBackend.php | 1 - .../LoginCredentials/ICredentials.php | 1 - .../LoginCredentials/IStore.php | 1 - .../TwoFactorAuth/IActivatableAtLogin.php | 1 - .../TwoFactorAuth/IActivatableByAdmin.php | 1 - .../TwoFactorAuth/IDeactivatableByAdmin.php | 1 - .../TwoFactorAuth/ILoginSetupProvider.php | 1 - .../IPersonalProviderSettings.php | 1 - .../TwoFactorAuth/IProvider.php | 1 - .../TwoFactorAuth/IProvidesCustomCSP.php | 1 - .../TwoFactorAuth/IProvidesIcons.php | 1 - .../IProvidesPersonalSettings.php | 1 - .../TwoFactorAuth/RegistryEvent.php | 1 - .../TwoFactorProviderDisabled.php | 1 - lib/public/BackgroundJob/QueuedJob.php | 1 - .../Broadcast/Events/IBroadcastEvent.php | 1 - lib/public/Calendar/ICalendar.php | 1 - lib/public/Calendar/ICalendarProvider.php | 1 - lib/public/Calendar/ICalendarQuery.php | 1 - lib/public/Calendar/ICreateFromString.php | 1 - lib/public/Calendar/IHandleImipMessage.php | 1 - lib/public/Calendar/IManager.php | 1 - lib/public/Calendar/IMetadataProvider.php | 1 - lib/public/Calendar/Resource/IBackend.php | 1 - lib/public/Calendar/Resource/IManager.php | 1 - lib/public/Calendar/Resource/IResource.php | 1 - .../Calendar/Resource/IResourceMetadata.php | 1 - lib/public/Calendar/Room/IBackend.php | 1 - lib/public/Calendar/Room/IManager.php | 1 - lib/public/Calendar/Room/IRoom.php | 1 - lib/public/Calendar/Room/IRoomMetadata.php | 1 - lib/public/Capabilities/ICapability.php | 1 - .../AutoComplete/AutoCompleteEvent.php | 1 - .../Collaboration/AutoComplete/ISorter.php | 1 - .../Collaboration/Reference/IReference.php | 1 - .../Collaboration/Resources/ICollection.php | 1 - .../Collaboration/Resources/IManager.php | 1 - .../Collaboration/Resources/IProvider.php | 1 - .../Resources/IProviderManager.php | 1 - .../Collaboration/Resources/IResource.php | 1 - lib/public/Comments/CommentsEvent.php | 1 - lib/public/Comments/ICommentsEventHandler.php | 1 - lib/public/Comments/ICommentsManager.php | 1 - .../Comments/ICommentsManagerFactory.php | 1 - lib/public/Console/ConsoleEvent.php | 1 - lib/public/Contacts/ContactsMenu/IAction.php | 1 - .../Contacts/ContactsMenu/IActionFactory.php | 1 - .../Contacts/ContactsMenu/IContactsStore.php | 2 - lib/public/Contacts/ContactsMenu/IEntry.php | 1 - .../Contacts/ContactsMenu/ILinkAction.php | 1 - .../Contacts/ContactsMenu/IProvider.php | 1 - .../Events/ContactInteractedWithEvent.php | 1 - lib/public/Contacts/IManager.php | 1 - lib/public/DB/Exception.php | 1 - lib/public/DB/IPreparedStatement.php | 1 - lib/public/DB/IResult.php | 1 - lib/public/DB/ISchemaWrapper.php | 1 - lib/public/DB/QueryBuilder/IQueryBuilder.php | 1 - lib/public/Dashboard/IAPIWidget.php | 1 - lib/public/Dashboard/IConditionalWidget.php | 1 - lib/public/Dashboard/IManager.php | 1 - lib/public/Dashboard/IWidget.php | 1 - lib/public/Defaults.php | 1 - lib/public/DirectEditing/ACreateEmpty.php | 1 - .../DirectEditing/ACreateFromTemplate.php | 1 - lib/public/DirectEditing/ATemplate.php | 1 - lib/public/DirectEditing/IEditor.php | 1 - lib/public/DirectEditing/IManager.php | 1 - lib/public/DirectEditing/IToken.php | 1 - .../RegisterDirectEditorEvent.php | 1 - .../Exceptions/GenericEncryptionException.php | 1 - lib/public/Encryption/IEncryptionModule.php | 1 - lib/public/Encryption/IFile.php | 1 - lib/public/Encryption/IManager.php | 1 - lib/public/Encryption/Keys/IStorage.php | 1 - .../EventDispatcher/ABroadcastedEvent.php | 1 - lib/public/EventDispatcher/Event.php | 1 - .../EventDispatcher/IEventDispatcher.php | 1 - lib/public/EventDispatcher/IEventListener.php | 1 - .../ActionNotSupportedException.php | 1 - .../AuthenticationFailedException.php | 1 - .../ProviderAlreadyExistsException.php | 1 - .../ProviderCouldNotAddShareException.php | 1 - .../ProviderDoesNotExistsException.php | 1 - .../Federation/ICloudFederationFactory.php | 1 - .../ICloudFederationNotification.php | 1 - .../Federation/ICloudFederationProvider.php | 1 - .../ICloudFederationProviderManager.php | 1 - .../Federation/ICloudFederationShare.php | 1 - lib/public/Files/AppData/IAppDataFactory.php | 1 - .../Files/Events/BeforeFileScannedEvent.php | 1 - .../Files/Events/BeforeFolderScannedEvent.php | 1 - lib/public/Files/Events/FileCacheUpdated.php | 1 - lib/public/Files/Events/FileScannedEvent.php | 1 - .../Files/Events/FolderScannedEvent.php | 1 - .../Files/Events/Node/AbstractNodeEvent.php | 1 - .../Files/Events/Node/AbstractNodesEvent.php | 1 - lib/public/Files/Events/NodeAddedToCache.php | 1 - .../Files/Events/NodeRemovedFromCache.php | 1 - lib/public/Files/ForbiddenException.php | 1 - lib/public/Files/IMimeTypeDetector.php | 1 - lib/public/Files/IMimeTypeLoader.php | 1 - lib/public/Files/IRootFolder.php | 1 - lib/public/Files/Lock/ILock.php | 1 - lib/public/Files/Lock/ILockManager.php | 1 - lib/public/Files/Lock/ILockProvider.php | 1 - lib/public/Files/Mount/IMountManager.php | 1 - lib/public/Files/Mount/IMountPoint.php | 1 - lib/public/Files/ObjectStore/IObjectStore.php | 1 - lib/public/Files/SimpleFS/ISimpleFile.php | 1 - lib/public/Files/StorageAuthException.php | 1 - .../Files/StorageBadConfigException.php | 1 - .../Files/StorageConnectionException.php | 1 - lib/public/Files/StorageTimeoutException.php | 1 - .../Files/Template/ITemplateManager.php | 1 - lib/public/Files/Template/Template.php | 1 - .../Model/AFilesDocument.php | 2 - .../FullTextSearch/IFullTextSearchManager.php | 2 - .../IFullTextSearchPlatform.php | 2 - .../IFullTextSearchProvider.php | 2 - .../FullTextSearch/Model/IDocumentAccess.php | 2 - .../FullTextSearch/Model/IIndexOptions.php | 2 - .../FullTextSearch/Model/ISearchOption.php | 2 - .../FullTextSearch/Model/ISearchRequest.php | 2 - .../FullTextSearch/Model/ISearchResult.php | 2 - .../FullTextSearch/Model/ISearchTemplate.php | 2 - .../FullTextSearch/Service/IIndexService.php | 2 - .../Service/IProviderService.php | 2 - .../FullTextSearch/Service/ISearchService.php | 2 - lib/public/GlobalScale/IConfig.php | 1 - lib/public/Group/Backend/ABackend.php | 1 - .../Group/Backend/IAddToGroupBackend.php | 1 - .../Group/Backend/ICountDisabledInGroup.php | 1 - .../Group/Backend/ICountUsersBackend.php | 1 - .../Group/Backend/ICreateGroupBackend.php | 1 - .../Group/Backend/IDeleteGroupBackend.php | 1 - .../Group/Backend/IGetDisplayNameBackend.php | 1 - .../Group/Backend/IGroupDetailsBackend.php | 1 - lib/public/Group/Backend/IIsAdminBackend.php | 1 - lib/public/Group/Backend/INamedBackend.php | 1 - .../Group/Backend/IRemoveFromGroupBackend.php | 1 - .../Group/Backend/ISetDisplayNameBackend.php | 1 - .../Group/Events/BeforeGroupCreatedEvent.php | 1 - .../Group/Events/BeforeGroupDeletedEvent.php | 1 - .../Group/Events/BeforeUserAddedEvent.php | 1 - .../Group/Events/BeforeUserRemovedEvent.php | 1 - lib/public/Group/Events/GroupCreatedEvent.php | 1 - lib/public/Group/Events/GroupDeletedEvent.php | 1 - .../Group/Events/SubAdminAddedEvent.php | 1 - .../Group/Events/SubAdminRemovedEvent.php | 1 - lib/public/Group/Events/UserAddedEvent.php | 1 - lib/public/Group/Events/UserRemovedEvent.php | 1 - lib/public/Group/ISubAdmin.php | 1 - lib/public/GroupInterface.php | 1 - lib/public/Http/Client/IClient.php | 1 - lib/public/Http/WellKnown/GenericResponse.php | 1 - lib/public/Http/WellKnown/IHandler.php | 1 - lib/public/Http/WellKnown/IRequestContext.php | 1 - lib/public/Http/WellKnown/IResponse.php | 1 - lib/public/Http/WellKnown/JrdResponse.php | 1 - lib/public/IAddressBook.php | 1 - lib/public/IAvatar.php | 1 - lib/public/IAvatarManager.php | 1 - lib/public/ICache.php | 1 - lib/public/IContainer.php | 1 - lib/public/INavigationManager.php | 1 - lib/public/IPreview.php | 1 - lib/public/ISearch.php | 1 - lib/public/IServerContainer.php | 1 - lib/public/ISession.php | 1 - lib/public/ITagManager.php | 1 - lib/public/IURLGenerator.php | 1 - lib/public/IUser.php | 1 - lib/public/IUserBackend.php | 1 - lib/public/IUserManager.php | 1 - lib/public/L10N/ILanguageIterator.php | 1 - lib/public/LDAP/ILDAPProviderFactory.php | 1 - lib/public/Lock/LockedException.php | 1 - lib/public/Lock/ManuallyLockedException.php | 2 - .../Audit/CriticalActionPerformedEvent.php | 1 - lib/public/Log/IDataLogger.php | 1 - lib/public/Log/RotationTrait.php | 1 - lib/public/Mail/Events/BeforeMessageSent.php | 1 - lib/public/Mail/Headers/AutoSubmitted.php | 1 - lib/public/Mail/IAttachment.php | 1 - lib/public/Mail/IEMailTemplate.php | 1 - lib/public/Mail/IMessage.php | 1 - lib/public/Migration/BigIntMigration.php | 1 - lib/public/Migration/IOutput.php | 1 - lib/public/Migration/IRepairStep.php | 1 - .../AlreadyProcessedException.php | 1 - lib/public/Notification/IAction.php | 1 - .../Notification/IDismissableNotifier.php | 1 - lib/public/Notification/INotifier.php | 1 - lib/public/OCS/IDiscoveryService.php | 1 - lib/public/Profile/ILinkAction.php | 1 - .../ParameterDoesNotExistException.php | 1 - lib/public/RichObjectStrings/IValidator.php | 1 - lib/public/Route/IRouter.php | 1 - lib/public/SabrePluginEvent.php | 1 - lib/public/SabrePluginException.php | 1 - lib/public/Search/IProvider.php | 1 - lib/public/Search/ISearchQuery.php | 1 - lib/public/Search/PagedProvider.php | 1 - lib/public/Search/Provider.php | 1 - lib/public/Search/Result.php | 1 - lib/public/Search/SearchResult.php | 1 - lib/public/Search/SearchResultEntry.php | 1 - .../CSP/AddContentSecurityPolicyEvent.php | 1 - .../Events/GenerateSecurePasswordEvent.php | 1 - .../Events/ValidatePasswordPolicyEvent.php | 1 - .../FeaturePolicy/AddFeaturePolicyEvent.php | 1 - lib/public/Security/ICredentialsManager.php | 1 - lib/public/Security/ICrypto.php | 1 - lib/public/Security/IRemoteHostValidator.php | 1 - lib/public/Security/ISecureRandom.php | 1 - .../VerificationToken/IVerificationToken.php | 1 - .../InvalidTokenException.php | 1 - lib/public/Settings/ISettings.php | 1 - lib/public/Share.php | 2 - lib/public/Share/Events/ShareCreatedEvent.php | 1 - lib/public/Share/Events/ShareDeletedEvent.php | 1 - .../Share/Events/VerifyMountPointEvent.php | 1 - .../Exceptions/GenericShareException.php | 1 - lib/public/Share/Exceptions/ShareNotFound.php | 1 - lib/public/Share/IAttributes.php | 1 - lib/public/Share/IManager.php | 1 - lib/public/Share/IProviderFactory.php | 1 - lib/public/Share/IShare.php | 1 - lib/public/Share/IShareHelper.php | 1 - lib/public/Share/IShareProvider.php | 1 - lib/public/Share_Backend.php | 1 - .../CrashReport/ICollectBreadcrumbs.php | 1 - .../Support/CrashReport/IMessageReporter.php | 1 - lib/public/Support/CrashReport/IRegistry.php | 1 - lib/public/Support/CrashReport/IReporter.php | 1 - lib/public/Support/Subscription/IRegistry.php | 1 - .../Support/Subscription/ISubscription.php | 1 - .../Support/Subscription/ISupportedApps.php | 1 - lib/public/SystemTag/ISystemTagManager.php | 1 - .../SystemTag/ISystemTagManagerFactory.php | 1 - .../SystemTag/ISystemTagObjectMapper.php | 1 - lib/public/SystemTag/ManagerEvent.php | 1 - lib/public/SystemTag/MapperEvent.php | 1 - .../SystemTag/SystemTagsEntityEvent.php | 1 - lib/public/SystemTag/TagNotFoundException.php | 1 - lib/public/Talk/IBroker.php | 1 - lib/public/Talk/IConversation.php | 1 - lib/public/Talk/IConversationOptions.php | 1 - lib/public/Talk/ITalkBackend.php | 1 - lib/public/User/Backend/ABackend.php | 1 - .../User/Backend/ICreateUserBackend.php | 1 - .../User/Backend/IGetDisplayNameBackend.php | 1 - lib/public/User/Backend/IGetHomeBackend.php | 1 - .../User/Backend/IGetRealUIDBackend.php | 1 - .../Backend/IPasswordConfirmationBackend.php | 1 - .../User/Backend/IProvideAvatarBackend.php | 1 - .../User/Backend/ISearchKnownUsersBackend.php | 1 - .../User/Backend/ISetDisplayNameBackend.php | 1 - .../User/Backend/ISetPasswordBackend.php | 1 - .../Events/BeforePasswordUpdatedEvent.php | 1 - .../User/Events/BeforeUserCreatedEvent.php | 1 - .../User/Events/BeforeUserDeletedEvent.php | 1 - .../User/Events/BeforeUserLoggedInEvent.php | 1 - .../BeforeUserLoggedInWithCookieEvent.php | 1 - .../User/Events/BeforeUserLoggedOutEvent.php | 1 - .../User/Events/PasswordUpdatedEvent.php | 1 - lib/public/User/Events/PostLoginEvent.php | 1 - lib/public/User/Events/UserCreatedEvent.php | 1 - lib/public/User/Events/UserDeletedEvent.php | 1 - .../User/Events/UserLiveStatusEvent.php | 1 - lib/public/User/Events/UserLoggedInEvent.php | 1 - .../Events/UserLoggedInWithCookieEvent.php | 1 - lib/public/User/Events/UserLoggedOutEvent.php | 1 - lib/public/UserInterface.php | 1 - .../UserMigration/IExportDestination.php | 1 - lib/public/UserMigration/IMigrator.php | 1 - lib/public/UserStatus/IManager.php | 1 - lib/public/UserStatus/IProvider.php | 1 - lib/public/UserStatus/IUserStatus.php | 1 - .../EntityContext/IContextPortation.php | 1 - .../EntityContext/IDisplayText.php | 1 - .../Events/RegisterChecksEvent.php | 1 - .../Events/RegisterEntitiesEvent.php | 1 - .../Events/RegisterOperationsEvent.php | 1 - .../WorkflowEngine/GenericEntityEvent.php | 1 - .../WorkflowEngine/IComplexOperation.php | 1 - lib/public/WorkflowEngine/IEntity.php | 1 - .../WorkflowEngine/ISpecificOperation.php | 1 - tests/Core/Command/Apps/AppsDisableTest.php | 1 - tests/Core/Command/Apps/AppsEnableTest.php | 1 - .../Encryption/ChangeKeyStorageRootTest.php | 2 - .../Command/Encryption/DecryptAllTest.php | 2 - .../Command/Encryption/EncryptAllTest.php | 1 - tests/Core/Command/Group/AddTest.php | 1 - tests/Core/Command/Group/AddUserTest.php | 1 - tests/Core/Command/Group/DeleteTest.php | 1 - tests/Core/Command/Group/InfoTest.php | 1 - tests/Core/Command/Group/ListCommandTest.php | 1 - tests/Core/Command/Group/RemoveUserTest.php | 1 - tests/Core/Command/SystemTag/AddTest.php | 1 - tests/Core/Command/SystemTag/DeleteTest.php | 1 - tests/Core/Command/SystemTag/EditTest.php | 1 - .../Command/SystemTag/ListCommandTest.php | 1 - .../Command/TwoFactorAuth/CleanupTest.php | 1 - .../Command/TwoFactorAuth/DisableTest.php | 1 - .../Core/Command/TwoFactorAuth/EnableTest.php | 1 - .../Command/TwoFactorAuth/EnforceTest.php | 1 - .../Core/Command/TwoFactorAuth/StateTest.php | 1 - .../Controller/AppPasswordControllerTest.php | 1 - .../Controller/CSRFTokenControllerTest.php | 1 - .../ClientFlowLoginV2ControllerTest.php | 1 - .../Controller/ContactsMenuControllerTest.php | 1 - tests/Core/Controller/CssControllerTest.php | 1 - .../Controller/GuestAvatarControllerTest.php | 1 - tests/Core/Controller/JsControllerTest.php | 1 - tests/Core/Controller/LoginControllerTest.php | 1 - .../Controller/NavigationControllerTest.php | 1 - .../Core/Controller/PreviewControllerTest.php | 1 - .../TwoFactorChallengeControllerTest.php | 1 - tests/Core/Controller/UserControllerTest.php | 1 - .../Controller/WellKnownControllerTest.php | 1 - tests/Core/Controller/WipeControllerTest.php | 1 - .../Middleware/TwoFactorMiddlewareTest.php | 1 - .../Repair/Owncloud/CleanPreviewsTest.php | 2 - .../bootstrap/AppNavigationContext.php | 18 ++--- .../features/bootstrap/AppSettingsContext.php | 6 +- .../bootstrap/AppsManagementContext.php | 6 +- .../features/bootstrap/CommentsAppContext.php | 10 +-- .../bootstrap/ContactsMenuContext.php | 16 ++--- .../features/bootstrap/DialogContext.php | 12 ++-- .../bootstrap/FileListAncestorSetter.php | 1 - .../features/bootstrap/FileListContext.php | 13 ++-- .../features/bootstrap/FilesAppContext.php | 40 +++++------ .../bootstrap/FilesAppSharingContext.php | 68 +++++++++---------- .../features/bootstrap/LoginPageContext.php | 8 +-- .../features/bootstrap/PublicShareContext.php | 38 +++++------ .../features/bootstrap/SearchContext.php | 4 +- .../features/bootstrap/SettingsContext.php | 12 ++-- .../bootstrap/SettingsMenuContext.php | 6 +- .../features/bootstrap/ToastContext.php | 2 +- .../bootstrap/UsersSettingsContext.php | 30 ++++---- .../acceptance/features/bootstrap/WaitFor.php | 1 - tests/acceptance/features/core/Actor.php | 1 - tests/acceptance/features/core/ActorAware.php | 1 - .../features/core/ActorAwareInterface.php | 1 - .../acceptance/features/core/ActorContext.php | 1 - .../features/core/ElementFinder.php | 1 - .../features/core/ElementWrapper.php | 1 - tests/acceptance/features/core/Locator.php | 4 -- .../core/NextcloudTestServerContext.php | 1 - .../core/NextcloudTestServerHelper.php | 1 - .../NextcloudTestServerLocalApacheHelper.php | 1 - .../NextcloudTestServerLocalBuiltInHelper.php | 1 - .../features/core/NoSuchElementException.php | 1 - tests/acceptance/features/core/Utils.php | 1 - tests/lib/APITest.php | 1 - tests/lib/Accounts/HooksTest.php | 1 - tests/lib/Activity/ManagerTest.php | 1 - tests/lib/AllConfigTest.php | 7 +- tests/lib/App/CompareVersionTest.php | 1 - tests/lib/App/DependencyAnalyzerTest.php | 1 - tests/lib/App/PlatformRepositoryTest.php | 1 - .../Bootstrap/BootContextTest.php | 1 - .../Bootstrap/CoordinatorTest.php | 1 - .../Bootstrap/FunctionInjectorTest.php | 1 - .../Bootstrap/RegistrationContextTest.php | 1 - .../AuthPublicShareControllerTest.php | 1 - .../Controller/ControllerTest.php | 1 - .../Controller/PublicShareControllerTest.php | 2 - tests/lib/AppFramework/Db/QBMapperTest.php | 1 - .../lib/AppFramework/Db/TransactionalTest.php | 1 - .../DependencyInjection/DIContainerTest.php | 1 - .../DIIntergrationTests.php | 1 - .../Http/ContentSecurityPolicyTest.php | 1 - .../AppFramework/Http/DataResponseTest.php | 1 - .../Http/EmptyContentSecurityPolicyTest.php | 1 - .../Http/EmptyFeaturePolicyTest.php | 1 - .../AppFramework/Http/FeaturePolicyTest.php | 1 - .../AppFramework/Http/JSONResponseTest.php | 1 - .../Http/RedirectResponseTest.php | 1 - tests/lib/AppFramework/Http/ResponseTest.php | 1 - .../AppFramework/Http/StreamResponseTest.php | 1 - .../Http/TemplateResponseTest.php | 1 - .../AdditionalScriptsMiddlewareTest.php | 1 - .../Middleware/CompressionMiddlewareTest.php | 1 - .../Middleware/MiddlewareTest.php | 1 - .../Middleware/NotModifiedMiddlewareTest.php | 1 - .../Middleware/OCSMiddlewareTest.php | 1 - .../PublicShare/PublicShareMiddlewareTest.php | 1 - .../Security/CORSMiddlewareTest.php | 1 - .../Middleware/Security/CSPMiddlewareTest.php | 1 - .../Security/FeaturePolicyMiddlewareTest.php | 1 - .../Security/SameSiteCookieMiddlewareTest.php | 1 - .../Security/SecurityMiddlewareTest.php | 1 - .../Middleware/SessionMiddlewareTest.php | 1 - .../lib/AppFramework/OCS/BaseResponseTest.php | 1 - .../Utility/ControllerMethodReflectorTest.php | 4 -- .../Utility/SimpleContainerTest.php | 18 ++--- .../RemoteWipeActivityListenerTest.php | 1 - .../Listeners/RemoteWipeEmailListenerTest.php | 1 - .../RemoteWipeNotificationsListenerTest.php | 1 - .../UserDeletedTokenCleanupListenerTest.php | 2 - .../Login/ALoginCommandTest.php | 1 - .../ClearLostPasswordTokensCommandTest.php | 1 - .../Login/CompleteLoginCommandTest.php | 1 - .../Login/CreateSessionTokenCommandTest.php | 1 - .../Login/EmailLoginCommandTest.php | 1 - .../FinishRememberedLoginCommandTest.php | 1 - .../Login/LoggedInCheckCommandTest.php | 1 - .../Login/PreLoginHookCommandTest.php | 1 - .../Login/SetUserTimezoneCommandTest.php | 1 - .../Login/TwoFactorCommandTest.php | 1 - .../Login/UidLoginCommandTest.php | 1 - .../UpdateLastPasswordConfirmCommandTest.php | 1 - .../Login/UserDisabledCheckCommandTest.php | 1 - .../LoginCredentials/CredentialsTest.php | 1 - .../LoginCredentials/StoreTest.php | 1 - .../Token/PublicKeyTokenMapperTest.php | 1 - .../Authentication/Token/RemoteWipeTest.php | 1 - .../Db/ProviderUserAssignmentDaoTest.php | 1 - .../TwoFactorAuth/ManagerTest.php | 1 - .../TwoFactorAuth/MandatoryTwoFactorTest.php | 1 - .../TwoFactorAuth/ProviderLoaderTest.php | 1 - .../TwoFactorAuth/ProviderManagerTest.php | 1 - .../TwoFactorAuth/ProviderSetTest.php | 1 - .../TwoFactorAuth/RegistryTest.php | 1 - tests/lib/Calendar/ManagerTest.php | 1 - tests/lib/Calendar/Resource/ManagerTest.php | 1 - tests/lib/Calendar/Room/ManagerTest.php | 1 - tests/lib/CapabilitiesManagerTest.php | 1 - .../Collaborators/LookupPluginTest.php | 1 - .../Collaborators/RemotePluginTest.php | 1 - .../Collaboration/Resources/ManagerTest.php | 1 - .../Resources/ProviderManagerTest.php | 1 - tests/lib/Comments/CommentTest.php | 1 - .../ContactsMenu/ActionProviderStoreTest.php | 1 - .../lib/Contacts/ContactsMenu/ManagerTest.php | 1 - .../Providers/EMailproviderTest.php | 1 - .../Providers/LocalTimeProviderTest.php | 1 - tests/lib/ContactsManagerTest.php | 1 - tests/lib/DB/Exception/DbalExceptionTest.php | 1 - tests/lib/Diagnostics/EventLoggerTest.php | 1 - tests/lib/Diagnostics/QueryLoggerTest.php | 1 - tests/lib/EmojiHelperTest.php | 1 - tests/lib/Encryption/DecryptAllTest.php | 2 - .../lib/Encryption/EncryptionWrapperTest.php | 1 - tests/lib/Encryption/ManagerTest.php | 1 - tests/lib/Encryption/UpdateTest.php | 1 - tests/lib/ErrorHandlerTest.php | 1 - .../EventDispatcher/SymfonyAdapterTest.php | 1 - tests/lib/Files/Cache/WatcherTest.php | 1 - .../Mount/ObjectHomeMountProviderTest.php | 1 - ...jectStorePreviewCacheMountProviderTest.php | 1 - tests/lib/Files/ObjectStore/MapperTest.php | 1 - .../lib/Files/ObjectStore/ObjectStoreTest.php | 1 - tests/lib/Files/PathVerificationTest.php | 1 - .../Storage/Wrapper/AvailabilityTest.php | 1 - .../Files/Storage/Wrapper/EncryptionTest.php | 31 ++++----- tests/lib/Files/Storage/Wrapper/JailTest.php | 1 - .../Storage/Wrapper/PermissionsMaskTest.php | 1 - .../Files/Stream/DummyEncryptionWrapper.php | 1 - tests/lib/Files/Stream/EncryptionTest.php | 1 - tests/lib/Files/Stream/QuotaTest.php | 1 - tests/lib/GlobalScale/ConfigTest.php | 1 - tests/lib/Group/GroupTest.php | 1 - tests/lib/Group/ManagerTest.php | 34 +++++----- .../lib/Http/WellKnown/RequestManagerTest.php | 1 - tests/lib/InitialStateServiceTest.php | 1 - tests/lib/IntegrityCheck/CheckerTest.php | 34 +++++----- tests/lib/L10N/FactoryTest.php | 1 - tests/lib/LegacyHelperTest.php | 44 ++++++------ .../lib/Lock/MemcacheLockingProviderTest.php | 1 - .../lib/Lockdown/Filesystem/NullCacheTest.php | 1 - .../Lockdown/Filesystem/NullStorageTest.php | 1 - tests/lib/LoggerTest.php | 1 - tests/lib/Migration/BackgroundRepairTest.php | 2 - tests/lib/NaturalSortTest.php | 1 - tests/lib/Notification/DummyApp.php | 1 - tests/lib/Notification/DummyNotifier.php | 1 - tests/lib/OCS/DiscoveryServiceTest.php | 1 - tests/lib/OCS/MapStatusCodeTest.php | 1 - tests/lib/Preview/GeneratorTest.php | 1 - tests/lib/Preview/Provider.php | 1 - tests/lib/Repair/CleanTagsTest.php | 1 - tests/lib/Repair/ClearFrontendCachesTest.php | 1 - .../Repair/ClearGeneratedAvatarCacheTest.php | 1 - .../lib/Repair/NC11/FixMountStoragesTest.php | 1 - .../Repair/OldGroupMembershipSharesTest.php | 1 - tests/lib/Repair/RepairCollationTest.php | 1 - tests/lib/Repair/RepairDavSharesTest.php | 1 - tests/lib/Repair/RepairInvalidSharesTest.php | 1 - tests/lib/Repair/RepairMimeTypesTest.php | 1 - .../Repair/RepairSqliteAutoincrementTest.php | 1 - tests/lib/Security/CertificateTest.php | 1 - tests/lib/Security/CredentialsManagerTest.php | 1 - tests/lib/Security/HasherTest.php | 1 - .../lib/Security/IdentityProof/SignerTest.php | 1 - .../RemoteHostValidatorIntegrationTest.php | 1 - .../lib/Security/RemoteHostValidatorTest.php | 1 - tests/lib/SetupTest.php | 1 - .../lib/Share20/DefaultShareProviderTest.php | 1 - tests/lib/Share20/LegacyHooksTest.php | 1 - tests/lib/Share20/ManagerTest.php | 6 +- tests/lib/Share20/ShareByMailProviderTest.php | 1 - tests/lib/Share20/ShareHelperTest.php | 1 - tests/lib/SubAdminTest.php | 1 - .../lib/Support/CrashReport/RegistryTest.php | 1 - .../Subscription/DummySubscription.php | 1 - .../lib/Support/Subscription/RegistryTest.php | 1 - tests/lib/SystemTag/SystemTagManagerTest.php | 1 - .../SystemTag/SystemTagObjectMapperTest.php | 1 - tests/lib/TagsTest.php | 6 +- tests/lib/TempManagerTest.php | 2 +- tests/lib/Template/JSCombinerTest.php | 10 +-- tests/lib/TestMoveableMountPoint.php | 1 - tests/lib/UrlGeneratorTest.php | 1 - tests/lib/User/ManagerTest.php | 1 - tests/lib/User/UserTest.php | 2 - 887 files changed, 430 insertions(+), 1320 deletions(-) diff --git a/build/OCPSinceChecker.php b/build/OCPSinceChecker.php index 75ce9c97cbc..f882d1b7724 100644 --- a/build/OCPSinceChecker.php +++ b/build/OCPSinceChecker.php @@ -28,7 +28,6 @@ require_once(dirname(__DIR__) . '/3rdparty/autoload.php'); * this class checks all methods for the presence of the @since tag */ class SinceTagCheckVisitor extends \PhpParser\NodeVisitorAbstract { - /** @var string */ protected $namespace = ''; /** @var string */ diff --git a/build/integration/features/bootstrap/Avatar.php b/build/integration/features/bootstrap/Avatar.php index 6f8b98ad605..6b8e5d88092 100644 --- a/build/integration/features/bootstrap/Avatar.php +++ b/build/integration/features/bootstrap/Avatar.php @@ -26,7 +26,6 @@ use PHPUnit\Framework\Assert; require __DIR__ . '/../../vendor/autoload.php'; trait Avatar { - /** @var string **/ private $lastAvatar; diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index 632e827669b..9060c85c756 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -73,7 +73,6 @@ trait BasicStructure { protected $remoteBaseUrl; public function __construct($baseUrl, $admin, $regular_user_password) { - // Initialize your context here $this->baseUrl = $baseUrl; $this->adminUser = $admin; diff --git a/build/integration/features/bootstrap/ContactsMenu.php b/build/integration/features/bootstrap/ContactsMenu.php index c5266ffb7d1..0506d827a39 100644 --- a/build/integration/features/bootstrap/ContactsMenu.php +++ b/build/integration/features/bootstrap/ContactsMenu.php @@ -23,7 +23,6 @@ use PHPUnit\Framework\Assert; trait ContactsMenu { - // BasicStructure trait is expected to be used in the class that uses this // trait. diff --git a/build/integration/features/bootstrap/Download.php b/build/integration/features/bootstrap/Download.php index 7879159325a..e5e6dc64853 100644 --- a/build/integration/features/bootstrap/Download.php +++ b/build/integration/features/bootstrap/Download.php @@ -26,7 +26,6 @@ use PHPUnit\Framework\Assert; require __DIR__ . '/../../vendor/autoload.php'; trait Download { - /** @var string **/ private $downloadedFile; diff --git a/build/integration/features/bootstrap/Mail.php b/build/integration/features/bootstrap/Mail.php index c661a5935c6..c2d9e86275c 100644 --- a/build/integration/features/bootstrap/Mail.php +++ b/build/integration/features/bootstrap/Mail.php @@ -21,7 +21,6 @@ * */ trait Mail { - // CommandLine trait is expected to be used in the class that uses this // trait. diff --git a/build/integration/features/bootstrap/Search.php b/build/integration/features/bootstrap/Search.php index 91c66ae1d20..c9d5f75a1d3 100644 --- a/build/integration/features/bootstrap/Search.php +++ b/build/integration/features/bootstrap/Search.php @@ -24,7 +24,6 @@ use Behat\Gherkin\Node\TableNode; use PHPUnit\Framework\Assert; trait Search { - // BasicStructure trait is expected to be used in the class that uses this // trait. diff --git a/build/integration/features/bootstrap/TalkContext.php b/build/integration/features/bootstrap/TalkContext.php index 9c4b9037829..5417c22a058 100644 --- a/build/integration/features/bootstrap/TalkContext.php +++ b/build/integration/features/bootstrap/TalkContext.php @@ -23,7 +23,6 @@ use Behat\Behat\Context\Context; class TalkContext implements Context { - /** * @BeforeFeature @Talk * @BeforeScenario @Talk diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php index 998720b67b2..19e9b57c3fb 100644 --- a/build/integration/features/bootstrap/Trashbin.php +++ b/build/integration/features/bootstrap/Trashbin.php @@ -31,7 +31,6 @@ require __DIR__ . '/../../vendor/autoload.php'; * Trashbin functions */ trait Trashbin { - // WebDav trait is expected to be used in the class that uses this trait. /** diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php index 6405afc2f68..365ac48e080 100644 --- a/core/Command/App/ListApps.php +++ b/core/Command/App/ListApps.php @@ -107,11 +107,11 @@ class ListApps extends Base { $output->writeln('Disabled:'); parent::writeArrayInOutputFormat($input, $output, $items['disabled']); - break; + break; default: parent::writeArrayInOutputFormat($input, $output, $items); - break; + break; } } diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php index a0fa9a84ea8..dd8fad72d7c 100644 --- a/core/Command/Config/ListConfigs.php +++ b/core/Command/Config/ListConfigs.php @@ -77,7 +77,7 @@ class ListConfigs extends Base { $configs = [ 'system' => $this->getSystemConfigs($noSensitiveValues), ]; - break; + break; case 'all': $apps = $this->appConfig->getApps(); @@ -88,7 +88,7 @@ class ListConfigs extends Base { foreach ($apps as $appName) { $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues); } - break; + break; default: $configs = [ diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index d53cd867b06..fa93a661906 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -74,7 +74,6 @@ class Install extends Command { } protected function execute(InputInterface $input, OutputInterface $output): int { - // validate the environment $server = \OC::$server; $setupHelper = new Setup( diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index d476b91d6bf..e929dc22bc8 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -95,10 +95,10 @@ class Upgrade extends Command { $self = $this; $updater = new Updater( - $this->config, - \OC::$server->getIntegrityCodeChecker(), - $this->logger, - $this->installer + $this->config, + \OC::$server->getIntegrityCodeChecker(), + $this->logger, + $this->installer ); /** @var IEventDispatcher $dispatcher */ diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 673ed1be05b..c6567b33209 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -308,16 +308,16 @@ class AvatarController extends Controller { return new JSONResponse(['data' => [ 'message' => $this->l->t("No temporary profile picture available, try again") ]], - Http::STATUS_NOT_FOUND); + Http::STATUS_NOT_FOUND); } $image = new \OCP\Image(); $image->loadFromData($tmpAvatar); $resp = new DataDisplayResponse( - $image->data() ?? '', - Http::STATUS_OK, - ['Content-Type' => $image->mimeType()]); + $image->data() ?? '', + Http::STATUS_OK, + ['Content-Type' => $image->mimeType()]); $resp->setETag((string)crc32($image->data() ?? '')); $resp->cacheFor(0); @@ -331,12 +331,12 @@ class AvatarController extends Controller { public function postCroppedAvatar(?array $crop = null): JSONResponse { if (is_null($crop)) { return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]], - Http::STATUS_BAD_REQUEST); + Http::STATUS_BAD_REQUEST); } if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) { return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]], - Http::STATUS_BAD_REQUEST); + Http::STATUS_BAD_REQUEST); } $tmpAvatar = $this->cache->get('tmpAvatar'); @@ -344,7 +344,7 @@ class AvatarController extends Controller { return new JSONResponse(['data' => [ 'message' => $this->l->t("No temporary profile picture available, try again") ]], - Http::STATUS_BAD_REQUEST); + Http::STATUS_BAD_REQUEST); } $image = new \OCP\Image(); @@ -358,7 +358,7 @@ class AvatarController extends Controller { return new JSONResponse(['status' => 'success']); } catch (\OC\NotSquareException $e) { return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]], - Http::STATUS_BAD_REQUEST); + Http::STATUS_BAD_REQUEST); } catch (\Exception $e) { $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']); return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST); diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php index 584c264aaf9..0079cc5a69a 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; class WalledGardenController extends Controller { - /** * @PublicPage * @NoCSRFRequired diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php index 12384b6f9ad..01ae5e4fae8 100644 --- a/core/Controller/WellKnownController.php +++ b/core/Controller/WellKnownController.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response; use OCP\IRequest; class WellKnownController extends Controller { - /** @var RequestManager */ private $requestManager; diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php index 12024dec030..0dae0f97322 100644 --- a/core/Controller/WhatsNewController.php +++ b/core/Controller/WhatsNewController.php @@ -37,7 +37,6 @@ use OCP\IUserSession; use OCP\L10N\IFactory; class WhatsNewController extends OCSController { - /** @var IConfig */ protected $config; /** @var IUserSession */ diff --git a/core/Controller/WipeController.php b/core/Controller/WipeController.php index 5eef03b129f..44ec5fc598a 100644 --- a/core/Controller/WipeController.php +++ b/core/Controller/WipeController.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; class WipeController extends Controller { - /** @var RemoteWipe */ private $remoteWipe; diff --git a/core/Data/LoginFlowV2Tokens.php b/core/Data/LoginFlowV2Tokens.php index 0e932d49ed6..c247a49fe0a 100644 --- a/core/Data/LoginFlowV2Tokens.php +++ b/core/Data/LoginFlowV2Tokens.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Core\Data; class LoginFlowV2Tokens { - /** @var string */ private $loginToken; /** @var string */ diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php index eb50da37a64..3ebfe02ca79 100644 --- a/core/Db/ProfileConfig.php +++ b/core/Db/ProfileConfig.php @@ -40,7 +40,6 @@ use OCP\Profile\ParameterDoesNotExistException; * @method void setConfig(string $config) */ class ProfileConfig extends Entity implements JsonSerializable { - /** * Visible to users, guests, and public access * diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php index 45c165d1ba5..0ea21ce78de 100644 --- a/core/Middleware/TwoFactorMiddleware.php +++ b/core/Middleware/TwoFactorMiddleware.php @@ -46,7 +46,6 @@ use OCP\IURLGenerator; use OCP\IUser; class TwoFactorMiddleware extends Middleware { - /** @var Manager */ private $twoFactorManager; diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 3e14b4af47a..5439998fce3 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -39,7 +39,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version13000Date20170718121200 extends SimpleMigrationStep { - /** @var IDBConnection */ private $connection; diff --git a/core/Migrations/Version13000Date20170814074715.php b/core/Migrations/Version13000Date20170814074715.php index 6882662dc53..c05c0324aeb 100644 --- a/core/Migrations/Version13000Date20170814074715.php +++ b/core/Migrations/Version13000Date20170814074715.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version13000Date20170814074715 extends SimpleMigrationStep { - /** * @param IOutput $output * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version13000Date20170919121250.php b/core/Migrations/Version13000Date20170919121250.php index 65d52829373..8aabaf23587 100644 --- a/core/Migrations/Version13000Date20170919121250.php +++ b/core/Migrations/Version13000Date20170919121250.php @@ -33,7 +33,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version13000Date20170919121250 extends SimpleMigrationStep { - /** * @param IOutput $output * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version13000Date20170926101637.php b/core/Migrations/Version13000Date20170926101637.php index 0961c15be71..b86535b005a 100644 --- a/core/Migrations/Version13000Date20170926101637.php +++ b/core/Migrations/Version13000Date20170926101637.php @@ -29,7 +29,6 @@ use OCP\Migration\BigIntMigration; * Auto-generated migration step: Please modify to your needs! */ class Version13000Date20170926101637 extends BigIntMigration { - /** * @return array Returns an array with the following structure * ['table1' => ['column1', 'column2'], ...] diff --git a/core/Migrations/Version14000Date20180404140050.php b/core/Migrations/Version14000Date20180404140050.php index d7b7ce1fce2..e670fe525da 100644 --- a/core/Migrations/Version14000Date20180404140050.php +++ b/core/Migrations/Version14000Date20180404140050.php @@ -35,7 +35,6 @@ use OCP\Migration\SimpleMigrationStep; * Auto-generated migration step: Please modify to your needs! */ class Version14000Date20180404140050 extends SimpleMigrationStep { - /** @var IDBConnection */ private $connection; diff --git a/core/Migrations/Version14000Date20180516101403.php b/core/Migrations/Version14000Date20180516101403.php index cd2df5b10ab..1cddcf74bac 100644 --- a/core/Migrations/Version14000Date20180516101403.php +++ b/core/Migrations/Version14000Date20180516101403.php @@ -27,7 +27,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version14000Date20180516101403 extends SimpleMigrationStep { - /** * @param IOutput $output * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version14000Date20180712153140.php b/core/Migrations/Version14000Date20180712153140.php index 444cad072a0..2f2ecdfcc0d 100644 --- a/core/Migrations/Version14000Date20180712153140.php +++ b/core/Migrations/Version14000Date20180712153140.php @@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep; */ class Version14000Date20180712153140 extends SimpleMigrationStep { public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) { - /** @var ISchemaWrapper $schema */ $schema = $schemaClosure(); diff --git a/core/Migrations/Version15000Date20180926101451.php b/core/Migrations/Version15000Date20180926101451.php index f70a786bbcd..c73501c4fe0 100644 --- a/core/Migrations/Version15000Date20180926101451.php +++ b/core/Migrations/Version15000Date20180926101451.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version15000Date20180926101451 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version15000Date20181015062942.php b/core/Migrations/Version15000Date20181015062942.php index deb64f32142..42729c02545 100644 --- a/core/Migrations/Version15000Date20181015062942.php +++ b/core/Migrations/Version15000Date20181015062942.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version15000Date20181015062942 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version15000Date20181029084625.php b/core/Migrations/Version15000Date20181029084625.php index c3022148b0a..28d3f5b5ca7 100644 --- a/core/Migrations/Version15000Date20181029084625.php +++ b/core/Migrations/Version15000Date20181029084625.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version15000Date20181029084625 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php index 837715a6838..6dc5a5b1773 100644 --- a/core/Migrations/Version16000Date20190207141427.php +++ b/core/Migrations/Version16000Date20190207141427.php @@ -35,8 +35,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version16000Date20190207141427 extends SimpleMigrationStep { - - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version16000Date20190427105638.php b/core/Migrations/Version16000Date20190427105638.php index dbad19d9b54..4df64a59250 100644 --- a/core/Migrations/Version16000Date20190427105638.php +++ b/core/Migrations/Version16000Date20190427105638.php @@ -33,7 +33,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version16000Date20190427105638 extends SimpleMigrationStep { - /** @var IDBConnection */ private $connection; diff --git a/core/Migrations/Version16000Date20190428150708.php b/core/Migrations/Version16000Date20190428150708.php index 14645925d3d..61d5ee0d2fa 100644 --- a/core/Migrations/Version16000Date20190428150708.php +++ b/core/Migrations/Version16000Date20190428150708.php @@ -35,7 +35,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version16000Date20190428150708 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version17000Date20190514105811.php b/core/Migrations/Version17000Date20190514105811.php index 53c4cd67647..6e081f7214d 100644 --- a/core/Migrations/Version17000Date20190514105811.php +++ b/core/Migrations/Version17000Date20190514105811.php @@ -36,7 +36,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version17000Date20190514105811 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php index 9384abeed30..d7b1727aa59 100644 --- a/core/Migrations/Version18000Date20190920085628.php +++ b/core/Migrations/Version18000Date20190920085628.php @@ -36,7 +36,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version18000Date20190920085628 extends SimpleMigrationStep { - /** @var IDBConnection */ protected $connection; diff --git a/core/Migrations/Version18000Date20191014105105.php b/core/Migrations/Version18000Date20191014105105.php index 740a03ba5d1..340c9b3d729 100644 --- a/core/Migrations/Version18000Date20191014105105.php +++ b/core/Migrations/Version18000Date20191014105105.php @@ -36,7 +36,6 @@ use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; class Version18000Date20191014105105 extends SimpleMigrationStep { - /** @var IDBConnection */ protected $connection; diff --git a/core/Migrations/Version18000Date20191204114856.php b/core/Migrations/Version18000Date20191204114856.php index 9fec994ba44..d7f4dbafe87 100644 --- a/core/Migrations/Version18000Date20191204114856.php +++ b/core/Migrations/Version18000Date20191204114856.php @@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; class Version18000Date20191204114856 extends SimpleMigrationStep { - /** @var IDBConnection */ protected $connection; diff --git a/core/Migrations/Version20000Date20201109081918.php b/core/Migrations/Version20000Date20201109081918.php index 9ebdd40aaf2..aae89465d75 100644 --- a/core/Migrations/Version20000Date20201109081918.php +++ b/core/Migrations/Version20000Date20201109081918.php @@ -35,7 +35,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version20000Date20201109081918 extends SimpleMigrationStep { - /** @var IDBConnection */ protected $connection; diff --git a/core/Migrations/Version20000Date20201109081919.php b/core/Migrations/Version20000Date20201109081919.php index 4c78dd901bd..0556e84a7b4 100644 --- a/core/Migrations/Version20000Date20201109081919.php +++ b/core/Migrations/Version20000Date20201109081919.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version20000Date20201109081919 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version23000Date20210721100600.php b/core/Migrations/Version23000Date20210721100600.php index d247811f8b9..99353819f60 100644 --- a/core/Migrations/Version23000Date20210721100600.php +++ b/core/Migrations/Version23000Date20210721100600.php @@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; class Version23000Date20210721100600 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version23000Date20211213203940.php b/core/Migrations/Version23000Date20211213203940.php index 943edbbd300..2a10acdafcf 100644 --- a/core/Migrations/Version23000Date20211213203940.php +++ b/core/Migrations/Version23000Date20211213203940.php @@ -29,7 +29,6 @@ namespace OC\Core\Migrations; use OCP\Migration\BigIntMigration; class Version23000Date20211213203940 extends BigIntMigration { - /** * @return array Returns an array with the following structure * ['table1' => ['column1', 'column2'], ...] diff --git a/core/Migrations/Version24000Date20211210141942.php b/core/Migrations/Version24000Date20211210141942.php index ea85e331d55..47a4b11ce4f 100644 --- a/core/Migrations/Version24000Date20211210141942.php +++ b/core/Migrations/Version24000Date20211210141942.php @@ -37,7 +37,6 @@ use OCP\Migration\SimpleMigrationStep; * */ class Version24000Date20211210141942 extends SimpleMigrationStep { - /** @var IDBConnection */ protected $connection; diff --git a/core/Migrations/Version25000Date20220602190540.php b/core/Migrations/Version25000Date20220602190540.php index 3a00423570a..ba5345f2ae7 100644 --- a/core/Migrations/Version25000Date20220602190540.php +++ b/core/Migrations/Version25000Date20220602190540.php @@ -33,7 +33,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version25000Date20220602190540 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/Migrations/Version25000Date20220905140840.php b/core/Migrations/Version25000Date20220905140840.php index 6cda6132a7f..ab7857cb63c 100644 --- a/core/Migrations/Version25000Date20220905140840.php +++ b/core/Migrations/Version25000Date20220905140840.php @@ -33,7 +33,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version25000Date20220905140840 extends SimpleMigrationStep { - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/core/ajax/update.php b/core/ajax/update.php index 56dffef409c..74907fa56b9 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -112,10 +112,10 @@ if (\OCP\Util::needUpgrade()) { $logger = \OC::$server->get(\Psr\Log\LoggerInterface::class); $config = \OC::$server->getConfig(); $updater = new \OC\Updater( - $config, - \OC::$server->getIntegrityCodeChecker(), - $logger, - \OC::$server->query(\OC\Installer::class) + $config, + \OC::$server->getIntegrityCodeChecker(), + $logger, + \OC::$server->query(\OC\Installer::class) ); $incompatibleApps = []; diff --git a/core/register_command.php b/core/register_command.php index b6da0a6d44d..df008402076 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -55,19 +55,19 @@ $application->add(new OC\Core\Command\Status(\OC::$server->get(\OCP\IConfig::cla $application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig())); $application->add(new OC\Core\Command\L10n\CreateJs()); $application->add(new \OC\Core\Command\Integrity\SignApp( - \OC::$server->getIntegrityCodeChecker(), - new \OC\IntegrityCheck\Helpers\FileAccessHelper(), - \OC::$server->getURLGenerator() + \OC::$server->getIntegrityCodeChecker(), + new \OC\IntegrityCheck\Helpers\FileAccessHelper(), + \OC::$server->getURLGenerator() )); $application->add(new \OC\Core\Command\Integrity\SignCore( - \OC::$server->getIntegrityCodeChecker(), - new \OC\IntegrityCheck\Helpers\FileAccessHelper() + \OC::$server->getIntegrityCodeChecker(), + new \OC\IntegrityCheck\Helpers\FileAccessHelper() )); $application->add(new \OC\Core\Command\Integrity\CheckApp( - \OC::$server->getIntegrityCodeChecker() + \OC::$server->getIntegrityCodeChecker() )); $application->add(new \OC\Core\Command\Integrity\CheckCore( - \OC::$server->getIntegrityCodeChecker() + \OC::$server->getIntegrityCodeChecker() )); @@ -142,21 +142,21 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) { \OC::$server->getConfig() ); $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot( - $view, - \OC::$server->getUserManager(), - \OC::$server->getConfig(), - $util, - new \Symfony\Component\Console\Helper\QuestionHelper() - ) + $view, + \OC::$server->getUserManager(), + \OC::$server->getConfig(), + $util, + new \Symfony\Component\Console\Helper\QuestionHelper() + ) ); $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util)); $application->add(new OC\Core\Command\Encryption\MigrateKeyStorage( - $view, - \OC::$server->getUserManager(), - \OC::$server->getConfig(), - $util, - \OC::$server->getCrypto() - ) + $view, + \OC::$server->getUserManager(), + \OC::$server->getConfig(), + $util, + \OC::$server->getCrypto() + ) ); $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory())); diff --git a/core/templates/403.php b/core/templates/403.php index d41d6cd3083..bdb5737f23d 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -12,6 +12,6 @@ if (!isset($_)) {//standalone page is not supported anymore - redirect to /

t('Access forbidden')); ?>

+ p($_['message']); + }?>

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index b32d163cd69..69acb6be375 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -9,8 +9,8 @@ <?php p(!empty($_['pageTitle']) ? $_['pageTitle'] . ' – ' : ''); - p($theme->getTitle()); - ?> +p($theme->getTitle()); +?> getiTunesAppId() !== '') { ?> diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php index 7d7a32bfbf4..311394592d1 100644 --- a/core/templates/layout.noscript.warning.php +++ b/core/templates/layout.noscript.warning.php @@ -2,10 +2,10 @@
', ''], - $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') - )); ?> + ['{linkstart}', '{linkend}'], + ['', ''], + $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') + )); ?>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 65110fb84f5..e5329716cc7 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -5,8 +5,8 @@ <?php p(!empty($_['application'])?$_['application'].' - ':''); - p($theme->getTitle()); - ?> +p($theme->getTitle()); +?> getiTunesAppId() !== '') { ?> @@ -55,10 +55,10 @@
getActionCount() !== 0) { - $primary = $template->getPrimaryAction(); - $others = $template->getOtherActions(); ?> +/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */ +if (isset($template) && $template->getActionCount() !== 0) { + $primary = $template->getPrimaryAction(); + $others = $template->getOtherActions(); ?> @@ -76,13 +76,13 @@ foreach ($others as $action) { print_unescaped($action->render()); } - ?> + ?>
+} ?>
@@ -99,15 +99,15 @@ diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b2eed70c299..951f0dabe21 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -19,9 +19,9 @@ $getUserAvatar = static function (int $size) use ($_): string { <?php p(!empty($_['pageTitle'])?$_['pageTitle'].' - ':''); - p(!empty($_['application'])?$_['application'].' - ':''); - p($theme->getTitle()); - ?> +p(!empty($_['application'])?$_['application'].' - ':''); +p($theme->getTitle()); +?> @@ -43,8 +43,8 @@ $getUserAvatar = static function (int $size) use ($_): string { data-themes=> + p("data-theme-$themeId "); + }?> data-themes=> $initialState) { ?> @@ -75,19 +75,19 @@ $getUserAvatar = static function (int $size) use ($_): string { aria-label="t('Open settings menu'));?>" aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
data-avatar="" + if ($_['userAvatarSet']) { + $avatar32 = $getUserAvatar(32); ?> data-avatar="" > + } ?>> + if ($_['userAvatarSet']) {?> + ?>
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php index e815fa16631..d81ce7c4a67 100644 --- a/core/templates/twofactorselectchallenge.php +++ b/core/templates/twofactorselectchallenge.php @@ -37,18 +37,18 @@ $noProviders = empty($_['providers']);
  • + [ + 'challengeProviderId' => $provider->getId(), + 'redirect_url' => $_['redirect_url'], + ] + )) ?>"> getLightIcon(); } else { $icon = image_path('core', 'actions/password-white.svg'); } - ?> + ?>

    getDisplayName()) ?>

    diff --git a/core/templates/twofactorsetupselection.php b/core/templates/twofactorsetupselection.php index 9e7946a4def..4ef19d86349 100644 --- a/core/templates/twofactorsetupselection.php +++ b/core/templates/twofactorsetupselection.php @@ -31,17 +31,17 @@ declare(strict_types=1);
  • + [ + 'providerId' => $provider->getId(), + ] + )) ?>"> getLightIcon(); } else { $icon = image_path('core', 'actions/password-white.svg'); } - ?> + ?>

    getDisplayName()) ?>

    diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php index 66cce4e521f..403de7feadc 100644 --- a/core/templates/update.use-cli.php +++ b/core/templates/update.use-cli.php @@ -3,12 +3,12 @@

    t('Update needed')) ?>

    t('Please use the command line updater because you have a big instance with more than 50 users.')); -} else { - p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.')); -} ?>

    + p($l->t('Please use the command line updater because you have a big instance with more than 50 users.')); + } else { + p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.')); + } ?>

    t('For help, see the     documentation.', [link_to_docs('admin-cli-upgrade')])); ?> + print_unescaped($l->t('For help, see the documentation.', [link_to_docs('admin-cli-upgrade')])); ?>
    diff --git a/lib/private/Accounts/AccountProperty.php b/lib/private/Accounts/AccountProperty.php index 896dfd247b5..a8e195feb98 100644 --- a/lib/private/Accounts/AccountProperty.php +++ b/lib/private/Accounts/AccountProperty.php @@ -32,7 +32,6 @@ use OCP\Accounts\IAccountManager; use OCP\Accounts\IAccountProperty; class AccountProperty implements IAccountProperty { - /** @var string */ private $name; /** @var string */ diff --git a/lib/private/Accounts/AccountPropertyCollection.php b/lib/private/Accounts/AccountPropertyCollection.php index 091c5734218..1e5d8a5112a 100644 --- a/lib/private/Accounts/AccountPropertyCollection.php +++ b/lib/private/Accounts/AccountPropertyCollection.php @@ -32,7 +32,6 @@ use OCP\Accounts\IAccountProperty; use OCP\Accounts\IAccountPropertyCollection; class AccountPropertyCollection implements IAccountPropertyCollection { - /** @var string */ protected $collectionName = ''; diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php index b440bc394d6..a6c52275d2d 100644 --- a/lib/private/Accounts/Hooks.php +++ b/lib/private/Accounts/Hooks.php @@ -36,7 +36,6 @@ use Psr\Log\LoggerInterface; * @template-implements IEventListener */ class Hooks implements IEventListener { - /** @var IAccountManager */ private $accountManager; /** @var LoggerInterface */ diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 5f0993532cb..9332d8b111a 100644 --- a/lib/private/Activity/EventMerger.php +++ b/lib/private/Activity/EventMerger.php @@ -29,7 +29,6 @@ use OCP\Activity\IEventMerger; use OCP\IL10N; class EventMerger implements IEventMerger { - /** @var IL10N */ protected $l10n; diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 6d2fe51d0ed..d14f0a2644e 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -52,7 +52,6 @@ use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AppManager implements IAppManager { - /** * Apps with these types can not be enabled for certain groups only * @var string[] diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index 661cc70578f..58ffd4f83b8 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EducationBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php index 901467048a8..bb64ec391ff 100644 --- a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php +++ b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EnterpriseBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/GroupwareBundle.php b/lib/private/App/AppStore/Bundles/GroupwareBundle.php index f1e130806c4..3a46ada52ad 100644 --- a/lib/private/App/AppStore/Bundles/GroupwareBundle.php +++ b/lib/private/App/AppStore/Bundles/GroupwareBundle.php @@ -25,7 +25,6 @@ namespace OC\App\AppStore\Bundles; class GroupwareBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php index 394cce17d63..f823792745b 100644 --- a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php +++ b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class SocialSharingBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 579f350b5bb..35bec10f5ae 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -39,7 +39,6 @@ use OCP\Support\Subscription\IRegistry; use Psr\Log\LoggerInterface; class AppFetcher extends Fetcher { - /** @var CompareVersion */ private $compareVersion; @@ -117,15 +116,15 @@ class AppFetcher extends Fetcher { $minPhpVersion = $phpVersion->getMinimumVersion(); $maxPhpVersion = $phpVersion->getMaximumVersion(); $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $minPhpVersion, - '>=' - ); + PHP_VERSION, + $minPhpVersion, + '>=' + ); $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $maxPhpVersion, - '<=' - ); + PHP_VERSION, + $maxPhpVersion, + '<=' + ); $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled; } diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 788f15c183f..0eb089bbdc2 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -167,10 +167,8 @@ abstract class Fetcher { // Always get latests apps info if $allowUnstable if (!$allowUnstable && is_array($jsonBlob)) { - // No caching when the version has been updated if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) { - // If the timestamp is older than 3600 seconds request the files new if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) { return $jsonBlob['data']; diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php index 373e3c5e04d..aa136f0e965 100644 --- a/lib/private/App/DependencyAnalyzer.php +++ b/lib/private/App/DependencyAnalyzer.php @@ -33,7 +33,6 @@ namespace OC\App; use OCP\IL10N; class DependencyAnalyzer { - /** @var Platform */ private $platform; /** @var \OCP\IL10N */ diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index 9d57ef95688..25f191502c3 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -267,7 +267,7 @@ class InfoParser { } else { $array[$element] = $data; } - // Just a value + // Just a value } else { if ($totalElement > 1) { $array[$element][] = $this->xmlToArray($node); diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index 325220823b8..04e76373466 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -42,7 +42,6 @@ use OCP\IConfig; * database. */ class AppConfig implements IAppConfig { - /** @var array[] */ protected $sensitiveValues = [ 'circles' => [ @@ -285,7 +284,6 @@ class AppConfig implements IAppConfig { * > Large objects (LOBs) are not supported in comparison conditions. */ if (!($this->conn instanceof OracleConnection)) { - /* * Only update the value when it is not the same * Note that NULL requires some special handling. Since comparing diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index 170acba0689..d2ef7da9e46 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -53,7 +53,6 @@ use OCP\IRequest; * Handles all the dependency injection, controllers and output flow */ class App { - /** @var string[] */ private static $nameSpaceCache = []; diff --git a/lib/private/AppFramework/Bootstrap/ARegistration.php b/lib/private/AppFramework/Bootstrap/ARegistration.php index bb8fe0c8e92..797d7d2317b 100644 --- a/lib/private/AppFramework/Bootstrap/ARegistration.php +++ b/lib/private/AppFramework/Bootstrap/ARegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ abstract class ARegistration { - /** @var string */ private $appId; diff --git a/lib/private/AppFramework/Bootstrap/BootContext.php b/lib/private/AppFramework/Bootstrap/BootContext.php index f21d7d00b1e..8c37d00a419 100644 --- a/lib/private/AppFramework/Bootstrap/BootContext.php +++ b/lib/private/AppFramework/Bootstrap/BootContext.php @@ -31,7 +31,6 @@ use OCP\AppFramework\IAppContainer; use OCP\IServerContainer; class BootContext implements IBootContext { - /** @var IAppContainer */ private $appContainer; diff --git a/lib/private/AppFramework/Bootstrap/Coordinator.php b/lib/private/AppFramework/Bootstrap/Coordinator.php index 3ab6ac4c8b0..f5f50b1b775 100644 --- a/lib/private/AppFramework/Bootstrap/Coordinator.php +++ b/lib/private/AppFramework/Bootstrap/Coordinator.php @@ -46,7 +46,6 @@ use Psr\Log\LoggerInterface; use Throwable; class Coordinator { - /** @var IServerContainer */ private $serverContainer; diff --git a/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php b/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php index be279cbfd52..2ad410be26f 100644 --- a/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php +++ b/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php @@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap; * @template-extends ServiceRegistration<\OCP\EventDispatcher\IEventListener> */ class EventListenerRegistration extends ServiceRegistration { - /** @var string */ private $event; diff --git a/lib/private/AppFramework/Bootstrap/FunctionInjector.php b/lib/private/AppFramework/Bootstrap/FunctionInjector.php index 13eb5d88969..2f95906ab4c 100644 --- a/lib/private/AppFramework/Bootstrap/FunctionInjector.php +++ b/lib/private/AppFramework/Bootstrap/FunctionInjector.php @@ -33,7 +33,6 @@ use ReflectionParameter; use function array_map; class FunctionInjector { - /** @var ContainerInterface */ private $container; diff --git a/lib/private/AppFramework/Bootstrap/ParameterRegistration.php b/lib/private/AppFramework/Bootstrap/ParameterRegistration.php index 5a683f41a9f..b501a757abd 100644 --- a/lib/private/AppFramework/Bootstrap/ParameterRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ParameterRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ final class ParameterRegistration extends ARegistration { - /** @var string */ private $name; diff --git a/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php b/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php index 47c25d39300..36c5cae7db3 100644 --- a/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php +++ b/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php @@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap; * @template-extends ServiceRegistration<\OCP\Preview\IProviderV2> */ class PreviewProviderRegistration extends ServiceRegistration { - /** @var string */ private $mimeTypeRegex; diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index 3ade98e334f..04faf330dc3 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -58,7 +58,6 @@ use Psr\Log\LoggerInterface; use Throwable; class RegistrationContext { - /** @var ServiceRegistration[] */ private $capabilities = []; diff --git a/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php b/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php index a8b9ddd1295..e2b115e0353 100644 --- a/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ class ServiceAliasRegistration extends ARegistration { - /** * @var string * @psalm-var string|class-string diff --git a/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php b/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php index 21e6d37865a..b6658e55239 100644 --- a/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ class ServiceFactoryRegistration extends ARegistration { - /** * @var string * @psalm-var string|class-string diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index cc288edc966..b4b03574d56 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -49,7 +49,6 @@ use Psr\Log\LoggerInterface; * Class to dispatch the request to the middleware dispatcher */ class Dispatcher { - /** @var MiddlewareDispatcher */ private $middlewareDispatcher; @@ -169,7 +168,7 @@ class Dispatcher { } catch (\Throwable $throwable) { $exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable); $response = $this->middlewareDispatcher->afterException( - $controller, $methodName, $exception); + $controller, $methodName, $exception); } $response = $this->middlewareDispatcher->afterController( @@ -202,7 +201,6 @@ class Dispatcher { $types = ['int', 'integer', 'bool', 'boolean', 'float', 'double']; foreach ($this->reflector->getParameters() as $param => $default) { - // try to get the parameter from the request object and cast // it to the type annotated in the @param annotation $value = $this->request->getParam($param, $default); @@ -234,7 +232,6 @@ class Dispatcher { // format response if ($response instanceof DataResponse || !($response instanceof Response)) { - // get format from the url format or request format parameter $format = $this->request->getParam('format'); diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index d8aac063f3e..ac162f6565e 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -429,7 +429,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { $this->items['post'] = $params; } } - // Handle application/x-www-form-urlencoded for methods other than GET + // Handle application/x-www-form-urlencoded for methods other than GET // or post correctly } elseif ($this->method !== 'GET' && $this->method !== 'POST' diff --git a/lib/private/AppFramework/Logger.php b/lib/private/AppFramework/Logger.php index 7fb30905df3..cd70cead7e9 100644 --- a/lib/private/AppFramework/Logger.php +++ b/lib/private/AppFramework/Logger.php @@ -32,7 +32,6 @@ use OCP\ILogger; * @deprecated */ class Logger implements ILogger { - /** @var ILogger */ private $logger; diff --git a/lib/private/AppFramework/Middleware/CompressionMiddleware.php b/lib/private/AppFramework/Middleware/CompressionMiddleware.php index 5128afa8cad..530c270c7bc 100644 --- a/lib/private/AppFramework/Middleware/CompressionMiddleware.php +++ b/lib/private/AppFramework/Middleware/CompressionMiddleware.php @@ -35,7 +35,6 @@ use OCP\AppFramework\Middleware; use OCP\IRequest; class CompressionMiddleware extends Middleware { - /** @var bool */ private $useGZip; diff --git a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index adf17e53caa..35eb0098eed 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -39,7 +39,6 @@ use OCP\AppFramework\Middleware; * This class is used to store and run all the middleware in correct order */ class MiddlewareDispatcher { - /** * @var array array containing all the middlewares */ diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 4c2dbd0f828..955b15f80c8 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -39,7 +39,6 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; class OCSMiddleware extends Middleware { - /** @var IRequest */ private $request; diff --git a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php index d956ce58912..f20bd333452 100644 --- a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php +++ b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php @@ -35,7 +35,6 @@ use OCP\IRequest; use OCP\ISession; class PublicShareMiddleware extends Middleware { - /** @var IRequest */ private $request; diff --git a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php index dd964915006..2476f4ec9b3 100644 --- a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php @@ -118,7 +118,6 @@ class CORSMiddleware extends Middleware { if (isset($this->request->server['HTTP_ORIGIN']) && $this->reflector->hasAnnotation('CORS')) { - // allow credentials headers must not be true or CSRF is possible // otherwise foreach ($response->getHeaders() as $header => $value) { diff --git a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php index 1eea52d620c..ae0dc1f134e 100644 --- a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php @@ -36,7 +36,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class CSPMiddleware extends Middleware { - /** @var ContentSecurityPolicyManager */ private $contentSecurityPolicyManager; /** @var ContentSecurityPolicyNonceManager */ diff --git a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php index 534ff56cced..418d4185184 100644 --- a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class FeaturePolicyMiddleware extends Middleware { - /** @var FeaturePolicyManager */ private $policyManager; diff --git a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php index 0ab5d061c44..e6d35dc66f2 100644 --- a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class SameSiteCookieMiddleware extends Middleware { - /** @var Request */ private $request; diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index e0f36231b68..eb8c1b8dc43 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -137,7 +137,6 @@ class SecurityMiddleware extends Middleware { * @suppress PhanUndeclaredClassConstant */ public function beforeController($controller, $methodName) { - // this will set the current navigation entry of the app, use this only // for normal HTML requests and not for AJAX requests $this->navigationManager->setActiveEntry($this->appName); @@ -207,11 +206,11 @@ class SecurityMiddleware extends Middleware { * This allows oauth apps (e.g. moodle) to use the OCS endpoints */ if (!$this->request->passesCSRFCheck() && !( - $controller instanceof OCSController && ( - $this->request->getHeader('OCS-APIREQUEST') === 'true' || - strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0 - ) - )) { + $controller instanceof OCSController && ( + $this->request->getHeader('OCS-APIREQUEST') === 'true' || + strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0 + ) + )) { throw new CrossSiteRequestForgeryException(); } } diff --git a/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index 32ac2b17ae5..af195df0de9 100644 --- a/lib/private/AppFramework/Middleware/SessionMiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php @@ -32,7 +32,6 @@ use OCP\AppFramework\Middleware; use OCP\ISession; class SessionMiddleware extends Middleware { - /** @var ControllerMethodReflector */ private $reflector; diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index 3986abd6d6e..6e3e49e8d99 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -79,7 +79,6 @@ class RouteConfig { * The routes and resource will be registered to the \OCP\Route\IRouter */ public function register() { - // parse simple $this->processIndexRoutes($this->routes); diff --git a/lib/private/AppFramework/ScopedPsrLogger.php b/lib/private/AppFramework/ScopedPsrLogger.php index 46832c6d38d..4ed91cdb6c0 100644 --- a/lib/private/AppFramework/ScopedPsrLogger.php +++ b/lib/private/AppFramework/ScopedPsrLogger.php @@ -30,7 +30,6 @@ use Psr\Log\LoggerInterface; use function array_merge; class ScopedPsrLogger implements LoggerInterface { - /** @var LoggerInterface */ private $inner; diff --git a/lib/private/AppFramework/Services/AppConfig.php b/lib/private/AppFramework/Services/AppConfig.php index 355a4123987..1fc07bc22b0 100644 --- a/lib/private/AppFramework/Services/AppConfig.php +++ b/lib/private/AppFramework/Services/AppConfig.php @@ -30,7 +30,6 @@ use OCP\AppFramework\Services\IAppConfig; use OCP\IConfig; class AppConfig implements IAppConfig { - /** @var IConfig */ private $config; diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 925ef67de64..06e9d4a3ec7 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -45,7 +45,6 @@ use function class_exists; * SimpleContainer is a simple implementation of a container on basis of Pimple */ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer { - /** @var Container */ private $container; diff --git a/lib/private/AppFramework/Utility/TimeFactory.php b/lib/private/AppFramework/Utility/TimeFactory.php index d4fe451a995..27117ed3cfc 100644 --- a/lib/private/AppFramework/Utility/TimeFactory.php +++ b/lib/private/AppFramework/Utility/TimeFactory.php @@ -33,8 +33,6 @@ use OCP\AppFramework\Utility\ITimeFactory; * Needed to mock calls to time() */ class TimeFactory implements ITimeFactory { - - /** * @return int the result of a call to time() */ diff --git a/lib/private/Authentication/Events/ARemoteWipeEvent.php b/lib/private/Authentication/Events/ARemoteWipeEvent.php index adfe1935013..e36b7d1087b 100644 --- a/lib/private/Authentication/Events/ARemoteWipeEvent.php +++ b/lib/private/Authentication/Events/ARemoteWipeEvent.php @@ -29,7 +29,6 @@ use OC\Authentication\Token\IToken; use OCP\EventDispatcher\Event; abstract class ARemoteWipeEvent extends Event { - /** @var IToken */ private $token; diff --git a/lib/private/Authentication/Listeners/LoginFailedListener.php b/lib/private/Authentication/Listeners/LoginFailedListener.php index f75ee51b287..d2971e07b55 100644 --- a/lib/private/Authentication/Listeners/LoginFailedListener.php +++ b/lib/private/Authentication/Listeners/LoginFailedListener.php @@ -39,7 +39,6 @@ use OCP\Util; * @template-implements IEventListener<\OC\Authentication\Events\LoginFailed> */ class LoginFailedListener implements IEventListener { - /** @var IEventDispatcher */ private $dispatcher; diff --git a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php index 6cc2403653f..edebb2a2641 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeActivityListener implements IEventListener { - /** @var IActvityManager */ private $activityManager; diff --git a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php index 4499f90d79b..cba2b183589 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php @@ -44,7 +44,6 @@ use function substr; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeEmailListener implements IEventListener { - /** @var IMailer */ private $mailer; diff --git a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php index 4b7e809d742..81feab32746 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php @@ -38,7 +38,6 @@ use OCP\Notification\IManager as INotificationManager; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeNotificationsListener implements IEventListener { - /** @var INotificationManager */ private $notificationManager; diff --git a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php index e52b989c353..e478c21239f 100644 --- a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php @@ -34,7 +34,6 @@ use OCP\User\Events\UserDeletedEvent; * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent> */ class UserDeletedStoreCleanupListener implements IEventListener { - /** @var Registry */ private $registry; diff --git a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php index 6a3f4402886..a09a08568d5 100644 --- a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php @@ -37,7 +37,6 @@ use Throwable; * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent> */ class UserDeletedTokenCleanupListener implements IEventListener { - /** @var Manager */ private $manager; diff --git a/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php index a56ac3bd54e..4927c3ac7f9 100644 --- a/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php @@ -32,7 +32,6 @@ use OCP\EventDispatcher\IEventListener; use OCP\User\Events\UserDeletedEvent; class UserDeletedWebAuthnCleanupListener implements IEventListener { - /** @var PublicKeyCredentialMapper */ private $credentialMapper; diff --git a/lib/private/Authentication/Listeners/UserLoggedInListener.php b/lib/private/Authentication/Listeners/UserLoggedInListener.php index 88298889057..df030c44749 100644 --- a/lib/private/Authentication/Listeners/UserLoggedInListener.php +++ b/lib/private/Authentication/Listeners/UserLoggedInListener.php @@ -35,7 +35,6 @@ use OCP\User\Events\PostLoginEvent; * @template-implements IEventListener<\OCP\User\Events\PostLoginEvent> */ class UserLoggedInListener implements IEventListener { - /** @var Manager */ private $manager; diff --git a/lib/private/Authentication/Login/ALoginCommand.php b/lib/private/Authentication/Login/ALoginCommand.php index 5b245db6bda..7944eac1b62 100644 --- a/lib/private/Authentication/Login/ALoginCommand.php +++ b/lib/private/Authentication/Login/ALoginCommand.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; abstract class ALoginCommand { - /** @var ALoginCommand */ protected $next; diff --git a/lib/private/Authentication/Login/Chain.php b/lib/private/Authentication/Login/Chain.php index 32f44268d52..3c3179472c4 100644 --- a/lib/private/Authentication/Login/Chain.php +++ b/lib/private/Authentication/Login/Chain.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; class Chain { - /** @var PreLoginHookCommand */ private $preLoginHookCommand; diff --git a/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php b/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php index 7e872a855a5..1643b5af1d5 100644 --- a/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php +++ b/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IConfig; class ClearLostPasswordTokensCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/CompleteLoginCommand.php b/lib/private/Authentication/Login/CompleteLoginCommand.php index ffe76b4c89d..46f7f1a3fa7 100644 --- a/lib/private/Authentication/Login/CompleteLoginCommand.php +++ b/lib/private/Authentication/Login/CompleteLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OC\User\Session; class CompleteLoginCommand extends ALoginCommand { - /** @var Session */ private $userSession; diff --git a/lib/private/Authentication/Login/CreateSessionTokenCommand.php b/lib/private/Authentication/Login/CreateSessionTokenCommand.php index 31ca0936942..ba237dfbf20 100644 --- a/lib/private/Authentication/Login/CreateSessionTokenCommand.php +++ b/lib/private/Authentication/Login/CreateSessionTokenCommand.php @@ -32,7 +32,6 @@ use OC\User\Session; use OCP\IConfig; class CreateSessionTokenCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/EmailLoginCommand.php b/lib/private/Authentication/Login/EmailLoginCommand.php index 7145ab9e14f..315fe450697 100644 --- a/lib/private/Authentication/Login/EmailLoginCommand.php +++ b/lib/private/Authentication/Login/EmailLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IUserManager; class EmailLoginCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; @@ -45,7 +44,6 @@ class EmailLoginCommand extends ALoginCommand { $users = $this->userManager->getByEmail($loginData->getUsername()); // we only allow login by email if unique if (count($users) === 1) { - // FIXME: This is a workaround to still stick to configured LDAP login filters // this can be removed once the email login is properly implemented in the local user backend // as described in https://github.com/nextcloud/server/issues/5221 diff --git a/lib/private/Authentication/Login/FinishRememberedLoginCommand.php b/lib/private/Authentication/Login/FinishRememberedLoginCommand.php index 9b5b4ed0642..04ed7ed846e 100644 --- a/lib/private/Authentication/Login/FinishRememberedLoginCommand.php +++ b/lib/private/Authentication/Login/FinishRememberedLoginCommand.php @@ -30,7 +30,6 @@ use OC\User\Session; use OCP\IConfig; class FinishRememberedLoginCommand extends ALoginCommand { - /** @var Session */ private $userSession; /** @var IConfig */ diff --git a/lib/private/Authentication/Login/LoggedInCheckCommand.php b/lib/private/Authentication/Login/LoggedInCheckCommand.php index 9f80d47a3d4..dc1a4d2d883 100644 --- a/lib/private/Authentication/Login/LoggedInCheckCommand.php +++ b/lib/private/Authentication/Login/LoggedInCheckCommand.php @@ -33,7 +33,6 @@ use OCP\EventDispatcher\IEventDispatcher; use Psr\Log\LoggerInterface; class LoggedInCheckCommand extends ALoginCommand { - /** @var LoggerInterface */ private $logger; /** @var IEventDispatcher */ diff --git a/lib/private/Authentication/Login/LoginData.php b/lib/private/Authentication/Login/LoginData.php index 43d1a725668..240a1dc6476 100644 --- a/lib/private/Authentication/Login/LoginData.php +++ b/lib/private/Authentication/Login/LoginData.php @@ -30,7 +30,6 @@ use OCP\IRequest; use OCP\IUser; class LoginData { - /** @var IRequest */ private $request; diff --git a/lib/private/Authentication/Login/LoginResult.php b/lib/private/Authentication/Login/LoginResult.php index 1f91c9c6a25..dec012c2fc9 100644 --- a/lib/private/Authentication/Login/LoginResult.php +++ b/lib/private/Authentication/Login/LoginResult.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; class LoginResult { - /** @var bool */ private $success; diff --git a/lib/private/Authentication/Login/PreLoginHookCommand.php b/lib/private/Authentication/Login/PreLoginHookCommand.php index b989927a21c..21c97433f5a 100644 --- a/lib/private/Authentication/Login/PreLoginHookCommand.php +++ b/lib/private/Authentication/Login/PreLoginHookCommand.php @@ -30,7 +30,6 @@ use OC\Hooks\PublicEmitter; use OCP\IUserManager; class PreLoginHookCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/Login/SetUserTimezoneCommand.php b/lib/private/Authentication/Login/SetUserTimezoneCommand.php index 57859b032b6..f68fce1771e 100644 --- a/lib/private/Authentication/Login/SetUserTimezoneCommand.php +++ b/lib/private/Authentication/Login/SetUserTimezoneCommand.php @@ -29,7 +29,6 @@ use OCP\IConfig; use OCP\ISession; class SetUserTimezoneCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/TwoFactorCommand.php b/lib/private/Authentication/Login/TwoFactorCommand.php index d20bc881f1f..256d88ffa81 100644 --- a/lib/private/Authentication/Login/TwoFactorCommand.php +++ b/lib/private/Authentication/Login/TwoFactorCommand.php @@ -34,7 +34,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; use OCP\IURLGenerator; class TwoFactorCommand extends ALoginCommand { - /** @var Manager */ private $twoFactorManager; diff --git a/lib/private/Authentication/Login/UidLoginCommand.php b/lib/private/Authentication/Login/UidLoginCommand.php index a1bc9c585ab..d3216b6aad8 100644 --- a/lib/private/Authentication/Login/UidLoginCommand.php +++ b/lib/private/Authentication/Login/UidLoginCommand.php @@ -29,7 +29,6 @@ use OC\User\Manager; use OCP\IUser; class UidLoginCommand extends ALoginCommand { - /** @var Manager */ private $userManager; diff --git a/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php b/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php index cd9cdfab6e8..571ea931d8a 100644 --- a/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php +++ b/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\ISession; class UpdateLastPasswordConfirmCommand extends ALoginCommand { - /** @var ISession */ private $session; diff --git a/lib/private/Authentication/Login/UserDisabledCheckCommand.php b/lib/private/Authentication/Login/UserDisabledCheckCommand.php index 87446dc72d7..7cf4c7235ec 100644 --- a/lib/private/Authentication/Login/UserDisabledCheckCommand.php +++ b/lib/private/Authentication/Login/UserDisabledCheckCommand.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use Psr\Log\LoggerInterface; class UserDisabledCheckCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/Login/WebAuthnLoginCommand.php b/lib/private/Authentication/Login/WebAuthnLoginCommand.php index 5f79768d257..478a579853c 100644 --- a/lib/private/Authentication/Login/WebAuthnLoginCommand.php +++ b/lib/private/Authentication/Login/WebAuthnLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IUserManager; class WebAuthnLoginCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/LoginCredentials/Credentials.php b/lib/private/Authentication/LoginCredentials/Credentials.php index 42f8f374059..69bfc2ba198 100644 --- a/lib/private/Authentication/LoginCredentials/Credentials.php +++ b/lib/private/Authentication/LoginCredentials/Credentials.php @@ -25,7 +25,6 @@ namespace OC\Authentication\LoginCredentials; use OCP\Authentication\LoginCredentials\ICredentials; class Credentials implements ICredentials { - /** @var string */ private $uid; diff --git a/lib/private/Authentication/LoginCredentials/Store.php b/lib/private/Authentication/LoginCredentials/Store.php index d3db0444664..3a09e983ee8 100644 --- a/lib/private/Authentication/LoginCredentials/Store.php +++ b/lib/private/Authentication/LoginCredentials/Store.php @@ -38,7 +38,6 @@ use OCP\Util; use Psr\Log\LoggerInterface; class Store implements IStore { - /** @var ISession */ private $session; diff --git a/lib/private/Authentication/Notifications/Notifier.php b/lib/private/Authentication/Notifications/Notifier.php index 849b421d4c3..8cf5d653771 100644 --- a/lib/private/Authentication/Notifications/Notifier.php +++ b/lib/private/Authentication/Notifications/Notifier.php @@ -32,7 +32,6 @@ use OCP\Notification\INotification; use OCP\Notification\INotifier; class Notifier implements INotifier { - /** @var IL10nFactory */ private $factory; diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php index 33e0ad46263..b5af3f3a5ee 100644 --- a/lib/private/Authentication/Token/IProvider.php +++ b/lib/private/Authentication/Token/IProvider.php @@ -35,8 +35,6 @@ use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Exceptions\WipeTokenException; interface IProvider { - - /** * Create and persist a new token * diff --git a/lib/private/Authentication/Token/IWipeableToken.php b/lib/private/Authentication/Token/IWipeableToken.php index 64dbb604ed2..5ba994e0d5e 100644 --- a/lib/private/Authentication/Token/IWipeableToken.php +++ b/lib/private/Authentication/Token/IWipeableToken.php @@ -27,7 +27,6 @@ declare(strict_types=1); namespace OC\Authentication\Token; interface IWipeableToken extends IToken { - /** * Mark the token for remote wipe */ diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php index f8a0fb11c52..59c7ca714c6 100644 --- a/lib/private/Authentication/Token/Manager.php +++ b/lib/private/Authentication/Token/Manager.php @@ -34,7 +34,6 @@ use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Exceptions\WipeTokenException; class Manager implements IProvider { - /** @var PublicKeyTokenProvider */ private $publicKeyTokenProvider; diff --git a/lib/private/Authentication/Token/RemoteWipe.php b/lib/private/Authentication/Token/RemoteWipe.php index 9e152d16a04..5fd01cfbe87 100644 --- a/lib/private/Authentication/Token/RemoteWipe.php +++ b/lib/private/Authentication/Token/RemoteWipe.php @@ -37,7 +37,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; class RemoteWipe { - /** @var IProvider */ private $tokenProvider; diff --git a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php index ed157f49006..b95128c1e0f 100644 --- a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php +++ b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php @@ -28,7 +28,6 @@ namespace OC\Authentication\TwoFactorAuth; use JsonSerializable; class EnforcementState implements JsonSerializable { - /** @var bool */ private $enforced; diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index ce732384987..d62556465df 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -342,7 +342,6 @@ class Manager { // First check if the session tells us we should do 2FA (99% case) if (!$this->session->exists(self::SESSION_UID_KEY)) { - // Check if the session tells us it is 2FA authenticated already if ($this->session->exists(self::SESSION_UID_DONE) && $this->session->get(self::SESSION_UID_DONE) === $user->getUID()) { diff --git a/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php b/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php index 675f4faf63a..3bfbd77941b 100644 --- a/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php +++ b/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php @@ -30,7 +30,6 @@ use OCP\IGroupManager; use OCP\IUser; class MandatoryTwoFactor { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php index e2bb367f47e..c7c075bdab3 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php @@ -33,7 +33,6 @@ use OCP\Authentication\TwoFactorAuth\IRegistry; use OCP\IUser; class ProviderManager { - /** @var ProviderLoader */ private $providerLoader; diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php index 5e05cb0f710..af270fb83c8 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php @@ -33,7 +33,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; * Contains all two-factor provider information for the two-factor login challenge */ class ProviderSet { - /** @var IProvider */ private $providers; diff --git a/lib/private/Authentication/TwoFactorAuth/Registry.php b/lib/private/Authentication/TwoFactorAuth/Registry.php index 1846ebcf8e2..6c82572578c 100644 --- a/lib/private/Authentication/TwoFactorAuth/Registry.php +++ b/lib/private/Authentication/TwoFactorAuth/Registry.php @@ -35,7 +35,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; class Registry implements IRegistry { - /** @var ProviderUserAssignmentDao */ private $assignmentDao; diff --git a/lib/private/Authentication/WebAuthn/CredentialRepository.php b/lib/private/Authentication/WebAuthn/CredentialRepository.php index 34af75b1ba6..e5c3fcf1618 100644 --- a/lib/private/Authentication/WebAuthn/CredentialRepository.php +++ b/lib/private/Authentication/WebAuthn/CredentialRepository.php @@ -33,7 +33,6 @@ use Webauthn\PublicKeyCredentialSourceRepository; use Webauthn\PublicKeyCredentialUserEntity; class CredentialRepository implements PublicKeyCredentialSourceRepository { - /** @var PublicKeyCredentialMapper */ private $credentialMapper; diff --git a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php index 786154d6d14..6f97ded483d 100644 --- a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php +++ b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php @@ -43,7 +43,6 @@ use Webauthn\PublicKeyCredentialSource; * @method void setData(string $data); */ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { - /** @var string */ protected $name; diff --git a/lib/private/Authentication/WebAuthn/Manager.php b/lib/private/Authentication/WebAuthn/Manager.php index de22fd6d450..744a3fa354a 100644 --- a/lib/private/Authentication/WebAuthn/Manager.php +++ b/lib/private/Authentication/WebAuthn/Manager.php @@ -56,7 +56,6 @@ use Webauthn\PublicKeyCredentialUserEntity; use Webauthn\TokenBinding\TokenBindingNotSupportedHandler; class Manager { - /** @var CredentialRepository */ private $repository; diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index ec9bed40850..5c4f04de6d6 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -55,7 +55,6 @@ use Psr\Log\LoggerInterface; * This class implements methods to access Avatar functionality */ class AvatarManager implements IAvatarManager { - /** @var IUserSession */ private $userSession; diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index 02fcfcb0fc8..6d39d5f067d 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -124,7 +124,7 @@ class UserAvatar extends Avatar { if ( (is_resource($data) && get_resource_type($data) === 'gd') || (is_object($data) && get_class($data) === \GdImage::class) - ) { + ) { $img->setResource($data); } elseif (is_resource($data)) { $img->loadFromFileHandle($data); diff --git a/lib/private/Broadcast/Events/BroadcastEvent.php b/lib/private/Broadcast/Events/BroadcastEvent.php index 47871e00132..de950ac9371 100644 --- a/lib/private/Broadcast/Events/BroadcastEvent.php +++ b/lib/private/Broadcast/Events/BroadcastEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\ABroadcastedEvent; use OCP\EventDispatcher\Event; class BroadcastEvent extends Event implements IBroadcastEvent { - /** @var ABroadcastedEvent */ private $event; diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php index 8e192b22332..1f63e462bb5 100644 --- a/lib/private/Cache/File.php +++ b/lib/private/Cache/File.php @@ -36,7 +36,6 @@ use OCP\Security\ISecureRandom; use Psr\Log\LoggerInterface; class File implements ICache { - /** @var View */ protected $storage; diff --git a/lib/private/Calendar/CalendarQuery.php b/lib/private/Calendar/CalendarQuery.php index 0569b66b616..64f74c2728b 100644 --- a/lib/private/Calendar/CalendarQuery.php +++ b/lib/private/Calendar/CalendarQuery.php @@ -28,7 +28,6 @@ namespace OC\Calendar; use OCP\Calendar\ICalendarQuery; class CalendarQuery implements ICalendarQuery { - /** @var string */ private $principalUri; diff --git a/lib/private/Calendar/Manager.php b/lib/private/Calendar/Manager.php index e85c2d2e377..7ef9dc585ae 100644 --- a/lib/private/Calendar/Manager.php +++ b/lib/private/Calendar/Manager.php @@ -47,7 +47,6 @@ use function array_map; use function array_merge; class Manager implements IManager { - /** * @var ICalendar[] holds all registered calendars */ diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index ff92ebb5444..9e63798475b 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -35,7 +35,6 @@ use OCP\Capabilities\IInitialStateExcludedCapability; use Psr\Log\LoggerInterface; class CapabilitiesManager { - /** @var \Closure[] */ private $capabilities = []; diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php index 72cbfd4de4b..a9038a0aa35 100644 --- a/lib/private/Collaboration/Collaborators/LookupPlugin.php +++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php @@ -38,7 +38,6 @@ use OCP\Share\IShare; use Psr\Log\LoggerInterface; class LookupPlugin implements ISearchPlugin { - /** @var IConfig */ private $config; /** @var IClientService */ diff --git a/lib/private/Collaboration/Resources/Collection.php b/lib/private/Collaboration/Resources/Collection.php index ba4005c2139..2e67c041566 100644 --- a/lib/private/Collaboration/Resources/Collection.php +++ b/lib/private/Collaboration/Resources/Collection.php @@ -37,7 +37,6 @@ use OCP\IDBConnection; use OCP\IUser; class Collection implements ICollection { - /** @var IManager|Manager */ protected $manager; diff --git a/lib/private/Collaboration/Resources/ProviderManager.php b/lib/private/Collaboration/Resources/ProviderManager.php index 4b099f33b4f..4f5ed53b162 100644 --- a/lib/private/Collaboration/Resources/ProviderManager.php +++ b/lib/private/Collaboration/Resources/ProviderManager.php @@ -33,7 +33,6 @@ use OCP\IServerContainer; use Psr\Log\LoggerInterface; class ProviderManager implements IProviderManager { - /** @var string[] */ protected $providers = []; diff --git a/lib/private/Collaboration/Resources/Resource.php b/lib/private/Collaboration/Resources/Resource.php index f138204403c..b5e0215cb39 100644 --- a/lib/private/Collaboration/Resources/Resource.php +++ b/lib/private/Collaboration/Resources/Resource.php @@ -33,7 +33,6 @@ use OCP\IDBConnection; use OCP\IUser; class Resource implements IResource { - /** @var IManager */ protected $manager; diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index c481e36f95b..f9e5c166872 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -306,7 +306,7 @@ class Comment implements IComment { */ public function setActor($actorType, $actorId) { if ( - !is_string($actorType) || !trim($actorType) + !is_string($actorType) || !trim($actorType) || !is_string($actorId) || $actorId === '' ) { throw new \InvalidArgumentException('String expected.'); @@ -388,7 +388,7 @@ class Comment implements IComment { */ public function setObject($objectType, $objectId) { if ( - !is_string($objectType) || !trim($objectType) + !is_string($objectType) || !trim($objectType) || !is_string($objectId) || trim($objectId) === '' ) { throw new \InvalidArgumentException('String expected.'); diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 3eb9aab6817..00cf323bfbf 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -47,7 +47,6 @@ use OCP\Util; use Psr\Log\LoggerInterface; class Manager implements ICommentsManager { - /** @var IDBConnection */ protected $dbConn; diff --git a/lib/private/Comments/ManagerFactory.php b/lib/private/Comments/ManagerFactory.php index c2fb3d37ab7..2b59a284b61 100644 --- a/lib/private/Comments/ManagerFactory.php +++ b/lib/private/Comments/ManagerFactory.php @@ -30,7 +30,6 @@ use OCP\Comments\ICommentsManagerFactory; use OCP\IServerContainer; class ManagerFactory implements ICommentsManagerFactory { - /** * Server container * diff --git a/lib/private/Contacts/ContactsMenu/ActionFactory.php b/lib/private/Contacts/ContactsMenu/ActionFactory.php index 891951a88e5..739c43d0bce 100644 --- a/lib/private/Contacts/ContactsMenu/ActionFactory.php +++ b/lib/private/Contacts/ContactsMenu/ActionFactory.php @@ -27,7 +27,6 @@ use OCP\Contacts\ContactsMenu\IActionFactory; use OCP\Contacts\ContactsMenu\ILinkAction; class ActionFactory implements IActionFactory { - /** * {@inheritDoc} */ diff --git a/lib/private/Contacts/ContactsMenu/Entry.php b/lib/private/Contacts/ContactsMenu/Entry.php index 3bbe679e999..51fde760407 100644 --- a/lib/private/Contacts/ContactsMenu/Entry.php +++ b/lib/private/Contacts/ContactsMenu/Entry.php @@ -31,7 +31,6 @@ use OCP\Contacts\ContactsMenu\IAction; use OCP\Contacts\ContactsMenu\IEntry; class Entry implements IEntry { - /** @var string|int|null */ private $id = null; diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index cc8111774d1..5a02968ad9b 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -32,7 +32,6 @@ use OCP\Contacts\IManager; use OCP\IAddressBook; class ContactsManager implements IManager { - /** * This function is used to search and find contacts within the users address books. * In case $pattern is empty all contacts will be returned. diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php index 334006d1706..acaa529c0e2 100644 --- a/lib/private/DB/Adapter.php +++ b/lib/private/DB/Adapter.php @@ -36,7 +36,6 @@ use Doctrine\DBAL\Exception\UniqueConstraintViolationException; * handled by the database abstraction layer. */ class Adapter { - /** * @var \OC\DB\Connection $conn */ diff --git a/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index b4be5c2e96a..295783616b6 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -23,7 +23,6 @@ namespace OC\DB; class AdapterMySQL extends Adapter { - /** @var string */ protected $collation; diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index bed7194ac39..27c700bce7f 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -29,7 +29,6 @@ namespace OC\DB; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; class AdapterSqlite extends Adapter { - /** * @param string $tableName */ diff --git a/lib/private/DB/ConnectionAdapter.php b/lib/private/DB/ConnectionAdapter.php index b21bce490f4..a53c7ecd994 100644 --- a/lib/private/DB/ConnectionAdapter.php +++ b/lib/private/DB/ConnectionAdapter.php @@ -38,7 +38,6 @@ use OCP\IDBConnection; * Adapts the public API to our internal DBAL connection wrapper */ class ConnectionAdapter implements IDBConnection { - /** @var Connection */ private $inner; diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php index ca0119a576c..f9610c5bf25 100644 --- a/lib/private/DB/Exceptions/DbalException.php +++ b/lib/private/DB/Exceptions/DbalException.php @@ -49,7 +49,6 @@ use OCP\DB\Exception; * @psalm-immutable */ class DbalException extends Exception { - /** @var \Doctrine\DBAL\Exception */ private $original; diff --git a/lib/private/DB/MySqlTools.php b/lib/private/DB/MySqlTools.php index a4bf728881f..b78db32eb53 100644 --- a/lib/private/DB/MySqlTools.php +++ b/lib/private/DB/MySqlTools.php @@ -29,7 +29,6 @@ use OCP\IDBConnection; * Various MySQL specific helper functions. */ class MySqlTools { - /** * @param IDBConnection $connection * @return bool diff --git a/lib/private/DB/OracleMigrator.php b/lib/private/DB/OracleMigrator.php index df331230f47..db9fc33f07f 100644 --- a/lib/private/DB/OracleMigrator.php +++ b/lib/private/DB/OracleMigrator.php @@ -37,7 +37,6 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Table; class OracleMigrator extends Migrator { - /** * Quote a column's name but changing the name requires recreating * the column instance and copying over all properties. @@ -74,7 +73,7 @@ class OracleMigrator extends Migrator { */ protected function quoteIndex($index) { return new Index( - //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()), + //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()), $index->getName(), array_map(function ($columnName) { return $this->connection->quoteIdentifier($columnName); diff --git a/lib/private/DB/PgSqlTools.php b/lib/private/DB/PgSqlTools.php index a150e9475d3..2781d3556e2 100644 --- a/lib/private/DB/PgSqlTools.php +++ b/lib/private/DB/PgSqlTools.php @@ -33,7 +33,6 @@ use function preg_quote; * Various PostgreSQL specific helper functions. */ class PgSqlTools { - /** @var \OCP\IConfig */ private $config; diff --git a/lib/private/DB/PreparedStatement.php b/lib/private/DB/PreparedStatement.php index 0debc762c87..849aa379832 100644 --- a/lib/private/DB/PreparedStatement.php +++ b/lib/private/DB/PreparedStatement.php @@ -42,7 +42,6 @@ use PDO; * methods without much magic. */ class PreparedStatement implements IPreparedStatement { - /** @var Statement */ private $statement; diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php index 3bb54d4b26e..618487e0f71 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php @@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class MySqlExpressionBuilder extends ExpressionBuilder { - /** @var string */ protected $collation; diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php index f9b58d7d8ed..caeb8009885 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php @@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class OCIExpressionBuilder extends ExpressionBuilder { - /** * @param mixed $column * @param mixed|null $type diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php index 0fba5363a28..03b58e222f3 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php @@ -29,7 +29,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class PgSqlExpressionBuilder extends ExpressionBuilder { - /** * Returns a IQueryFunction that casts the column to the given type * diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index e81ba61b3a7..99eaed07488 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -56,7 +56,6 @@ use OCP\DB\QueryBuilder\IQueryFunction; use Psr\Log\LoggerInterface; class QueryBuilder implements IQueryBuilder { - /** @var ConnectionAdapter */ private $connection; diff --git a/lib/private/DB/ResultAdapter.php b/lib/private/DB/ResultAdapter.php index 989839a473d..63881b71e7d 100644 --- a/lib/private/DB/ResultAdapter.php +++ b/lib/private/DB/ResultAdapter.php @@ -33,7 +33,6 @@ use PDO; * Adapts DBAL 2.6 API for DBAL 3.x for backwards compatibility of a leaked type */ class ResultAdapter implements IResult { - /** @var Result */ private $inner; diff --git a/lib/private/DB/SQLiteMigrator.php b/lib/private/DB/SQLiteMigrator.php index 76138fee545..2be3591afdc 100644 --- a/lib/private/DB/SQLiteMigrator.php +++ b/lib/private/DB/SQLiteMigrator.php @@ -28,7 +28,6 @@ use Doctrine\DBAL\Types\BigIntType; use Doctrine\DBAL\Types\Type; class SQLiteMigrator extends Migrator { - /** * @param Schema $targetSchema * @param \Doctrine\DBAL\Connection $connection diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php index 40d41f0dafc..31b74014a98 100644 --- a/lib/private/DB/SchemaWrapper.php +++ b/lib/private/DB/SchemaWrapper.php @@ -29,7 +29,6 @@ use Doctrine\DBAL\Schema\Schema; use OCP\DB\ISchemaWrapper; class SchemaWrapper implements ISchemaWrapper { - /** @var Connection */ protected $connection; diff --git a/lib/private/Dashboard/Manager.php b/lib/private/Dashboard/Manager.php index ba34219a615..18a66499167 100644 --- a/lib/private/Dashboard/Manager.php +++ b/lib/private/Dashboard/Manager.php @@ -37,7 +37,6 @@ use Throwable; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var array */ private $lazyWidgets = []; diff --git a/lib/private/Diagnostics/EventLogger.php b/lib/private/Diagnostics/EventLogger.php index 7b9bd9630ab..f1dd1addb08 100644 --- a/lib/private/Diagnostics/EventLogger.php +++ b/lib/private/Diagnostics/EventLogger.php @@ -31,7 +31,6 @@ use OCP\Diagnostics\IEventLogger; use Psr\Log\LoggerInterface; class EventLogger implements IEventLogger { - /** @var Event[] */ private $events = []; diff --git a/lib/private/DirectEditing/Token.php b/lib/private/DirectEditing/Token.php index 5f98ef51386..0ec911f9624 100644 --- a/lib/private/DirectEditing/Token.php +++ b/lib/private/DirectEditing/Token.php @@ -26,7 +26,6 @@ use OCP\DirectEditing\IToken; use OCP\Files\File; class Token implements IToken { - /** @var Manager */ private $manager; private $data; diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index 6d604e38d4b..7bf4ce62d28 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -37,7 +37,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class DecryptAll { - /** @var OutputInterface */ protected $output; @@ -250,7 +249,6 @@ class DecryptAll { * @return bool */ protected function decryptFile($path) { - // skip already decrypted files $fileInfo = $this->rootView->getFileInfo($path); if ($fileInfo !== false && !$fileInfo->isEncrypted()) { diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index f2803fa5ff8..37264e81823 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -40,7 +40,6 @@ use Psr\Log\LoggerInterface; * @package OC\Encryption */ class EncryptionWrapper { - /** @var ArrayCache */ private $arrayCache; diff --git a/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php index 7c9e70b4958..99cfb1eb8d1 100644 --- a/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php +++ b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php @@ -25,7 +25,6 @@ namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; class EncryptionHeaderKeyExistsException extends GenericEncryptionException { - /** * @param string $key */ diff --git a/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php index 64b34e1b883..d0a2756212b 100644 --- a/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php +++ b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php @@ -25,7 +25,6 @@ namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; class ModuleAlreadyExistsException extends GenericEncryptionException { - /** * @param string $id * @param string $name diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php index 87bc35bc159..daab097ce7c 100644 --- a/lib/private/Encryption/File.php +++ b/lib/private/Encryption/File.php @@ -71,7 +71,6 @@ class File implements \OCP\Encryption\IFile { * @return array{users: string[], public: bool} */ public function getAccessList($path) { - // Make sure that a share key is generated for the owner too [$owner, $ownerPath] = $this->util->getUidAndFilename($path); diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index a3772af5878..b6376dc0146 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -37,7 +37,6 @@ use OCP\IConfig; use OCP\Security\ICrypto; class Storage implements IStorage { - // hidden file which indicate that the folder is a valid key storage public const KEY_STORAGE_MARKER = '.oc_key_storage'; diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 5788da990d5..a553d6a55d1 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -37,7 +37,6 @@ use OCP\IL10N; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var array */ protected $encryptionModules; diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php index 9996d6e077c..2e390177baf 100644 --- a/lib/private/Encryption/Update.php +++ b/lib/private/Encryption/Update.php @@ -37,7 +37,6 @@ use Psr\Log\LoggerInterface; * update encrypted files, e.g. because a file was shared */ class Update { - /** @var View */ protected $view; diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index bf7bbce8ad7..371f2588289 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -308,7 +308,6 @@ class Util { $normalizedPath = Filesystem::normalizePath($path); $root = explode('/', $normalizedPath, 4); if (count($root) > 1) { - // detect alternative key storage root $rootDir = $this->getKeyStorageRoot(); if ($rootDir !== '' && diff --git a/lib/private/EventDispatcher/EventDispatcher.php b/lib/private/EventDispatcher/EventDispatcher.php index 7de1f68d8d7..2a306344923 100644 --- a/lib/private/EventDispatcher/EventDispatcher.php +++ b/lib/private/EventDispatcher/EventDispatcher.php @@ -39,7 +39,6 @@ use OCP\IServerContainer; use Symfony\Component\EventDispatcher\EventDispatcher as SymfonyDispatcher; class EventDispatcher implements IEventDispatcher { - /** @var SymfonyDispatcher */ private $dispatcher; diff --git a/lib/private/EventDispatcher/ServiceEventListener.php b/lib/private/EventDispatcher/ServiceEventListener.php index a7e15f1df1b..21cdf7f8cc2 100644 --- a/lib/private/EventDispatcher/ServiceEventListener.php +++ b/lib/private/EventDispatcher/ServiceEventListener.php @@ -41,7 +41,6 @@ use function sprintf; * created by the service container */ final class ServiceEventListener { - /** @var IServerContainer */ private $container; diff --git a/lib/private/EventDispatcher/SymfonyAdapter.php b/lib/private/EventDispatcher/SymfonyAdapter.php index a12e932e380..aa6fcbc1ad3 100644 --- a/lib/private/EventDispatcher/SymfonyAdapter.php +++ b/lib/private/EventDispatcher/SymfonyAdapter.php @@ -40,7 +40,6 @@ use function is_string; * @deprecated 20.0.0 use \OCP\EventDispatcher\IEventDispatcher */ class SymfonyAdapter implements EventDispatcherInterface { - /** @var EventDispatcher */ private $eventDispatcher; private LoggerInterface $logger; diff --git a/lib/private/Federation/CloudFederationFactory.php b/lib/private/Federation/CloudFederationFactory.php index 010ffdafe47..391213c21e0 100644 --- a/lib/private/Federation/CloudFederationFactory.php +++ b/lib/private/Federation/CloudFederationFactory.php @@ -27,7 +27,6 @@ use OCP\Federation\ICloudFederationNotification; use OCP\Federation\ICloudFederationShare; class CloudFederationFactory implements ICloudFederationFactory { - /** * get a CloudFederationShare Object to prepare a share you want to send * diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php index f077e36d97d..b11c4060ab4 100644 --- a/lib/private/Federation/CloudFederationProviderManager.php +++ b/lib/private/Federation/CloudFederationProviderManager.php @@ -42,7 +42,6 @@ use Psr\Log\LoggerInterface; * @package OC\Federation */ class CloudFederationProviderManager implements ICloudFederationProviderManager { - /** @var array list of available cloud federation providers */ private $cloudFederationProvider; diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index 3529ede9746..eba2aac927b 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -38,7 +38,6 @@ use OCP\IDBConnection; use Psr\Log\LoggerInterface; class QuerySearchHelper { - /** @var IMimeTypeLoader */ private $mimetypeLoader; /** @var IDBConnection */ diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index 7be9c750262..f7d1d105d83 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -142,7 +142,6 @@ class Scanner extends BasicEmitter implements IScanner { } // only proceed if $file is not a partial file, blacklist is handled by the storage if (!self::isPartialFile($file)) { - // acquire a lock if ($lock) { if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { @@ -164,7 +163,6 @@ class Scanner extends BasicEmitter implements IScanner { try { if ($data) { - // pre-emit only if it was a file. By that we avoid counting/treating folders as files if ($data['mimetype'] !== 'httpd/unix-directory') { $this->emit('\OC\Files\Cache\Scanner', 'scanFile', [$file, $this->storageId]); diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index 1a8c3637063..63dc4b9cd0e 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -111,7 +111,7 @@ class SearchBuilder { } else { throw new \InvalidArgumentException('Binary operators inside "not" is not supported'); } - // no break + // no break case ISearchBinaryOperator::OPERATOR_AND: return call_user_func_array([$expr, 'andX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments())); case ISearchBinaryOperator::OPERATOR_OR: diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 6c763540847..64a6fc57b27 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -49,7 +49,6 @@ use OCP\IUserManager; use OCP\IUserSession; class Filesystem { - /** * @var Mount\Manager $mounts */ diff --git a/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php b/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php index 1e10c3ad593..2f6db935236 100644 --- a/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Files\ObjectStore; class AppdataPreviewObjectStoreStorage extends ObjectStoreStorage { - /** @var string */ private $internalId; diff --git a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index afc0ac96abc..824adcc1d0e 100644 --- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php @@ -28,7 +28,6 @@ namespace OC\Files\ObjectStore; use OC\User\User; class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage { - /** * The home user storage requires a user object to create a unique storage id * @param array $params diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 02b65bf37f7..d0c5bd14b38 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -342,7 +342,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { } else { return false; } - // no break + // no break case 'w': case 'wb': case 'w+': diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index ec5cd59d960..979e4ce966a 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -191,10 +191,10 @@ class SetupManager { return new PermissionsMask([ 'storage' => $storage, 'mask' => Constants::PERMISSION_ALL & ~( - Constants::PERMISSION_UPDATE | - Constants::PERMISSION_CREATE | - Constants::PERMISSION_DELETE - ), + Constants::PERMISSION_UPDATE | + Constants::PERMISSION_CREATE | + Constants::PERMISSION_DELETE + ), ]); } return $storage; diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php index 1f267119871..4d24aa138c1 100644 --- a/lib/private/Files/SimpleFS/SimpleFolder.php +++ b/lib/private/Files/SimpleFS/SimpleFolder.php @@ -32,7 +32,6 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFile; class SimpleFolder implements ISimpleFolder { - /** @var Folder */ private $folder; diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index a53ed5d1957..0c121feb11e 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -523,7 +523,6 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { * @throws InvalidPathException */ public function verifyPath($path, $fileName) { - // verify empty and dot files $trimmed = trim($fileName); if ($trimmed === '') { diff --git a/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php index 482cdc453af..d748b3410c3 100644 --- a/lib/private/Files/Storage/FailedStorage.php +++ b/lib/private/Files/Storage/FailedStorage.php @@ -34,7 +34,6 @@ use OCP\Lock\ILockingProvider; * Storage placeholder to represent a missing precondition, storage unavailable */ class FailedStorage extends Common { - /** @var \Exception */ protected $e; diff --git a/lib/private/Files/Storage/LocalTempFileTrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php index 2a1338148f5..2ac0a74b692 100644 --- a/lib/private/Files/Storage/LocalTempFileTrait.php +++ b/lib/private/Files/Storage/LocalTempFileTrait.php @@ -35,7 +35,6 @@ namespace OC\Files\Storage; * in classes which extend it, e.g. $this->stat() . */ trait LocalTempFileTrait { - /** @var string[] */ protected $cachedFiles = []; diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php index cc317de2669..0a2511de164 100644 --- a/lib/private/Files/Storage/Storage.php +++ b/lib/private/Files/Storage/Storage.php @@ -32,7 +32,6 @@ use OCP\Lock\ILockingProvider; * All paths passed to the storage are relative to the storage and should NOT have a leading slash. */ interface Storage extends \OCP\Files\Storage { - /** * get a cache instance for the storage * diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index cb82e00845c..ed680f5045d 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -40,7 +40,6 @@ use OCP\ICache; * the actual given name and then try its NFD form. */ class Encoding extends Wrapper { - /** * @var ICache */ diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 2f7123426d1..be0db3d414a 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -375,7 +375,6 @@ class Encryption extends Wrapper { * @throws ModuleDoesNotExistsException */ public function fopen($path, $mode) { - // check if the file is stored in the array cache, this means that we // copy a file over to the versions folder, in this case we don't want to // decrypt it @@ -685,7 +684,6 @@ class Encryption extends Wrapper { $preserveMtime = false, $isRename = false ) { - // TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed: // - call $this->storage->copyFromStorage() instead of $this->copyBetweenStorage // - copy the file cache update from $this->copyBetweenStorage to this method @@ -766,7 +764,6 @@ class Encryption extends Wrapper { $preserveMtime, $isRename ) { - // for versions we have nothing to do, because versions should always use the // key from the original file. Just create a 1:1 copy and done if ($this->isVersion($targetInternalPath) || diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 9cc8b238ee1..cebf7bafced 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/lib/private/Files/Stream/Encryption.php @@ -37,7 +37,6 @@ use function is_array; use function stream_context_create; class Encryption extends Wrapper { - /** @var \OC\Encryption\Util */ protected $util; @@ -375,7 +374,6 @@ class Encryption extends Wrapper { // only allow writes on seekable streams, or at the end of the encrypted stream if (!$this->readOnly && ($resultFseek || $positionInFile === $this->size)) { - // switch the writeFlag so flush() will write the block $this->writeFlag = true; $this->fileUpdated = true; @@ -392,7 +390,7 @@ class Encryption extends Wrapper { $length += $remainingLength; $data = ''; // if $data doesn't fit the current block, the fill the current block and reiterate - // after the block is filled, it is flushed and $data is updatedxxx + // after the block is filled, it is flushed and $data is updatedxxx } else { $this->cache = substr($this->cache, 0, $blockPosition) . substr($data, 0, $this->unencryptedBlockSize - $blockPosition); diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index 4cade024460..432bc4c4d6d 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -202,7 +202,6 @@ class Detection implements IMimeTypeDetector { // note: leading dot doesn't qualify as extension if (strpos($fileName, '.') > 0) { - // remove versioning extension: name.v1508946057 and transfer extension: name.ocTransferId2057600214.part $fileName = preg_replace('!((\.v\d+)|((\.ocTransferId\d+)?\.part))$!', '', $fileName); diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index 8193a3f7b03..bf5af36ec6e 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -33,7 +33,6 @@ use OCP\IDBConnection; * @package OC\Files\Type */ class Loader implements IMimeTypeLoader { - /** @var IDBConnection */ private $dbConnection; @@ -121,7 +120,7 @@ class Loader implements IMimeTypeLoader { ->from('mimetypes') ->where( $fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype) - )); + )); $result = $fetch->execute(); $row = $result->fetch(); diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 16a9381768b..8f073da9164 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -821,14 +821,14 @@ class View { } else { $result = false; } - // moving a file/folder within the same mount point + // moving a file/folder within the same mount point } elseif ($storage1 === $storage2) { if ($storage1) { $result = $storage1->rename($internalPath1, $internalPath2); } else { $result = false; } - // moving a file/folder between storages (from $storage1 to $storage2) + // moving a file/folder between storages (from $storage1 to $storage2) } else { $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2); } @@ -1047,7 +1047,6 @@ class View { public function fromTmpFile($tmpFile, $path) { $this->assertPathLength($path); if (Filesystem::isValidPath($path)) { - // Get directory that the file is going into $filePath = dirname($path); @@ -1803,7 +1802,6 @@ class View { * @return boolean */ private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) { - // note: cannot use the view because the target is already locked $fileId = (int)$targetStorage->getCache()->getId($targetInternalPath); if ($fileId === -1) { diff --git a/lib/private/FullTextSearch/FullTextSearchManager.php b/lib/private/FullTextSearch/FullTextSearchManager.php index 6265c6dc94d..8d850513949 100644 --- a/lib/private/FullTextSearch/FullTextSearchManager.php +++ b/lib/private/FullTextSearch/FullTextSearchManager.php @@ -39,8 +39,6 @@ use OCP\FullTextSearch\Service\ISearchService; * @package OC\FullTextSearch */ class FullTextSearchManager implements IFullTextSearchManager { - - /** @var IProviderService */ private $providerService; diff --git a/lib/private/FullTextSearch/Model/DocumentAccess.php b/lib/private/FullTextSearch/Model/DocumentAccess.php index 3fe08dfcc08..cb2b95284f1 100644 --- a/lib/private/FullTextSearch/Model/DocumentAccess.php +++ b/lib/private/FullTextSearch/Model/DocumentAccess.php @@ -49,8 +49,6 @@ use OCP\FullTextSearch\Model\IDocumentAccess; * @package OC\FullTextSearch\Model */ final class DocumentAccess implements IDocumentAccess, JsonSerializable { - - /** @var string */ private $ownerId; diff --git a/lib/private/FullTextSearch/Model/IndexDocument.php b/lib/private/FullTextSearch/Model/IndexDocument.php index 3078f12c465..74788463693 100644 --- a/lib/private/FullTextSearch/Model/IndexDocument.php +++ b/lib/private/FullTextSearch/Model/IndexDocument.php @@ -47,8 +47,6 @@ use OCP\FullTextSearch\Model\IIndexDocument; * @package OC\FullTextSearch\Model */ class IndexDocument implements IIndexDocument, JsonSerializable { - - /** @var string */ protected $id = ''; diff --git a/lib/private/FullTextSearch/Model/SearchOption.php b/lib/private/FullTextSearch/Model/SearchOption.php index c4c63a801a3..91f45db5fb4 100644 --- a/lib/private/FullTextSearch/Model/SearchOption.php +++ b/lib/private/FullTextSearch/Model/SearchOption.php @@ -36,8 +36,6 @@ use OCP\FullTextSearch\Model\ISearchOption; * @package OC\FullTextSearch\Model */ final class SearchOption implements ISearchOption, JsonSerializable { - - /** @var string */ private $name = ''; diff --git a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php index d6bfe6d9102..c58d55b9b55 100644 --- a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php +++ b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php @@ -37,8 +37,6 @@ use OCP\FullTextSearch\Model\ISearchRequestSimpleQuery; * @package OC\FullTextSearch\Model */ final class SearchRequestSimpleQuery implements ISearchRequestSimpleQuery, JsonSerializable { - - /** @var int */ private $type = 0; diff --git a/lib/private/FullTextSearch/Model/SearchTemplate.php b/lib/private/FullTextSearch/Model/SearchTemplate.php index eb1ab8ead84..4bb56f24b58 100644 --- a/lib/private/FullTextSearch/Model/SearchTemplate.php +++ b/lib/private/FullTextSearch/Model/SearchTemplate.php @@ -56,8 +56,6 @@ use OCP\FullTextSearch\Model\ISearchTemplate; * @package OC\FullTextSearch\Model */ final class SearchTemplate implements ISearchTemplate, JsonSerializable { - - /** @var string */ private $icon = ''; diff --git a/lib/private/GlobalScale/Config.php b/lib/private/GlobalScale/Config.php index 71bcbbc4a1e..a5449ade691 100644 --- a/lib/private/GlobalScale/Config.php +++ b/lib/private/GlobalScale/Config.php @@ -25,7 +25,6 @@ namespace OC\GlobalScale; use OCP\IConfig; class Config implements \OCP\GlobalScale\IConfig { - /** @var IConfig */ private $config; diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 7b7ee41def9..5f17477db77 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -49,16 +49,15 @@ use OCP\IDBConnection; */ class Database extends ABackend implements IAddToGroupBackend, - ICountDisabledInGroup, - ICountUsersBackend, - ICreateGroupBackend, - IDeleteGroupBackend, - IGetDisplayNameBackend, - IGroupDetailsBackend, - IRemoveFromGroupBackend, - ISetDisplayNameBackend, - INamedBackend { - + ICountDisabledInGroup, + ICountUsersBackend, + ICreateGroupBackend, + IDeleteGroupBackend, + IGetDisplayNameBackend, + IGroupDetailsBackend, + IRemoveFromGroupBackend, + ISetDisplayNameBackend, + INamedBackend { /** @var string[] */ private $groupCache = []; diff --git a/lib/private/Hooks/EmitterTrait.php b/lib/private/Hooks/EmitterTrait.php index de012cca044..da4e3da2bd6 100644 --- a/lib/private/Hooks/EmitterTrait.php +++ b/lib/private/Hooks/EmitterTrait.php @@ -27,7 +27,6 @@ namespace OC\Hooks; * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service */ trait EmitterTrait { - /** * @var callable[][] $listeners */ diff --git a/lib/private/Http/WellKnown/RequestManager.php b/lib/private/Http/WellKnown/RequestManager.php index 17e2ed658a6..b83ff2ada50 100644 --- a/lib/private/Http/WellKnown/RequestManager.php +++ b/lib/private/Http/WellKnown/RequestManager.php @@ -39,7 +39,6 @@ use RuntimeException; use function array_reduce; class RequestManager { - /** @var Coordinator */ private $coordinator; diff --git a/lib/private/InitialStateService.php b/lib/private/InitialStateService.php index 4920e1bf40e..1d997e4133a 100644 --- a/lib/private/InitialStateService.php +++ b/lib/private/InitialStateService.php @@ -37,7 +37,6 @@ use OCP\IServerContainer; use Psr\Log\LoggerInterface; class InitialStateService implements IInitialStateService { - /** @var LoggerInterface */ private $logger; diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index ba555cff438..9587e0fd42a 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -259,7 +259,7 @@ class Checker { $hashes = $this->generateHashes($iterator, $path); $signature = $this->createSignatureData($hashes, $certificate, $privateKey); $this->fileAccessHelper->file_put_contents( - $appInfoDir . '/signature.json', + $appInfoDir . '/signature.json', json_encode($signature, JSON_PRETTY_PRINT) ); } catch (\Exception $e) { @@ -357,7 +357,7 @@ class Checker { // Verify if certificate has proper CN. "core" CN is always trusted. if ($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') { throw new InvalidSignatureException( - sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN']) + sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN']) ); } @@ -515,10 +515,10 @@ class Checker { $path = $this->appLocator->getAppPath($appId); } $result = $this->verify( - $path . '/appinfo/signature.json', - $path, - $appId, - $forceVerify + $path . '/appinfo/signature.json', + $path, + $appId, + $forceVerify ); } catch (\Exception $e) { $result = [ @@ -566,9 +566,9 @@ class Checker { public function verifyCoreSignature(): array { try { $result = $this->verify( - $this->environmentHelper->getServerRoot() . '/core/signature.json', - $this->environmentHelper->getServerRoot(), - 'core' + $this->environmentHelper->getServerRoot() . '/core/signature.json', + $this->environmentHelper->getServerRoot(), + 'core' ); } catch (\Exception $e) { $result = [ diff --git a/lib/private/KnownUser/KnownUser.php b/lib/private/KnownUser/KnownUser.php index fa0453e0329..532d3ccb565 100644 --- a/lib/private/KnownUser/KnownUser.php +++ b/lib/private/KnownUser/KnownUser.php @@ -34,7 +34,6 @@ use OCP\AppFramework\Db\Entity; * @method string getKnownUser() */ class KnownUser extends Entity { - /** @var string */ protected $knownTo; diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 71910873db7..593af02bd1c 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -54,7 +54,6 @@ use function is_null; * A factory that generates language instances */ class Factory implements IFactory { - /** @var string */ protected $requestLanguage = ''; diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index 82ef3350b1f..d0794c9c9c0 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -34,7 +34,6 @@ use Punic\Calendar; use Symfony\Component\Translation\IdentityTranslator; class L10N implements IL10N { - /** @var IFactory */ protected $factory; diff --git a/lib/private/L10N/LanguageIterator.php b/lib/private/L10N/LanguageIterator.php index 4a76667caf2..b3549782d54 100644 --- a/lib/private/L10N/LanguageIterator.php +++ b/lib/private/L10N/LanguageIterator.php @@ -63,8 +63,8 @@ class LanguageIterator implements ILanguageIterator { return $forcedLang; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 1: $forcedLang = $this->config->getSystemValue('force_language', false); if (is_string($forcedLang) @@ -73,16 +73,16 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 2: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang)) { return $userLang; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 3: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang) @@ -94,7 +94,7 @@ class LanguageIterator implements ILanguageIterator { // no break case 4: return $this->config->getSystemValue('default_language', 'en'); - /** @noinspection PhpMissingBreakStatementInspection */ + /** @noinspection PhpMissingBreakStatementInspection */ case 5: $defaultLang = $this->config->getSystemValue('default_language', 'en'); if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) { diff --git a/lib/private/L10N/LazyL10N.php b/lib/private/L10N/LazyL10N.php index f56761799b3..3226c1a604b 100644 --- a/lib/private/L10N/LazyL10N.php +++ b/lib/private/L10N/LazyL10N.php @@ -28,7 +28,6 @@ namespace OC\L10N; use OCP\IL10N; class LazyL10N implements IL10N { - /** @var IL10N */ private $l; diff --git a/lib/private/Lock/NoopLockingProvider.php b/lib/private/Lock/NoopLockingProvider.php index ff56932a894..542cb5c028e 100644 --- a/lib/private/Lock/NoopLockingProvider.php +++ b/lib/private/Lock/NoopLockingProvider.php @@ -34,7 +34,6 @@ use OCP\Lock\ILockingProvider; * To be used when locking is disabled. */ class NoopLockingProvider implements ILockingProvider { - /** * {@inheritdoc} */ diff --git a/lib/private/Log.php b/lib/private/Log.php index 2ee5bfc9c5a..c139510a3b3 100644 --- a/lib/private/Log.php +++ b/lib/private/Log.php @@ -237,7 +237,6 @@ class Log implements ILogger, IDataLogger { // default to false to just process this once per request $this->logConditionSatisfied = false; if (!empty($logCondition)) { - // check for secret token in the request if (isset($logCondition['shared_secret'])) { $request = \OC::$server->getRequest(); diff --git a/lib/private/Log/Errorlog.php b/lib/private/Log/Errorlog.php index 5c00528210a..72d11aa098c 100644 --- a/lib/private/Log/Errorlog.php +++ b/lib/private/Log/Errorlog.php @@ -32,7 +32,6 @@ use OC\SystemConfig; use OCP\Log\IWriter; class Errorlog extends LogDetails implements IWriter { - /** @var string */ protected $tag; diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php index b3544572708..c82904d7cea 100644 --- a/lib/private/Log/LogDetails.php +++ b/lib/private/Log/LogDetails.php @@ -28,7 +28,6 @@ namespace OC\Log; use OC\SystemConfig; abstract class LogDetails { - /** @var SystemConfig */ private $config; diff --git a/lib/private/Log/LogFactory.php b/lib/private/Log/LogFactory.php index 2fdadc3bdb2..a5008f5ef77 100644 --- a/lib/private/Log/LogFactory.php +++ b/lib/private/Log/LogFactory.php @@ -57,7 +57,7 @@ class LogFactory implements ILogFactory { case 'file': return $this->buildLogFile(); - // Backwards compatibility for old and fallback for unknown log types + // Backwards compatibility for old and fallback for unknown log types case 'owncloud': case 'nextcloud': default: diff --git a/lib/private/Log/PsrLoggerAdapter.php b/lib/private/Log/PsrLoggerAdapter.php index 1cf81c49a69..80c4c187b13 100644 --- a/lib/private/Log/PsrLoggerAdapter.php +++ b/lib/private/Log/PsrLoggerAdapter.php @@ -35,7 +35,6 @@ use function array_key_exists; use function array_merge; final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { - /** @var Log */ private $logger; diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php index 20a60623713..8619cb5e4dd 100644 --- a/lib/private/Log/Systemdlog.php +++ b/lib/private/Log/Systemdlog.php @@ -78,7 +78,7 @@ class Systemdlog extends LogDetails implements IWriter { public function write(string $app, $message, int $level) { $journal_level = $this->levels[$level]; sd_journal_send('PRIORITY='.$journal_level, - 'SYSLOG_IDENTIFIER='.$this->syslogId, - 'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level)); + 'SYSLOG_IDENTIFIER='.$this->syslogId, + 'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level)); } } diff --git a/lib/private/Mail/Attachment.php b/lib/private/Mail/Attachment.php index bebcd19e107..12f71df86d9 100644 --- a/lib/private/Mail/Attachment.php +++ b/lib/private/Mail/Attachment.php @@ -35,7 +35,6 @@ use OCP\Mail\IAttachment; * @since 13.0.0 */ class Attachment implements IAttachment { - /** @var \Swift_Mime_Attachment */ protected $swiftAttachment; diff --git a/lib/private/Memcache/APCu.php b/lib/private/Memcache/APCu.php index f0eb98b9db2..957926ab848 100644 --- a/lib/private/Memcache/APCu.php +++ b/lib/private/Memcache/APCu.php @@ -156,8 +156,8 @@ class APCu extends Cache implements IMemcache { } elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enable_cli') && \OC::$CLI) { return false; } elseif ( - version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 && - version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1 + version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 && + version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1 ) { return false; } else { diff --git a/lib/private/Migration/ConsoleOutput.php b/lib/private/Migration/ConsoleOutput.php index b8fb25e9655..9e3396f2a75 100644 --- a/lib/private/Migration/ConsoleOutput.php +++ b/lib/private/Migration/ConsoleOutput.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Output\OutputInterface; * @package OC\Migration */ class ConsoleOutput implements IOutput { - /** @var OutputInterface */ private $output; diff --git a/lib/private/Notification/Action.php b/lib/private/Notification/Action.php index 6d1375a611b..ff9cf9e38f5 100644 --- a/lib/private/Notification/Action.php +++ b/lib/private/Notification/Action.php @@ -27,7 +27,6 @@ namespace OC\Notification; use OCP\Notification\IAction; class Action implements IAction { - /** @var string */ protected $label; diff --git a/lib/private/OCS/CoreCapabilities.php b/lib/private/OCS/CoreCapabilities.php index 578152ff108..2c630531b17 100644 --- a/lib/private/OCS/CoreCapabilities.php +++ b/lib/private/OCS/CoreCapabilities.php @@ -32,7 +32,6 @@ use OCP\IURLGenerator; * @package OC\OCS */ class CoreCapabilities implements ICapability { - /** @var IConfig */ private $config; diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php index 7ab876811e7..8f98ff7d5ae 100644 --- a/lib/private/OCS/DiscoveryService.php +++ b/lib/private/OCS/DiscoveryService.php @@ -36,7 +36,6 @@ use OCP\ICacheFactory; use OCP\OCS\IDiscoveryService; class DiscoveryService implements IDiscoveryService { - /** @var ICache */ private $cache; diff --git a/lib/private/OCS/Exception.php b/lib/private/OCS/Exception.php index 981c138b385..ca3c3f70430 100644 --- a/lib/private/OCS/Exception.php +++ b/lib/private/OCS/Exception.php @@ -23,7 +23,6 @@ namespace OC\OCS; class Exception extends \Exception { - /** @var Result */ private $result; diff --git a/lib/private/OCS/Result.php b/lib/private/OCS/Result.php index 73c2bf98272..d77e360e6d2 100644 --- a/lib/private/OCS/Result.php +++ b/lib/private/OCS/Result.php @@ -31,7 +31,6 @@ namespace OC\OCS; class Result { - /** @var array */ protected $data; diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index ffe5bc88856..84c7b4a8968 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -37,7 +37,6 @@ use Psr\Log\LoggerInterface; * @package OC\Preview */ abstract class Bitmap extends ProviderV2 { - /** * {@inheritDoc} */ diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 7d2408d683f..47f2952c6e6 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -513,7 +513,6 @@ class Generator { * @return int[] */ private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) { - /* * If we are not cropping we have to make sure the requested image * respects the aspect ratio of the original. diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php index 6a94b948241..64714a9f899 100644 --- a/lib/private/Preview/GeneratorHelper.php +++ b/lib/private/Preview/GeneratorHelper.php @@ -38,7 +38,6 @@ use OCP\Preview\IProviderV2; * Very small wrapper class to make the generator fully unit testable */ class GeneratorHelper { - /** @var IRootFolder */ private $rootFolder; diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php index 55e1220b56a..95b66a922fd 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -33,7 +33,6 @@ use OCP\Files\File; use OCP\IImage; abstract class Image extends ProviderV2 { - /** * {@inheritDoc} */ diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 5cb66a00881..486c301d987 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -35,7 +35,6 @@ use OCP\IImage; use Psr\Log\LoggerInterface; class Movie extends ProviderV2 { - /** * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2 * @var string diff --git a/lib/private/Preview/WatcherConnector.php b/lib/private/Preview/WatcherConnector.php index 4d038c9a2b7..d0eafed42c1 100644 --- a/lib/private/Preview/WatcherConnector.php +++ b/lib/private/Preview/WatcherConnector.php @@ -30,7 +30,6 @@ use OCP\Files\IRootFolder; use OCP\Files\Node; class WatcherConnector { - /** @var IRootFolder */ private $root; diff --git a/lib/private/Profile/Actions/EmailAction.php b/lib/private/Profile/Actions/EmailAction.php index d3c749e06c3..8ab4939b515 100644 --- a/lib/private/Profile/Actions/EmailAction.php +++ b/lib/private/Profile/Actions/EmailAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class EmailAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/PhoneAction.php b/lib/private/Profile/Actions/PhoneAction.php index 43974df62fb..6081a04ad7e 100644 --- a/lib/private/Profile/Actions/PhoneAction.php +++ b/lib/private/Profile/Actions/PhoneAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class PhoneAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/TwitterAction.php b/lib/private/Profile/Actions/TwitterAction.php index 204284be1f5..041da42e539 100644 --- a/lib/private/Profile/Actions/TwitterAction.php +++ b/lib/private/Profile/Actions/TwitterAction.php @@ -34,7 +34,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class TwitterAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/WebsiteAction.php b/lib/private/Profile/Actions/WebsiteAction.php index 0a08879059c..6b052be57bd 100644 --- a/lib/private/Profile/Actions/WebsiteAction.php +++ b/lib/private/Profile/Actions/WebsiteAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class WebsiteAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php index ab1af1c1c16..ddc0670604b 100644 --- a/lib/private/Profile/ProfileManager.php +++ b/lib/private/Profile/ProfileManager.php @@ -50,7 +50,6 @@ use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; class ProfileManager { - /** @var IAccountManager */ private $accountManager; diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 9ca3ece6dd4..330fa241b1e 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -89,7 +89,6 @@ use Psr\Log\LoggerInterface; use Throwable; class Repair implements IOutput { - /** @var IRepairStep[] */ private array $repairSteps; diff --git a/lib/private/Repair/AddBruteForceCleanupJob.php b/lib/private/Repair/AddBruteForceCleanupJob.php index 5a82c7c9176..5584e5b81c7 100644 --- a/lib/private/Repair/AddBruteForceCleanupJob.php +++ b/lib/private/Repair/AddBruteForceCleanupJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddBruteForceCleanupJob implements IRepairStep { - /** @var IJobList */ protected $jobList; diff --git a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php index b9e20186fc8..3642931694a 100644 --- a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php +++ b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddCleanupUpdaterBackupsJob implements IRepairStep { - /** @var IJobList */ protected $jobList; diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php index 0dd70112984..531fcc1112f 100644 --- a/lib/private/Repair/CleanTags.php +++ b/lib/private/Repair/CleanTags.php @@ -38,7 +38,6 @@ use OCP\Migration\IRepairStep; * @package OC\Repair */ class CleanTags implements IRepairStep { - /** @var IDBConnection */ protected $connection; diff --git a/lib/private/Repair/ClearFrontendCaches.php b/lib/private/Repair/ClearFrontendCaches.php index 47f037fd626..bf94e5bfbff 100644 --- a/lib/private/Repair/ClearFrontendCaches.php +++ b/lib/private/Repair/ClearFrontendCaches.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ClearFrontendCaches implements IRepairStep { - /** @var ICacheFactory */ protected $cacheFactory; diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php index 9731babe4ce..905fc9451f5 100644 --- a/lib/private/Repair/MoveUpdaterStepFile.php +++ b/lib/private/Repair/MoveUpdaterStepFile.php @@ -27,7 +27,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class MoveUpdaterStepFile implements IRepairStep { - /** @var \OCP\IConfig */ protected $config; diff --git a/lib/private/Repair/NC11/FixMountStorages.php b/lib/private/Repair/NC11/FixMountStorages.php index 6552ea4bde9..4cf721e9b13 100644 --- a/lib/private/Repair/NC11/FixMountStorages.php +++ b/lib/private/Repair/NC11/FixMountStorages.php @@ -29,7 +29,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class FixMountStorages implements IRepairStep { - /** @var IDBConnection */ private $db; diff --git a/lib/private/Repair/NC13/AddLogRotateJob.php b/lib/private/Repair/NC13/AddLogRotateJob.php index 0b5f3d10e70..e0156ff873c 100644 --- a/lib/private/Repair/NC13/AddLogRotateJob.php +++ b/lib/private/Repair/NC13/AddLogRotateJob.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddLogRotateJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php index afd442a18b5..e12f2771903 100644 --- a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php +++ b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddPreviewBackgroundCleanupJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php b/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php index 70c73fbf9a6..217141cf0b9 100644 --- a/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php +++ b/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddClenupLoginFlowV2BackgroundJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php index 25dc24fb66c..b12604cd132 100644 --- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php +++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php @@ -45,7 +45,6 @@ use RuntimeException; * photo could be returned for this vcard. These invalid files are removed by this migration step. */ class CleanupCardDAVPhotoCache implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php index 44cb4b050ad..8bc73c8f66b 100644 --- a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php +++ b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ClearCollectionsAccessCache implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php index 95839823a82..3635c86e1b9 100644 --- a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php +++ b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ResetGeneratedAvatarFlag implements IRepairStep { - /** @var IConfig */ private $config; /** @var IDBConnection */ diff --git a/lib/private/Repair/NC20/EncryptionLegacyCipher.php b/lib/private/Repair/NC20/EncryptionLegacyCipher.php index d9ac1bcad4b..6e31423915f 100644 --- a/lib/private/Repair/NC20/EncryptionLegacyCipher.php +++ b/lib/private/Repair/NC20/EncryptionLegacyCipher.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class EncryptionLegacyCipher implements IRepairStep { - /** @var IConfig */ private $config; /** @var IManager */ diff --git a/lib/private/Repair/NC20/EncryptionMigration.php b/lib/private/Repair/NC20/EncryptionMigration.php index 60b5032955c..6e209314462 100644 --- a/lib/private/Repair/NC20/EncryptionMigration.php +++ b/lib/private/Repair/NC20/EncryptionMigration.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class EncryptionMigration implements IRepairStep { - /** @var IConfig */ private $config; /** @var IManager */ diff --git a/lib/private/Repair/NC20/ShippedDashboardEnable.php b/lib/private/Repair/NC20/ShippedDashboardEnable.php index 61f402f1af4..a9713d49a6f 100644 --- a/lib/private/Repair/NC20/ShippedDashboardEnable.php +++ b/lib/private/Repair/NC20/ShippedDashboardEnable.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ShippedDashboardEnable implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php index 3a98f6bab3c..e9b26947db6 100644 --- a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php +++ b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php @@ -29,7 +29,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddCheckForUserCertificatesJob implements IRepairStep { - /** @var IJobList */ protected $jobList; /** @var IConfig */ diff --git a/lib/private/Repair/NC21/ValidatePhoneNumber.php b/lib/private/Repair/NC21/ValidatePhoneNumber.php index 3217a1f082c..f9c3c5952bf 100644 --- a/lib/private/Repair/NC21/ValidatePhoneNumber.php +++ b/lib/private/Repair/NC21/ValidatePhoneNumber.php @@ -34,7 +34,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ValidatePhoneNumber implements IRepairStep { - /** @var IConfig */ protected $config; /** @var IUserManager */ diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php index 1cee4077731..be507debbd9 100644 --- a/lib/private/Repair/OldGroupMembershipShares.php +++ b/lib/private/Repair/OldGroupMembershipShares.php @@ -29,7 +29,6 @@ use OCP\Migration\IRepairStep; use OCP\Share\IShare; class OldGroupMembershipShares implements IRepairStep { - /** @var \OCP\IDBConnection */ protected $connection; diff --git a/lib/private/Repair/Owncloud/CleanPreviews.php b/lib/private/Repair/Owncloud/CleanPreviews.php index b9146b77249..853a94c8adc 100644 --- a/lib/private/Repair/Owncloud/CleanPreviews.php +++ b/lib/private/Repair/Owncloud/CleanPreviews.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class CleanPreviews implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/Owncloud/DropAccountTermsTable.php b/lib/private/Repair/Owncloud/DropAccountTermsTable.php index e0c6a4f17ac..d5c01d64131 100644 --- a/lib/private/Repair/Owncloud/DropAccountTermsTable.php +++ b/lib/private/Repair/Owncloud/DropAccountTermsTable.php @@ -27,7 +27,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class DropAccountTermsTable implements IRepairStep { - /** @var IDBConnection */ protected $db; diff --git a/lib/private/Repair/Owncloud/MigrateOauthTables.php b/lib/private/Repair/Owncloud/MigrateOauthTables.php index 4011a043f20..10481a966f2 100644 --- a/lib/private/Repair/Owncloud/MigrateOauthTables.php +++ b/lib/private/Repair/Owncloud/MigrateOauthTables.php @@ -27,7 +27,6 @@ use OC\DB\SchemaWrapper; use OCP\DB\QueryBuilder\IQueryBuilder; class MigrateOauthTables implements IRepairStep { - /** @var Connection */ protected $db; diff --git a/lib/private/Repair/Owncloud/MoveAvatars.php b/lib/private/Repair/Owncloud/MoveAvatars.php index ab48731ecb0..fa3dd924648 100644 --- a/lib/private/Repair/Owncloud/MoveAvatars.php +++ b/lib/private/Repair/Owncloud/MoveAvatars.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class MoveAvatars implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php index 280426fb9c1..83c78c2cba4 100644 --- a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php +++ b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use function is_resource; class MoveAvatarsBackgroundJob extends QueuedJob { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php index 23ca2a6a0fa..4585cbfc814 100644 --- a/lib/private/RichObjectStrings/Validator.php +++ b/lib/private/RichObjectStrings/Validator.php @@ -35,7 +35,6 @@ use OCP\RichObjectStrings\IValidator; * @since 11.0.0 */ class Validator implements IValidator { - /** @var Definitions */ protected $definitions; diff --git a/lib/private/Search/Provider/File.php b/lib/private/Search/Provider/File.php index fba8e6db05f..7046fea33d2 100644 --- a/lib/private/Search/Provider/File.php +++ b/lib/private/Search/Provider/File.php @@ -42,7 +42,6 @@ use OCP\Search\PagedProvider; * @deprecated 20.0.0 */ class File extends PagedProvider { - /** * Search for files and folders matching the given query * diff --git a/lib/private/Search/Result/Audio.php b/lib/private/Search/Result/Audio.php index 0a734767df0..41afe691e8c 100644 --- a/lib/private/Search/Result/Audio.php +++ b/lib/private/Search/Result/Audio.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Audio extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php index dc10cab09e9..59111b0cee2 100644 --- a/lib/private/Search/Result/File.php +++ b/lib/private/Search/Result/File.php @@ -36,7 +36,6 @@ use OCP\IUserSession; * @deprecated 20.0.0 */ class File extends \OCP\Search\Result { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/Folder.php b/lib/private/Search/Result/Folder.php index 590943fb941..36d0e91c042 100644 --- a/lib/private/Search/Result/Folder.php +++ b/lib/private/Search/Result/Folder.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Folder extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/Image.php b/lib/private/Search/Result/Image.php index 9870e316a79..27f5702e39a 100644 --- a/lib/private/Search/Result/Image.php +++ b/lib/private/Search/Result/Image.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Image extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php index 3c228261ec2..4ec73ec54e9 100644 --- a/lib/private/Search/SearchComposer.php +++ b/lib/private/Search/SearchComposer.php @@ -58,7 +58,6 @@ use function array_map; * @see IProvider::search() for the arguments of the individual search requests */ class SearchComposer { - /** @var IProvider[] */ private $providers = []; diff --git a/lib/private/Security/Bruteforce/CleanupJob.php b/lib/private/Security/Bruteforce/CleanupJob.php index 6faf853760a..45cfe572acb 100644 --- a/lib/private/Security/Bruteforce/CleanupJob.php +++ b/lib/private/Security/Bruteforce/CleanupJob.php @@ -32,7 +32,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; class CleanupJob extends TimedJob { - /** @var IDBConnection */ private $connection; diff --git a/lib/private/Server.php b/lib/private/Server.php index 92fa9bf768d..d8857b4efc6 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -275,7 +275,6 @@ use OC\Profiler\Profiler; * TODO: hookup all manager classes */ class Server extends ServerContainer implements IServerContainer { - /** @var string */ private $webRoot; diff --git a/lib/private/Session/Session.php b/lib/private/Session/Session.php index affba322bec..b434461a335 100644 --- a/lib/private/Session/Session.php +++ b/lib/private/Session/Session.php @@ -30,7 +30,6 @@ namespace OC\Session; use OCP\ISession; abstract class Session implements \ArrayAccess, ISession { - /** * @var bool */ diff --git a/lib/private/Settings/AuthorizedGroup.php b/lib/private/Settings/AuthorizedGroup.php index d549e3d48f3..21b897b6787 100644 --- a/lib/private/Settings/AuthorizedGroup.php +++ b/lib/private/Settings/AuthorizedGroup.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Db\Entity; * @method getClass(): string */ class AuthorizedGroup extends Entity implements \JsonSerializable { - /** @var string $group_id */ protected $groupId; diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 44f1df09c15..2d44ac7d3df 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -48,7 +48,6 @@ use OCP\Settings\ISubAdminSettings; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var LoggerInterface */ private $log; diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 6c67254deba..94719a742e2 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -37,7 +37,6 @@ use OCP\Security\ISecureRandom; use Psr\Log\LoggerInterface; abstract class AbstractDatabase { - /** @var IL10N */ protected $trans; /** @var string */ diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php index 3632a2a26d1..03c4c2ba828 100644 --- a/lib/private/Share/Constants.php +++ b/lib/private/Share/Constants.php @@ -29,7 +29,6 @@ namespace OC\Share; use OCP\Share\IShare; class Constants { - /** * @deprecated 17.0.0 - use IShare::TYPE_USER instead */ diff --git a/lib/private/Share/Helper.php b/lib/private/Share/Helper.php index 8f2cfa4e197..f1b9ae2b9fa 100644 --- a/lib/private/Share/Helper.php +++ b/lib/private/Share/Helper.php @@ -26,7 +26,6 @@ namespace OC\Share; class Helper extends \OC\Share\Constants { - /** * get default expire settings defined by the admin * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays' @@ -128,14 +127,14 @@ class Helper extends \OC\Share\Constants { if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) { // FIXME this should be a method in the user management instead \OCP\Util::emitHook( - '\OCA\Files_Sharing\API\Server2Server', - 'preLoginNameUsedAsUserName', - ['uid' => &$user1] + '\OCA\Files_Sharing\API\Server2Server', + 'preLoginNameUsedAsUserName', + ['uid' => &$user1] ); \OCP\Util::emitHook( - '\OCA\Files_Sharing\API\Server2Server', - 'preLoginNameUsedAsUserName', - ['uid' => &$user2] + '\OCA\Files_Sharing\API\Server2Server', + 'preLoginNameUsedAsUserName', + ['uid' => &$user2] ); if ($user1 === $user2) { diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 9e7b913d60a..487625affc1 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -50,7 +50,6 @@ use Psr\Log\LoggerInterface; * - post_shared */ class Share extends Constants { - /** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask * Construct permissions for share() and setPermissions with Or (|) e.g. * Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index a5a5568788d..215b47344b5 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -62,7 +62,6 @@ use OCP\Share\IShareProvider; * @package OC\Share20 */ class DefaultShareProvider implements IShareProvider { - // Special share type for user modified group shares public const SHARE_TYPE_USERGROUP = 2; @@ -608,7 +607,6 @@ class DefaultShareProvider implements IShareProvider { ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))) ->execute(); } elseif ($share->getShareType() === IShare::TYPE_GROUP) { - // Check if there is a usergroup share $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->select('id') @@ -664,9 +662,9 @@ class DefaultShareProvider implements IShareProvider { public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) { $qb = $this->dbConn->getQueryBuilder(); $qb->select('s.*', - 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash', - 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime', - 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum') + 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash', + 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime', + 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum') ->from('share', 's') ->andWhere($qb->expr()->orX( $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), diff --git a/lib/private/Share20/LegacyHooks.php b/lib/private/Share20/LegacyHooks.php index 94cfa6636d7..feb4604e884 100644 --- a/lib/private/Share20/LegacyHooks.php +++ b/lib/private/Share20/LegacyHooks.php @@ -33,7 +33,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class LegacyHooks { - /** @var EventDispatcherInterface */ private $eventDispatcher; diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ffd779707df..7fd99545668 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -82,7 +82,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; * This class is the communication hub for all sharing related operations. */ class Manager implements IManager { - /** @var IProviderFactory */ private $factory; private LoggerInterface $logger; @@ -668,7 +667,6 @@ class Manager implements IManager { * @param IShare $share */ protected function setLinkParent(IShare $share) { - // No sense in checking if the method is not there. if (method_exists($share, 'setParent')) { $storage = $share->getNode()->getStorage(); diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 9bba4d771aa..16f9a17ee42 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -56,7 +56,6 @@ use Psr\Log\LoggerInterface; * @package OC\Share20 */ class ProviderFactory implements IProviderFactory { - /** @var IServerContainer */ private $serverContainer; /** @var DefaultShareProvider */ diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index c2d45503696..0a50fa0ccfb 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -41,7 +41,6 @@ use OCP\Share\IAttributes; use OCP\Share\IShare; class Share implements IShare { - /** @var string */ private $id; /** @var string */ diff --git a/lib/private/Share20/ShareAttributes.php b/lib/private/Share20/ShareAttributes.php index 92f034e6783..9b97c94275d 100644 --- a/lib/private/Share20/ShareAttributes.php +++ b/lib/private/Share20/ShareAttributes.php @@ -23,7 +23,6 @@ namespace OC\Share20; use OCP\Share\IAttributes; class ShareAttributes implements IAttributes { - /** @var array */ private $attributes; diff --git a/lib/private/Share20/ShareHelper.php b/lib/private/Share20/ShareHelper.php index 329e4470cb4..3debfe185e0 100644 --- a/lib/private/Share20/ShareHelper.php +++ b/lib/private/Share20/ShareHelper.php @@ -31,7 +31,6 @@ use OCP\Share\IManager; use OCP\Share\IShareHelper; class ShareHelper implements IShareHelper { - /** @var IManager */ private $shareManager; diff --git a/lib/private/Share20/UserRemovedListener.php b/lib/private/Share20/UserRemovedListener.php index 6db0f2e0910..3af7b5a3650 100644 --- a/lib/private/Share20/UserRemovedListener.php +++ b/lib/private/Share20/UserRemovedListener.php @@ -34,7 +34,6 @@ use OCP\Share\IManager; * @template-implements IEventListener */ class UserRemovedListener implements IEventListener { - /** @var IManager */ protected $shareManager; diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php index db7d0024b5a..f96646e3365 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -54,7 +54,6 @@ class Streamer { * be included in the streamed file */ public function __construct(IRequest $request, int $size, int $numberOfFiles) { - /** * zip32 constraints for a basic (without compression, volumes nor * encryption) zip file according to the Zip specification: diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index 10eff9ffad5..54f14b8ab88 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -42,7 +42,6 @@ use OCP\IUser; use OCP\IUserManager; class SubAdmin extends PublicEmitter implements ISubAdmin { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php index f5457f60ad4..f2a35069288 100644 --- a/lib/private/Support/CrashReport/Registry.php +++ b/lib/private/Support/CrashReport/Registry.php @@ -38,7 +38,6 @@ use Throwable; use function array_shift; class Registry implements IRegistry { - /** @var string[] */ private $lazyReporters = []; diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php index 6cd0e4376c5..a18c4c2a138 100644 --- a/lib/private/SystemConfig.php +++ b/lib/private/SystemConfig.php @@ -34,7 +34,6 @@ use OCP\IConfig; * fixes cyclic DI: AllConfig needs AppConfig needs Database needs AllConfig */ class SystemConfig { - /** @var array */ protected $sensitiveValues = [ 'instanceid' => true, diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php index f878cbf07c3..ca0508fe19b 100644 --- a/lib/private/SystemTag/ManagerFactory.php +++ b/lib/private/SystemTag/ManagerFactory.php @@ -38,7 +38,6 @@ use OCP\SystemTag\ISystemTagObjectMapper; * @since 9.0.0 */ class ManagerFactory implements ISystemTagManagerFactory { - /** * Server container * diff --git a/lib/private/SystemTag/SystemTag.php b/lib/private/SystemTag/SystemTag.php index e6b84c9916e..da6d4bd4b11 100644 --- a/lib/private/SystemTag/SystemTag.php +++ b/lib/private/SystemTag/SystemTag.php @@ -30,7 +30,6 @@ namespace OC\SystemTag; use OCP\SystemTag\ISystemTag; class SystemTag implements ISystemTag { - /** * @var string */ diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php index c075e65d76a..b87829360d5 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -37,7 +37,6 @@ use OCP\IURLGenerator; use Psr\Log\LoggerInterface; class JSCombiner { - /** @var IAppData */ protected $appData; diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index 88323af75de..7648c7953f3 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -30,7 +30,6 @@ namespace OC\Template; use Psr\Log\LoggerInterface; class JSResourceLocator extends ResourceLocator { - /** @var JSCombiner */ protected $jsCombiner; diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index aa1ee203f31..5a4cd32e5df 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -79,7 +79,6 @@ class TemplateLayout extends \OC_Template { * @param string $appId application id */ public function __construct($renderAs, $appId = '') { - /** @var IConfig */ $this->config = \OC::$server->get(IConfig::class); diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 53b07e25809..09516674e9b 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -73,7 +73,6 @@ use Psr\Log\LoggerInterface; * - failure(string $message) */ class Updater extends BasicEmitter { - /** @var LoggerInterface */ private $log; diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index d9f795796b8..3abbae682b5 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -31,7 +31,6 @@ use OCP\IConfig; use OCP\Util; class VersionCheck { - /** @var IClientService */ private $clientService; diff --git a/lib/private/User/User.php b/lib/private/User/User.php index eda6b5f79d9..7044770b57e 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -275,7 +275,6 @@ class User implements IUser { $this->dispatcher->dispatchTyped(new BeforeUserDeletedEvent($this)); $result = $this->backend->deleteUser($this->uid); if ($result) { - // FIXME: Feels like an hack - suggestions? $groupManager = \OC::$server->getGroupManager(); diff --git a/lib/private/UserStatus/Manager.php b/lib/private/UserStatus/Manager.php index c93795bea5b..89a1bb455c7 100644 --- a/lib/private/UserStatus/Manager.php +++ b/lib/private/UserStatus/Manager.php @@ -32,7 +32,6 @@ use Psr\Container\ContainerExceptionInterface; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var IServerContainer */ private $container; diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php index 0da546f3263..275e02986c4 100644 --- a/lib/private/legacy/OC_API.php +++ b/lib/private/legacy/OC_API.php @@ -32,7 +32,6 @@ use OCP\API; use OCP\AppFramework\Http; class OC_API { - /** * api actions */ diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index f5e4780a25f..c7433d7c6c8 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -429,7 +429,6 @@ class OC_App { */ public function enable(string $appId, array $groups = []) { - // Check if app is already downloaded /** @var Installer $installer */ $installer = \OC::$server->query(Installer::class); diff --git a/lib/private/legacy/OC_Hook.php b/lib/private/legacy/OC_Hook.php index b223b0fa6d6..a7a0f755673 100644 --- a/lib/private/legacy/OC_Hook.php +++ b/lib/private/legacy/OC_Hook.php @@ -87,7 +87,6 @@ class OC_Hook { * TODO: write example */ public static function emit($signalClass, $signalName, $params = []) { - // Return false if no hook handlers are listening to this // emitting class if (!array_key_exists($signalClass, self::$registered)) { diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php index d2faae9e24d..f2fa2058faa 100644 --- a/lib/private/legacy/OC_Image.php +++ b/lib/private/legacy/OC_Image.php @@ -49,7 +49,6 @@ use OCP\IImage; * Class for basic image manipulation */ class OC_Image implements \OCP\IImage { - // Default memory limit for images to load (256 MBytes). protected const DEFAULT_MEMORY_LIMIT = 256; @@ -728,30 +727,30 @@ class OC_Image implements \OCP\IImage { $this->logger->debug('OC_Image->loadFromFile, webp images not supported: ' . $imagePath, ['app' => 'core']); } break; - /* - case IMAGETYPE_TIFF_II: // (intel byte order) - break; - case IMAGETYPE_TIFF_MM: // (motorola byte order) - break; - case IMAGETYPE_JPC: - break; - case IMAGETYPE_JP2: - break; - case IMAGETYPE_JPX: - break; - case IMAGETYPE_JB2: - break; - case IMAGETYPE_SWC: - break; - case IMAGETYPE_IFF: - break; - case IMAGETYPE_ICO: - break; - case IMAGETYPE_SWF: - break; - case IMAGETYPE_PSD: - break; - */ + /* + case IMAGETYPE_TIFF_II: // (intel byte order) + break; + case IMAGETYPE_TIFF_MM: // (motorola byte order) + break; + case IMAGETYPE_JPC: + break; + case IMAGETYPE_JP2: + break; + case IMAGETYPE_JPX: + break; + case IMAGETYPE_JB2: + break; + case IMAGETYPE_SWC: + break; + case IMAGETYPE_IFF: + break; + case IMAGETYPE_ICO: + break; + case IMAGETYPE_SWF: + break; + case IMAGETYPE_PSD: + break; + */ default: // this is mostly file created from encrypted file diff --git a/lib/private/legacy/OC_JSON.php b/lib/private/legacy/OC_JSON.php index 7734e29c545..b9cfb8210e0 100644 --- a/lib/private/legacy/OC_JSON.php +++ b/lib/private/legacy/OC_JSON.php @@ -28,7 +28,6 @@ * */ class OC_JSON { - /** * Check if the app is enabled, send json error msg if not * @param string $app diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 813cedd0740..0c9fa1ccc0c 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -47,7 +47,6 @@ require_once __DIR__.'/template/functions.php'; * This class provides the templates for ownCloud. */ class OC_Template extends \OC\Template\Base { - /** @var string */ private $renderAs; // Create a full page? @@ -101,7 +100,6 @@ class OC_Template extends \OC\Template\Base { */ public static function initTemplateEngine($renderAs) { if (self::$initTemplateEngineFirstRun) { - // apps that started before the template initialization can load their own scripts/styles // so to make sure this scripts/styles here are loaded first we put all core scripts first // check lib/public/Util.php diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php index de066e143b4..8aaa9072ba4 100644 --- a/lib/private/legacy/OC_User.php +++ b/lib/private/legacy/OC_User.php @@ -202,10 +202,10 @@ class OC_User { /** @var IEventDispatcher $dispatcher */ $dispatcher = \OC::$server->get(IEventDispatcher::class); $dispatcher->dispatchTyped(new UserLoggedInEvent( - \OC::$server->get(IUserManager::class)->get($uid), - $uid, - null, - false) + \OC::$server->get(IUserManager::class)->get($uid), + $uid, + null, + false) ); //trigger creation of user home and /files folder diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 429f7ed5d05..6dc08341b18 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -544,7 +544,7 @@ class OC_Util { 'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. ' . $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s', - [ $urlGenerator->linkToDocs('admin-config') ]) + [ $urlGenerator->linkToDocs('admin-config') ]) ]; } } @@ -839,11 +839,11 @@ class OC_Util { // Check if we are a user if (!\OC::$server->getUserSession()->isLoggedIn()) { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( - 'core.login.showLoginForm', - [ - 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), - ] - ) + 'core.login.showLoginForm', + [ + 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), + ] + ) ); exit(); } diff --git a/lib/public/Accounts/IAccount.php b/lib/public/Accounts/IAccount.php index 383f21068a9..190896a54ef 100644 --- a/lib/public/Accounts/IAccount.php +++ b/lib/public/Accounts/IAccount.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 15.0.0 */ interface IAccount extends \JsonSerializable { - /** * Set a property with data * diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php index 77c32d6ff4e..7c977b575ae 100644 --- a/lib/public/Accounts/IAccountManager.php +++ b/lib/public/Accounts/IAccountManager.php @@ -39,7 +39,6 @@ use OCP\IUser; * */ interface IAccountManager { - /** * Contact details visible locally only * diff --git a/lib/public/Accounts/IAccountProperty.php b/lib/public/Accounts/IAccountProperty.php index 94866fc4807..82a83e8948a 100644 --- a/lib/public/Accounts/IAccountProperty.php +++ b/lib/public/Accounts/IAccountProperty.php @@ -34,7 +34,6 @@ use InvalidArgumentException; * @since 15.0.0 */ interface IAccountProperty extends \JsonSerializable { - /** * Set the value of a property * diff --git a/lib/public/Accounts/IAccountPropertyCollection.php b/lib/public/Accounts/IAccountPropertyCollection.php index 0d4c416cbaa..3f42cb1e6b7 100644 --- a/lib/public/Accounts/IAccountPropertyCollection.php +++ b/lib/public/Accounts/IAccountPropertyCollection.php @@ -37,7 +37,6 @@ use JsonSerializable; * @since 22.0.0 */ interface IAccountPropertyCollection extends JsonSerializable { - /** * retuns the collection name * diff --git a/lib/public/Accounts/PropertyDoesNotExistException.php b/lib/public/Accounts/PropertyDoesNotExistException.php index 17c629fdc3e..0ce3f1b069b 100644 --- a/lib/public/Accounts/PropertyDoesNotExistException.php +++ b/lib/public/Accounts/PropertyDoesNotExistException.php @@ -30,7 +30,6 @@ namespace OCP\Accounts; * */ class PropertyDoesNotExistException extends \Exception { - /** * Constructor * @param string $msg the error message diff --git a/lib/public/Activity/IEventMerger.php b/lib/public/Activity/IEventMerger.php index a093a52744c..d72106b24f7 100644 --- a/lib/public/Activity/IEventMerger.php +++ b/lib/public/Activity/IEventMerger.php @@ -28,7 +28,6 @@ namespace OCP\Activity; * @since 11.0 */ interface IEventMerger { - /** * Combines two events when possible to have grouping: * diff --git a/lib/public/Activity/IFilter.php b/lib/public/Activity/IFilter.php index 967a739726c..8d98cc37c07 100644 --- a/lib/public/Activity/IFilter.php +++ b/lib/public/Activity/IFilter.php @@ -28,7 +28,6 @@ namespace OCP\Activity; * @since 11.0.0 */ interface IFilter { - /** * @return string Lowercase a-z and underscore only identifier * @since 11.0.0 diff --git a/lib/public/Activity/ISetting.php b/lib/public/Activity/ISetting.php index 53e01d42868..0e5b7653b27 100644 --- a/lib/public/Activity/ISetting.php +++ b/lib/public/Activity/ISetting.php @@ -28,7 +28,6 @@ namespace OCP\Activity; * @since 11.0.0 */ interface ISetting { - /** * @return string Lowercase a-z and underscore only identifier * @since 11.0.0 diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php index f7c9d848099..de36fafcdfe 100644 --- a/lib/public/App/IAppManager.php +++ b/lib/public/App/IAppManager.php @@ -42,7 +42,6 @@ use OCP\IUser; * @since 8.0.0 */ interface IAppManager { - /** * Returns the app information from "appinfo/info.xml". * diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index 88045c73df5..4d6e9177b78 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -47,7 +47,6 @@ use OCP\Route\IRouter; * @since 6.0.0 */ class App { - /** @var IAppContainer */ private $container; diff --git a/lib/public/AppFramework/AuthPublicShareController.php b/lib/public/AppFramework/AuthPublicShareController.php index bd0e32f566d..00834506b05 100644 --- a/lib/public/AppFramework/AuthPublicShareController.php +++ b/lib/public/AppFramework/AuthPublicShareController.php @@ -46,7 +46,6 @@ use OCP\IURLGenerator; * @since 14.0.0 */ abstract class AuthPublicShareController extends PublicShareController { - /** @var IURLGenerator */ protected $urlGenerator; diff --git a/lib/public/AppFramework/Bootstrap/IBootContext.php b/lib/public/AppFramework/Bootstrap/IBootContext.php index a69c9423a98..72a9602217d 100644 --- a/lib/public/AppFramework/Bootstrap/IBootContext.php +++ b/lib/public/AppFramework/Bootstrap/IBootContext.php @@ -35,7 +35,6 @@ use Throwable; * @since 20.0.0 */ interface IBootContext { - /** * Get hold of the app's container * diff --git a/lib/public/AppFramework/Bootstrap/IBootstrap.php b/lib/public/AppFramework/Bootstrap/IBootstrap.php index bdb739e0cfa..8ebb377c152 100644 --- a/lib/public/AppFramework/Bootstrap/IBootstrap.php +++ b/lib/public/AppFramework/Bootstrap/IBootstrap.php @@ -29,7 +29,6 @@ namespace OCP\AppFramework\Bootstrap; * @since 20.0.0 */ interface IBootstrap { - /** * @param IRegistrationContext $context * diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php index 0f398c13979..7ff2bdca52e 100644 --- a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php +++ b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php @@ -47,7 +47,6 @@ use OCP\Preview\IProviderV2; * @see IBootstrap::register() */ interface IRegistrationContext { - /** * @param string $capability * @psalm-param class-string $capability diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php index 12a6a75cf0f..89cfd2e55fc 100644 --- a/lib/public/AppFramework/Controller.php +++ b/lib/public/AppFramework/Controller.php @@ -38,7 +38,6 @@ use OCP\IRequest; * @since 6.0.0 */ abstract class Controller { - /** * app name * @var string diff --git a/lib/public/AppFramework/Db/DoesNotExistException.php b/lib/public/AppFramework/Db/DoesNotExistException.php index eb0a8437a64..58e86528795 100644 --- a/lib/public/AppFramework/Db/DoesNotExistException.php +++ b/lib/public/AppFramework/Db/DoesNotExistException.php @@ -33,7 +33,6 @@ namespace OCP\AppFramework\Db; * @since 7.0.0 */ class DoesNotExistException extends \Exception implements IMapperException { - /** * Constructor * @param string $msg the error message diff --git a/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php index 9281db75961..6ae45849d83 100644 --- a/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php +++ b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php @@ -33,7 +33,6 @@ namespace OCP\AppFramework\Db; * @since 7.0.0 */ class MultipleObjectsReturnedException extends \Exception implements IMapperException { - /** * Constructor * @param string $msg the error message diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php index 2491fd83f4a..57f4cba2ff5 100644 --- a/lib/public/AppFramework/Db/QBMapper.php +++ b/lib/public/AppFramework/Db/QBMapper.php @@ -43,7 +43,6 @@ use OCP\IDBConnection; * @template T of Entity */ abstract class QBMapper { - /** @var string */ protected $tableName; diff --git a/lib/public/AppFramework/Db/TTransactional.php b/lib/public/AppFramework/Db/TTransactional.php index 59f4a346386..1e02a129e69 100644 --- a/lib/public/AppFramework/Db/TTransactional.php +++ b/lib/public/AppFramework/Db/TTransactional.php @@ -35,7 +35,6 @@ use Throwable; * @since 24.0.0 */ trait TTransactional { - /** * Run an atomic database operation * diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php index 32c8d09b664..78ab343abd6 100644 --- a/lib/public/AppFramework/Http/DataDisplayResponse.php +++ b/lib/public/AppFramework/Http/DataDisplayResponse.php @@ -32,7 +32,6 @@ use OCP\AppFramework\Http; * @since 8.1.0 */ class DataDisplayResponse extends Response { - /** * response data * @var string diff --git a/lib/public/AppFramework/Http/DataResponse.php b/lib/public/AppFramework/Http/DataResponse.php index ca0392e521c..e329b9c2975 100644 --- a/lib/public/AppFramework/Http/DataResponse.php +++ b/lib/public/AppFramework/Http/DataResponse.php @@ -32,7 +32,6 @@ use OCP\AppFramework\Http; * @since 8.0.0 */ class DataResponse extends Response { - /** * response data * @var array|int|float|string|bool|object diff --git a/lib/public/AppFramework/Http/EmptyFeaturePolicy.php b/lib/public/AppFramework/Http/EmptyFeaturePolicy.php index 1cc6034963a..b73eaf667e7 100644 --- a/lib/public/AppFramework/Http/EmptyFeaturePolicy.php +++ b/lib/public/AppFramework/Http/EmptyFeaturePolicy.php @@ -36,7 +36,6 @@ namespace OCP\AppFramework\Http; * @since 17.0.0 */ class EmptyFeaturePolicy { - /** @var string[] of allowed domains to autoplay media */ protected $autoplayDomains = null; diff --git a/lib/public/AppFramework/Http/FileDisplayResponse.php b/lib/public/AppFramework/Http/FileDisplayResponse.php index 90c18e85546..41b452b5553 100644 --- a/lib/public/AppFramework/Http/FileDisplayResponse.php +++ b/lib/public/AppFramework/Http/FileDisplayResponse.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http; * @since 11.0.0 */ class FileDisplayResponse extends Response implements ICallbackResponse { - /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */ private $file; diff --git a/lib/public/AppFramework/Http/ICallbackResponse.php b/lib/public/AppFramework/Http/ICallbackResponse.php index 8bb32de4d58..e0948769d94 100644 --- a/lib/public/AppFramework/Http/ICallbackResponse.php +++ b/lib/public/AppFramework/Http/ICallbackResponse.php @@ -30,7 +30,6 @@ namespace OCP\AppFramework\Http; * @since 8.1.0 */ interface ICallbackResponse { - /** * Outputs the content that should be printed * diff --git a/lib/public/AppFramework/Http/IOutput.php b/lib/public/AppFramework/Http/IOutput.php index f9c0b7898d9..33f13503d27 100644 --- a/lib/public/AppFramework/Http/IOutput.php +++ b/lib/public/AppFramework/Http/IOutput.php @@ -31,7 +31,6 @@ namespace OCP\AppFramework\Http; * @since 8.1.0 */ interface IOutput { - /** * @param string $out * @since 8.1.0 diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php index 4870a64afd7..d31a2761673 100644 --- a/lib/public/AppFramework/Http/JSONResponse.php +++ b/lib/public/AppFramework/Http/JSONResponse.php @@ -34,7 +34,6 @@ use OCP\AppFramework\Http; * @since 6.0.0 */ class JSONResponse extends Response { - /** * response data * @var array|object diff --git a/lib/public/AppFramework/Http/NotFoundResponse.php b/lib/public/AppFramework/Http/NotFoundResponse.php index 651e41735b9..34b74d353db 100644 --- a/lib/public/AppFramework/Http/NotFoundResponse.php +++ b/lib/public/AppFramework/Http/NotFoundResponse.php @@ -29,7 +29,6 @@ namespace OCP\AppFramework\Http; * @since 8.1.0 */ class NotFoundResponse extends TemplateResponse { - /** * @since 8.1.0 */ diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php index 9dd84a16649..4db6caa556c 100644 --- a/lib/public/AppFramework/Http/Response.php +++ b/lib/public/AppFramework/Http/Response.php @@ -43,7 +43,6 @@ use Psr\Log\LoggerInterface; * @since 6.0.0 */ class Response { - /** * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate'] * @var array diff --git a/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php b/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php index b0eb482f9f7..ed799e4fd94 100644 --- a/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/StrictEvalContentSecurityPolicy.php @@ -42,7 +42,6 @@ namespace OCP\AppFramework\Http; * @deprecated 17.0.0 */ class StrictEvalContentSecurityPolicy extends ContentSecurityPolicy { - /** * @since 14.0.0 */ diff --git a/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php b/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php index 7010862dc12..45b230ad9b5 100644 --- a/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/StrictInlineContentSecurityPolicy.php @@ -42,7 +42,6 @@ namespace OCP\AppFramework\Http; * @deprecated 17.0.0 */ class StrictInlineContentSecurityPolicy extends ContentSecurityPolicy { - /** * @since 14.0.0 */ diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php index d4114c51c09..e5b09193ba9 100644 --- a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php +++ b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php @@ -33,7 +33,6 @@ use OCP\Util; * @since 14.0.0 */ class ExternalShareMenuAction extends SimpleMenuAction { - /** @var string */ private $owner; diff --git a/lib/public/AppFramework/Http/Template/IMenuAction.php b/lib/public/AppFramework/Http/Template/IMenuAction.php index 970211952b0..83e52bd882f 100644 --- a/lib/public/AppFramework/Http/Template/IMenuAction.php +++ b/lib/public/AppFramework/Http/Template/IMenuAction.php @@ -29,7 +29,6 @@ namespace OCP\AppFramework\Http\Template; * @since 14.0 */ interface IMenuAction { - /** * @since 14.0.0 * @return string diff --git a/lib/public/AppFramework/Http/Template/LinkMenuAction.php b/lib/public/AppFramework/Http/Template/LinkMenuAction.php index 61398f99374..4982172bffe 100644 --- a/lib/public/AppFramework/Http/Template/LinkMenuAction.php +++ b/lib/public/AppFramework/Http/Template/LinkMenuAction.php @@ -31,7 +31,6 @@ use OCP\Util; * @since 14.0.0 */ class LinkMenuAction extends SimpleMenuAction { - /** * LinkMenuAction constructor. * diff --git a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php index f8492eb2989..de13f3ef0b2 100644 --- a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php +++ b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php @@ -31,7 +31,6 @@ use OCP\Util; * @since 14.0.0 */ class SimpleMenuAction implements IMenuAction { - /** @var string */ private $id; diff --git a/lib/public/AppFramework/Http/TooManyRequestsResponse.php b/lib/public/AppFramework/Http/TooManyRequestsResponse.php index 908a9c60fd8..caf565ee954 100644 --- a/lib/public/AppFramework/Http/TooManyRequestsResponse.php +++ b/lib/public/AppFramework/Http/TooManyRequestsResponse.php @@ -32,7 +32,6 @@ use OCP\Template; * @since 19.0.0 */ class TooManyRequestsResponse extends Response { - /** * @since 19.0.0 */ diff --git a/lib/public/AppFramework/IAppContainer.php b/lib/public/AppFramework/IAppContainer.php index a3b82144033..355e1fd0366 100644 --- a/lib/public/AppFramework/IAppContainer.php +++ b/lib/public/AppFramework/IAppContainer.php @@ -42,7 +42,6 @@ use Psr\Container\ContainerInterface; * @since 6.0.0 */ interface IAppContainer extends ContainerInterface, IContainer { - /** * used to return the appname of the set application * @return string the name of your application diff --git a/lib/public/AppFramework/Middleware.php b/lib/public/AppFramework/Middleware.php index 1e8e92964b0..5ae8eccae51 100644 --- a/lib/public/AppFramework/Middleware.php +++ b/lib/public/AppFramework/Middleware.php @@ -35,8 +35,6 @@ use OCP\AppFramework\Http\Response; * @since 6.0.0 */ abstract class Middleware { - - /** * This is being run in normal order before the controller is being * called which allows several modifications and checks diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index 11bac9effd5..51c71ad4e64 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -64,7 +64,7 @@ abstract class OCSController extends ApiController { $corsAllowedHeaders = 'Authorization, Content-Type, Accept, OCS-APIRequest', $corsMaxAge = 1728000) { parent::__construct($appName, $request, $corsMethods, - $corsAllowedHeaders, $corsMaxAge); + $corsAllowedHeaders, $corsMaxAge); $this->registerResponder('json', function ($data) { return $this->buildOCSResponse('json', $data); }); diff --git a/lib/public/AppFramework/PublicShareController.php b/lib/public/AppFramework/PublicShareController.php index ec3e8500d61..706dc0b9ae9 100644 --- a/lib/public/AppFramework/PublicShareController.php +++ b/lib/public/AppFramework/PublicShareController.php @@ -43,7 +43,6 @@ use OCP\ISession; * @since 14.0.0 */ abstract class PublicShareController extends Controller { - /** @var ISession */ protected $session; diff --git a/lib/public/AppFramework/Services/IInitialState.php b/lib/public/AppFramework/Services/IInitialState.php index d8365893764..1a597567e19 100644 --- a/lib/public/AppFramework/Services/IInitialState.php +++ b/lib/public/AppFramework/Services/IInitialState.php @@ -33,7 +33,6 @@ use Closure; * @since 20.0.0 */ interface IInitialState { - /** * Allows an app to provide its initial state to the template system. * Use this if you know your initial state sill be used for example if diff --git a/lib/public/AppFramework/Services/InitialStateProvider.php b/lib/public/AppFramework/Services/InitialStateProvider.php index dbc48653792..b9956b5fa71 100644 --- a/lib/public/AppFramework/Services/InitialStateProvider.php +++ b/lib/public/AppFramework/Services/InitialStateProvider.php @@ -29,7 +29,6 @@ namespace OCP\AppFramework\Services; * @since 21.0.0 */ abstract class InitialStateProvider implements \JsonSerializable { - /** * @since 21.0.0 */ diff --git a/lib/public/AppFramework/Utility/IControllerMethodReflector.php b/lib/public/AppFramework/Utility/IControllerMethodReflector.php index fbeb14b1a35..a091c8b3707 100644 --- a/lib/public/AppFramework/Utility/IControllerMethodReflector.php +++ b/lib/public/AppFramework/Utility/IControllerMethodReflector.php @@ -37,7 +37,6 @@ namespace OCP\AppFramework\Utility; * @see https://help.nextcloud.com/t/how-should-we-use-php8-attributes/104278 */ interface IControllerMethodReflector { - /** * @param object $object an object or classname * @param string $method the method which we want to inspect diff --git a/lib/public/AppFramework/Utility/ITimeFactory.php b/lib/public/AppFramework/Utility/ITimeFactory.php index 63a87cf1b16..92101fd3848 100644 --- a/lib/public/AppFramework/Utility/ITimeFactory.php +++ b/lib/public/AppFramework/Utility/ITimeFactory.php @@ -31,7 +31,6 @@ namespace OCP\AppFramework\Utility; * @since 8.0.0 */ interface ITimeFactory { - /** * @return int the result of a call to time() * @since 8.0.0 diff --git a/lib/public/Authentication/Events/LoginFailedEvent.php b/lib/public/Authentication/Events/LoginFailedEvent.php index b1a70e4dd55..73028a04320 100644 --- a/lib/public/Authentication/Events/LoginFailedEvent.php +++ b/lib/public/Authentication/Events/LoginFailedEvent.php @@ -34,7 +34,6 @@ use OCP\EventDispatcher\Event; * @since 19.0.0 */ class LoginFailedEvent extends Event { - /** @var string */ private $uid; diff --git a/lib/public/Authentication/IAlternativeLogin.php b/lib/public/Authentication/IAlternativeLogin.php index 837487f057e..0fd6333359d 100644 --- a/lib/public/Authentication/IAlternativeLogin.php +++ b/lib/public/Authentication/IAlternativeLogin.php @@ -29,7 +29,6 @@ namespace OCP\Authentication; * @since 20.0.0 */ interface IAlternativeLogin { - /** * Label shown on the login option * @return string diff --git a/lib/public/Authentication/IApacheBackend.php b/lib/public/Authentication/IApacheBackend.php index 4528bef3479..d138c5bfc24 100644 --- a/lib/public/Authentication/IApacheBackend.php +++ b/lib/public/Authentication/IApacheBackend.php @@ -33,7 +33,6 @@ namespace OCP\Authentication; * @since 6.0.0 */ interface IApacheBackend { - /** * In case the user has been authenticated by a module true is returned. * diff --git a/lib/public/Authentication/IProvideUserSecretBackend.php b/lib/public/Authentication/IProvideUserSecretBackend.php index 08f4043d828..43ec6af0c4f 100644 --- a/lib/public/Authentication/IProvideUserSecretBackend.php +++ b/lib/public/Authentication/IProvideUserSecretBackend.php @@ -30,7 +30,6 @@ namespace OCP\Authentication; * @since 23.0.0 */ interface IProvideUserSecretBackend { - /** * Optionally returns a stable per-user secret. This secret is for * instance used to secure file encryption keys. diff --git a/lib/public/Authentication/LoginCredentials/ICredentials.php b/lib/public/Authentication/LoginCredentials/ICredentials.php index c01761648a4..480ae06bbcb 100644 --- a/lib/public/Authentication/LoginCredentials/ICredentials.php +++ b/lib/public/Authentication/LoginCredentials/ICredentials.php @@ -29,7 +29,6 @@ use OCP\Authentication\Exceptions\PasswordUnavailableException; * @since 12 */ interface ICredentials { - /** * Get the user UID * diff --git a/lib/public/Authentication/LoginCredentials/IStore.php b/lib/public/Authentication/LoginCredentials/IStore.php index 33ffefe2344..71e2d276a71 100644 --- a/lib/public/Authentication/LoginCredentials/IStore.php +++ b/lib/public/Authentication/LoginCredentials/IStore.php @@ -31,7 +31,6 @@ use OCP\Authentication\Exceptions\CredentialsUnavailableException; * @since 12 */ interface IStore { - /** * Get login credentials of the currently logged in user * diff --git a/lib/public/Authentication/TwoFactorAuth/IActivatableAtLogin.php b/lib/public/Authentication/TwoFactorAuth/IActivatableAtLogin.php index e3ef7c62f40..e84399f0170 100644 --- a/lib/public/Authentication/TwoFactorAuth/IActivatableAtLogin.php +++ b/lib/public/Authentication/TwoFactorAuth/IActivatableAtLogin.php @@ -31,7 +31,6 @@ use OCP\IUser; * @since 17.0.0 */ interface IActivatableAtLogin extends IProvider { - /** * @param IUser $user * diff --git a/lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php b/lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php index d9fd8099235..90eb25b061f 100644 --- a/lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php +++ b/lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 15.0.0 */ interface IActivatableByAdmin extends IProvider { - /** * Enable this provider for the given user. * diff --git a/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php b/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php index 1acf3e575d8..6e0827371e0 100644 --- a/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php +++ b/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 15.0.0 */ interface IDeactivatableByAdmin extends IProvider { - /** * Disable this provider for the given user. * diff --git a/lib/public/Authentication/TwoFactorAuth/ILoginSetupProvider.php b/lib/public/Authentication/TwoFactorAuth/ILoginSetupProvider.php index 9d07b11ebed..48699bb7a31 100644 --- a/lib/public/Authentication/TwoFactorAuth/ILoginSetupProvider.php +++ b/lib/public/Authentication/TwoFactorAuth/ILoginSetupProvider.php @@ -31,7 +31,6 @@ use OCP\Template; * @since 17.0.0 */ interface ILoginSetupProvider { - /** * @return Template * diff --git a/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php b/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php index 23913b761b2..35fa4301131 100644 --- a/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php +++ b/lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php @@ -33,7 +33,6 @@ use OCP\Template; * @since 15.0.0 */ interface IPersonalProviderSettings { - /** * @return Template * diff --git a/lib/public/Authentication/TwoFactorAuth/IProvider.php b/lib/public/Authentication/TwoFactorAuth/IProvider.php index 8f1c4ae2802..09fa7a56f5c 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvider.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvider.php @@ -32,7 +32,6 @@ use OCP\Template; * @since 9.1.0 */ interface IProvider { - /** * @since 14.0.0 * @deprecated 22.0.0 diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php b/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php index 5d4c010fbdc..db94eb3be79 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php @@ -32,7 +32,6 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; * @since 13.0.0 */ interface IProvidesCustomCSP { - /** * @return ContentSecurityPolicy * diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php b/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php index cd5205e5416..d62f46e8bc3 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php @@ -32,7 +32,6 @@ namespace OCP\Authentication\TwoFactorAuth; * @since 15.0.0 */ interface IProvidesIcons extends IProvider { - /** * Get the path to the light (white) icon of this provider * diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php b/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php index 3a101764c94..c4cc752325c 100644 --- a/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php +++ b/lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 15.0.0 */ interface IProvidesPersonalSettings extends IProvider { - /** * @param IUser $user * diff --git a/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php b/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php index 830ce8e1c3b..fcc7e5f9207 100644 --- a/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php +++ b/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 15.0.0 */ class RegistryEvent extends Event { - /** @var IProvider */ private $provider; diff --git a/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php b/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php index 539c5716bbd..20c9479a1a9 100644 --- a/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php +++ b/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 20.0.0 */ final class TwoFactorProviderDisabled extends Event { - /** @var string */ private $providerId; diff --git a/lib/public/BackgroundJob/QueuedJob.php b/lib/public/BackgroundJob/QueuedJob.php index b9c4d693b8f..e93db3420b8 100644 --- a/lib/public/BackgroundJob/QueuedJob.php +++ b/lib/public/BackgroundJob/QueuedJob.php @@ -33,7 +33,6 @@ use OCP\ILogger; * @since 15.0.0 */ abstract class QueuedJob extends Job { - /** * Run the job, then remove it from the joblist * diff --git a/lib/public/Broadcast/Events/IBroadcastEvent.php b/lib/public/Broadcast/Events/IBroadcastEvent.php index e7a0e70ba0a..f96fbdea595 100644 --- a/lib/public/Broadcast/Events/IBroadcastEvent.php +++ b/lib/public/Broadcast/Events/IBroadcastEvent.php @@ -31,7 +31,6 @@ use JsonSerializable; * @since 18.0.0 */ interface IBroadcastEvent { - /** * @return string the name of the event * @since 18.0.0 diff --git a/lib/public/Calendar/ICalendar.php b/lib/public/Calendar/ICalendar.php index 2631ef327fc..c6037690f65 100644 --- a/lib/public/Calendar/ICalendar.php +++ b/lib/public/Calendar/ICalendar.php @@ -32,7 +32,6 @@ namespace OCP\Calendar; * @since 13.0.0 */ interface ICalendar { - /** * @return string defining the technical unique key * @since 13.0.0 diff --git a/lib/public/Calendar/ICalendarProvider.php b/lib/public/Calendar/ICalendarProvider.php index 14ef644e580..99b199c1518 100644 --- a/lib/public/Calendar/ICalendarProvider.php +++ b/lib/public/Calendar/ICalendarProvider.php @@ -34,7 +34,6 @@ namespace OCP\Calendar; * @since 23.0.0 */ interface ICalendarProvider { - /** * @param string $principalUri URI of the principal * @param string[] $calendarUris optionally specify which calendars to load, or all if this array is empty diff --git a/lib/public/Calendar/ICalendarQuery.php b/lib/public/Calendar/ICalendarQuery.php index 6a1fff619f6..9151f2b3d47 100644 --- a/lib/public/Calendar/ICalendarQuery.php +++ b/lib/public/Calendar/ICalendarQuery.php @@ -34,7 +34,6 @@ use DateTimeImmutable; * @since 23.0.0 */ interface ICalendarQuery { - /** * @since 24.0.0 */ diff --git a/lib/public/Calendar/ICreateFromString.php b/lib/public/Calendar/ICreateFromString.php index 17d529cdef3..9e60f20db4c 100644 --- a/lib/public/Calendar/ICreateFromString.php +++ b/lib/public/Calendar/ICreateFromString.php @@ -33,7 +33,6 @@ use OCP\Calendar\Exceptions\CalendarException; * @since 23.0.0 */ interface ICreateFromString extends ICalendar { - /** * @since 23.0.0 * diff --git a/lib/public/Calendar/IHandleImipMessage.php b/lib/public/Calendar/IHandleImipMessage.php index 58c1400d987..e3848d6a859 100644 --- a/lib/public/Calendar/IHandleImipMessage.php +++ b/lib/public/Calendar/IHandleImipMessage.php @@ -36,7 +36,6 @@ use OCP\Calendar\Exceptions\CalendarException; * @since 26.0.0 */ interface IHandleImipMessage extends ICalendar { - /** * Handle an iMIP VEvent for validation and processing * diff --git a/lib/public/Calendar/IManager.php b/lib/public/Calendar/IManager.php index dd65917d12b..bd23e67bebc 100644 --- a/lib/public/Calendar/IManager.php +++ b/lib/public/Calendar/IManager.php @@ -58,7 +58,6 @@ namespace OCP\Calendar; * @since 13.0.0 */ interface IManager { - /** * This function is used to search and find objects within the user's calendars. * In case $pattern is empty all events/journals/todos will be returned. diff --git a/lib/public/Calendar/IMetadataProvider.php b/lib/public/Calendar/IMetadataProvider.php index 5d0770caabd..31f888e45d7 100644 --- a/lib/public/Calendar/IMetadataProvider.php +++ b/lib/public/Calendar/IMetadataProvider.php @@ -30,7 +30,6 @@ namespace OCP\Calendar; * @since 17.0.0 */ interface IMetadataProvider { - /** * Get a list of all metadata keys available for this room * diff --git a/lib/public/Calendar/Resource/IBackend.php b/lib/public/Calendar/Resource/IBackend.php index a1e050df60a..95ff958be86 100644 --- a/lib/public/Calendar/Resource/IBackend.php +++ b/lib/public/Calendar/Resource/IBackend.php @@ -31,7 +31,6 @@ use OCP\Calendar\BackendTemporarilyUnavailableException; * @since 14.0.0 */ interface IBackend { - /** * get a list of all resources in this backend * diff --git a/lib/public/Calendar/Resource/IManager.php b/lib/public/Calendar/Resource/IManager.php index 268cf8ec633..00f94bcc548 100644 --- a/lib/public/Calendar/Resource/IManager.php +++ b/lib/public/Calendar/Resource/IManager.php @@ -30,7 +30,6 @@ namespace OCP\Calendar\Resource; * @deprecated 24.0.0 */ interface IManager { - /** * Registers a resource backend * diff --git a/lib/public/Calendar/Resource/IResource.php b/lib/public/Calendar/Resource/IResource.php index f2c3d0a06f0..d419b9f2abc 100644 --- a/lib/public/Calendar/Resource/IResource.php +++ b/lib/public/Calendar/Resource/IResource.php @@ -28,7 +28,6 @@ namespace OCP\Calendar\Resource; * @since 14.0.0 */ interface IResource { - /** * get the resource id * diff --git a/lib/public/Calendar/Resource/IResourceMetadata.php b/lib/public/Calendar/Resource/IResourceMetadata.php index 4d2eaf72488..f97f684e8af 100644 --- a/lib/public/Calendar/Resource/IResourceMetadata.php +++ b/lib/public/Calendar/Resource/IResourceMetadata.php @@ -32,7 +32,6 @@ namespace OCP\Calendar\Resource; * @since 17.0.0 */ interface IResourceMetadata { - /** * Type of resource * diff --git a/lib/public/Calendar/Room/IBackend.php b/lib/public/Calendar/Room/IBackend.php index 095240202bf..211780ef57c 100644 --- a/lib/public/Calendar/Room/IBackend.php +++ b/lib/public/Calendar/Room/IBackend.php @@ -31,7 +31,6 @@ use OCP\Calendar\BackendTemporarilyUnavailableException; * @since 14.0.0 */ interface IBackend { - /** * get a list of all rooms in this backend * diff --git a/lib/public/Calendar/Room/IManager.php b/lib/public/Calendar/Room/IManager.php index c55f3fd4ae4..3095ddc118a 100644 --- a/lib/public/Calendar/Room/IManager.php +++ b/lib/public/Calendar/Room/IManager.php @@ -30,7 +30,6 @@ namespace OCP\Calendar\Room; * @deprecated 24.0.0 */ interface IManager { - /** * Registers a room backend * diff --git a/lib/public/Calendar/Room/IRoom.php b/lib/public/Calendar/Room/IRoom.php index 6402c02319b..e29f658899e 100644 --- a/lib/public/Calendar/Room/IRoom.php +++ b/lib/public/Calendar/Room/IRoom.php @@ -28,7 +28,6 @@ namespace OCP\Calendar\Room; * @since 14.0.0 */ interface IRoom { - /** * Get a unique ID for the room * diff --git a/lib/public/Calendar/Room/IRoomMetadata.php b/lib/public/Calendar/Room/IRoomMetadata.php index ba0eba71311..d28bd9a6e94 100644 --- a/lib/public/Calendar/Room/IRoomMetadata.php +++ b/lib/public/Calendar/Room/IRoomMetadata.php @@ -32,7 +32,6 @@ namespace OCP\Calendar\Room; * @since 17.0.0 */ interface IRoomMetadata { - /** * Type of room * diff --git a/lib/public/Capabilities/ICapability.php b/lib/public/Capabilities/ICapability.php index 34cbe63973e..fed1dba49d1 100644 --- a/lib/public/Capabilities/ICapability.php +++ b/lib/public/Capabilities/ICapability.php @@ -34,7 +34,6 @@ namespace OCP\Capabilities; * @since 8.2.0 */ interface ICapability { - /** * Function an app uses to return the capabilities * diff --git a/lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php b/lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php index 503f31bfffb..5206dc37115 100644 --- a/lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php +++ b/lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\GenericEvent; * @since 16.0.0 */ class AutoCompleteEvent extends GenericEvent { - /** * @param array $arguments * @since 16.0.0 diff --git a/lib/public/Collaboration/AutoComplete/ISorter.php b/lib/public/Collaboration/AutoComplete/ISorter.php index ddf39671d87..91a50761967 100644 --- a/lib/public/Collaboration/AutoComplete/ISorter.php +++ b/lib/public/Collaboration/AutoComplete/ISorter.php @@ -30,7 +30,6 @@ namespace OCP\Collaboration\AutoComplete; * @since 13.0.0 */ interface ISorter { - /** * @return string The ID of the sorter, e.g. commenters * @since 13.0.0 diff --git a/lib/public/Collaboration/Reference/IReference.php b/lib/public/Collaboration/Reference/IReference.php index 31608b52cc5..1b9157fd9b1 100644 --- a/lib/public/Collaboration/Reference/IReference.php +++ b/lib/public/Collaboration/Reference/IReference.php @@ -30,7 +30,6 @@ use JsonSerializable; * @since 25.0.0 */ interface IReference extends JsonSerializable { - /** * @since 25.0.0 */ diff --git a/lib/public/Collaboration/Resources/ICollection.php b/lib/public/Collaboration/Resources/ICollection.php index 5efae755f4d..1fae6fc8db3 100644 --- a/lib/public/Collaboration/Resources/ICollection.php +++ b/lib/public/Collaboration/Resources/ICollection.php @@ -31,7 +31,6 @@ use OCP\IUser; * @since 16.0.0 */ interface ICollection { - /** * @return int * @since 16.0.0 diff --git a/lib/public/Collaboration/Resources/IManager.php b/lib/public/Collaboration/Resources/IManager.php index f220a9c489f..a71fa0bb335 100644 --- a/lib/public/Collaboration/Resources/IManager.php +++ b/lib/public/Collaboration/Resources/IManager.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 16.0.0 */ interface IManager extends IProvider { - /** * @param int $id * @return ICollection diff --git a/lib/public/Collaboration/Resources/IProvider.php b/lib/public/Collaboration/Resources/IProvider.php index 88a74496e55..befb3acc00b 100644 --- a/lib/public/Collaboration/Resources/IProvider.php +++ b/lib/public/Collaboration/Resources/IProvider.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 16.0.0 */ interface IProvider { - /** * Get the resource type of the provider * diff --git a/lib/public/Collaboration/Resources/IProviderManager.php b/lib/public/Collaboration/Resources/IProviderManager.php index 5dcb3eeaca9..ba1ab0eba9d 100644 --- a/lib/public/Collaboration/Resources/IProviderManager.php +++ b/lib/public/Collaboration/Resources/IProviderManager.php @@ -29,7 +29,6 @@ namespace OCP\Collaboration\Resources; * @since 18.0.0 */ interface IProviderManager { - /** * @return IProvider[] list of resource providers * @since 18.0.0 diff --git a/lib/public/Collaboration/Resources/IResource.php b/lib/public/Collaboration/Resources/IResource.php index 20148090d64..3d724e79470 100644 --- a/lib/public/Collaboration/Resources/IResource.php +++ b/lib/public/Collaboration/Resources/IResource.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 16.0.0 */ interface IResource { - /** * @return string * @since 16.0.0 diff --git a/lib/public/Comments/CommentsEvent.php b/lib/public/Comments/CommentsEvent.php index 244df0243f7..1793a1e3a86 100644 --- a/lib/public/Comments/CommentsEvent.php +++ b/lib/public/Comments/CommentsEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class CommentsEvent extends Event { - /** * @deprecated 22.0.0 */ diff --git a/lib/public/Comments/ICommentsEventHandler.php b/lib/public/Comments/ICommentsEventHandler.php index 4e19a3aaadc..19d9dee1339 100644 --- a/lib/public/Comments/ICommentsEventHandler.php +++ b/lib/public/Comments/ICommentsEventHandler.php @@ -29,7 +29,6 @@ namespace OCP\Comments; * @since 11.0.0 */ interface ICommentsEventHandler { - /** * @param CommentsEvent $event * @since 11.0.0 diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index da9e4d76a38..a245e5d2f20 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -39,7 +39,6 @@ use OCP\PreConditionNotMetException; * @since 9.0.0 */ interface ICommentsManager { - /** * @const DELETED_USER type and id for a user that has been deleted * @see deleteReferencesOfActor diff --git a/lib/public/Comments/ICommentsManagerFactory.php b/lib/public/Comments/ICommentsManagerFactory.php index e6f69807b05..b1c70d445f3 100644 --- a/lib/public/Comments/ICommentsManagerFactory.php +++ b/lib/public/Comments/ICommentsManagerFactory.php @@ -35,7 +35,6 @@ use OCP\IServerContainer; * @since 9.0.0 */ interface ICommentsManagerFactory { - /** * Constructor for the comments manager factory * diff --git a/lib/public/Console/ConsoleEvent.php b/lib/public/Console/ConsoleEvent.php index 803cf761c0c..99f42d2895f 100644 --- a/lib/public/Console/ConsoleEvent.php +++ b/lib/public/Console/ConsoleEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class ConsoleEvent extends Event { - /** * @deprecated 22.0.0 */ diff --git a/lib/public/Contacts/ContactsMenu/IAction.php b/lib/public/Contacts/ContactsMenu/IAction.php index f6022fefac3..f9b868906df 100644 --- a/lib/public/Contacts/ContactsMenu/IAction.php +++ b/lib/public/Contacts/ContactsMenu/IAction.php @@ -30,7 +30,6 @@ use JsonSerializable; * @since 12.0 */ interface IAction extends JsonSerializable { - /** * @param string $icon absolute URI to an icon * @since 12.0 diff --git a/lib/public/Contacts/ContactsMenu/IActionFactory.php b/lib/public/Contacts/ContactsMenu/IActionFactory.php index b4e4eb96819..791fc1f288c 100644 --- a/lib/public/Contacts/ContactsMenu/IActionFactory.php +++ b/lib/public/Contacts/ContactsMenu/IActionFactory.php @@ -26,7 +26,6 @@ namespace OCP\Contacts\ContactsMenu; * @since 12.0 */ interface IActionFactory { - /** * Construct and return a new link action for the contacts menu * diff --git a/lib/public/Contacts/ContactsMenu/IContactsStore.php b/lib/public/Contacts/ContactsMenu/IContactsStore.php index 8b36f9cde5c..ce153375a29 100644 --- a/lib/public/Contacts/ContactsMenu/IContactsStore.php +++ b/lib/public/Contacts/ContactsMenu/IContactsStore.php @@ -30,8 +30,6 @@ use OCP\IUser; * @since 13.0.0 */ interface IContactsStore { - - /** * @param IUser $user * @param string|null $filter diff --git a/lib/public/Contacts/ContactsMenu/IEntry.php b/lib/public/Contacts/ContactsMenu/IEntry.php index d4e3e31cf79..9d78b0c8f57 100644 --- a/lib/public/Contacts/ContactsMenu/IEntry.php +++ b/lib/public/Contacts/ContactsMenu/IEntry.php @@ -29,7 +29,6 @@ use JsonSerializable; * @since 12.0 */ interface IEntry extends JsonSerializable { - /** * @since 12.0 * @return string diff --git a/lib/public/Contacts/ContactsMenu/ILinkAction.php b/lib/public/Contacts/ContactsMenu/ILinkAction.php index 936dd22bcf2..989e4ef522c 100644 --- a/lib/public/Contacts/ContactsMenu/ILinkAction.php +++ b/lib/public/Contacts/ContactsMenu/ILinkAction.php @@ -26,7 +26,6 @@ namespace OCP\Contacts\ContactsMenu; * @since 12.0 */ interface ILinkAction extends IAction { - /** * @param string $href the target URL of the action * @since 12.0 diff --git a/lib/public/Contacts/ContactsMenu/IProvider.php b/lib/public/Contacts/ContactsMenu/IProvider.php index c6c695c5698..c05f2707c18 100644 --- a/lib/public/Contacts/ContactsMenu/IProvider.php +++ b/lib/public/Contacts/ContactsMenu/IProvider.php @@ -26,7 +26,6 @@ namespace OCP\Contacts\ContactsMenu; * @since 12.0 */ interface IProvider { - /** * @since 12.0 * @param IEntry $entry diff --git a/lib/public/Contacts/Events/ContactInteractedWithEvent.php b/lib/public/Contacts/Events/ContactInteractedWithEvent.php index b879c89a730..050183bd761 100644 --- a/lib/public/Contacts/Events/ContactInteractedWithEvent.php +++ b/lib/public/Contacts/Events/ContactInteractedWithEvent.php @@ -39,7 +39,6 @@ use OCP\IUser; * @since 19.0.0 */ class ContactInteractedWithEvent extends Event { - /** @var IUser */ private $actor; diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 2e87f6c8afc..7aa3d9ce38b 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -48,7 +48,6 @@ namespace OCP\Contacts; * @since 6.0.0 */ interface IManager { - /** * This function is used to search and find contacts within the users address books. * In case $pattern is empty all contacts will be returned. diff --git a/lib/public/DB/Exception.php b/lib/public/DB/Exception.php index d9d11e308d6..105cbd188d7 100644 --- a/lib/public/DB/Exception.php +++ b/lib/public/DB/Exception.php @@ -39,7 +39,6 @@ use Exception as BaseException; * @since 21.0.0 */ class Exception extends BaseException { - /** * Nextcloud lost connection to the database * diff --git a/lib/public/DB/IPreparedStatement.php b/lib/public/DB/IPreparedStatement.php index 391f987d20a..2ef5cf7fc46 100644 --- a/lib/public/DB/IPreparedStatement.php +++ b/lib/public/DB/IPreparedStatement.php @@ -42,7 +42,6 @@ use PDO; * @since 21.0.0 */ interface IPreparedStatement { - /** * @return true * diff --git a/lib/public/DB/IResult.php b/lib/public/DB/IResult.php index cbed1e51dac..10a60cd5ff4 100644 --- a/lib/public/DB/IResult.php +++ b/lib/public/DB/IResult.php @@ -44,7 +44,6 @@ use PDO; * @since 21.0.0 */ interface IResult { - /** * @return true * diff --git a/lib/public/DB/ISchemaWrapper.php b/lib/public/DB/ISchemaWrapper.php index 5c7ebaa7c30..06827203f74 100644 --- a/lib/public/DB/ISchemaWrapper.php +++ b/lib/public/DB/ISchemaWrapper.php @@ -36,7 +36,6 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; * @since 13.0.0 */ interface ISchemaWrapper { - /** * @param string $tableName * diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 218b7d8cb2d..d677ee214f8 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -38,7 +38,6 @@ use OCP\DB\IResult; * @psalm-taint-specialize */ interface IQueryBuilder { - /** * @since 9.0.0 */ diff --git a/lib/public/Dashboard/IAPIWidget.php b/lib/public/Dashboard/IAPIWidget.php index 42ba9544d8a..6553e8ec89a 100644 --- a/lib/public/Dashboard/IAPIWidget.php +++ b/lib/public/Dashboard/IAPIWidget.php @@ -32,7 +32,6 @@ namespace OCP\Dashboard; * @since 22.0.0 */ interface IAPIWidget extends IWidget { - /** * @return \OCP\Dashboard\Model\WidgetItem[] The widget items * @since 22.0.0 diff --git a/lib/public/Dashboard/IConditionalWidget.php b/lib/public/Dashboard/IConditionalWidget.php index 4fdeec700d3..443a9c9332c 100644 --- a/lib/public/Dashboard/IConditionalWidget.php +++ b/lib/public/Dashboard/IConditionalWidget.php @@ -35,7 +35,6 @@ namespace OCP\Dashboard; * @since 26.0.0 */ interface IConditionalWidget extends IWidget { - /** * @return bool Whether the widget is enabled and should be registered * @since 26.0.0 diff --git a/lib/public/Dashboard/IManager.php b/lib/public/Dashboard/IManager.php index d9e73c89eb9..77bff7b34ff 100644 --- a/lib/public/Dashboard/IManager.php +++ b/lib/public/Dashboard/IManager.php @@ -31,7 +31,6 @@ namespace OCP\Dashboard; * @since 20.0.0 */ interface IManager { - /** * @param string $widgetClass * @since 20.0.0 diff --git a/lib/public/Dashboard/IWidget.php b/lib/public/Dashboard/IWidget.php index 6f3f795f958..46ba2135775 100644 --- a/lib/public/Dashboard/IWidget.php +++ b/lib/public/Dashboard/IWidget.php @@ -31,7 +31,6 @@ namespace OCP\Dashboard; * @since 20.0.0 */ interface IWidget { - /** * @return string Unique id that identifies the widget, e.g. the app id * @since 20.0.0 diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php index cbef0ec79a4..cb04d62df0d 100644 --- a/lib/public/Defaults.php +++ b/lib/public/Defaults.php @@ -39,7 +39,6 @@ namespace OCP; * @since 6.0.0 */ class Defaults { - /** * \OC_Defaults instance to retrieve the defaults * @since 6.0.0 diff --git a/lib/public/DirectEditing/ACreateEmpty.php b/lib/public/DirectEditing/ACreateEmpty.php index 263663c7907..89209748e4f 100644 --- a/lib/public/DirectEditing/ACreateEmpty.php +++ b/lib/public/DirectEditing/ACreateEmpty.php @@ -28,7 +28,6 @@ use OCP\Files\File; * @since 18.0.0 */ abstract class ACreateEmpty { - /** * Unique id for the creator to filter templates * diff --git a/lib/public/DirectEditing/ACreateFromTemplate.php b/lib/public/DirectEditing/ACreateFromTemplate.php index 0bdebc3e2d1..c91e56d79d7 100644 --- a/lib/public/DirectEditing/ACreateFromTemplate.php +++ b/lib/public/DirectEditing/ACreateFromTemplate.php @@ -26,7 +26,6 @@ namespace OCP\DirectEditing; * @since 18.0.0 */ abstract class ACreateFromTemplate extends ACreateEmpty { - /** * List of available templates for the create from template action * diff --git a/lib/public/DirectEditing/ATemplate.php b/lib/public/DirectEditing/ATemplate.php index 53aff0d40ff..f66628ad93b 100644 --- a/lib/public/DirectEditing/ATemplate.php +++ b/lib/public/DirectEditing/ATemplate.php @@ -30,7 +30,6 @@ use JsonSerializable; * @since 18.0.0 */ abstract class ATemplate implements JsonSerializable { - /** * Return a unique id so the app can identify the template * diff --git a/lib/public/DirectEditing/IEditor.php b/lib/public/DirectEditing/IEditor.php index f3b0de07e5b..c70b4751e6e 100644 --- a/lib/public/DirectEditing/IEditor.php +++ b/lib/public/DirectEditing/IEditor.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response; * @since 18.0.0 */ interface IEditor { - /** * Return a unique identifier for the editor * diff --git a/lib/public/DirectEditing/IManager.php b/lib/public/DirectEditing/IManager.php index a1a5ed4f2bd..ee4408fee84 100644 --- a/lib/public/DirectEditing/IManager.php +++ b/lib/public/DirectEditing/IManager.php @@ -35,7 +35,6 @@ use RuntimeException; * @since 18.0.0 */ interface IManager { - /** * Register a new editor * diff --git a/lib/public/DirectEditing/IToken.php b/lib/public/DirectEditing/IToken.php index 502ef7f5032..d9c51ca31d3 100644 --- a/lib/public/DirectEditing/IToken.php +++ b/lib/public/DirectEditing/IToken.php @@ -29,7 +29,6 @@ use OCP\Files\NotFoundException; * @since 18.0.0 */ interface IToken { - /** * Extend the token validity time * diff --git a/lib/public/DirectEditing/RegisterDirectEditorEvent.php b/lib/public/DirectEditing/RegisterDirectEditorEvent.php index ed9a450d5e6..655fe815f6c 100644 --- a/lib/public/DirectEditing/RegisterDirectEditorEvent.php +++ b/lib/public/DirectEditing/RegisterDirectEditorEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class RegisterDirectEditorEvent extends Event { - /** * @var IManager */ diff --git a/lib/public/Encryption/Exceptions/GenericEncryptionException.php b/lib/public/Encryption/Exceptions/GenericEncryptionException.php index aef4114bb1b..8406d0593d2 100644 --- a/lib/public/Encryption/Exceptions/GenericEncryptionException.php +++ b/lib/public/Encryption/Exceptions/GenericEncryptionException.php @@ -34,7 +34,6 @@ use OCP\HintException; * @since 8.1.0 */ class GenericEncryptionException extends HintException { - /** * @param string $message * @param string $hint diff --git a/lib/public/Encryption/IEncryptionModule.php b/lib/public/Encryption/IEncryptionModule.php index 058256e4850..d0ae430a81a 100644 --- a/lib/public/Encryption/IEncryptionModule.php +++ b/lib/public/Encryption/IEncryptionModule.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Output\OutputInterface; * @since 8.1.0 */ interface IEncryptionModule { - /** * @return string defining the technical unique id * @since 8.1.0 diff --git a/lib/public/Encryption/IFile.php b/lib/public/Encryption/IFile.php index ab2b46a5ce4..209245677bb 100644 --- a/lib/public/Encryption/IFile.php +++ b/lib/public/Encryption/IFile.php @@ -29,7 +29,6 @@ namespace OCP\Encryption; * @since 8.1.0 */ interface IFile { - /** * get list of users with access to the file * diff --git a/lib/public/Encryption/IManager.php b/lib/public/Encryption/IManager.php index 1a745716209..f55fd9a50fd 100644 --- a/lib/public/Encryption/IManager.php +++ b/lib/public/Encryption/IManager.php @@ -33,7 +33,6 @@ use OC\Encryption\Exceptions\ModuleDoesNotExistsException; * @since 8.1.0 */ interface IManager { - /** * Check if encryption is available (at least one encryption module needs to be enabled) * diff --git a/lib/public/Encryption/Keys/IStorage.php b/lib/public/Encryption/Keys/IStorage.php index ae1449c7fdf..832cb97ec37 100644 --- a/lib/public/Encryption/Keys/IStorage.php +++ b/lib/public/Encryption/Keys/IStorage.php @@ -31,7 +31,6 @@ namespace OCP\Encryption\Keys; * @since 8.1.0 */ interface IStorage { - /** * get user specific key * diff --git a/lib/public/EventDispatcher/ABroadcastedEvent.php b/lib/public/EventDispatcher/ABroadcastedEvent.php index 3e41d316b9c..aa18ce94498 100644 --- a/lib/public/EventDispatcher/ABroadcastedEvent.php +++ b/lib/public/EventDispatcher/ABroadcastedEvent.php @@ -31,7 +31,6 @@ use JsonSerializable; * @since 18.0.0 */ abstract class ABroadcastedEvent extends Event implements JsonSerializable { - /** * @since 18.0.0 */ diff --git a/lib/public/EventDispatcher/Event.php b/lib/public/EventDispatcher/Event.php index 92f18a4fa43..94104300a09 100644 --- a/lib/public/EventDispatcher/Event.php +++ b/lib/public/EventDispatcher/Event.php @@ -41,7 +41,6 @@ use Psr\EventDispatcher\StoppableEventInterface; * @since 17.0.0 */ class Event implements StoppableEventInterface { - /** * @var bool * diff --git a/lib/public/EventDispatcher/IEventDispatcher.php b/lib/public/EventDispatcher/IEventDispatcher.php index 82505b6a512..0a96fa799d4 100644 --- a/lib/public/EventDispatcher/IEventDispatcher.php +++ b/lib/public/EventDispatcher/IEventDispatcher.php @@ -32,7 +32,6 @@ namespace OCP\EventDispatcher; * @since 17.0.0 */ interface IEventDispatcher { - /** * @template T of \OCP\EventDispatcher\Event * @param string $eventName preferably the fully-qualified class name of the Event sub class diff --git a/lib/public/EventDispatcher/IEventListener.php b/lib/public/EventDispatcher/IEventListener.php index 638e0570ca0..829a8769be2 100644 --- a/lib/public/EventDispatcher/IEventListener.php +++ b/lib/public/EventDispatcher/IEventListener.php @@ -31,7 +31,6 @@ namespace OCP\EventDispatcher; * @template T of Event */ interface IEventListener { - /** * @param Event $event * @psalm-param T $event diff --git a/lib/public/Federation/Exceptions/ActionNotSupportedException.php b/lib/public/Federation/Exceptions/ActionNotSupportedException.php index 7b2ca3d9597..e5f8d50fd99 100644 --- a/lib/public/Federation/Exceptions/ActionNotSupportedException.php +++ b/lib/public/Federation/Exceptions/ActionNotSupportedException.php @@ -31,7 +31,6 @@ use OCP\HintException; * @since 14.0.0 */ class ActionNotSupportedException extends HintException { - /** * ActionNotSupportedException constructor. * diff --git a/lib/public/Federation/Exceptions/AuthenticationFailedException.php b/lib/public/Federation/Exceptions/AuthenticationFailedException.php index dfcd9636035..2bd3e361edd 100644 --- a/lib/public/Federation/Exceptions/AuthenticationFailedException.php +++ b/lib/public/Federation/Exceptions/AuthenticationFailedException.php @@ -31,7 +31,6 @@ use OCP\HintException; * @since 14.0.0 */ class AuthenticationFailedException extends HintException { - /** * BadRequestException constructor. * diff --git a/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php b/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php index b6d4b7e9bce..d30d81eca27 100644 --- a/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php +++ b/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php @@ -33,7 +33,6 @@ use OCP\HintException; * @since 14.0.0 */ class ProviderAlreadyExistsException extends HintException { - /** * ProviderAlreadyExistsException constructor. * diff --git a/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php b/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php index efcc8788386..9294f5e1d95 100644 --- a/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php +++ b/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php @@ -32,7 +32,6 @@ use OCP\HintException; * @since 14.0.0 */ class ProviderCouldNotAddShareException extends HintException { - /** * ProviderCouldNotAddShareException constructor. * diff --git a/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php b/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php index 69c69f17d99..849209da22d 100644 --- a/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php +++ b/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php @@ -31,7 +31,6 @@ use OCP\HintException; * @since 14.0.0 */ class ProviderDoesNotExistsException extends HintException { - /** * ProviderDoesNotExistsException constructor. * diff --git a/lib/public/Federation/ICloudFederationFactory.php b/lib/public/Federation/ICloudFederationFactory.php index d92e9f6b4ed..ba1d93bb4cd 100644 --- a/lib/public/Federation/ICloudFederationFactory.php +++ b/lib/public/Federation/ICloudFederationFactory.php @@ -29,7 +29,6 @@ namespace OCP\Federation; * @since 14.0.0 */ interface ICloudFederationFactory { - /** * get a CloudFederationShare Object to prepare a share you want to send * diff --git a/lib/public/Federation/ICloudFederationNotification.php b/lib/public/Federation/ICloudFederationNotification.php index b8fec05d6d2..2b51b2bc8db 100644 --- a/lib/public/Federation/ICloudFederationNotification.php +++ b/lib/public/Federation/ICloudFederationNotification.php @@ -29,7 +29,6 @@ namespace OCP\Federation; * @since 14.0.0 */ interface ICloudFederationNotification { - /** * add a message to the notification * diff --git a/lib/public/Federation/ICloudFederationProvider.php b/lib/public/Federation/ICloudFederationProvider.php index 2e9d58fcb3e..7cb620848ef 100644 --- a/lib/public/Federation/ICloudFederationProvider.php +++ b/lib/public/Federation/ICloudFederationProvider.php @@ -39,7 +39,6 @@ use OCP\Share\Exceptions\ShareNotFound; */ interface ICloudFederationProvider { - /** * get the name of the share type, handled by this provider * diff --git a/lib/public/Federation/ICloudFederationProviderManager.php b/lib/public/Federation/ICloudFederationProviderManager.php index e607b0555ab..7272653b14d 100644 --- a/lib/public/Federation/ICloudFederationProviderManager.php +++ b/lib/public/Federation/ICloudFederationProviderManager.php @@ -32,7 +32,6 @@ namespace OCP\Federation; * */ interface ICloudFederationProviderManager { - /** * Registers an callback function which must return an cloud federation provider * diff --git a/lib/public/Federation/ICloudFederationShare.php b/lib/public/Federation/ICloudFederationShare.php index 892a47e8186..c2a4ca29e11 100644 --- a/lib/public/Federation/ICloudFederationShare.php +++ b/lib/public/Federation/ICloudFederationShare.php @@ -29,7 +29,6 @@ namespace OCP\Federation; * @since 14.0.0 */ interface ICloudFederationShare { - /** * set uid of the recipient * diff --git a/lib/public/Files/AppData/IAppDataFactory.php b/lib/public/Files/AppData/IAppDataFactory.php index b689da36b83..fe53b582720 100644 --- a/lib/public/Files/AppData/IAppDataFactory.php +++ b/lib/public/Files/AppData/IAppDataFactory.php @@ -10,7 +10,6 @@ use OCP\Files\IAppData; * @since 25.0.0 */ interface IAppDataFactory { - /** * Get the AppData folder for the specified $appId * @param string $appId diff --git a/lib/public/Files/Events/BeforeFileScannedEvent.php b/lib/public/Files/Events/BeforeFileScannedEvent.php index 10aabc4a143..c5e0a40cfd9 100644 --- a/lib/public/Files/Events/BeforeFileScannedEvent.php +++ b/lib/public/Files/Events/BeforeFileScannedEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeFileScannedEvent extends Event { - /** @var string */ private $absolutePath; diff --git a/lib/public/Files/Events/BeforeFolderScannedEvent.php b/lib/public/Files/Events/BeforeFolderScannedEvent.php index add86ab719c..3f163a5a73b 100644 --- a/lib/public/Files/Events/BeforeFolderScannedEvent.php +++ b/lib/public/Files/Events/BeforeFolderScannedEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeFolderScannedEvent extends Event { - /** @var string */ private $absolutePath; diff --git a/lib/public/Files/Events/FileCacheUpdated.php b/lib/public/Files/Events/FileCacheUpdated.php index 28376fc10b9..18d6318f2f4 100644 --- a/lib/public/Files/Events/FileCacheUpdated.php +++ b/lib/public/Files/Events/FileCacheUpdated.php @@ -32,7 +32,6 @@ use OCP\Files\Storage\IStorage; * @since 18.0.0 */ class FileCacheUpdated extends Event { - /** @var IStorage */ private $storage; diff --git a/lib/public/Files/Events/FileScannedEvent.php b/lib/public/Files/Events/FileScannedEvent.php index 3d6b3020b94..96a40a0204c 100644 --- a/lib/public/Files/Events/FileScannedEvent.php +++ b/lib/public/Files/Events/FileScannedEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class FileScannedEvent extends Event { - /** @var string */ private $absolutePath; diff --git a/lib/public/Files/Events/FolderScannedEvent.php b/lib/public/Files/Events/FolderScannedEvent.php index 82c408daaba..e8907979364 100644 --- a/lib/public/Files/Events/FolderScannedEvent.php +++ b/lib/public/Files/Events/FolderScannedEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class FolderScannedEvent extends Event { - /** @var string */ private $absolutePath; diff --git a/lib/public/Files/Events/Node/AbstractNodeEvent.php b/lib/public/Files/Events/Node/AbstractNodeEvent.php index 6478d527eee..d6c1c6d0f95 100644 --- a/lib/public/Files/Events/Node/AbstractNodeEvent.php +++ b/lib/public/Files/Events/Node/AbstractNodeEvent.php @@ -32,7 +32,6 @@ use OCP\Files\Node; * @since 20.0.0 */ abstract class AbstractNodeEvent extends Event { - /** @var Node */ private $node; diff --git a/lib/public/Files/Events/Node/AbstractNodesEvent.php b/lib/public/Files/Events/Node/AbstractNodesEvent.php index dd2174f0884..6bd9bc32a88 100644 --- a/lib/public/Files/Events/Node/AbstractNodesEvent.php +++ b/lib/public/Files/Events/Node/AbstractNodesEvent.php @@ -32,7 +32,6 @@ use OCP\Files\Node; * @since 20.0.0 */ abstract class AbstractNodesEvent extends Event { - /** @var Node */ private $source; /** @var Node */ diff --git a/lib/public/Files/Events/NodeAddedToCache.php b/lib/public/Files/Events/NodeAddedToCache.php index 8699131d4d4..6986b4b5989 100644 --- a/lib/public/Files/Events/NodeAddedToCache.php +++ b/lib/public/Files/Events/NodeAddedToCache.php @@ -32,7 +32,6 @@ use OCP\Files\Storage\IStorage; * @since 18.0.0 */ class NodeAddedToCache extends Event { - /** @var IStorage */ private $storage; diff --git a/lib/public/Files/Events/NodeRemovedFromCache.php b/lib/public/Files/Events/NodeRemovedFromCache.php index 7c85e5e4586..9f67cb71371 100644 --- a/lib/public/Files/Events/NodeRemovedFromCache.php +++ b/lib/public/Files/Events/NodeRemovedFromCache.php @@ -32,7 +32,6 @@ use OCP\Files\Storage\IStorage; * @since 18.0.0 */ class NodeRemovedFromCache extends Event { - /** @var IStorage */ private $storage; diff --git a/lib/public/Files/ForbiddenException.php b/lib/public/Files/ForbiddenException.php index 4b148dde93b..6a0a8d7fc4b 100644 --- a/lib/public/Files/ForbiddenException.php +++ b/lib/public/Files/ForbiddenException.php @@ -32,7 +32,6 @@ namespace OCP\Files; * @since 9.0.0 */ class ForbiddenException extends \Exception { - /** @var bool */ private $retry; diff --git a/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php index 6017360cab0..11ba5cfc95f 100644 --- a/lib/public/Files/IMimeTypeDetector.php +++ b/lib/public/Files/IMimeTypeDetector.php @@ -32,7 +32,6 @@ namespace OCP\Files; * Interface to handle mimetypes (detection and icon retrieval) **/ interface IMimeTypeDetector { - /** * detect mimetype only based on filename, content of file is not used * @param string $path diff --git a/lib/public/Files/IMimeTypeLoader.php b/lib/public/Files/IMimeTypeLoader.php index faed18ed7d9..d4f2767bc17 100644 --- a/lib/public/Files/IMimeTypeLoader.php +++ b/lib/public/Files/IMimeTypeLoader.php @@ -28,7 +28,6 @@ namespace OCP\Files; * Interface to load mimetypes **/ interface IMimeTypeLoader { - /** * Get a mimetype from its ID * diff --git a/lib/public/Files/IRootFolder.php b/lib/public/Files/IRootFolder.php index 7d007cb690c..452c0fd3157 100644 --- a/lib/public/Files/IRootFolder.php +++ b/lib/public/Files/IRootFolder.php @@ -33,7 +33,6 @@ use OC\User\NoUserException; * @since 8.0.0 */ interface IRootFolder extends Folder, Emitter { - /** * Returns a view to user's files folder * diff --git a/lib/public/Files/Lock/ILock.php b/lib/public/Files/Lock/ILock.php index 03737a178c6..2f863a585dc 100644 --- a/lib/public/Files/Lock/ILock.php +++ b/lib/public/Files/Lock/ILock.php @@ -30,7 +30,6 @@ namespace OCP\Files\Lock; * @since 24.0.0 */ interface ILock { - /** * User owned manual lock * diff --git a/lib/public/Files/Lock/ILockManager.php b/lib/public/Files/Lock/ILockManager.php index cad66380e93..2cdb027a570 100644 --- a/lib/public/Files/Lock/ILockManager.php +++ b/lib/public/Files/Lock/ILockManager.php @@ -39,7 +39,6 @@ use OCP\PreConditionNotMetException; * @since 24.0.0 */ interface ILockManager extends ILockProvider { - /** * @throws PreConditionNotMetException if there is already a lock provider registered * @since 24.0.0 diff --git a/lib/public/Files/Lock/ILockProvider.php b/lib/public/Files/Lock/ILockProvider.php index 50326c427e4..c2e18e6b19d 100644 --- a/lib/public/Files/Lock/ILockProvider.php +++ b/lib/public/Files/Lock/ILockProvider.php @@ -32,7 +32,6 @@ use OCP\PreConditionNotMetException; * @since 24.0.0 */ interface ILockProvider { - /** * @throws PreConditionNotMetException * @throws NoLockProviderException diff --git a/lib/public/Files/Mount/IMountManager.php b/lib/public/Files/Mount/IMountManager.php index aa760f53e96..a55e5758199 100644 --- a/lib/public/Files/Mount/IMountManager.php +++ b/lib/public/Files/Mount/IMountManager.php @@ -33,7 +33,6 @@ namespace OCP\Files\Mount; * @since 8.2.0 */ interface IMountManager { - /** * Add a new mount * diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php index 66144bc4360..b8e7ec9118f 100644 --- a/lib/public/Files/Mount/IMountPoint.php +++ b/lib/public/Files/Mount/IMountPoint.php @@ -28,7 +28,6 @@ namespace OCP\Files\Mount; * @since 8.0.0 */ interface IMountPoint { - /** * get complete path to the mount point * diff --git a/lib/public/Files/ObjectStore/IObjectStore.php b/lib/public/Files/ObjectStore/IObjectStore.php index 924141a3d4b..a202ef7c0c2 100644 --- a/lib/public/Files/ObjectStore/IObjectStore.php +++ b/lib/public/Files/ObjectStore/IObjectStore.php @@ -32,7 +32,6 @@ use OCP\Files\NotFoundException; * @since 7.0.0 */ interface IObjectStore { - /** * @return string the container or bucket name where objects are stored * @since 7.0.0 diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php index 34cd128d449..9050fe770b9 100644 --- a/lib/public/Files/SimpleFS/ISimpleFile.php +++ b/lib/public/Files/SimpleFS/ISimpleFile.php @@ -37,7 +37,6 @@ use OCP\Files\NotPermittedException; * @since 11.0.0 */ interface ISimpleFile { - /** * Get the name * diff --git a/lib/public/Files/StorageAuthException.php b/lib/public/Files/StorageAuthException.php index 696792c8d43..5fce191b57e 100644 --- a/lib/public/Files/StorageAuthException.php +++ b/lib/public/Files/StorageAuthException.php @@ -28,7 +28,6 @@ namespace OCP\Files; * @since 9.0.0 */ class StorageAuthException extends StorageNotAvailableException { - /** * StorageAuthException constructor. * diff --git a/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php index e05b9217799..0e16a24daa8 100644 --- a/lib/public/Files/StorageBadConfigException.php +++ b/lib/public/Files/StorageBadConfigException.php @@ -28,7 +28,6 @@ namespace OCP\Files; * @since 9.0.0 */ class StorageBadConfigException extends StorageNotAvailableException { - /** * ExtStorageBadConfigException constructor. * diff --git a/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php index d9a69e53edd..9113faf72a1 100644 --- a/lib/public/Files/StorageConnectionException.php +++ b/lib/public/Files/StorageConnectionException.php @@ -28,7 +28,6 @@ namespace OCP\Files; * @since 9.0.0 */ class StorageConnectionException extends StorageNotAvailableException { - /** * StorageConnectionException constructor. * diff --git a/lib/public/Files/StorageTimeoutException.php b/lib/public/Files/StorageTimeoutException.php index 256f7e710a1..bad88ad35e0 100644 --- a/lib/public/Files/StorageTimeoutException.php +++ b/lib/public/Files/StorageTimeoutException.php @@ -28,7 +28,6 @@ namespace OCP\Files; * @since 9.0.0 */ class StorageTimeoutException extends StorageNotAvailableException { - /** * StorageTimeoutException constructor. * diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php index a874ec6491a..f39cf65fba4 100644 --- a/lib/public/Files/Template/ITemplateManager.php +++ b/lib/public/Files/Template/ITemplateManager.php @@ -32,7 +32,6 @@ use OCP\Files\GenericFileException; * @since 21.0.0 */ interface ITemplateManager { - /** * Register a template type support * diff --git a/lib/public/Files/Template/Template.php b/lib/public/Files/Template/Template.php index d71ef3b3655..8fefc422c86 100644 --- a/lib/public/Files/Template/Template.php +++ b/lib/public/Files/Template/Template.php @@ -31,7 +31,6 @@ use OCP\Files\File; * @since 21.0.0 */ final class Template implements \JsonSerializable { - /** @var string */ private $templateType; /** @var string */ diff --git a/lib/public/Files_FullTextSearch/Model/AFilesDocument.php b/lib/public/Files_FullTextSearch/Model/AFilesDocument.php index 421015067df..5a9d989f9af 100644 --- a/lib/public/Files_FullTextSearch/Model/AFilesDocument.php +++ b/lib/public/Files_FullTextSearch/Model/AFilesDocument.php @@ -49,8 +49,6 @@ use OCP\FullTextSearch\Model\IIndexDocument; * */ abstract class AFilesDocument extends IndexDocument { - - /** * Returns the owner of the document/file. * diff --git a/lib/public/FullTextSearch/IFullTextSearchManager.php b/lib/public/FullTextSearch/IFullTextSearchManager.php index ee9f4ba20e1..bd8fe19a349 100644 --- a/lib/public/FullTextSearch/IFullTextSearchManager.php +++ b/lib/public/FullTextSearch/IFullTextSearchManager.php @@ -41,8 +41,6 @@ use OCP\FullTextSearch\Service\ISearchService; * */ interface IFullTextSearchManager { - - /** * Register a IProviderService. * diff --git a/lib/public/FullTextSearch/IFullTextSearchPlatform.php b/lib/public/FullTextSearch/IFullTextSearchPlatform.php index 147a883885e..6ef39a4b2ed 100644 --- a/lib/public/FullTextSearch/IFullTextSearchPlatform.php +++ b/lib/public/FullTextSearch/IFullTextSearchPlatform.php @@ -70,8 +70,6 @@ use OCP\FullTextSearch\Model\ISearchResult; * */ interface IFullTextSearchPlatform { - - /** * Must returns a unique Id used to identify the Search Platform. * Id must contains only alphanumeric chars, with no space. diff --git a/lib/public/FullTextSearch/IFullTextSearchProvider.php b/lib/public/FullTextSearch/IFullTextSearchProvider.php index 3d78199f4d6..c9e4e44d931 100644 --- a/lib/public/FullTextSearch/IFullTextSearchProvider.php +++ b/lib/public/FullTextSearch/IFullTextSearchProvider.php @@ -71,8 +71,6 @@ use OCP\FullTextSearch\Model\ISearchTemplate; * */ interface IFullTextSearchProvider { - - /** * Must returns a unique Id used to identify the Content Provider. * Id must contains only alphanumeric chars, with no space. diff --git a/lib/public/FullTextSearch/Model/IDocumentAccess.php b/lib/public/FullTextSearch/Model/IDocumentAccess.php index 84ce46db361..08d600849a5 100644 --- a/lib/public/FullTextSearch/Model/IDocumentAccess.php +++ b/lib/public/FullTextSearch/Model/IDocumentAccess.php @@ -45,8 +45,6 @@ namespace OCP\FullTextSearch\Model; * */ interface IDocumentAccess { - - /** * Owner of the document can be set at the init of the object. * diff --git a/lib/public/FullTextSearch/Model/IIndexOptions.php b/lib/public/FullTextSearch/Model/IIndexOptions.php index f8ee10671e5..9f66496703d 100644 --- a/lib/public/FullTextSearch/Model/IIndexOptions.php +++ b/lib/public/FullTextSearch/Model/IIndexOptions.php @@ -37,8 +37,6 @@ namespace OCP\FullTextSearch\Model; * */ interface IIndexOptions { - - /** * Get the value (as a string) for an option. * diff --git a/lib/public/FullTextSearch/Model/ISearchOption.php b/lib/public/FullTextSearch/Model/ISearchOption.php index 7cfe07d9c3e..fbea54977da 100644 --- a/lib/public/FullTextSearch/Model/ISearchOption.php +++ b/lib/public/FullTextSearch/Model/ISearchOption.php @@ -33,8 +33,6 @@ namespace OCP\FullTextSearch\Model; * */ interface ISearchOption { - - /** * @since 16.0.0 */ diff --git a/lib/public/FullTextSearch/Model/ISearchRequest.php b/lib/public/FullTextSearch/Model/ISearchRequest.php index 76fc3b18b02..5eaac6557c7 100644 --- a/lib/public/FullTextSearch/Model/ISearchRequest.php +++ b/lib/public/FullTextSearch/Model/ISearchRequest.php @@ -43,8 +43,6 @@ namespace OCP\FullTextSearch\Model; * */ interface ISearchRequest { - - /** * Get the maximum number of results to be returns by the Search Platform. * diff --git a/lib/public/FullTextSearch/Model/ISearchResult.php b/lib/public/FullTextSearch/Model/ISearchResult.php index 729f79da762..60070856264 100644 --- a/lib/public/FullTextSearch/Model/ISearchResult.php +++ b/lib/public/FullTextSearch/Model/ISearchResult.php @@ -46,8 +46,6 @@ use OCP\FullTextSearch\IFullTextSearchProvider; * */ interface ISearchResult { - - /** * Get the original SearchRequest. * diff --git a/lib/public/FullTextSearch/Model/ISearchTemplate.php b/lib/public/FullTextSearch/Model/ISearchTemplate.php index adeccd4224c..c7e946761bb 100644 --- a/lib/public/FullTextSearch/Model/ISearchTemplate.php +++ b/lib/public/FullTextSearch/Model/ISearchTemplate.php @@ -52,8 +52,6 @@ use OCP\FullTextSearch\IFullTextSearchProvider; * */ interface ISearchTemplate { - - /** * Set the class of the icon to be displayed in the left panel of the * FullTextSearch navigation page, in front of the related Content Provider. diff --git a/lib/public/FullTextSearch/Service/IIndexService.php b/lib/public/FullTextSearch/Service/IIndexService.php index b9b15e96371..f7ab451fe77 100644 --- a/lib/public/FullTextSearch/Service/IIndexService.php +++ b/lib/public/FullTextSearch/Service/IIndexService.php @@ -34,8 +34,6 @@ use OCP\FullTextSearch\Model\IIndex; * */ interface IIndexService { - - /** * Create an Index * diff --git a/lib/public/FullTextSearch/Service/IProviderService.php b/lib/public/FullTextSearch/Service/IProviderService.php index 8a5db07cb1d..23d33c57b09 100644 --- a/lib/public/FullTextSearch/Service/IProviderService.php +++ b/lib/public/FullTextSearch/Service/IProviderService.php @@ -32,8 +32,6 @@ namespace OCP\FullTextSearch\Service; * */ interface IProviderService { - - /** * Check if the provider $providerId is already indexed. * diff --git a/lib/public/FullTextSearch/Service/ISearchService.php b/lib/public/FullTextSearch/Service/ISearchService.php index 6a29e15755a..3a65781d477 100644 --- a/lib/public/FullTextSearch/Service/ISearchService.php +++ b/lib/public/FullTextSearch/Service/ISearchService.php @@ -35,8 +35,6 @@ use OCP\FullTextSearch\Model\ISearchResult; * */ interface ISearchService { - - /** * generate a search request, based on an array: * diff --git a/lib/public/GlobalScale/IConfig.php b/lib/public/GlobalScale/IConfig.php index 03bac271fbe..f28bea4b9b1 100644 --- a/lib/public/GlobalScale/IConfig.php +++ b/lib/public/GlobalScale/IConfig.php @@ -30,7 +30,6 @@ namespace OCP\GlobalScale; * @since 12.0.1 */ interface IConfig { - /** * check if global scale is enabled * diff --git a/lib/public/Group/Backend/ABackend.php b/lib/public/Group/Backend/ABackend.php index 2d611c27b4f..e5b7f78ac6a 100644 --- a/lib/public/Group/Backend/ABackend.php +++ b/lib/public/Group/Backend/ABackend.php @@ -31,7 +31,6 @@ use OCP\GroupInterface; * @since 14.0.0 */ abstract class ABackend implements GroupInterface { - /** * @deprecated 14.0.0 * diff --git a/lib/public/Group/Backend/IAddToGroupBackend.php b/lib/public/Group/Backend/IAddToGroupBackend.php index 8019766ca84..e7f1f92bd3a 100644 --- a/lib/public/Group/Backend/IAddToGroupBackend.php +++ b/lib/public/Group/Backend/IAddToGroupBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface IAddToGroupBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/ICountDisabledInGroup.php b/lib/public/Group/Backend/ICountDisabledInGroup.php index a971d3d0c06..44d25715cb3 100644 --- a/lib/public/Group/Backend/ICountDisabledInGroup.php +++ b/lib/public/Group/Backend/ICountDisabledInGroup.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface ICountDisabledInGroup { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/ICountUsersBackend.php b/lib/public/Group/Backend/ICountUsersBackend.php index 946dd20ee8b..10920975451 100644 --- a/lib/public/Group/Backend/ICountUsersBackend.php +++ b/lib/public/Group/Backend/ICountUsersBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface ICountUsersBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/ICreateGroupBackend.php b/lib/public/Group/Backend/ICreateGroupBackend.php index 43f2960725b..1c90eae1149 100644 --- a/lib/public/Group/Backend/ICreateGroupBackend.php +++ b/lib/public/Group/Backend/ICreateGroupBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface ICreateGroupBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/IDeleteGroupBackend.php b/lib/public/Group/Backend/IDeleteGroupBackend.php index 90be105e7d8..422ec4905fe 100644 --- a/lib/public/Group/Backend/IDeleteGroupBackend.php +++ b/lib/public/Group/Backend/IDeleteGroupBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface IDeleteGroupBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/IGetDisplayNameBackend.php b/lib/public/Group/Backend/IGetDisplayNameBackend.php index 096555d0c8e..d3f83b15506 100644 --- a/lib/public/Group/Backend/IGetDisplayNameBackend.php +++ b/lib/public/Group/Backend/IGetDisplayNameBackend.php @@ -30,7 +30,6 @@ namespace OCP\Group\Backend; * @since 17.0.0 */ interface IGetDisplayNameBackend { - /** * @param string $gid * @return string diff --git a/lib/public/Group/Backend/IGroupDetailsBackend.php b/lib/public/Group/Backend/IGroupDetailsBackend.php index 56241d5538b..4852f978195 100644 --- a/lib/public/Group/Backend/IGroupDetailsBackend.php +++ b/lib/public/Group/Backend/IGroupDetailsBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface IGroupDetailsBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/IIsAdminBackend.php b/lib/public/Group/Backend/IIsAdminBackend.php index 4ee67cc139f..c653ef51f87 100644 --- a/lib/public/Group/Backend/IIsAdminBackend.php +++ b/lib/public/Group/Backend/IIsAdminBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface IIsAdminBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/INamedBackend.php b/lib/public/Group/Backend/INamedBackend.php index eca9b5d7aca..3ce7ea663ef 100644 --- a/lib/public/Group/Backend/INamedBackend.php +++ b/lib/public/Group/Backend/INamedBackend.php @@ -26,7 +26,6 @@ namespace OCP\Group\Backend; * @since 22.0.0 */ interface INamedBackend { - /** * Backend name to be shown in group management * @return string the name of the backend to be shown diff --git a/lib/public/Group/Backend/IRemoveFromGroupBackend.php b/lib/public/Group/Backend/IRemoveFromGroupBackend.php index 8532bcefd1c..13e8ee4441f 100644 --- a/lib/public/Group/Backend/IRemoveFromGroupBackend.php +++ b/lib/public/Group/Backend/IRemoveFromGroupBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 14.0.0 */ interface IRemoveFromGroupBackend { - /** * @since 14.0.0 */ diff --git a/lib/public/Group/Backend/ISetDisplayNameBackend.php b/lib/public/Group/Backend/ISetDisplayNameBackend.php index e5896b52953..463e83ae4c1 100644 --- a/lib/public/Group/Backend/ISetDisplayNameBackend.php +++ b/lib/public/Group/Backend/ISetDisplayNameBackend.php @@ -29,7 +29,6 @@ namespace OCP\Group\Backend; * @since 18.0.0 */ interface ISetDisplayNameBackend { - /** * @param string $gid * @param string $displayName diff --git a/lib/public/Group/Events/BeforeGroupCreatedEvent.php b/lib/public/Group/Events/BeforeGroupCreatedEvent.php index a8bd6a4e100..ba053277984 100644 --- a/lib/public/Group/Events/BeforeGroupCreatedEvent.php +++ b/lib/public/Group/Events/BeforeGroupCreatedEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeGroupCreatedEvent extends Event { - /** @var string */ private $name; diff --git a/lib/public/Group/Events/BeforeGroupDeletedEvent.php b/lib/public/Group/Events/BeforeGroupDeletedEvent.php index 7824a17dfdd..eed9014d9b8 100644 --- a/lib/public/Group/Events/BeforeGroupDeletedEvent.php +++ b/lib/public/Group/Events/BeforeGroupDeletedEvent.php @@ -32,7 +32,6 @@ use OCP\IGroup; * @since 18.0.0 */ class BeforeGroupDeletedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/BeforeUserAddedEvent.php b/lib/public/Group/Events/BeforeUserAddedEvent.php index 526d94f564f..7aad16bef19 100644 --- a/lib/public/Group/Events/BeforeUserAddedEvent.php +++ b/lib/public/Group/Events/BeforeUserAddedEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 18.0.0 */ class BeforeUserAddedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/BeforeUserRemovedEvent.php b/lib/public/Group/Events/BeforeUserRemovedEvent.php index 164e3282c31..e3d2d0bf682 100644 --- a/lib/public/Group/Events/BeforeUserRemovedEvent.php +++ b/lib/public/Group/Events/BeforeUserRemovedEvent.php @@ -38,7 +38,6 @@ use OCP\IUser; * https://github.com/nextcloud/server/issues */ class BeforeUserRemovedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/GroupCreatedEvent.php b/lib/public/Group/Events/GroupCreatedEvent.php index 38c5aaf4fec..2f121349782 100644 --- a/lib/public/Group/Events/GroupCreatedEvent.php +++ b/lib/public/Group/Events/GroupCreatedEvent.php @@ -32,7 +32,6 @@ use OCP\IGroup; * @since 18.0.0 */ class GroupCreatedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/GroupDeletedEvent.php b/lib/public/Group/Events/GroupDeletedEvent.php index d3d9a3736f4..d4567a643b9 100644 --- a/lib/public/Group/Events/GroupDeletedEvent.php +++ b/lib/public/Group/Events/GroupDeletedEvent.php @@ -32,7 +32,6 @@ use OCP\IGroup; * @since 18.0.0 */ class GroupDeletedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/SubAdminAddedEvent.php b/lib/public/Group/Events/SubAdminAddedEvent.php index 08bca54253a..17f117515a4 100644 --- a/lib/public/Group/Events/SubAdminAddedEvent.php +++ b/lib/public/Group/Events/SubAdminAddedEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 21.0.0 */ class SubAdminAddedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/SubAdminRemovedEvent.php b/lib/public/Group/Events/SubAdminRemovedEvent.php index 41d42a24b88..334fd15178a 100644 --- a/lib/public/Group/Events/SubAdminRemovedEvent.php +++ b/lib/public/Group/Events/SubAdminRemovedEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 21.0.0 */ class SubAdminRemovedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/UserAddedEvent.php b/lib/public/Group/Events/UserAddedEvent.php index 85b618d5e78..99b1cd775d6 100644 --- a/lib/public/Group/Events/UserAddedEvent.php +++ b/lib/public/Group/Events/UserAddedEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserAddedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/Events/UserRemovedEvent.php b/lib/public/Group/Events/UserRemovedEvent.php index c3c9483996f..9ea1700d560 100644 --- a/lib/public/Group/Events/UserRemovedEvent.php +++ b/lib/public/Group/Events/UserRemovedEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserRemovedEvent extends Event { - /** @var IGroup */ private $group; diff --git a/lib/public/Group/ISubAdmin.php b/lib/public/Group/ISubAdmin.php index d2b302a4b8c..c8c14e1c880 100644 --- a/lib/public/Group/ISubAdmin.php +++ b/lib/public/Group/ISubAdmin.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 16.0.0 */ interface ISubAdmin { - /** * add a SubAdmin * @param IUser $user user to be SubAdmin diff --git a/lib/public/GroupInterface.php b/lib/public/GroupInterface.php index f1765afed96..b7c07136126 100644 --- a/lib/public/GroupInterface.php +++ b/lib/public/GroupInterface.php @@ -36,7 +36,6 @@ namespace OCP; * @since 4.5.0 */ interface GroupInterface { - /** * actions that user backends can define */ diff --git a/lib/public/Http/Client/IClient.php b/lib/public/Http/Client/IClient.php index 9a6dc7a9b65..d692edc5b71 100644 --- a/lib/public/Http/Client/IClient.php +++ b/lib/public/Http/Client/IClient.php @@ -32,7 +32,6 @@ namespace OCP\Http\Client; * @since 8.1.0 */ interface IClient { - /** * Sends a GET request * @param string $uri diff --git a/lib/public/Http/WellKnown/GenericResponse.php b/lib/public/Http/WellKnown/GenericResponse.php index a240c0eebde..f427758b363 100644 --- a/lib/public/Http/WellKnown/GenericResponse.php +++ b/lib/public/Http/WellKnown/GenericResponse.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response; * @since 21.0.0 */ final class GenericResponse implements IResponse { - /** @var Response */ private $response; diff --git a/lib/public/Http/WellKnown/IHandler.php b/lib/public/Http/WellKnown/IHandler.php index c0dd1d372bc..18a25dd0baa 100644 --- a/lib/public/Http/WellKnown/IHandler.php +++ b/lib/public/Http/WellKnown/IHandler.php @@ -34,7 +34,6 @@ namespace OCP\Http\WellKnown; * @since 21.0.0 */ interface IHandler { - /** * @param string $service the name of the well known service, e.g. 'webfinger' * @param IRequestContext $context diff --git a/lib/public/Http/WellKnown/IRequestContext.php b/lib/public/Http/WellKnown/IRequestContext.php index 1d05b116e9b..a764ad96c93 100644 --- a/lib/public/Http/WellKnown/IRequestContext.php +++ b/lib/public/Http/WellKnown/IRequestContext.php @@ -36,7 +36,6 @@ use OCP\IRequest; * @since 21.0.0 */ interface IRequestContext { - /** * @return IRequest * diff --git a/lib/public/Http/WellKnown/IResponse.php b/lib/public/Http/WellKnown/IResponse.php index 1504d4d0066..d3ae5f7afcc 100644 --- a/lib/public/Http/WellKnown/IResponse.php +++ b/lib/public/Http/WellKnown/IResponse.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response; * @since 21.0.0 */ interface IResponse { - /** * @since 21.0.0 */ diff --git a/lib/public/Http/WellKnown/JrdResponse.php b/lib/public/Http/WellKnown/JrdResponse.php index 192334ce83c..7a25f8fe0c3 100644 --- a/lib/public/Http/WellKnown/JrdResponse.php +++ b/lib/public/Http/WellKnown/JrdResponse.php @@ -38,7 +38,6 @@ use function array_filter; * @since 21.0.0 */ final class JrdResponse implements IResponse { - /** @var string */ private $subject; diff --git a/lib/public/IAddressBook.php b/lib/public/IAddressBook.php index 8df9a0c007d..10988bd81e6 100644 --- a/lib/public/IAddressBook.php +++ b/lib/public/IAddressBook.php @@ -38,7 +38,6 @@ namespace OCP { * @since 5.0.0 */ interface IAddressBook { - /** * @return string defining the technical unique key * @since 5.0.0 diff --git a/lib/public/IAvatar.php b/lib/public/IAvatar.php index f9fe9a645e6..a80726c73f6 100644 --- a/lib/public/IAvatar.php +++ b/lib/public/IAvatar.php @@ -34,7 +34,6 @@ use OCP\Files\SimpleFS\ISimpleFile; * @since 6.0.0 */ interface IAvatar { - /** * Get the users avatar * diff --git a/lib/public/IAvatarManager.php b/lib/public/IAvatarManager.php index 15894550d10..aef85855ff6 100644 --- a/lib/public/IAvatarManager.php +++ b/lib/public/IAvatarManager.php @@ -35,7 +35,6 @@ namespace OCP; */ interface IAvatarManager { - /** * Return a user specific instance of \OCP\IAvatar * @see IAvatar diff --git a/lib/public/ICache.php b/lib/public/ICache.php index 0e818277f60..d13aec534d5 100644 --- a/lib/public/ICache.php +++ b/lib/public/ICache.php @@ -33,7 +33,6 @@ namespace OCP; * @since 6.0.0 */ interface ICache { - /** * Get a value from the user cache * @param string $key diff --git a/lib/public/IContainer.php b/lib/public/IContainer.php index 08634ad508f..86595e1e8f7 100644 --- a/lib/public/IContainer.php +++ b/lib/public/IContainer.php @@ -43,7 +43,6 @@ use Psr\Container\ContainerInterface; * @deprecated 20.0.0 use \Psr\Container\ContainerInterface */ interface IContainer extends ContainerInterface { - /** * @template T * diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index 71979042811..710cbd1248d 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -37,7 +37,6 @@ namespace OCP; * @since 6.0.0 */ interface INavigationManager { - /** * Navigation entries of the app navigation * @since 16.0.0 diff --git a/lib/public/IPreview.php b/lib/public/IPreview.php index a8a798a526c..8483587d60e 100644 --- a/lib/public/IPreview.php +++ b/lib/public/IPreview.php @@ -38,7 +38,6 @@ use OCP\Files\SimpleFS\ISimpleFile; * @since 6.0.0 */ interface IPreview { - /** * @since 9.2.0 * @deprecated 22.0.0 diff --git a/lib/public/ISearch.php b/lib/public/ISearch.php index 3b6f8cf6065..f0016c7c4db 100644 --- a/lib/public/ISearch.php +++ b/lib/public/ISearch.php @@ -31,7 +31,6 @@ namespace OCP; * @deprecated 20.0.0 */ interface ISearch { - /** * Search all providers for $query * @param string $query diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php index 6c07a5218ba..c69dab8b3c6 100644 --- a/lib/public/IServerContainer.php +++ b/lib/public/IServerContainer.php @@ -60,7 +60,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; * @since 6.0.0 */ interface IServerContainer extends ContainerInterface, IContainer { - /** * The calendar manager will act as a broker between consumers for calendar information and * providers which actual deliver the calendar information. diff --git a/lib/public/ISession.php b/lib/public/ISession.php index 12cd716ec3f..5836a6f373e 100644 --- a/lib/public/ISession.php +++ b/lib/public/ISession.php @@ -41,7 +41,6 @@ use OCP\Session\Exceptions\SessionNotAvailableException; * @since 6.0.0 */ interface ISession { - /** * Set a value in the session * diff --git a/lib/public/ITagManager.php b/lib/public/ITagManager.php index f015dad809e..d35135bb32a 100644 --- a/lib/public/ITagManager.php +++ b/lib/public/ITagManager.php @@ -40,7 +40,6 @@ namespace OCP; * @since 6.0.0 */ interface ITagManager { - /** * Create a new \OCP\ITags instance and load tags from db for the current user. * diff --git a/lib/public/IURLGenerator.php b/lib/public/IURLGenerator.php index b6d78876478..8229d51f231 100644 --- a/lib/public/IURLGenerator.php +++ b/lib/public/IURLGenerator.php @@ -35,7 +35,6 @@ namespace OCP; * @since 6.0.0 */ interface IURLGenerator { - /** * Regex for matching http(s) urls * diff --git a/lib/public/IUser.php b/lib/public/IUser.php index bb7bdf3304a..3a7e6ab1f11 100644 --- a/lib/public/IUser.php +++ b/lib/public/IUser.php @@ -35,7 +35,6 @@ use InvalidArgumentException; * @since 8.0.0 */ interface IUser { - /** * get the user id * diff --git a/lib/public/IUserBackend.php b/lib/public/IUserBackend.php index 22df225cb8a..8c8ead61965 100644 --- a/lib/public/IUserBackend.php +++ b/lib/public/IUserBackend.php @@ -31,7 +31,6 @@ namespace OCP; * @since 8.0.0 */ interface IUserBackend { - /** * Backend name to be shown in user management * @return string the name of the backend to be shown diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index 151c153917f..1efb3d5f0c2 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -46,7 +46,6 @@ namespace OCP; * @since 8.0.0 */ interface IUserManager { - /** * @since 26.0.0 */ diff --git a/lib/public/L10N/ILanguageIterator.php b/lib/public/L10N/ILanguageIterator.php index 534d4229b1c..d3644a4b2e6 100644 --- a/lib/public/L10N/ILanguageIterator.php +++ b/lib/public/L10N/ILanguageIterator.php @@ -41,7 +41,6 @@ namespace OCP\L10N; * @since 14.0.0 */ interface ILanguageIterator extends \Iterator { - /** * Return the current element * diff --git a/lib/public/LDAP/ILDAPProviderFactory.php b/lib/public/LDAP/ILDAPProviderFactory.php index 246c665b04b..f987e91ec6e 100644 --- a/lib/public/LDAP/ILDAPProviderFactory.php +++ b/lib/public/LDAP/ILDAPProviderFactory.php @@ -36,7 +36,6 @@ use OCP\IServerContainer; * @since 11.0.0 */ interface ILDAPProviderFactory { - /** * Constructor for the LDAP provider factory * diff --git a/lib/public/Lock/LockedException.php b/lib/public/Lock/LockedException.php index cf85096d389..ec7701523fb 100644 --- a/lib/public/Lock/LockedException.php +++ b/lib/public/Lock/LockedException.php @@ -34,7 +34,6 @@ namespace OCP\Lock; * @since 8.1.0 */ class LockedException extends \Exception { - /** * Locked path * diff --git a/lib/public/Lock/ManuallyLockedException.php b/lib/public/Lock/ManuallyLockedException.php index 55a1e807a57..914f0392e39 100644 --- a/lib/public/Lock/ManuallyLockedException.php +++ b/lib/public/Lock/ManuallyLockedException.php @@ -31,8 +31,6 @@ namespace OCP\Lock; * @since 18.0.0 */ class ManuallyLockedException extends LockedException { - - /** * owner of the lock * diff --git a/lib/public/Log/Audit/CriticalActionPerformedEvent.php b/lib/public/Log/Audit/CriticalActionPerformedEvent.php index 1b991e4d871..79c67e5b8bd 100644 --- a/lib/public/Log/Audit/CriticalActionPerformedEvent.php +++ b/lib/public/Log/Audit/CriticalActionPerformedEvent.php @@ -33,7 +33,6 @@ use OCP\EventDispatcher\Event; * @since 22.0.0 */ class CriticalActionPerformedEvent extends Event { - /** @var string */ private $logMessage; diff --git a/lib/public/Log/IDataLogger.php b/lib/public/Log/IDataLogger.php index e9e476c3760..2a261b2b665 100644 --- a/lib/public/Log/IDataLogger.php +++ b/lib/public/Log/IDataLogger.php @@ -31,7 +31,6 @@ namespace OCP\Log; * @since 18.0.1 */ interface IDataLogger { - /** * allows to log custom data, similar to how logException works * diff --git a/lib/public/Log/RotationTrait.php b/lib/public/Log/RotationTrait.php index 8fc1516c346..b2415b6f61f 100644 --- a/lib/public/Log/RotationTrait.php +++ b/lib/public/Log/RotationTrait.php @@ -30,7 +30,6 @@ namespace OCP\Log; * @since 14.0.0 */ trait RotationTrait { - /** * @var string * @since 14.0.0 diff --git a/lib/public/Mail/Events/BeforeMessageSent.php b/lib/public/Mail/Events/BeforeMessageSent.php index e4ea0680f9e..dea748e4044 100644 --- a/lib/public/Mail/Events/BeforeMessageSent.php +++ b/lib/public/Mail/Events/BeforeMessageSent.php @@ -35,7 +35,6 @@ use OCP\Mail\IMessage; * @since 19.0.0 */ class BeforeMessageSent extends Event { - /** @var IMessage */ private $message; diff --git a/lib/public/Mail/Headers/AutoSubmitted.php b/lib/public/Mail/Headers/AutoSubmitted.php index 21df18dd918..45b43c7a652 100644 --- a/lib/public/Mail/Headers/AutoSubmitted.php +++ b/lib/public/Mail/Headers/AutoSubmitted.php @@ -36,7 +36,6 @@ namespace OCP\Mail\Headers; * @since 26.0.0 */ final class AutoSubmitted { - /** * Name of the Header as used in the final message later * diff --git a/lib/public/Mail/IAttachment.php b/lib/public/Mail/IAttachment.php index 714d4a45158..5d013dd1c45 100644 --- a/lib/public/Mail/IAttachment.php +++ b/lib/public/Mail/IAttachment.php @@ -32,7 +32,6 @@ namespace OCP\Mail; * @since 13.0.0 */ interface IAttachment { - /** * @param string $filename * @return IAttachment diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php index 2d776549814..ea0fa970c9a 100644 --- a/lib/public/Mail/IEMailTemplate.php +++ b/lib/public/Mail/IEMailTemplate.php @@ -57,7 +57,6 @@ namespace OCP\Mail; * @since 12.0.0 */ interface IEMailTemplate { - /** * Sets the subject of the email * diff --git a/lib/public/Mail/IMessage.php b/lib/public/Mail/IMessage.php index 994d32603e9..35a67bc4bb8 100644 --- a/lib/public/Mail/IMessage.php +++ b/lib/public/Mail/IMessage.php @@ -32,7 +32,6 @@ namespace OCP\Mail; * @since 13.0.0 */ interface IMessage { - /** * @param IAttachment $attachment * @return IMessage diff --git a/lib/public/Migration/BigIntMigration.php b/lib/public/Migration/BigIntMigration.php index 85da6fd740d..a9782f1f264 100644 --- a/lib/public/Migration/BigIntMigration.php +++ b/lib/public/Migration/BigIntMigration.php @@ -31,7 +31,6 @@ use OCP\DB\ISchemaWrapper; * @since 13.0.0 */ abstract class BigIntMigration extends SimpleMigrationStep { - /** * @return array Returns an array with the following structure * ['table1' => ['column1', 'column2'], ...] diff --git a/lib/public/Migration/IOutput.php b/lib/public/Migration/IOutput.php index 212b5d927f8..70fb56b6bdd 100644 --- a/lib/public/Migration/IOutput.php +++ b/lib/public/Migration/IOutput.php @@ -29,7 +29,6 @@ namespace OCP\Migration; * @since 9.1.0 */ interface IOutput { - /** * @param string $message * @return void diff --git a/lib/public/Migration/IRepairStep.php b/lib/public/Migration/IRepairStep.php index 74f0060b990..ec899c945f8 100644 --- a/lib/public/Migration/IRepairStep.php +++ b/lib/public/Migration/IRepairStep.php @@ -28,7 +28,6 @@ namespace OCP\Migration; * @since 9.1.0 */ interface IRepairStep { - /** * Returns the step's name * diff --git a/lib/public/Notification/AlreadyProcessedException.php b/lib/public/Notification/AlreadyProcessedException.php index 5b0e672d5a0..bc200eb71bd 100644 --- a/lib/public/Notification/AlreadyProcessedException.php +++ b/lib/public/Notification/AlreadyProcessedException.php @@ -29,7 +29,6 @@ namespace OCP\Notification; * @since 17.0.0 */ class AlreadyProcessedException extends \RuntimeException { - /** * @since 17.0.0 */ diff --git a/lib/public/Notification/IAction.php b/lib/public/Notification/IAction.php index 2499b66a1a9..bcd013f08bc 100644 --- a/lib/public/Notification/IAction.php +++ b/lib/public/Notification/IAction.php @@ -30,7 +30,6 @@ namespace OCP\Notification; * @since 9.0.0 */ interface IAction { - /** * @since 17.0.0 */ diff --git a/lib/public/Notification/IDismissableNotifier.php b/lib/public/Notification/IDismissableNotifier.php index 8c236875cca..c13e880a4a6 100644 --- a/lib/public/Notification/IDismissableNotifier.php +++ b/lib/public/Notification/IDismissableNotifier.php @@ -35,7 +35,6 @@ namespace OCP\Notification; * @since 18.0.0 */ interface IDismissableNotifier extends INotifier { - /** * @param INotification $notification * @throws \InvalidArgumentException In case the handler can't handle the notification diff --git a/lib/public/Notification/INotifier.php b/lib/public/Notification/INotifier.php index b8333cd368a..ba43cc04cf6 100644 --- a/lib/public/Notification/INotifier.php +++ b/lib/public/Notification/INotifier.php @@ -30,7 +30,6 @@ namespace OCP\Notification; * @since 9.0.0 */ interface INotifier { - /** * Identifier of the notifier, only use [a-z0-9_] * diff --git a/lib/public/OCS/IDiscoveryService.php b/lib/public/OCS/IDiscoveryService.php index b3f0a0e53f7..fa03a6b972c 100644 --- a/lib/public/OCS/IDiscoveryService.php +++ b/lib/public/OCS/IDiscoveryService.php @@ -35,7 +35,6 @@ namespace OCP\OCS; * @since 12.0.0 */ interface IDiscoveryService { - /** * Discover OCS end-points * diff --git a/lib/public/Profile/ILinkAction.php b/lib/public/Profile/ILinkAction.php index 67e69a73d9c..53bdd11361a 100644 --- a/lib/public/Profile/ILinkAction.php +++ b/lib/public/Profile/ILinkAction.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 23.0.0 */ interface ILinkAction { - /** * Preload the user specific value required by the action * diff --git a/lib/public/Profile/ParameterDoesNotExistException.php b/lib/public/Profile/ParameterDoesNotExistException.php index 543a8edc17a..6143aa26964 100644 --- a/lib/public/Profile/ParameterDoesNotExistException.php +++ b/lib/public/Profile/ParameterDoesNotExistException.php @@ -30,7 +30,6 @@ namespace OCP\Profile; * @since 23.0.0 */ class ParameterDoesNotExistException extends \Exception { - /** * @since 23.0.0 */ diff --git a/lib/public/RichObjectStrings/IValidator.php b/lib/public/RichObjectStrings/IValidator.php index 1dfd2a8d329..f465254eeab 100644 --- a/lib/public/RichObjectStrings/IValidator.php +++ b/lib/public/RichObjectStrings/IValidator.php @@ -29,7 +29,6 @@ namespace OCP\RichObjectStrings; * @since 11.0.0 */ interface IValidator { - /** * @param string $subject * @param array[] $parameters diff --git a/lib/public/Route/IRouter.php b/lib/public/Route/IRouter.php index 5b50cf8c3c8..9eff94193ab 100644 --- a/lib/public/Route/IRouter.php +++ b/lib/public/Route/IRouter.php @@ -32,7 +32,6 @@ namespace OCP\Route; * @deprecated 9.0.0 */ interface IRouter { - /** * Create a \OCP\Route\IRoute. * diff --git a/lib/public/SabrePluginEvent.php b/lib/public/SabrePluginEvent.php index c0dde301ff1..81131ff7113 100644 --- a/lib/public/SabrePluginEvent.php +++ b/lib/public/SabrePluginEvent.php @@ -32,7 +32,6 @@ use Sabre\DAV\Server; * @since 8.2.0 */ class SabrePluginEvent extends Event { - /** @var int */ protected $statusCode; diff --git a/lib/public/SabrePluginException.php b/lib/public/SabrePluginException.php index 8e322b1fa9b..85bd105f750 100644 --- a/lib/public/SabrePluginException.php +++ b/lib/public/SabrePluginException.php @@ -27,7 +27,6 @@ use Sabre\DAV\Exception; * @since 8.2.0 */ class SabrePluginException extends Exception { - /** * Returns the HTTP statuscode for this exception * diff --git a/lib/public/Search/IProvider.php b/lib/public/Search/IProvider.php index c94dfe7a4e4..61655c47367 100644 --- a/lib/public/Search/IProvider.php +++ b/lib/public/Search/IProvider.php @@ -40,7 +40,6 @@ use OCP\IUser; * @since 20.0.0 */ interface IProvider { - /** * Get the unique ID of this search provider * diff --git a/lib/public/Search/ISearchQuery.php b/lib/public/Search/ISearchQuery.php index 2f4f1038fe4..a545d1dbccb 100644 --- a/lib/public/Search/ISearchQuery.php +++ b/lib/public/Search/ISearchQuery.php @@ -38,7 +38,6 @@ namespace OCP\Search; * @since 20.0.0 */ interface ISearchQuery { - /** * @since 20.0.0 */ diff --git a/lib/public/Search/PagedProvider.php b/lib/public/Search/PagedProvider.php index 61f5dd457ee..8cbcc40da61 100644 --- a/lib/public/Search/PagedProvider.php +++ b/lib/public/Search/PagedProvider.php @@ -32,7 +32,6 @@ namespace OCP\Search; * @deprecated 20.0.0 */ abstract class PagedProvider extends Provider { - /** * show all results * @since 8.0.0 diff --git a/lib/public/Search/Provider.php b/lib/public/Search/Provider.php index 2cf0c4d043b..e709cb402eb 100644 --- a/lib/public/Search/Provider.php +++ b/lib/public/Search/Provider.php @@ -32,7 +32,6 @@ namespace OCP\Search; * @deprecated 20.0.0 */ abstract class Provider { - /** * @since 8.0.0 * @deprecated 20.0.0 diff --git a/lib/public/Search/Result.php b/lib/public/Search/Result.php index 86476ade721..e063413059f 100644 --- a/lib/public/Search/Result.php +++ b/lib/public/Search/Result.php @@ -31,7 +31,6 @@ namespace OCP\Search; * @deprecated 20.0.0 */ class Result { - /** * A unique identifier for the result, usually given as the item ID in its * corresponding application. diff --git a/lib/public/Search/SearchResult.php b/lib/public/Search/SearchResult.php index 5371b77ef0a..9ac8b28fb8b 100644 --- a/lib/public/Search/SearchResult.php +++ b/lib/public/Search/SearchResult.php @@ -33,7 +33,6 @@ use function array_values; * @since 20.0.0 */ final class SearchResult implements JsonSerializable { - /** @var string */ private $name; diff --git a/lib/public/Search/SearchResultEntry.php b/lib/public/Search/SearchResultEntry.php index 42c3a4cbdd7..86a3f08cfe6 100644 --- a/lib/public/Search/SearchResultEntry.php +++ b/lib/public/Search/SearchResultEntry.php @@ -44,7 +44,6 @@ use JsonSerializable; * @since 20.0.0 */ class SearchResultEntry implements JsonSerializable { - /** * @var string * @since 20.0.0 diff --git a/lib/public/Security/CSP/AddContentSecurityPolicyEvent.php b/lib/public/Security/CSP/AddContentSecurityPolicyEvent.php index 13aeab8bf44..2bbce0402a7 100644 --- a/lib/public/Security/CSP/AddContentSecurityPolicyEvent.php +++ b/lib/public/Security/CSP/AddContentSecurityPolicyEvent.php @@ -45,7 +45,6 @@ use OCP\EventDispatcher\Event; * @since 17.0.0 */ class AddContentSecurityPolicyEvent extends Event { - /** @var ContentSecurityPolicyManager */ private $policyManager; diff --git a/lib/public/Security/Events/GenerateSecurePasswordEvent.php b/lib/public/Security/Events/GenerateSecurePasswordEvent.php index 6897cb1ee91..a2d067f0e86 100644 --- a/lib/public/Security/Events/GenerateSecurePasswordEvent.php +++ b/lib/public/Security/Events/GenerateSecurePasswordEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class GenerateSecurePasswordEvent extends Event { - /** @var null|string */ private $password; diff --git a/lib/public/Security/Events/ValidatePasswordPolicyEvent.php b/lib/public/Security/Events/ValidatePasswordPolicyEvent.php index efe420d3cf2..7f577d75b60 100644 --- a/lib/public/Security/Events/ValidatePasswordPolicyEvent.php +++ b/lib/public/Security/Events/ValidatePasswordPolicyEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class ValidatePasswordPolicyEvent extends Event { - /** @var string */ private $password; diff --git a/lib/public/Security/FeaturePolicy/AddFeaturePolicyEvent.php b/lib/public/Security/FeaturePolicy/AddFeaturePolicyEvent.php index a0478ad56fe..8d39b58a141 100644 --- a/lib/public/Security/FeaturePolicy/AddFeaturePolicyEvent.php +++ b/lib/public/Security/FeaturePolicy/AddFeaturePolicyEvent.php @@ -37,7 +37,6 @@ use OCP\EventDispatcher\Event; * @since 17.0.0 */ class AddFeaturePolicyEvent extends Event { - /** @var FeaturePolicyManager */ private $policyManager; diff --git a/lib/public/Security/ICredentialsManager.php b/lib/public/Security/ICredentialsManager.php index 7ac0d705a77..17b84a306f6 100644 --- a/lib/public/Security/ICredentialsManager.php +++ b/lib/public/Security/ICredentialsManager.php @@ -32,7 +32,6 @@ namespace OCP\Security; * @since 8.2.0 */ interface ICredentialsManager { - /** * Store a set of credentials * diff --git a/lib/public/Security/ICrypto.php b/lib/public/Security/ICrypto.php index 2ca501e62be..1ec2f60c4e8 100644 --- a/lib/public/Security/ICrypto.php +++ b/lib/public/Security/ICrypto.php @@ -37,7 +37,6 @@ namespace OCP\Security; * @since 8.0.0 */ interface ICrypto { - /** * @param string $message The message to authenticate * @param string $password Password to use (defaults to `secret` in config.php) diff --git a/lib/public/Security/IRemoteHostValidator.php b/lib/public/Security/IRemoteHostValidator.php index 99f149aee04..5cb25584dca 100644 --- a/lib/public/Security/IRemoteHostValidator.php +++ b/lib/public/Security/IRemoteHostValidator.php @@ -31,7 +31,6 @@ namespace OCP\Security; * @since 26.0.0 */ interface IRemoteHostValidator { - /** * Validate if a host may be connected to * diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 250ecd25358..3634ebf99f7 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -39,7 +39,6 @@ namespace OCP\Security; * @since 8.0.0 */ interface ISecureRandom { - /** * Flags for characters that can be used for generate($length, $characters) */ diff --git a/lib/public/Security/VerificationToken/IVerificationToken.php b/lib/public/Security/VerificationToken/IVerificationToken.php index e1d9203ec3b..308b0d5c1a8 100644 --- a/lib/public/Security/VerificationToken/IVerificationToken.php +++ b/lib/public/Security/VerificationToken/IVerificationToken.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 23.0.0 */ interface IVerificationToken { - /** * Checks whether the a provided tokent matches a stored token and its * constraints. An InvalidTokenException is thrown on issues, otherwise diff --git a/lib/public/Security/VerificationToken/InvalidTokenException.php b/lib/public/Security/VerificationToken/InvalidTokenException.php index 5c8144c5c74..b8ef797c44e 100644 --- a/lib/public/Security/VerificationToken/InvalidTokenException.php +++ b/lib/public/Security/VerificationToken/InvalidTokenException.php @@ -28,7 +28,6 @@ namespace OCP\Security\VerificationToken; /** @since 23.0.0 */ class InvalidTokenException extends \Exception { - /** * @since 23.0.0 */ diff --git a/lib/public/Settings/ISettings.php b/lib/public/Settings/ISettings.php index be7e0b7bf82..43c7008a15e 100644 --- a/lib/public/Settings/ISettings.php +++ b/lib/public/Settings/ISettings.php @@ -30,7 +30,6 @@ use OCP\AppFramework\Http\TemplateResponse; * @since 9.1 */ interface ISettings { - /** * @return TemplateResponse returns the instance with all parameters set, ready to be rendered * @since 9.1 diff --git a/lib/public/Share.php b/lib/public/Share.php index cb6b145bcfb..9499cdb14b6 100644 --- a/lib/public/Share.php +++ b/lib/public/Share.php @@ -42,7 +42,6 @@ namespace OCP; * @deprecated 17.0.0 */ class Share extends \OC\Share\Constants { - /** * Get the item of item type shared with a given user by source * @param string $itemType @@ -99,7 +98,6 @@ class Share extends \OC\Share\Constants { */ public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) { - // only used by AppVNCSafe app (https://github.com/vnc-biz/nextcloud-appvncsafe/issues/2) - only here to not break apps syntax } diff --git a/lib/public/Share/Events/ShareCreatedEvent.php b/lib/public/Share/Events/ShareCreatedEvent.php index 85de3a83040..52a0eb636f1 100644 --- a/lib/public/Share/Events/ShareCreatedEvent.php +++ b/lib/public/Share/Events/ShareCreatedEvent.php @@ -32,7 +32,6 @@ use OCP\Share\IShare; * @since 18.0.0 */ class ShareCreatedEvent extends Event { - /** @var IShare */ private $share; diff --git a/lib/public/Share/Events/ShareDeletedEvent.php b/lib/public/Share/Events/ShareDeletedEvent.php index 9a42088a8ff..b6544ba3b17 100644 --- a/lib/public/Share/Events/ShareDeletedEvent.php +++ b/lib/public/Share/Events/ShareDeletedEvent.php @@ -33,7 +33,6 @@ use OCP\Share\IShare; * @since 21.0.0 */ class ShareDeletedEvent extends Event { - /** @var IShare */ private $share; diff --git a/lib/public/Share/Events/VerifyMountPointEvent.php b/lib/public/Share/Events/VerifyMountPointEvent.php index c824eea4608..650f4ad2245 100644 --- a/lib/public/Share/Events/VerifyMountPointEvent.php +++ b/lib/public/Share/Events/VerifyMountPointEvent.php @@ -33,7 +33,6 @@ use OCP\Share\IShare; * @since 19.0.0 */ class VerifyMountPointEvent extends Event { - /** @var IShare */ private $share; /** @var View */ diff --git a/lib/public/Share/Exceptions/GenericShareException.php b/lib/public/Share/Exceptions/GenericShareException.php index 85c440e2387..496aae1406b 100644 --- a/lib/public/Share/Exceptions/GenericShareException.php +++ b/lib/public/Share/Exceptions/GenericShareException.php @@ -32,7 +32,6 @@ use OCP\HintException; * @since 9.0.0 */ class GenericShareException extends HintException { - /** * @param string $message * @param string $hint diff --git a/lib/public/Share/Exceptions/ShareNotFound.php b/lib/public/Share/Exceptions/ShareNotFound.php index 66827b4d179..7f73220e38d 100644 --- a/lib/public/Share/Exceptions/ShareNotFound.php +++ b/lib/public/Share/Exceptions/ShareNotFound.php @@ -27,7 +27,6 @@ namespace OCP\Share\Exceptions; * @since 9.0.0 */ class ShareNotFound extends GenericShareException { - /** * @param string $message * @param string $hint diff --git a/lib/public/Share/IAttributes.php b/lib/public/Share/IAttributes.php index 6e4cee08b12..75450e75757 100644 --- a/lib/public/Share/IAttributes.php +++ b/lib/public/Share/IAttributes.php @@ -27,7 +27,6 @@ namespace OCP\Share; * @since 25.0.0 */ interface IAttributes { - /** * Sets an attribute enabled/disabled. If the key did not exist before it will be created. * diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php index 82a92428b31..9ac224ed7ef 100644 --- a/lib/public/Share/IManager.php +++ b/lib/public/Share/IManager.php @@ -46,7 +46,6 @@ use OCP\Share\Exceptions\ShareNotFound; * @since 9.0.0 */ interface IManager { - /** * Create a Share * diff --git a/lib/public/Share/IProviderFactory.php b/lib/public/Share/IProviderFactory.php index 71d95203007..4e7fbb2d191 100644 --- a/lib/public/Share/IProviderFactory.php +++ b/lib/public/Share/IProviderFactory.php @@ -31,7 +31,6 @@ use OC\Share20\Exception\ProviderException; * @since 9.0.0 */ interface IProviderFactory { - /** * @param string $id * @return IShareProvider diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php index 5a825552e26..f8f75be4c41 100644 --- a/lib/public/Share/IShare.php +++ b/lib/public/Share/IShare.php @@ -43,7 +43,6 @@ use OCP\Share\Exceptions\IllegalIDChangeException; * @since 9.0.0 */ interface IShare { - /** * @since 17.0.0 */ diff --git a/lib/public/Share/IShareHelper.php b/lib/public/Share/IShareHelper.php index 8bb08de07d6..4d35010b333 100644 --- a/lib/public/Share/IShareHelper.php +++ b/lib/public/Share/IShareHelper.php @@ -31,7 +31,6 @@ use OCP\Files\Node; * @since 12 */ interface IShareHelper { - /** * @param Node $node * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]] diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index c549592d6f6..b6e0c4ba38b 100644 --- a/lib/public/Share/IShareProvider.php +++ b/lib/public/Share/IShareProvider.php @@ -36,7 +36,6 @@ use OCP\Share\Exceptions\ShareNotFound; * @since 9.0.0 */ interface IShareProvider { - /** * Return the identifier of this provider. * diff --git a/lib/public/Share_Backend.php b/lib/public/Share_Backend.php index 6b046df0feb..044ecf9aa28 100644 --- a/lib/public/Share_Backend.php +++ b/lib/public/Share_Backend.php @@ -33,7 +33,6 @@ namespace OCP; * @since 5.0.0 */ interface Share_Backend { - /** * Check if this $itemSource exist for the user * @param string $itemSource diff --git a/lib/public/Support/CrashReport/ICollectBreadcrumbs.php b/lib/public/Support/CrashReport/ICollectBreadcrumbs.php index 105f3272bd4..75797a2474a 100644 --- a/lib/public/Support/CrashReport/ICollectBreadcrumbs.php +++ b/lib/public/Support/CrashReport/ICollectBreadcrumbs.php @@ -29,7 +29,6 @@ namespace OCP\Support\CrashReport; * @since 15.0.0 */ interface ICollectBreadcrumbs extends IReporter { - /** * Collect breadcrumbs for crash reports * diff --git a/lib/public/Support/CrashReport/IMessageReporter.php b/lib/public/Support/CrashReport/IMessageReporter.php index e56710750b6..ff0564ae48e 100644 --- a/lib/public/Support/CrashReport/IMessageReporter.php +++ b/lib/public/Support/CrashReport/IMessageReporter.php @@ -29,7 +29,6 @@ namespace OCP\Support\CrashReport; * @since 17.0.0 */ interface IMessageReporter extends IReporter { - /** * Report a (error) message * diff --git a/lib/public/Support/CrashReport/IRegistry.php b/lib/public/Support/CrashReport/IRegistry.php index 35cf78920da..a80fffdc18a 100644 --- a/lib/public/Support/CrashReport/IRegistry.php +++ b/lib/public/Support/CrashReport/IRegistry.php @@ -34,7 +34,6 @@ use Throwable; * @deprecated used internally only */ interface IRegistry { - /** * Register a reporter instance * diff --git a/lib/public/Support/CrashReport/IReporter.php b/lib/public/Support/CrashReport/IReporter.php index ecbfa348d04..ada3221cfb5 100644 --- a/lib/public/Support/CrashReport/IReporter.php +++ b/lib/public/Support/CrashReport/IReporter.php @@ -32,7 +32,6 @@ use Throwable; * @since 13.0.0 */ interface IReporter { - /** * Report an (unhandled) exception * diff --git a/lib/public/Support/Subscription/IRegistry.php b/lib/public/Support/Subscription/IRegistry.php index 4a34cc91c5e..f2e6b3fc161 100644 --- a/lib/public/Support/Subscription/IRegistry.php +++ b/lib/public/Support/Subscription/IRegistry.php @@ -34,7 +34,6 @@ use OCP\Support\Subscription\Exception\AlreadyRegisteredException; * @since 17.0.0 */ interface IRegistry { - /** * Register a subscription instance. In case it is called multiple times an * exception is thrown diff --git a/lib/public/Support/Subscription/ISubscription.php b/lib/public/Support/Subscription/ISubscription.php index c602156b47c..b532e6aa03c 100644 --- a/lib/public/Support/Subscription/ISubscription.php +++ b/lib/public/Support/Subscription/ISubscription.php @@ -30,7 +30,6 @@ namespace OCP\Support\Subscription; * @since 17.0.0 */ interface ISubscription { - /** * Indicates if a valid subscription is available * diff --git a/lib/public/Support/Subscription/ISupportedApps.php b/lib/public/Support/Subscription/ISupportedApps.php index 121c2325a6e..2f9c8fa3ad9 100644 --- a/lib/public/Support/Subscription/ISupportedApps.php +++ b/lib/public/Support/Subscription/ISupportedApps.php @@ -29,7 +29,6 @@ namespace OCP\Support\Subscription; * @since 17.0.0 */ interface ISupportedApps extends ISubscription { - /** * Fetches the list of app IDs that are supported by the subscription * diff --git a/lib/public/SystemTag/ISystemTagManager.php b/lib/public/SystemTag/ISystemTagManager.php index 500d80ea278..9918e3a4f99 100644 --- a/lib/public/SystemTag/ISystemTagManager.php +++ b/lib/public/SystemTag/ISystemTagManager.php @@ -34,7 +34,6 @@ use OCP\IUser; * @since 9.0.0 */ interface ISystemTagManager { - /** * Returns the tag objects matching the given tag ids. * diff --git a/lib/public/SystemTag/ISystemTagManagerFactory.php b/lib/public/SystemTag/ISystemTagManagerFactory.php index f016585dfc9..2028128d6a0 100644 --- a/lib/public/SystemTag/ISystemTagManagerFactory.php +++ b/lib/public/SystemTag/ISystemTagManagerFactory.php @@ -35,7 +35,6 @@ use OCP\IServerContainer; * @since 9.0.0 */ interface ISystemTagManagerFactory { - /** * Constructor for the system tag manager factory * diff --git a/lib/public/SystemTag/ISystemTagObjectMapper.php b/lib/public/SystemTag/ISystemTagObjectMapper.php index 4d9cb24a2e8..07a542c6794 100644 --- a/lib/public/SystemTag/ISystemTagObjectMapper.php +++ b/lib/public/SystemTag/ISystemTagObjectMapper.php @@ -32,7 +32,6 @@ namespace OCP\SystemTag; * @since 9.0.0 */ interface ISystemTagObjectMapper { - /** * Get a list of tag ids for the given object ids. * diff --git a/lib/public/SystemTag/ManagerEvent.php b/lib/public/SystemTag/ManagerEvent.php index 738cd1c748d..704aecd4536 100644 --- a/lib/public/SystemTag/ManagerEvent.php +++ b/lib/public/SystemTag/ManagerEvent.php @@ -36,7 +36,6 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class ManagerEvent extends Event { - /** * @deprecated 22.0.0 */ diff --git a/lib/public/SystemTag/MapperEvent.php b/lib/public/SystemTag/MapperEvent.php index cf686fa5ff6..6aa0ea77000 100644 --- a/lib/public/SystemTag/MapperEvent.php +++ b/lib/public/SystemTag/MapperEvent.php @@ -35,7 +35,6 @@ use OCP\EventDispatcher\Event; * @since 9.0.0 */ class MapperEvent extends Event { - /** * @deprecated 22.0.0 */ diff --git a/lib/public/SystemTag/SystemTagsEntityEvent.php b/lib/public/SystemTag/SystemTagsEntityEvent.php index 5ef78c25728..4360d924c23 100644 --- a/lib/public/SystemTag/SystemTagsEntityEvent.php +++ b/lib/public/SystemTag/SystemTagsEntityEvent.php @@ -35,7 +35,6 @@ use OCP\EventDispatcher\Event; * @since 9.1.0 */ class SystemTagsEntityEvent extends Event { - /** * @deprecated 22.0.0 */ diff --git a/lib/public/SystemTag/TagNotFoundException.php b/lib/public/SystemTag/TagNotFoundException.php index 1e9ac3c7503..54e96856052 100644 --- a/lib/public/SystemTag/TagNotFoundException.php +++ b/lib/public/SystemTag/TagNotFoundException.php @@ -33,7 +33,6 @@ namespace OCP\SystemTag; * @since 9.0.0 */ class TagNotFoundException extends \RuntimeException { - /** @var string[] */ protected $tags; diff --git a/lib/public/Talk/IBroker.php b/lib/public/Talk/IBroker.php index 705c39d2c01..d3b6e1429e6 100644 --- a/lib/public/Talk/IBroker.php +++ b/lib/public/Talk/IBroker.php @@ -36,7 +36,6 @@ use OCP\Talk\Exceptions\NoBackendException; * @since 24.0.0 */ interface IBroker { - /** * Check if the Talk backend is available * diff --git a/lib/public/Talk/IConversation.php b/lib/public/Talk/IConversation.php index efa33c0b357..5137f1c5c79 100644 --- a/lib/public/Talk/IConversation.php +++ b/lib/public/Talk/IConversation.php @@ -29,7 +29,6 @@ namespace OCP\Talk; * @since 24.0.0 */ interface IConversation { - /** * Get the unique token that identifies this conversation * diff --git a/lib/public/Talk/IConversationOptions.php b/lib/public/Talk/IConversationOptions.php index 020a98cc405..c5396487f58 100644 --- a/lib/public/Talk/IConversationOptions.php +++ b/lib/public/Talk/IConversationOptions.php @@ -29,7 +29,6 @@ namespace OCP\Talk; * @since 24.0.0 */ interface IConversationOptions { - /** * Will the conversation be public? * diff --git a/lib/public/Talk/ITalkBackend.php b/lib/public/Talk/ITalkBackend.php index 605a15680d0..3ee995576a4 100644 --- a/lib/public/Talk/ITalkBackend.php +++ b/lib/public/Talk/ITalkBackend.php @@ -37,7 +37,6 @@ use OCP\IUser; * @since 24.0.0 */ interface ITalkBackend { - /** * @param string $name * @param IUser[] $moderators diff --git a/lib/public/User/Backend/ABackend.php b/lib/public/User/Backend/ABackend.php index dff705e0806..2b246dc0acf 100644 --- a/lib/public/User/Backend/ABackend.php +++ b/lib/public/User/Backend/ABackend.php @@ -34,7 +34,6 @@ use OCP\UserInterface; * @since 14.0.0 */ abstract class ABackend implements IUserBackend, UserInterface { - /** * @deprecated 14.0.0 * diff --git a/lib/public/User/Backend/ICreateUserBackend.php b/lib/public/User/Backend/ICreateUserBackend.php index a33cec58010..83b3cf9d64a 100644 --- a/lib/public/User/Backend/ICreateUserBackend.php +++ b/lib/public/User/Backend/ICreateUserBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface ICreateUserBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Backend/IGetDisplayNameBackend.php b/lib/public/User/Backend/IGetDisplayNameBackend.php index 1c3ed287f37..3177f99f796 100644 --- a/lib/public/User/Backend/IGetDisplayNameBackend.php +++ b/lib/public/User/Backend/IGetDisplayNameBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface IGetDisplayNameBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Backend/IGetHomeBackend.php b/lib/public/User/Backend/IGetHomeBackend.php index 45ef5b6b215..ca04ee76b3e 100644 --- a/lib/public/User/Backend/IGetHomeBackend.php +++ b/lib/public/User/Backend/IGetHomeBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface IGetHomeBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Backend/IGetRealUIDBackend.php b/lib/public/User/Backend/IGetRealUIDBackend.php index 5d618b294d9..cd0208bbb76 100644 --- a/lib/public/User/Backend/IGetRealUIDBackend.php +++ b/lib/public/User/Backend/IGetRealUIDBackend.php @@ -30,7 +30,6 @@ namespace OCP\User\Backend; * @since 17.0.0 */ interface IGetRealUIDBackend { - /** * Some backends accept different UIDs than what is the internal UID to be used. * For example the database backend accepts different cased UIDs in all the functions diff --git a/lib/public/User/Backend/IPasswordConfirmationBackend.php b/lib/public/User/Backend/IPasswordConfirmationBackend.php index 3c6d14c3f1d..b43f0a0c717 100644 --- a/lib/public/User/Backend/IPasswordConfirmationBackend.php +++ b/lib/public/User/Backend/IPasswordConfirmationBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 15.0.0 */ interface IPasswordConfirmationBackend { - /** * @since 15.0.0 */ diff --git a/lib/public/User/Backend/IProvideAvatarBackend.php b/lib/public/User/Backend/IProvideAvatarBackend.php index fe4bb841f72..aa89e343896 100644 --- a/lib/public/User/Backend/IProvideAvatarBackend.php +++ b/lib/public/User/Backend/IProvideAvatarBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface IProvideAvatarBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Backend/ISearchKnownUsersBackend.php b/lib/public/User/Backend/ISearchKnownUsersBackend.php index 60a147dc62c..ff4baf989a2 100644 --- a/lib/public/User/Backend/ISearchKnownUsersBackend.php +++ b/lib/public/User/Backend/ISearchKnownUsersBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 21.0.1 */ interface ISearchKnownUsersBackend { - /** * @param string $searcher * @param string $pattern diff --git a/lib/public/User/Backend/ISetDisplayNameBackend.php b/lib/public/User/Backend/ISetDisplayNameBackend.php index db62223ad52..bf0cf6c5429 100644 --- a/lib/public/User/Backend/ISetDisplayNameBackend.php +++ b/lib/public/User/Backend/ISetDisplayNameBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface ISetDisplayNameBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Backend/ISetPasswordBackend.php b/lib/public/User/Backend/ISetPasswordBackend.php index 2ba992286ec..e848a07817d 100644 --- a/lib/public/User/Backend/ISetPasswordBackend.php +++ b/lib/public/User/Backend/ISetPasswordBackend.php @@ -29,7 +29,6 @@ namespace OCP\User\Backend; * @since 14.0.0 */ interface ISetPasswordBackend { - /** * @since 14.0.0 * diff --git a/lib/public/User/Events/BeforePasswordUpdatedEvent.php b/lib/public/User/Events/BeforePasswordUpdatedEvent.php index a35659eccf4..11eb5ad9dd0 100644 --- a/lib/public/User/Events/BeforePasswordUpdatedEvent.php +++ b/lib/public/User/Events/BeforePasswordUpdatedEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class BeforePasswordUpdatedEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/BeforeUserCreatedEvent.php b/lib/public/User/Events/BeforeUserCreatedEvent.php index 11575428839..67e9177b34d 100644 --- a/lib/public/User/Events/BeforeUserCreatedEvent.php +++ b/lib/public/User/Events/BeforeUserCreatedEvent.php @@ -34,7 +34,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeUserCreatedEvent extends Event { - /** @var string */ private $uid; diff --git a/lib/public/User/Events/BeforeUserDeletedEvent.php b/lib/public/User/Events/BeforeUserDeletedEvent.php index 511128b5d93..689222fdfb5 100644 --- a/lib/public/User/Events/BeforeUserDeletedEvent.php +++ b/lib/public/User/Events/BeforeUserDeletedEvent.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 18.0.0 */ class BeforeUserDeletedEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/BeforeUserLoggedInEvent.php b/lib/public/User/Events/BeforeUserLoggedInEvent.php index e39cd0f116d..a0818bff88f 100644 --- a/lib/public/User/Events/BeforeUserLoggedInEvent.php +++ b/lib/public/User/Events/BeforeUserLoggedInEvent.php @@ -32,7 +32,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeUserLoggedInEvent extends Event { - /** @var string */ private $username; diff --git a/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php b/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php index d86892c52ff..d8b4bfd4f57 100644 --- a/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php +++ b/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php @@ -34,7 +34,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ class BeforeUserLoggedInWithCookieEvent extends Event { - /** @var string */ private $username; diff --git a/lib/public/User/Events/BeforeUserLoggedOutEvent.php b/lib/public/User/Events/BeforeUserLoggedOutEvent.php index 88a365b0eb8..aa81801f474 100644 --- a/lib/public/User/Events/BeforeUserLoggedOutEvent.php +++ b/lib/public/User/Events/BeforeUserLoggedOutEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class BeforeUserLoggedOutEvent extends Event { - /** @var IUser|null */ private $user; diff --git a/lib/public/User/Events/PasswordUpdatedEvent.php b/lib/public/User/Events/PasswordUpdatedEvent.php index 335557835c7..41d510553b5 100644 --- a/lib/public/User/Events/PasswordUpdatedEvent.php +++ b/lib/public/User/Events/PasswordUpdatedEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class PasswordUpdatedEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/PostLoginEvent.php b/lib/public/User/Events/PostLoginEvent.php index e481b552e3b..173df33999f 100644 --- a/lib/public/User/Events/PostLoginEvent.php +++ b/lib/public/User/Events/PostLoginEvent.php @@ -34,7 +34,6 @@ use OCP\IUser; * @since 18.0.0 */ class PostLoginEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/UserCreatedEvent.php b/lib/public/User/Events/UserCreatedEvent.php index 958d93d56ff..7d343bfd5b8 100644 --- a/lib/public/User/Events/UserCreatedEvent.php +++ b/lib/public/User/Events/UserCreatedEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserCreatedEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/UserDeletedEvent.php b/lib/public/User/Events/UserDeletedEvent.php index 8db7d0f2c74..9b20062df66 100644 --- a/lib/public/User/Events/UserDeletedEvent.php +++ b/lib/public/User/Events/UserDeletedEvent.php @@ -32,7 +32,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserDeletedEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/UserLiveStatusEvent.php b/lib/public/User/Events/UserLiveStatusEvent.php index 4bba71f95b9..d04c3b61e24 100644 --- a/lib/public/User/Events/UserLiveStatusEvent.php +++ b/lib/public/User/Events/UserLiveStatusEvent.php @@ -33,7 +33,6 @@ use OCP\UserStatus\IUserStatus; * @since 20.0.0 */ class UserLiveStatusEvent extends Event { - /** * @var string * @since 20.0.0 diff --git a/lib/public/User/Events/UserLoggedInEvent.php b/lib/public/User/Events/UserLoggedInEvent.php index b1a46b9570d..1b262729f8c 100644 --- a/lib/public/User/Events/UserLoggedInEvent.php +++ b/lib/public/User/Events/UserLoggedInEvent.php @@ -33,7 +33,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserLoggedInEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/UserLoggedInWithCookieEvent.php b/lib/public/User/Events/UserLoggedInWithCookieEvent.php index 245c1f434f0..c8ea946a5fb 100644 --- a/lib/public/User/Events/UserLoggedInWithCookieEvent.php +++ b/lib/public/User/Events/UserLoggedInWithCookieEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserLoggedInWithCookieEvent extends Event { - /** @var IUser */ private $user; diff --git a/lib/public/User/Events/UserLoggedOutEvent.php b/lib/public/User/Events/UserLoggedOutEvent.php index 3e1472cc6ee..c1b97fec29c 100644 --- a/lib/public/User/Events/UserLoggedOutEvent.php +++ b/lib/public/User/Events/UserLoggedOutEvent.php @@ -35,7 +35,6 @@ use OCP\IUser; * @since 18.0.0 */ class UserLoggedOutEvent extends Event { - /** @var IUser|null */ private $user; diff --git a/lib/public/UserInterface.php b/lib/public/UserInterface.php index c5fcc32276a..317bac1d44b 100644 --- a/lib/public/UserInterface.php +++ b/lib/public/UserInterface.php @@ -34,7 +34,6 @@ namespace OCP; * @since 4.5.0 */ interface UserInterface { - /** * Check if backend implements actions * @param int $actions bitwise-or'ed actions diff --git a/lib/public/UserMigration/IExportDestination.php b/lib/public/UserMigration/IExportDestination.php index 5cd313843cc..3da52c1abfd 100644 --- a/lib/public/UserMigration/IExportDestination.php +++ b/lib/public/UserMigration/IExportDestination.php @@ -32,7 +32,6 @@ use OCP\Files\Folder; * @since 24.0.0 */ interface IExportDestination { - /** * Adds a file to the export * diff --git a/lib/public/UserMigration/IMigrator.php b/lib/public/UserMigration/IMigrator.php index d02e5df0683..43e74743ecd 100644 --- a/lib/public/UserMigration/IMigrator.php +++ b/lib/public/UserMigration/IMigrator.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Output\OutputInterface; * @since 24.0.0 */ interface IMigrator { - /** * Export user data * diff --git a/lib/public/UserStatus/IManager.php b/lib/public/UserStatus/IManager.php index 354a1e19ee9..9cc8eaad8ee 100644 --- a/lib/public/UserStatus/IManager.php +++ b/lib/public/UserStatus/IManager.php @@ -35,7 +35,6 @@ namespace OCP\UserStatus; * @since 20.0.0 */ interface IManager { - /** * Gets the statuses for all users in $users * diff --git a/lib/public/UserStatus/IProvider.php b/lib/public/UserStatus/IProvider.php index 976ebbefeab..0bc31a1589d 100644 --- a/lib/public/UserStatus/IProvider.php +++ b/lib/public/UserStatus/IProvider.php @@ -31,7 +31,6 @@ namespace OCP\UserStatus; * @since 20.0.0 */ interface IProvider { - /** * Gets the statuses for all users in $users * diff --git a/lib/public/UserStatus/IUserStatus.php b/lib/public/UserStatus/IUserStatus.php index 8803b328ad5..74c54cc9da2 100644 --- a/lib/public/UserStatus/IUserStatus.php +++ b/lib/public/UserStatus/IUserStatus.php @@ -33,7 +33,6 @@ use DateTimeImmutable; * @since 20.0.0 */ interface IUserStatus { - /** * @var string * @since 20.0.0 diff --git a/lib/public/WorkflowEngine/EntityContext/IContextPortation.php b/lib/public/WorkflowEngine/EntityContext/IContextPortation.php index 079151d70b1..5137ff5424a 100644 --- a/lib/public/WorkflowEngine/EntityContext/IContextPortation.php +++ b/lib/public/WorkflowEngine/EntityContext/IContextPortation.php @@ -38,7 +38,6 @@ namespace OCP\WorkflowEngine\EntityContext; * @since 20.0.0 */ interface IContextPortation { - /** * All relevant context identifiers that are needed to restore the state * of an entity shall be returned with this method. The resulting array diff --git a/lib/public/WorkflowEngine/EntityContext/IDisplayText.php b/lib/public/WorkflowEngine/EntityContext/IDisplayText.php index c840bd56fb7..c5a30b7cdea 100644 --- a/lib/public/WorkflowEngine/EntityContext/IDisplayText.php +++ b/lib/public/WorkflowEngine/EntityContext/IDisplayText.php @@ -32,7 +32,6 @@ namespace OCP\WorkflowEngine\EntityContext; * @since 18.0.0 */ interface IDisplayText { - /** * returns translated text used for display to the end user. For instance, * it can describe the event in a human readable way. diff --git a/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php b/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php index 7f36dbbc1b4..956fce53330 100644 --- a/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterChecksEvent.php @@ -33,7 +33,6 @@ use OCP\WorkflowEngine\IManager; * @since 18.0.0 */ class RegisterChecksEvent extends Event { - /** @var IManager */ private $manager; diff --git a/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php b/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php index 5fd87490ff9..b82ff943b11 100644 --- a/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterEntitiesEvent.php @@ -33,7 +33,6 @@ use OCP\WorkflowEngine\IManager; * @since 18.0.0 */ class RegisterEntitiesEvent extends Event { - /** @var IManager */ private $manager; diff --git a/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php b/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php index a94f181139b..97cc870b976 100644 --- a/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php +++ b/lib/public/WorkflowEngine/Events/RegisterOperationsEvent.php @@ -33,7 +33,6 @@ use OCP\WorkflowEngine\IOperation; * @since 18.0.0 */ class RegisterOperationsEvent extends Event { - /** @var IManager */ private $manager; diff --git a/lib/public/WorkflowEngine/GenericEntityEvent.php b/lib/public/WorkflowEngine/GenericEntityEvent.php index 64aee909a0d..94a095cde57 100644 --- a/lib/public/WorkflowEngine/GenericEntityEvent.php +++ b/lib/public/WorkflowEngine/GenericEntityEvent.php @@ -34,7 +34,6 @@ namespace OCP\WorkflowEngine; * @since 18.0.0 */ class GenericEntityEvent implements IEntityEvent { - /** @var string */ private $displayName; /** @var string */ diff --git a/lib/public/WorkflowEngine/IComplexOperation.php b/lib/public/WorkflowEngine/IComplexOperation.php index f15580f0216..65b916e3fe0 100644 --- a/lib/public/WorkflowEngine/IComplexOperation.php +++ b/lib/public/WorkflowEngine/IComplexOperation.php @@ -41,7 +41,6 @@ namespace OCP\WorkflowEngine; * @since 18.0.0 */ interface IComplexOperation extends IOperation { - /** * As IComplexOperation chooses the triggering events itself, a hint has * to be shown to the user so make clear when this operation is becoming diff --git a/lib/public/WorkflowEngine/IEntity.php b/lib/public/WorkflowEngine/IEntity.php index 38da66384a0..124125b3c7e 100644 --- a/lib/public/WorkflowEngine/IEntity.php +++ b/lib/public/WorkflowEngine/IEntity.php @@ -39,7 +39,6 @@ use OCP\EventDispatcher\Event; * @since 18.0.0 */ interface IEntity { - /** * returns a translated name to be presented in the web interface. * diff --git a/lib/public/WorkflowEngine/ISpecificOperation.php b/lib/public/WorkflowEngine/ISpecificOperation.php index 9c031d9086b..9f35183df03 100644 --- a/lib/public/WorkflowEngine/ISpecificOperation.php +++ b/lib/public/WorkflowEngine/ISpecificOperation.php @@ -38,7 +38,6 @@ namespace OCP\WorkflowEngine; * @since 18.0.0 */ interface ISpecificOperation extends IOperation { - /** * returns the id of the entity the operator is designed for * diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php index 493dfc16f3e..8995ee2673f 100644 --- a/tests/Core/Command/Apps/AppsDisableTest.php +++ b/tests/Core/Command/Apps/AppsDisableTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @group DB */ class AppsDisableTest extends TestCase { - /** @var CommandTester */ private $commandTester; diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php index 0c45362d997..02bf86cfd43 100644 --- a/tests/Core/Command/Apps/AppsEnableTest.php +++ b/tests/Core/Command/Apps/AppsEnableTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @group DB */ class AppsEnableTest extends TestCase { - /** @var CommandTester */ private $commandTester; diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index fc916ad4099..1d5e2ac420d 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ChangeKeyStorageRootTest extends TestCase { - /** @var ChangeKeyStorageRoot */ protected $changeKeyStorageRoot; @@ -147,7 +146,6 @@ class ChangeKeyStorageRootTest extends TestCase { } public function testMoveAllKeys() { - /** @var \OC\Core\Command\Encryption\ChangeKeyStorageRoot $changeKeyStorageRoot */ $changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot') ->setConstructorArgs( diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index 12ace5fe371..c78500fd9d8 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DecryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; @@ -86,7 +85,6 @@ class DecryptAllTest extends TestCase { } public function testMaintenanceAndTrashbin() { - // on construct we enable single-user-mode and disable the trash bin $this->config->expects($this->at(1)) ->method('setSystemValue') diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index 68cd4971e4f..1190a98843f 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EncryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | \OCP\IConfig */ protected $config; diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index 65806fa538b..bfddee468a4 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index d9471956dfd..c885365f8c6 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddUserTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 3b29fb4e6ad..393f33aea98 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/InfoTest.php b/tests/Core/Command/Group/InfoTest.php index fc98cf647c7..3f1cc359799 100644 --- a/tests/Core/Command/Group/InfoTest.php +++ b/tests/Core/Command/Group/InfoTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class InfoTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index ed454a796a6..f8e750bbe65 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ListCommandTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index 495046402a8..470d5965333 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class RemoveUserTest extends TestCase { - /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */ private $groupManager; diff --git a/tests/Core/Command/SystemTag/AddTest.php b/tests/Core/Command/SystemTag/AddTest.php index c875c8f3ec3..93a79e1e1a9 100644 --- a/tests/Core/Command/SystemTag/AddTest.php +++ b/tests/Core/Command/SystemTag/AddTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class AddTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/DeleteTest.php b/tests/Core/Command/SystemTag/DeleteTest.php index 138606049ee..16c0c9e7b04 100644 --- a/tests/Core/Command/SystemTag/DeleteTest.php +++ b/tests/Core/Command/SystemTag/DeleteTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class DeleteTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/EditTest.php b/tests/Core/Command/SystemTag/EditTest.php index 7794ac5aefd..a5340cf6b53 100644 --- a/tests/Core/Command/SystemTag/EditTest.php +++ b/tests/Core/Command/SystemTag/EditTest.php @@ -32,7 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class EditTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/SystemTag/ListCommandTest.php b/tests/Core/Command/SystemTag/ListCommandTest.php index 2e2fba1017f..6488e130947 100644 --- a/tests/Core/Command/SystemTag/ListCommandTest.php +++ b/tests/Core/Command/SystemTag/ListCommandTest.php @@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; class ListCommandTest extends TestCase { - /** @var ISystemTagManager|\PHPUnit\Framework\MockObject\MockObject */ private $systemTagManager; diff --git a/tests/Core/Command/TwoFactorAuth/CleanupTest.php b/tests/Core/Command/TwoFactorAuth/CleanupTest.php index 75e869ad06f..b23e9c9b4c4 100644 --- a/tests/Core/Command/TwoFactorAuth/CleanupTest.php +++ b/tests/Core/Command/TwoFactorAuth/CleanupTest.php @@ -33,7 +33,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class CleanupTest extends TestCase { - /** @var IRegistry|MockObject */ private $registry; diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/Core/Command/TwoFactorAuth/DisableTest.php index 5accaccb907..35b810c637f 100644 --- a/tests/Core/Command/TwoFactorAuth/DisableTest.php +++ b/tests/Core/Command/TwoFactorAuth/DisableTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class DisableTest extends TestCase { - /** @var ProviderManager|MockObject */ private $providerManager; diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/Core/Command/TwoFactorAuth/EnableTest.php index fc71cc32148..0e26bcb9578 100644 --- a/tests/Core/Command/TwoFactorAuth/EnableTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnableTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class EnableTest extends TestCase { - /** @var ProviderManager|MockObject */ private $providerManager; diff --git a/tests/Core/Command/TwoFactorAuth/EnforceTest.php b/tests/Core/Command/TwoFactorAuth/EnforceTest.php index ed3deaa3fb3..194e16e8699 100644 --- a/tests/Core/Command/TwoFactorAuth/EnforceTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnforceTest.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class EnforceTest extends TestCase { - /** @var MandatoryTwoFactor|MockObject */ private $mandatoryTwoFactor; diff --git a/tests/Core/Command/TwoFactorAuth/StateTest.php b/tests/Core/Command/TwoFactorAuth/StateTest.php index 54ab85b51b8..bc683c11886 100644 --- a/tests/Core/Command/TwoFactorAuth/StateTest.php +++ b/tests/Core/Command/TwoFactorAuth/StateTest.php @@ -35,7 +35,6 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; class StateTest extends TestCase { - /** @var IRegistry|MockObject */ private $registry; diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php index 7d81e0ec115..47220fcf5ab 100644 --- a/tests/Core/Controller/AppPasswordControllerTest.php +++ b/tests/Core/Controller/AppPasswordControllerTest.php @@ -43,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class AppPasswordControllerTest extends TestCase { - /** @var ISession|MockObject */ private $session; diff --git a/tests/Core/Controller/CSRFTokenControllerTest.php b/tests/Core/Controller/CSRFTokenControllerTest.php index 875d5a79168..ba01675e978 100644 --- a/tests/Core/Controller/CSRFTokenControllerTest.php +++ b/tests/Core/Controller/CSRFTokenControllerTest.php @@ -33,7 +33,6 @@ use OCP\IRequest; use Test\TestCase; class CSRFTokenControllerTest extends TestCase { - /** @var CSRFTokenController */ private $controller; diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php index 53d5f392ac6..2f5cc507378 100644 --- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php @@ -43,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ClientFlowLoginV2ControllerTest extends TestCase { - /** @var IRequest|MockObject */ private $request; /** @var LoginFlowV2Service|MockObject */ diff --git a/tests/Core/Controller/ContactsMenuControllerTest.php b/tests/Core/Controller/ContactsMenuControllerTest.php index 0bed7b8e7a1..f51bab0f006 100644 --- a/tests/Core/Controller/ContactsMenuControllerTest.php +++ b/tests/Core/Controller/ContactsMenuControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ContactsMenuControllerTest extends TestCase { - /** @var IUserSession|MockObject */ private $userSession; diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index d2a791ec1b0..9659d76a7cb 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -38,7 +38,6 @@ use OCP\IRequest; use Test\TestCase; class CssControllerTest extends TestCase { - /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; diff --git a/tests/Core/Controller/GuestAvatarControllerTest.php b/tests/Core/Controller/GuestAvatarControllerTest.php index 8688f531519..42a00e1618c 100644 --- a/tests/Core/Controller/GuestAvatarControllerTest.php +++ b/tests/Core/Controller/GuestAvatarControllerTest.php @@ -14,7 +14,6 @@ use Psr\Log\LoggerInterface; * This class provides tests for the guest avatar controller. */ class GuestAvatarControllerTest extends \Test\TestCase { - /** * @var GuestAvatarController */ diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 3f76e19efc9..6561d22f264 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -38,7 +38,6 @@ use OCP\IRequest; use Test\TestCase; class JsControllerTest extends TestCase { - /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */ private $appData; diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index 2c8aedf99c4..c97ed53d331 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -47,7 +47,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class LoginControllerTest extends TestCase { - /** @var LoginController */ private $loginController; diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index e98d0e8ed40..39f389faa5e 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -32,7 +32,6 @@ use OCP\IURLGenerator; use Test\TestCase; class NavigationControllerTest extends TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index e6045386538..7815505d5a8 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -37,7 +37,6 @@ use OCP\IPreview; use OCP\IRequest; class PreviewControllerTest extends \Test\TestCase { - /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */ private $rootFolder; diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index 94bb959fbbc..27b0f476b61 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -41,7 +41,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class TwoFactorChallengeControllerTest extends TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index 8b9c11ad4b1..b7b6e0c69f6 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use Test\TestCase; class UserControllerTest extends TestCase { - /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ private $userManager; diff --git a/tests/Core/Controller/WellKnownControllerTest.php b/tests/Core/Controller/WellKnownControllerTest.php index 2a35ed5ac85..08af2a214ae 100644 --- a/tests/Core/Controller/WellKnownControllerTest.php +++ b/tests/Core/Controller/WellKnownControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class WellKnownControllerTest extends TestCase { - /** @var IRequest|MockObject */ private $request; diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/Core/Controller/WipeControllerTest.php index 298d11848b8..5c06a867b79 100644 --- a/tests/Core/Controller/WipeControllerTest.php +++ b/tests/Core/Controller/WipeControllerTest.php @@ -34,7 +34,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class WipeControllerTest extends TestCase { - /** @var RemoteWipe|MockObject */ private $remoteWipe; diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index c5de9f81fe5..fe1b53e3fa5 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -46,7 +46,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class TwoFactorMiddlewareTest extends TestCase { - /** @var Manager|MockObject */ private $twoFactorManager; diff --git a/tests/Test/Repair/Owncloud/CleanPreviewsTest.php b/tests/Test/Repair/Owncloud/CleanPreviewsTest.php index 7a6c374a2d7..b291b4d86d1 100644 --- a/tests/Test/Repair/Owncloud/CleanPreviewsTest.php +++ b/tests/Test/Repair/Owncloud/CleanPreviewsTest.php @@ -32,8 +32,6 @@ use OCP\Migration\IOutput; use Test\TestCase; class CleanPreviewsTest extends TestCase { - - /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ private $jobList; diff --git a/tests/acceptance/features/bootstrap/AppNavigationContext.php b/tests/acceptance/features/bootstrap/AppNavigationContext.php index cba56856bfa..49d664e2333 100644 --- a/tests/acceptance/features/bootstrap/AppNavigationContext.php +++ b/tests/acceptance/features/bootstrap/AppNavigationContext.php @@ -114,9 +114,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionIsShown($section) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appNavigationSectionItemFor($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appNavigationSectionItemFor($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The section $section in the app navigation is not shown yet after $timeout seconds"); } } @@ -126,9 +126,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionIsNotShown($section) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::appNavigationSectionItemFor($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appNavigationSectionItemFor($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The section $section in the app navigation is still shown after $timeout seconds"); } } @@ -145,9 +145,9 @@ class AppNavigationContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSectionDoesNotHaveACount($section) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::counterForTheSection($section), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::counterForTheSection($section), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The counter for section $section is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/AppSettingsContext.php b/tests/acceptance/features/bootstrap/AppSettingsContext.php index 210e907a9bc..c8033a46f2d 100644 --- a/tests/acceptance/features/bootstrap/AppSettingsContext.php +++ b/tests/acceptance/features/bootstrap/AppSettingsContext.php @@ -90,9 +90,9 @@ class AppSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSettingsAreOpened() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appSettingsContent(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appSettingsContent(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The app settings are not open yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/AppsManagementContext.php b/tests/acceptance/features/bootstrap/AppsManagementContext.php index 908754163d7..7b06b77d117 100644 --- a/tests/acceptance/features/bootstrap/AppsManagementContext.php +++ b/tests/acceptance/features/bootstrap/AppsManagementContext.php @@ -200,9 +200,9 @@ class AppsManagementContext implements Context, ActorAwareInterface { */ public function iSeeThatThereSomeAppsListedFromTheAppStore() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::appEntries(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::appEntries(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The apps from the app store were not shown yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/CommentsAppContext.php b/tests/acceptance/features/bootstrap/CommentsAppContext.php index 577b14b7e72..b193ba9fb33 100644 --- a/tests/acceptance/features/bootstrap/CommentsAppContext.php +++ b/tests/acceptance/features/bootstrap/CommentsAppContext.php @@ -85,9 +85,9 @@ class CommentsAppContext implements Context, ActorAwareInterface { */ public function iSeeThatThereAreNoComments() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::emptyContent(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::emptyContent(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The no comments message is not visible yet after $timeout seconds"); } } @@ -97,7 +97,7 @@ class CommentsAppContext implements Context, ActorAwareInterface { */ public function iSeeACommentWithAsMessage($commentText) { Assert::assertTrue( - $this->actor->find(self::commentWithText($commentText), 10)->isVisible()); + $this->actor->find(self::commentWithText($commentText), 10)->isVisible()); } /** @@ -106,7 +106,7 @@ class CommentsAppContext implements Context, ActorAwareInterface { public function iSeeThatThereIsNoCommentWithAsMessage($commentText) { try { Assert::assertFalse( - $this->actor->find(self::commentWithText($commentText))->isVisible()); + $this->actor->find(self::commentWithText($commentText))->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/ContactsMenuContext.php b/tests/acceptance/features/bootstrap/ContactsMenuContext.php index b22f33a3c55..72c33410b28 100644 --- a/tests/acceptance/features/bootstrap/ContactsMenuContext.php +++ b/tests/acceptance/features/bootstrap/ContactsMenuContext.php @@ -89,7 +89,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::contactsMenu(), 10)->isVisible()); + $this->actor->find(self::contactsMenu(), 10)->isVisible()); } /** @@ -97,7 +97,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactsMenuSearchInputIsShown() { Assert::assertTrue( - $this->actor->find(self::contactsMenuSearchInput(), 10)->isVisible()); + $this->actor->find(self::contactsMenuSearchInput(), 10)->isVisible()); } /** @@ -105,7 +105,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheNoResultsMessageInTheContactsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::noResultsMessage(), 10)->isVisible()); + $this->actor->find(self::noResultsMessage(), 10)->isVisible()); } /** @@ -113,7 +113,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheContactInTheContactsMenuIsShown($contactName) { Assert::assertTrue( - $this->actor->find(self::menuItemFor($contactName), 10)->isVisible()); + $this->actor->find(self::menuItemFor($contactName), 10)->isVisible()); } /** @@ -124,7 +124,7 @@ class ContactsMenuContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::menuItemFor($contactName))->isVisible()); + $this->actor->find(self::menuItemFor($contactName))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -136,9 +136,9 @@ class ContactsMenuContext implements Context, ActorAwareInterface { $this->iSeeThatThecontactsMenuIsShown(); if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::menuItemFor($contactName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::menuItemFor($contactName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The $contactName contact in Contacts menu is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/DialogContext.php b/tests/acceptance/features/bootstrap/DialogContext.php index dea9f434bab..3deea2f5ebf 100644 --- a/tests/acceptance/features/bootstrap/DialogContext.php +++ b/tests/acceptance/features/bootstrap/DialogContext.php @@ -56,9 +56,9 @@ class DialogContext implements Context, ActorAwareInterface { */ public function iSeeThatTheConfirmationDialogIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::theDialog(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::theDialog(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The confirmation dialog was not shown yet after $timeout seconds"); } } @@ -68,9 +68,9 @@ class DialogContext implements Context, ActorAwareInterface { */ public function iSeeThatTheConfirmationDialogIsNotShown() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::theDialog(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::theDialog(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The confirmation dialog is still shown after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php index af8534f012c..b87d1d7dee3 100644 --- a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php +++ b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php @@ -37,7 +37,6 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope; * "setFileListAncestorForActor" when needed. */ trait FileListAncestorSetter { - /** * @var FileListContext */ diff --git a/tests/acceptance/features/bootstrap/FileListContext.php b/tests/acceptance/features/bootstrap/FileListContext.php index 12402c07cc0..501bad73c06 100644 --- a/tests/acceptance/features/bootstrap/FileListContext.php +++ b/tests/acceptance/features/bootstrap/FileListContext.php @@ -25,7 +25,6 @@ use Behat\Behat\Context\Context; use PHPUnit\Framework\Assert; class FileListContext implements Context, ActorAwareInterface { - /** * @var Actor */ @@ -484,9 +483,9 @@ class FileListContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileListIsEventuallyLoaded() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::mainWorkingIcon($this->fileListAncestor), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::mainWorkingIcon($this->fileListAncestor), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The main working icon for the file list is still shown after $timeout seconds"); } } @@ -522,9 +521,9 @@ class FileListContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileListDoesNotContainAFileNamed($fileName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::rowForFile($this->fileListAncestor, $fileName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForFile($this->fileListAncestor, $fileName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The file list still contains a file named $fileName after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index 124000f878d..b4b6e72e5b5 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -297,8 +297,8 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheFilesApp() { Assert::assertStringStartsWith( - $this->actor->locatePath("/apps/files/"), - $this->actor->getSession()->getCurrentUrl()); + $this->actor->locatePath("/apps/files/"), + $this->actor->getSession()->getCurrentUrl()); $this->setFileListAncestorForActor(self::currentSectionMainView(), $this->actor); } @@ -311,9 +311,9 @@ class FilesAppContext implements Context, ActorAwareInterface { // waited for it to be visible instead of relying on the implicit wait // made to find the element. if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::detailsView(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::detailsView(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The details view is not open yet after $timeout seconds"); } } @@ -323,9 +323,9 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDetailsViewIsClosed() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::detailsView(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::detailsView(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The details view is not closed yet after $timeout seconds"); } } @@ -335,7 +335,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileNameShownInTheDetailsViewIs($fileName) { Assert::assertEquals( - $this->actor->find(self::fileNameInDetailsView(), 10)->getText(), $fileName); + $this->actor->find(self::fileNameInDetailsView(), 10)->getText(), $fileName); } /** @@ -343,7 +343,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsMarkedAsFavoriteInTheDetailsView() { Assert::assertNotNull( - $this->actor->find(self::favoritedStateIconInFileDetailsInDetailsView(), 10)); + $this->actor->find(self::favoritedStateIconInFileDetailsInDetailsView(), 10)); } /** @@ -351,7 +351,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsNotMarkedAsFavoriteInTheDetailsView() { Assert::assertNotNull( - $this->actor->find(self::notFavoritedStateIconInFileDetailsInDetailsView(), 10)); + $this->actor->find(self::notFavoritedStateIconInFileDetailsInDetailsView(), 10)); } /** @@ -359,7 +359,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheInputFieldForTagsInTheDetailsViewIsShown() { Assert::assertTrue( - $this->actor->find(self::inputFieldForTagsInDetailsView(), 10)->isVisible()); + $this->actor->find(self::inputFieldForTagsInDetailsView(), 10)->isVisible()); } /** @@ -367,7 +367,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag($tag) { Assert::assertTrue( - $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag), 10)->isVisible()); + $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag), 10)->isVisible()); } /** @@ -378,7 +378,7 @@ class FilesAppContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag))->isVisible()); + $this->actor->find(self::itemInInputFieldForTagsInDetailsViewForTag($tag))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -388,7 +388,7 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked($tag) { Assert::assertTrue( - $this->actor->find(self::checkmarkInItemInDropdownForTag($tag), 10)->isVisible()); + $this->actor->find(self::checkmarkInItemInDropdownForTag($tag), 10)->isVisible()); } /** @@ -396,10 +396,10 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsNotChecked($tag) { Assert::assertTrue( - $this->actor->find(self::itemInDropdownForTag($tag), 10)->isVisible()); + $this->actor->find(self::itemInDropdownForTag($tag), 10)->isVisible()); Assert::assertFalse( - $this->actor->find(self::checkmarkInItemInDropdownForTag($tag))->isVisible()); + $this->actor->find(self::checkmarkInItemInDropdownForTag($tag))->isVisible()); } /** @@ -407,9 +407,9 @@ class FilesAppContext implements Context, ActorAwareInterface { */ public function iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded($tabName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::loadingIconForTabInDetailsViewNamed($tabName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::loadingIconForTabInDetailsViewNamed($tabName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The $tabName tab in the details view has not been loaded after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php index 95398423e3b..40c055ed06e 100644 --- a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php @@ -378,9 +378,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // Close the share link menu if it is open to ensure that it does not // cover the copy link button. if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkMenu($shareLinkMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkMenu($shareLinkMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { // It may not be possible to click on the menu button (due to the // menu itself covering it), so "Enter" key is pressed instead. $this->actor->find(self::shareLinkMenuButton(), 2)->getWrappedElement()->keyPress(13); @@ -528,7 +528,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsSharedWithMeBy($sharedByName) { Assert::assertEquals( - $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); + $this->actor->find(self::sharedByLabel(), 10)->getText(), "Shared with you by $sharedByName"); } /** @@ -536,7 +536,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsSharedWith($sharedWithName) { Assert::assertTrue( - $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); + $this->actor->find(self::sharedWithRow($sharedWithName), 10)->isVisible()); } /** @@ -544,9 +544,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatTheFileIsNotSharedWith($sharedWithName) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::sharedWithRow($sharedWithName), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::sharedWithRow($sharedWithName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The shared with $sharedWithName row is still shown after $timeout seconds"); } } @@ -556,9 +556,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingTheFileIsNotAllowed() { Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); Assert::assertEquals( - $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); + $this->actor->find(self::shareWithInput(), 10)->getWrappedElement()->getAttribute("placeholder"), "Resharing is not allowed"); } /** @@ -566,9 +566,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingTheFileByLinkIsNotAvailable() { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkAddNewButton(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkAddNewButton(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The add new share link button is still shown after $timeout seconds"); } } @@ -581,7 +581,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertEquals( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); } /** @@ -592,7 +592,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -603,7 +603,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canEditCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -614,7 +614,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertEquals( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->getWrappedElement()->getAttribute("disabled"), "disabled"); } /** @@ -625,7 +625,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -636,7 +636,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canCreateCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -647,9 +647,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::canReshareCheckbox($sharedWithName, $shareWithMenuTriggerElement), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::canReshareCheckbox($sharedWithName, $shareWithMenuTriggerElement), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The resharing checkbox for $sharedWithName is still shown after $timeout seconds"); } } @@ -662,7 +662,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertTrue( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -673,7 +673,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareWithMenuTriggerElement = $this->actor->find(self::shareWithMenuTrigger($sharedWithName), 10); Assert::assertFalse( - $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); + $this->actor->find(self::canReshareCheckboxInput($sharedWithName, $shareWithMenuTriggerElement), 10)->isChecked()); } /** @@ -719,9 +719,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { } if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::disabledPasswordProtectField($shareLinkMenuTriggerElement), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::disabledPasswordProtectField($shareLinkMenuTriggerElement), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The password protect field is still disabled after $timeout seconds"); } } @@ -766,7 +766,7 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { $shareLinkMenuTriggerElement = $this->actor->find(self::shareLinkMenuTrigger(), 10); try { Assert::assertFalse( - $this->actor->find(self::passwordProtectByTalkCheckbox($shareLinkMenuTriggerElement))->isVisible()); + $this->actor->find(self::passwordProtectByTalkCheckbox($shareLinkMenuTriggerElement))->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -788,9 +788,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // case it is in the process of being hidden due to a previous action, // in which case it is shown again. if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareLinkMenu($shareLinkMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareLinkMenu($shareLinkMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { $this->actor->find(self::shareLinkMenuButton(), 10)->click(); } } @@ -803,9 +803,9 @@ class FilesAppSharingContext implements Context, ActorAwareInterface { // case it is in the process of being hidden due to a previous action, // in which case it is shown again. if (WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::shareWithMenu($shareWithName, $shareWithMenuTriggerElement), - $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::shareWithMenu($shareWithName, $shareWithMenuTriggerElement), + $timeout = 2 * $this->actor->getFindTimeoutMultiplier())) { $this->actor->find(self::shareWithMenuButton($shareWithName), 10)->click(); } } diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php index 01ad34ba149..fc924bbff80 100644 --- a/tests/acceptance/features/bootstrap/LoginPageContext.php +++ b/tests/acceptance/features/bootstrap/LoginPageContext.php @@ -80,8 +80,8 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheLoginPage() { Assert::assertStringStartsWith( - $this->actor->locatePath("/login"), - $this->actor->getSession()->getCurrentUrl()); + $this->actor->locatePath("/login"), + $this->actor->getSession()->getCurrentUrl()); } /** @@ -89,7 +89,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatAWrongPasswordMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); + $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); } /** @@ -97,7 +97,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDisabledUserMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::userDisabledMessage(), 10)->isVisible()); + $this->actor->find(self::userDisabledMessage(), 10)->isVisible()); } /** diff --git a/tests/acceptance/features/bootstrap/PublicShareContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php index d31d6541335..ce25afa792b 100644 --- a/tests/acceptance/features/bootstrap/PublicShareContext.php +++ b/tests/acceptance/features/bootstrap/PublicShareContext.php @@ -145,8 +145,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheAuthenticatePageForTheSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/authenticate/showShare", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/authenticate/showShare", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -154,8 +154,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheAuthenticatePageForTheDirectDownloadSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/authenticate/downloadShare", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/authenticate/downloadShare", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -163,8 +163,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"], - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"], + $this->actor->getSession()->getCurrentUrl()); $this->setFileListAncestorForActor(null, $this->actor); } @@ -174,8 +174,8 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheDirectDownloadSharedLinkIWroteDown() { Assert::assertEquals( - $this->actor->getSharedNotebook()["shared link"] . "/download", - $this->actor->getSession()->getCurrentUrl()); + $this->actor->getSharedNotebook()["shared link"] . "/download", + $this->actor->getSession()->getCurrentUrl()); } /** @@ -183,7 +183,7 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatAWrongPasswordForTheSharedFileMessageIsShown() { Assert::assertTrue( - $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); + $this->actor->find(self::wrongPasswordMessage(), 10)->isVisible()); } /** @@ -194,7 +194,7 @@ class PublicShareContext implements Context, ActorAwareInterface { // the element could be found when it was no made visible yet due to the // command not having been processed by the browser. if (!WaitFor::elementToBeEventuallyShown( - $this->actor, self::shareMenu(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, self::shareMenu(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The Share menu is not visible yet after $timeout seconds"); } @@ -202,14 +202,14 @@ class PublicShareContext implements Context, ActorAwareInterface { // download item should not be shown in the menu (although it will be in // the DOM). Assert::assertFalse( - $this->actor->find(self::downloadItemInShareMenu())->isVisible(), - "Download item in share menu is visible"); + $this->actor->find(self::downloadItemInShareMenu())->isVisible(), + "Download item in share menu is visible"); Assert::assertTrue( - $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), - "Direct link item in share menu is not visible"); + $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), + "Direct link item in share menu is not visible"); Assert::assertTrue( - $this->actor->find(self::saveItemInShareMenu())->isVisible(), - "Save item in share menu is not visible"); + $this->actor->find(self::saveItemInShareMenu())->isVisible(), + "Save item in share menu is not visible"); } /** @@ -218,7 +218,7 @@ class PublicShareContext implements Context, ActorAwareInterface { public function iSeeThatTheShareMenuButtonIsNotShown() { try { Assert::assertFalse( - $this->actor->find(self::shareMenuButton())->isVisible()); + $this->actor->find(self::shareMenuButton())->isVisible()); } catch (NoSuchElementException $exception) { } } @@ -235,7 +235,7 @@ class PublicShareContext implements Context, ActorAwareInterface { */ public function iSeeThatTheDownloadButtonIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, self::downloadButton(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, self::downloadButton(), $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The download button is not visible yet after $timeout seconds"); } } @@ -246,7 +246,7 @@ class PublicShareContext implements Context, ActorAwareInterface { public function iSeeThatTheDownloadButtonIsNotShown() { try { Assert::assertFalse( - $this->actor->find(self::downloadButton())->isVisible()); + $this->actor->find(self::downloadButton())->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php index db7aeb90ffe..f776c078c68 100644 --- a/tests/acceptance/features/bootstrap/SearchContext.php +++ b/tests/acceptance/features/bootstrap/SearchContext.php @@ -101,7 +101,7 @@ class SearchContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSearchResultIs($number, $name) { Assert::assertEquals( - $name, $this->actor->find(self::searchResultName($number), 10)->getText()); + $name, $this->actor->find(self::searchResultName($number), 10)->getText()); } /** @@ -109,6 +109,6 @@ class SearchContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSearchResultWasFoundIn($number, $path) { Assert::assertEquals( - $path, $this->actor->find(self::searchResultPath($number), 10)->getText()); + $path, $this->actor->find(self::searchResultPath($number), 10)->getText()); } } diff --git a/tests/acceptance/features/bootstrap/SettingsContext.php b/tests/acceptance/features/bootstrap/SettingsContext.php index 1e0eadd044a..ae1a559a360 100644 --- a/tests/acceptance/features/bootstrap/SettingsContext.php +++ b/tests/acceptance/features/bootstrap/SettingsContext.php @@ -182,7 +182,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatSharesAreAcceptedByDefault() { Assert::assertTrue( - $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); } /** @@ -190,7 +190,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingIsEnabled() { Assert::assertTrue( - $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); } /** @@ -198,7 +198,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatResharingIsDisabled() { Assert::assertFalse( - $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::allowResharingCheckboxInput(), 10)->isChecked()); } /** @@ -206,7 +206,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatUsernameAutocompletionIsRestrictedToGroups() { Assert::assertTrue( - $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); } /** @@ -214,7 +214,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatUsernameAutocompletionIsNotRestrictedToGroups() { Assert::assertFalse( - $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::restrictUsernameAutocompletionToGroupsCheckboxInput(), 10)->isChecked()); } /** @@ -222,7 +222,7 @@ class SettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatSharesAreNotAcceptedByDefault() { Assert::assertFalse( - $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); + $this->actor->find(self::acceptSharesByDefaultCheckboxInput(), 10)->isChecked()); } /** diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php index f89d8782198..eaf667d4423 100644 --- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php +++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php @@ -165,7 +165,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheSettingsMenuIsShown() { Assert::assertTrue( - $this->actor->find(self::settingsMenu(), 10)->isVisible()); + $this->actor->find(self::settingsMenu(), 10)->isVisible()); } /** @@ -180,7 +180,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { */ public function iSeeThatTheItemInTheSettingsMenuIsShown($itemText) { Assert::assertTrue( - $this->actor->find(self::menuItemFor($itemText), 10)->isVisible()); + $this->actor->find(self::menuItemFor($itemText), 10)->isVisible()); } /** @@ -191,7 +191,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface { try { Assert::assertFalse( - $this->actor->find(self::menuItemFor($itemText))->isVisible()); + $this->actor->find(self::menuItemFor($itemText))->isVisible()); } catch (NoSuchElementException $exception) { } } diff --git a/tests/acceptance/features/bootstrap/ToastContext.php b/tests/acceptance/features/bootstrap/ToastContext.php index 3dc941901c1..7ca3df2f47e 100644 --- a/tests/acceptance/features/bootstrap/ToastContext.php +++ b/tests/acceptance/features/bootstrap/ToastContext.php @@ -49,6 +49,6 @@ class ToastContext implements Context, ActorAwareInterface { */ public function iSeeThatTheToastIsShown($message) { Assert::assertTrue($this->actor->find( - self::toastMessage($message), 10)->isVisible()); + self::toastMessage($message), 10)->isVisible()); } } diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php index 4d17b3b5118..33c47850202 100644 --- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php +++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php @@ -270,9 +270,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheListOfUsersContainsTheUser($user) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::rowForUser($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForUser($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The user $user in the list of users is not shown yet after $timeout seconds"); } } @@ -282,9 +282,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheListOfUsersDoesNotContainsTheUser($user) { if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::rowForUser($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::rowForUser($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The user $user in the list of users is still shown after $timeout seconds"); } } @@ -294,9 +294,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheNewUserFormIsShown() { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::newUserForm(), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::newUserForm(), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The new user form is not shown yet after $timeout seconds"); } } @@ -352,9 +352,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { } if (!WaitFor::elementToBeEventuallyNotShown( - $this->actor, - self::classCellForUser($cell . ' icon-loading-small', $user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::classCellForUser($cell . ' icon-loading-small', $user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The loading icon for user $user is still shown after $timeout seconds"); } } @@ -372,9 +372,9 @@ class UsersSettingsContext implements Context, ActorAwareInterface { */ public function iSeeThatTheEditModeIsOn($user) { if (!WaitFor::elementToBeEventuallyShown( - $this->actor, - self::editModeOn($user), - $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + $this->actor, + self::editModeOn($user), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { Assert::fail("The edit mode for user $user in the list of users is not on yet after $timeout seconds"); } } diff --git a/tests/acceptance/features/bootstrap/WaitFor.php b/tests/acceptance/features/bootstrap/WaitFor.php index b07586c4662..37a268360aa 100644 --- a/tests/acceptance/features/bootstrap/WaitFor.php +++ b/tests/acceptance/features/bootstrap/WaitFor.php @@ -25,7 +25,6 @@ * Helper class with common "wait for" functions. */ class WaitFor { - /** * Waits for the element to be visible. * diff --git a/tests/acceptance/features/core/Actor.php b/tests/acceptance/features/core/Actor.php index ea33e7df21e..abe9a390920 100644 --- a/tests/acceptance/features/core/Actor.php +++ b/tests/acceptance/features/core/Actor.php @@ -59,7 +59,6 @@ * performs them. */ class Actor { - /** * @var string */ diff --git a/tests/acceptance/features/core/ActorAware.php b/tests/acceptance/features/core/ActorAware.php index 5a1a7542355..c734d7e1906 100644 --- a/tests/acceptance/features/core/ActorAware.php +++ b/tests/acceptance/features/core/ActorAware.php @@ -22,7 +22,6 @@ */ trait ActorAware { - /** * @var Actor */ diff --git a/tests/acceptance/features/core/ActorAwareInterface.php b/tests/acceptance/features/core/ActorAwareInterface.php index 37261773cbb..7b855aed4d3 100644 --- a/tests/acceptance/features/core/ActorAwareInterface.php +++ b/tests/acceptance/features/core/ActorAwareInterface.php @@ -22,7 +22,6 @@ */ interface ActorAwareInterface { - /** * @param Actor $actor */ diff --git a/tests/acceptance/features/core/ActorContext.php b/tests/acceptance/features/core/ActorContext.php index aa538f06069..7f152a1f3eb 100644 --- a/tests/acceptance/features/core/ActorContext.php +++ b/tests/acceptance/features/core/ActorContext.php @@ -48,7 +48,6 @@ use Behat\MinkExtension\Context\RawMinkContext; * are stopped after each scenario is run. */ class ActorContext extends RawMinkContext { - /** * @var array */ diff --git a/tests/acceptance/features/core/ElementFinder.php b/tests/acceptance/features/core/ElementFinder.php index 9981321c90d..714b100bfa2 100644 --- a/tests/acceptance/features/core/ElementFinder.php +++ b/tests/acceptance/features/core/ElementFinder.php @@ -44,7 +44,6 @@ * NoSuchElementException is thrown. */ class ElementFinder { - /** * Finds an element in the given Mink Session. * diff --git a/tests/acceptance/features/core/ElementWrapper.php b/tests/acceptance/features/core/ElementWrapper.php index 89a73d5aa79..6ac9a6b8e8f 100644 --- a/tests/acceptance/features/core/ElementWrapper.php +++ b/tests/acceptance/features/core/ElementWrapper.php @@ -90,7 +90,6 @@ * the ElementWrapper). */ class ElementWrapper { - /** * @var ElementFinder */ diff --git a/tests/acceptance/features/core/Locator.php b/tests/acceptance/features/core/Locator.php index dd971147f86..1b933399e6b 100644 --- a/tests/acceptance/features/core/Locator.php +++ b/tests/acceptance/features/core/Locator.php @@ -29,7 +29,6 @@ * fluent interface with Locator::forThe(). */ class Locator { - /** * @var string */ @@ -102,7 +101,6 @@ class Locator { } class LocatorBuilder { - /** * @param string $selector * @param string|array $locator @@ -242,7 +240,6 @@ class LocatorBuilder { } class LocatorBuilderSecondStep { - /** * @var string */ @@ -280,7 +277,6 @@ class LocatorBuilderSecondStep { } class LocatorBuilderThirdStep { - /** * @var string */ diff --git a/tests/acceptance/features/core/NextcloudTestServerContext.php b/tests/acceptance/features/core/NextcloudTestServerContext.php index 682811248e1..d0dc0c32181 100644 --- a/tests/acceptance/features/core/NextcloudTestServerContext.php +++ b/tests/acceptance/features/core/NextcloudTestServerContext.php @@ -59,7 +59,6 @@ use Behat\Behat\Hook\Scope\BeforeScenarioScope; * - second-parameter-value */ class NextcloudTestServerContext implements Context { - /** * @var NextcloudTestServerHelper */ diff --git a/tests/acceptance/features/core/NextcloudTestServerHelper.php b/tests/acceptance/features/core/NextcloudTestServerHelper.php index cd50616e34c..69b8ce70505 100644 --- a/tests/acceptance/features/core/NextcloudTestServerHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerHelper.php @@ -46,7 +46,6 @@ * nothing to be explicitly catched a plain base Exception is used. */ interface NextcloudTestServerHelper { - /** * Sets up the Nextcloud test server. * diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php index 36cffc325dc..367e950931d 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php @@ -47,7 +47,6 @@ * server can be got from "getBaseUrl". */ class NextcloudTestServerLocalApacheHelper implements NextcloudTestServerHelper { - /** * @var string */ diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php index ce81881c9c4..a1ab1f8720a 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php @@ -44,7 +44,6 @@ * server can be got from "getBaseUrl". */ class NextcloudTestServerLocalBuiltInHelper implements NextcloudTestServerHelper { - /** * @var string */ diff --git a/tests/acceptance/features/core/NoSuchElementException.php b/tests/acceptance/features/core/NoSuchElementException.php index dca884556ad..35583c7e63f 100644 --- a/tests/acceptance/features/core/NoSuchElementException.php +++ b/tests/acceptance/features/core/NoSuchElementException.php @@ -25,7 +25,6 @@ * Exception to signal that the element looked for could not be found. */ class NoSuchElementException extends \Exception { - /** * @param string $message * @param null|\Exception $previous diff --git a/tests/acceptance/features/core/Utils.php b/tests/acceptance/features/core/Utils.php index 1650df4f824..eb7c65e993a 100644 --- a/tests/acceptance/features/core/Utils.php +++ b/tests/acceptance/features/core/Utils.php @@ -22,7 +22,6 @@ */ class Utils { - /** * Waits at most $timeout seconds for the given condition to be true, * checking it again every $timeoutStep seconds. diff --git a/tests/lib/APITest.php b/tests/lib/APITest.php index 22d1270ccd6..5e29629c92e 100644 --- a/tests/lib/APITest.php +++ b/tests/lib/APITest.php @@ -11,7 +11,6 @@ namespace Test; use OCP\IRequest; class APITest extends \Test\TestCase { - // Helps build a response variable /** diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index d5c7cd60b1b..0907f31d842 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -38,7 +38,6 @@ use Test\TestCase; * @group DB */ class HooksTest extends TestCase { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php index f8b34b4c716..9a39f21f4e5 100644 --- a/tests/lib/Activity/ManagerTest.php +++ b/tests/lib/Activity/ManagerTest.php @@ -32,7 +32,6 @@ use OCP\RichObjectStrings\IValidator; use Test\TestCase; class ManagerTest extends TestCase { - /** @var \OC\Activity\Manager */ private $activityManager; diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php index 8570b94456f..fca4e8d8308 100644 --- a/tests/lib/AllConfigTest.php +++ b/tests/lib/AllConfigTest.php @@ -20,7 +20,6 @@ use OC\SystemConfig; use OCP\IDBConnection; class AllConfigTest extends \Test\TestCase { - /** @var \OCP\IDBConnection */ protected $connection; @@ -52,9 +51,9 @@ class AllConfigTest extends \Test\TestCase { $config->deleteUserValue('userDelete', 'appDelete', 'keyDelete'); $result = $this->connection->executeQuery( - 'SELECT COUNT(*) AS `count` FROM `*PREFIX*preferences` WHERE `userid` = ?', - ['userDelete'] - )->fetch(); + 'SELECT COUNT(*) AS `count` FROM `*PREFIX*preferences` WHERE `userid` = ?', + ['userDelete'] + )->fetch(); $actualCount = $result['count']; $this->assertEquals(0, $actualCount, 'There was one value in the database and after the tests there should be no entry left.'); diff --git a/tests/lib/App/CompareVersionTest.php b/tests/lib/App/CompareVersionTest.php index cec4f1114df..0988304f8fc 100644 --- a/tests/lib/App/CompareVersionTest.php +++ b/tests/lib/App/CompareVersionTest.php @@ -31,7 +31,6 @@ use OC\App\CompareVersion; use Test\TestCase; class CompareVersionTest extends TestCase { - /** @var CompareVersion */ private $compare; diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index 75cc991cf99..f2ae412c2f6 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -16,7 +16,6 @@ use OCP\IL10N; use Test\TestCase; class DependencyAnalyzerTest extends TestCase { - /** @var Platform|\PHPUnit\Framework\MockObject\MockObject */ private $platformMock; diff --git a/tests/lib/App/PlatformRepositoryTest.php b/tests/lib/App/PlatformRepositoryTest.php index 6bc256c20b0..51884b26e71 100644 --- a/tests/lib/App/PlatformRepositoryTest.php +++ b/tests/lib/App/PlatformRepositoryTest.php @@ -12,7 +12,6 @@ namespace Test\App; use OC; class PlatformRepositoryTest extends \Test\TestCase { - /** * @dataProvider providesVersions * @param $expected diff --git a/tests/lib/AppFramework/Bootstrap/BootContextTest.php b/tests/lib/AppFramework/Bootstrap/BootContextTest.php index b566347e3ff..86f653604a9 100644 --- a/tests/lib/AppFramework/Bootstrap/BootContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/BootContextTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class BootContextTest extends TestCase { - /** @var IAppContainer|MockObject */ private $appContainer; diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php index 5a151806adf..a706abecc4f 100644 --- a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php +++ b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php @@ -42,7 +42,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class CoordinatorTest extends TestCase { - /** @var IAppManager|MockObject */ private $appManager; diff --git a/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php b/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php index cd2332b0588..909a98f97c8 100644 --- a/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php +++ b/tests/lib/AppFramework/Bootstrap/FunctionInjectorTest.php @@ -33,7 +33,6 @@ interface Foo { } class FunctionInjectorTest extends TestCase { - /** @var SimpleContainer */ private $container; diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index 81fac49348b..22111f5b68e 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -35,7 +35,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RegistrationContextTest extends TestCase { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php index c8adef80966..e996f287c16 100644 --- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php @@ -31,7 +31,6 @@ use OCP\ISession; use OCP\IURLGenerator; class AuthPublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 4d36fcadce1..1f347cea535 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -56,7 +56,6 @@ class ChildController extends Controller { }; class ControllerTest extends \Test\TestCase { - /** * @var Controller */ diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php index deffedcec05..9c03ba4cb6e 100644 --- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php @@ -28,7 +28,6 @@ use OCP\IRequest; use OCP\ISession; class TestController extends PublicShareController { - /** @var string */ private $hash; @@ -56,7 +55,6 @@ class TestController extends PublicShareController { } class PublicShareControllerTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index 96d319923b3..82830dcc05a 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -80,7 +80,6 @@ class QBTestMapper extends QBMapper { * @package Test\AppFramework\Db */ class QBMapperTest extends \Test\TestCase { - /** * @var \PHPUnit\Framework\MockObject\MockObject|IDBConnection */ diff --git a/tests/lib/AppFramework/Db/TransactionalTest.php b/tests/lib/AppFramework/Db/TransactionalTest.php index 060badca0eb..fc2d4121382 100644 --- a/tests/lib/AppFramework/Db/TransactionalTest.php +++ b/tests/lib/AppFramework/Db/TransactionalTest.php @@ -31,7 +31,6 @@ use RuntimeException; use Test\TestCase; class TransactionalTest extends TestCase { - /** @var IDBConnection|MockObject */ private IDBConnection $db; diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 9a3d40d1c6b..69367ad6ce2 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -36,7 +36,6 @@ use OCP\IRequestId; * @group DB */ class DIContainerTest extends \Test\TestCase { - /** @var DIContainer|\PHPUnit\Framework\MockObject\MockObject */ private $container; diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index 78a1d40bea6..369a30ba7a3 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -52,7 +52,6 @@ class ClassB { } class DIIntergrationTests extends TestCase { - /** @var DIContainer */ private $container; diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php index a96cd4a163b..5c3f3ead5b0 100644 --- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php @@ -16,7 +16,6 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; * @package OC\AppFramework\Http */ class ContentSecurityPolicyTest extends \Test\TestCase { - /** @var ContentSecurityPolicy */ private $contentSecurityPolicy; diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php index f933b3102b7..575698dd878 100644 --- a/tests/lib/AppFramework/Http/DataResponseTest.php +++ b/tests/lib/AppFramework/Http/DataResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; class DataResponseTest extends \Test\TestCase { - /** * @var DataResponse */ diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php index 5fe81bb0136..68e54886527 100644 --- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php @@ -16,7 +16,6 @@ use OCP\AppFramework\Http\EmptyContentSecurityPolicy; * @package OC\AppFramework\Http */ class EmptyContentSecurityPolicyTest extends \Test\TestCase { - /** @var EmptyContentSecurityPolicy */ private $contentSecurityPolicy; diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php index 18c255463c5..6ced435286c 100644 --- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php @@ -28,7 +28,6 @@ namespace Test\AppFramework\Http; use OCP\AppFramework\Http\EmptyFeaturePolicy; class EmptyFeaturePolicyTest extends \Test\TestCase { - /** @var EmptyFeaturePolicy */ private $policy; diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php index 869650f42b1..60ddca7481b 100644 --- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php @@ -28,7 +28,6 @@ namespace Test\AppFramework\Http; use OCP\AppFramework\Http\FeaturePolicy; class FeaturePolicyTest extends \Test\TestCase { - /** @var EmptyFeaturePolicy */ private $policy; diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php index 8c8318eb602..82f00457907 100644 --- a/tests/lib/AppFramework/Http/JSONResponseTest.php +++ b/tests/lib/AppFramework/Http/JSONResponseTest.php @@ -29,7 +29,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; class JSONResponseTest extends \Test\TestCase { - /** * @var JSONResponse */ diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php index 5130d36937f..c49c4a7c1f7 100644 --- a/tests/lib/AppFramework/Http/RedirectResponseTest.php +++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php @@ -27,7 +27,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\RedirectResponse; class RedirectResponseTest extends \Test\TestCase { - /** * @var RedirectResponse */ diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index c725e2fb602..c5d228e5753 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Utility\ITimeFactory; class ResponseTest extends \Test\TestCase { - /** * @var \OCP\AppFramework\Http\Response */ diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php index 97aced01506..3c0105ad145 100644 --- a/tests/lib/AppFramework/Http/StreamResponseTest.php +++ b/tests/lib/AppFramework/Http/StreamResponseTest.php @@ -28,7 +28,6 @@ use OCP\AppFramework\Http\IOutput; use OCP\AppFramework\Http\StreamResponse; class StreamResponseTest extends \Test\TestCase { - /** @var IOutput */ private $output; diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php index 6cbf112494e..13eef5c7c22 100644 --- a/tests/lib/AppFramework/Http/TemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php @@ -27,7 +27,6 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; class TemplateResponseTest extends \Test\TestCase { - /** * @var \OCP\AppFramework\Http\TemplateResponse */ diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php index 5127248215b..1cd6b614aad 100644 --- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php @@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AdditionalScriptsMiddlewareTest extends \Test\TestCase { - /** @var EventDispatcherInterface|MockObject */ private $legacyDispatcher; /** @var IUserSession|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php index 5dd13942097..79e07ac6686 100644 --- a/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/CompressionMiddlewareTest.php @@ -35,7 +35,6 @@ use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; class CompressionMiddlewareTest extends \Test\TestCase { - /** @var IRequest */ private $request; /** @var Controller */ diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php index bd61aab4673..f9d8926db7e 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php @@ -36,7 +36,6 @@ class ChildMiddleware extends Middleware { class MiddlewareTest extends \Test\TestCase { - /** * @var Middleware */ diff --git a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php index c62384302fb..3b69a289e99 100644 --- a/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http; use OCP\IRequest; class NotModifiedMiddlewareTest extends \Test\TestCase { - /** @var IRequest */ private $request; /** @var Controller */ diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index 83b764f6c65..4839ff75b5e 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -36,7 +36,6 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; class OCSMiddlewareTest extends \Test\TestCase { - /** * @var IRequest */ diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php index 7d07bffc46b..3e48078cbad 100644 --- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php @@ -38,7 +38,6 @@ use OCP\ISession; use OCP\IURLGenerator; class PublicShareMiddlewareTest extends \Test\TestCase { - /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index cc6c74c16c4..f3c1f7934ef 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -24,7 +24,6 @@ use OCP\IConfig; use OCP\IRequestId; class CORSMiddlewareTest extends \Test\TestCase { - /** @var ControllerMethodReflector */ private $reflector; /** @var Session|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php index 2dfb04e138e..284634f7db2 100644 --- a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php @@ -37,7 +37,6 @@ use OCP\AppFramework\Http\Response; use PHPUnit\Framework\MockObject\MockObject; class CSPMiddlewareTest extends \Test\TestCase { - /** @var CSPMiddleware|MockObject */ private $middleware; /** @var Controller|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php index 0a4b3c4f34c..154b43f69a5 100644 --- a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php @@ -34,7 +34,6 @@ use OCP\AppFramework\Http\Response; use PHPUnit\Framework\MockObject\MockObject; class FeaturePolicyMiddlewareTest extends \Test\TestCase { - /** @var FeaturePolicyMiddleware|MockObject */ private $middleware; /** @var Controller|MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index 61f5eeb5aea..787f5c92fd7 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http; use Test\TestCase; class SameSiteCookieMiddlewareTest extends TestCase { - /** @var SameSiteCookieMiddleware */ private $middleware; diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 276ebe8f9ac..c68ada87657 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -48,7 +48,6 @@ use OCP\IUserSession; use Psr\Log\LoggerInterface; class SecurityMiddlewareTest extends \Test\TestCase { - /** @var SecurityMiddleware|\PHPUnit\Framework\MockObject\MockObject */ private $middleware; /** @var Controller|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php index be684e36013..9641042d1b9 100644 --- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php @@ -17,7 +17,6 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; class SessionMiddlewareTest extends \Test\TestCase { - /** @var ControllerMethodReflector */ private $reflector; diff --git a/tests/lib/AppFramework/OCS/BaseResponseTest.php b/tests/lib/AppFramework/OCS/BaseResponseTest.php index aca8c355f41..9038aee6baf 100644 --- a/tests/lib/AppFramework/OCS/BaseResponseTest.php +++ b/tests/lib/AppFramework/OCS/BaseResponseTest.php @@ -30,7 +30,6 @@ use OC\AppFramework\OCS\BaseResponse; class BaseResponseTest extends \Test\TestCase { public function testToXml(): void { - /** @var BaseResponse $response */ $response = $this->createMock(BaseResponse::class); diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php index 6bf683ef2ed..5452fb853b9 100644 --- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php +++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php @@ -26,7 +26,6 @@ namespace Test\AppFramework\Utility; use OC\AppFramework\Utility\ControllerMethodReflector; class BaseController { - /** * @Annotation */ @@ -47,7 +46,6 @@ class BaseController { } class MiddleController extends BaseController { - /** * @NoAnnotation */ @@ -62,8 +60,6 @@ class EndController extends MiddleController { } class ControllerMethodReflectorTest extends \Test\TestCase { - - /** * @Annotation */ diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php index 36fa1febfcf..8caaf517f5c 100644 --- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php +++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php @@ -128,9 +128,9 @@ class SimpleContainerTest extends \Test\TestCase { public function testConstructorComplexInterface() { $this->container->registerParameter('test', 'abc'); $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); + }); $object = $this->container->query( 'Test\AppFramework\Utility\ClassInterfaceConstructor' ); @@ -142,13 +142,13 @@ class SimpleContainerTest extends \Test\TestCase { public function testOverrideService() { $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassSimpleConstructor'); + }); $this->container->registerService( - 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { - return $c->query('Test\AppFramework\Utility\ClassEmptyConstructor'); - }); + 'Test\AppFramework\Utility\IInterfaceConstructor', function ($c) { + return $c->query('Test\AppFramework\Utility\ClassEmptyConstructor'); + }); $object = $this->container->query( 'Test\AppFramework\Utility\IInterfaceConstructor' ); diff --git a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php index a5038dd23b2..daf8d272c2f 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php @@ -38,7 +38,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeActivityListenerTest extends TestCase { - /** @var IActivityManager|MockObject */ private $activityManager; diff --git a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php index 932097d875f..7a715dd3f0c 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php @@ -43,7 +43,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeEmailListenerTest extends TestCase { - /** @var IMailer|MockObject */ private $mailer; diff --git a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php index ef5545438c2..e5a329a4a7f 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php @@ -39,7 +39,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class RemoteWipeNotificationsListenerTest extends TestCase { - /** @var INotificationManager|MockObject */ private $notificationManager; diff --git a/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php b/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php index bf8405a4422..20b85a293d4 100644 --- a/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php +++ b/tests/lib/Authentication/Listeners/UserDeletedTokenCleanupListenerTest.php @@ -37,8 +37,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class UserDeletedTokenCleanupListenerTest extends TestCase { - - /** @var Manager|MockObject */ private $manager; diff --git a/tests/lib/Authentication/Login/ALoginCommandTest.php b/tests/lib/Authentication/Login/ALoginCommandTest.php index 7c66e102704..7d56a76e10c 100644 --- a/tests/lib/Authentication/Login/ALoginCommandTest.php +++ b/tests/lib/Authentication/Login/ALoginCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; abstract class ALoginCommandTest extends TestCase { - /** @var IRequest|MockObject */ protected $request; diff --git a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php index ded03cd95cd..1d6250415a9 100644 --- a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php +++ b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php @@ -30,7 +30,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class ClearLostPasswordTokensCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php index f90de10cdda..3f7f9e4fe73 100644 --- a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php +++ b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php @@ -30,7 +30,6 @@ use OC\User\Session; use PHPUnit\Framework\MockObject\MockObject; class CompleteLoginCommandTest extends ALoginCommandTest { - /** @var Session|MockObject */ private $session; diff --git a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php index ef23e072c60..eb48463402d 100644 --- a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php +++ b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php @@ -32,7 +32,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class CreateSessionTokenCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/EmailLoginCommandTest.php b/tests/lib/Authentication/Login/EmailLoginCommandTest.php index 0e70c40a1df..4544aedec11 100644 --- a/tests/lib/Authentication/Login/EmailLoginCommandTest.php +++ b/tests/lib/Authentication/Login/EmailLoginCommandTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; class EmailLoginCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php index e24a3ca8f8d..d6f18ad9eff 100644 --- a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php +++ b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php @@ -31,7 +31,6 @@ use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; class FinishRememberedLoginCommandTest extends ALoginCommandTest { - /** @var Session|MockObject */ private $userSession; /** @var IConfig|MockObject */ diff --git a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php index afe486ab095..d3ebf205943 100644 --- a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php +++ b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class LoggedInCheckCommandTest extends ALoginCommandTest { - /** @var LoggerInterface|MockObject */ private $logger; diff --git a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php index d83717399d4..2e83ef51ffa 100644 --- a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php +++ b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use PHPUnit\Framework\MockObject\MockObject; class PreLoginHookCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php index 8f7057e9d69..ae08b6205d5 100644 --- a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php +++ b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php @@ -31,7 +31,6 @@ use OCP\ISession; use PHPUnit\Framework\MockObject\MockObject; class SetUserTimezoneCommandTest extends ALoginCommandTest { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/Login/TwoFactorCommandTest.php b/tests/lib/Authentication/Login/TwoFactorCommandTest.php index fd37712c130..679bae07351 100644 --- a/tests/lib/Authentication/Login/TwoFactorCommandTest.php +++ b/tests/lib/Authentication/Login/TwoFactorCommandTest.php @@ -35,7 +35,6 @@ use OCP\IURLGenerator; use PHPUnit\Framework\MockObject\MockObject; class TwoFactorCommandTest extends ALoginCommandTest { - /** @var Manager|MockObject */ private $twoFactorManager; diff --git a/tests/lib/Authentication/Login/UidLoginCommandTest.php b/tests/lib/Authentication/Login/UidLoginCommandTest.php index 1f00ba77da4..812215f266e 100644 --- a/tests/lib/Authentication/Login/UidLoginCommandTest.php +++ b/tests/lib/Authentication/Login/UidLoginCommandTest.php @@ -30,7 +30,6 @@ use OC\User\Manager; use PHPUnit\Framework\MockObject\MockObject; class UidLoginCommandTest extends ALoginCommandTest { - /** @var Manager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php index 3ff82b38acc..07b32daa065 100644 --- a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php +++ b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php @@ -30,7 +30,6 @@ use OCP\ISession; use PHPUnit\Framework\MockObject\MockObject; class UpdateLastPasswordConfirmCommandTest extends ALoginCommandTest { - /** @var ISession|MockObject */ private $session; diff --git a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php index 65cfd0a71ac..fe30d3b4fea 100644 --- a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php +++ b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php @@ -32,7 +32,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class UserDisabledCheckCommandTest extends ALoginCommandTest { - /** @var IUserManager|MockObject */ private $userManager; diff --git a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php index d3dcd9f4d6b..f550325a6dc 100644 --- a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php +++ b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php @@ -28,7 +28,6 @@ use OC\Authentication\LoginCredentials\Credentials; use Test\TestCase; class CredentialsTest extends TestCase { - /** @var string */ private $uid; diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/lib/Authentication/LoginCredentials/StoreTest.php index 797dbc08da9..80d64d5466f 100644 --- a/tests/lib/Authentication/LoginCredentials/StoreTest.php +++ b/tests/lib/Authentication/LoginCredentials/StoreTest.php @@ -38,7 +38,6 @@ use Test\TestCase; use function json_encode; class StoreTest extends TestCase { - /** @var ISession|\PHPUnit\Framework\MockObject\MockObject */ private $session; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index bfb92932e81..27646f19888 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -38,7 +38,6 @@ use Test\TestCase; * @group DB */ class PublicKeyTokenMapperTest extends TestCase { - /** @var PublicKeyTokenMapper */ private $mapper; diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/lib/Authentication/Token/RemoteWipeTest.php index e2506562dd4..843dd4aec5c 100644 --- a/tests/lib/Authentication/Token/RemoteWipeTest.php +++ b/tests/lib/Authentication/Token/RemoteWipeTest.php @@ -40,7 +40,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteWipeTest extends TestCase { - /** @var ITokenProvider|MockObject */ private $tokenProvider; diff --git a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php index 7975108c59b..4f1b8d25b58 100644 --- a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php @@ -35,7 +35,6 @@ use Test\TestCase; * @group DB */ class ProviderUserAssignmentDaoTest extends TestCase { - /** @var IDBConnection */ private $dbConn; diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php index ae6fadc790c..da11b11e537 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php @@ -44,7 +44,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var IUser|MockObject */ private $user; diff --git a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php index 525defd671b..0119c977696 100644 --- a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php @@ -35,7 +35,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class MandatoryTwoFactorTest extends TestCase { - /** @var IConfig|MockObject */ private $config; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index d9c565a3f6d..b71339dd0ed 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ProviderLoaderTest extends TestCase { - /** @var IAppManager|MockObject */ private $appManager; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php index 0c85d0cf1ba..65447e1d8d6 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ProviderManagerTest extends TestCase { - /** @var ProviderLoader|MockObject */ private $providerLoader; diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php index ef221851894..f6afbf245ee 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderSetTest.php @@ -32,7 +32,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; use Test\TestCase; class ProviderSetTest extends TestCase { - /** @var ProviderSet */ private $providerSet; diff --git a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php index b0d0ef8efef..b6e0caff427 100644 --- a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php @@ -38,7 +38,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class RegistryTest extends TestCase { - /** @var ProviderUserAssignmentDao|MockObject */ private $dao; diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index 540fd5c0c69..fcf6ab3a588 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -43,7 +43,6 @@ interface ICreateFromStringAndHandleImipMessage extends ICreateFromString, IHand } class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php index 8753f547fb2..854f83af845 100644 --- a/tests/lib/Calendar/Resource/ManagerTest.php +++ b/tests/lib/Calendar/Resource/ManagerTest.php @@ -36,7 +36,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php index 598415246dc..9309a3fa0bb 100644 --- a/tests/lib/Calendar/Room/ManagerTest.php +++ b/tests/lib/Calendar/Room/ManagerTest.php @@ -36,7 +36,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index ec07f3dfa36..690ee1496ac 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -28,7 +28,6 @@ use OCP\Capabilities\IPublicCapability; use Psr\Log\LoggerInterface; class CapabilitiesManagerTest extends TestCase { - /** @var CapabilitiesManager */ private $manager; diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index b52e1d2745e..462497c637b 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -41,7 +41,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class LookupPluginTest extends TestCase { - /** @var IConfig|MockObject */ protected $config; /** @var IClientService|MockObject */ diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 22bd6f84be9..4fed1f179e7 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -40,7 +40,6 @@ use OCP\Share\IShare; use Test\TestCase; class RemotePluginTest extends TestCase { - /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */ protected $userManager; diff --git a/tests/lib/Collaboration/Resources/ManagerTest.php b/tests/lib/Collaboration/Resources/ManagerTest.php index 01a39660a7c..80b1ac464a6 100644 --- a/tests/lib/Collaboration/Resources/ManagerTest.php +++ b/tests/lib/Collaboration/Resources/ManagerTest.php @@ -31,7 +31,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var LoggerInterface */ protected $logger; /** @var IProviderManager */ diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php index 8f408418409..6c66422c9d3 100644 --- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php +++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php @@ -32,7 +32,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ProviderManagerTest extends TestCase { - /** @var IServerContainer */ protected $serverContainer; /** @var LoggerInterface */ diff --git a/tests/lib/Comments/CommentTest.php b/tests/lib/Comments/CommentTest.php index 28e38d7b143..328e6fd5447 100644 --- a/tests/lib/Comments/CommentTest.php +++ b/tests/lib/Comments/CommentTest.php @@ -7,7 +7,6 @@ use OCP\Comments\IComment; use Test\TestCase; class CommentTest extends TestCase { - /** * @throws \OCP\Comments\IllegalIDChangeException */ diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php index 2543746ddb5..549bfd8670d 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ActionProviderStoreTest extends TestCase { - /** @var IServerContainer|MockObject */ private $serverContainer; diff --git a/tests/lib/Contacts/ContactsMenu/ManagerTest.php b/tests/lib/Contacts/ContactsMenu/ManagerTest.php index ecd925faffa..eb776a6e39d 100644 --- a/tests/lib/Contacts/ContactsMenu/ManagerTest.php +++ b/tests/lib/Contacts/ContactsMenu/ManagerTest.php @@ -37,7 +37,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ManagerTest extends TestCase { - /** @var ContactsStore|MockObject */ private $contactsStore; diff --git a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php index 39deeeaecc9..e9eb41ad397 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php @@ -33,7 +33,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class EMailproviderTest extends TestCase { - /** @var IActionFactory|MockObject */ private $actionFactory; diff --git a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php index b87b4047071..96fb7909d6b 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/LocalTimeProviderTest.php @@ -42,7 +42,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class LocalTimeProviderTest extends TestCase { - /** @var IActionFactory|MockObject */ private $actionFactory; /** @var IL10N|MockObject */ diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php index c02a95a4162..d15cd74bef8 100644 --- a/tests/lib/ContactsManagerTest.php +++ b/tests/lib/ContactsManagerTest.php @@ -5,7 +5,6 @@ namespace Test; use OCP\IAddressBook; class ContactsManagerTest extends \Test\TestCase { - /** @var \OC\ContactsManager */ private $cm; diff --git a/tests/lib/DB/Exception/DbalExceptionTest.php b/tests/lib/DB/Exception/DbalExceptionTest.php index 0cb8ebf046c..da57264aa76 100644 --- a/tests/lib/DB/Exception/DbalExceptionTest.php +++ b/tests/lib/DB/Exception/DbalExceptionTest.php @@ -39,7 +39,6 @@ use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OC\DB\Exceptions\DbalException; class DbalExceptionTest extends \Test\TestCase { - /** @var TheDriverException */ protected $driverException; diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/lib/Diagnostics/EventLoggerTest.php index 4e24c24f225..18cd3a91b1a 100644 --- a/tests/lib/Diagnostics/EventLoggerTest.php +++ b/tests/lib/Diagnostics/EventLoggerTest.php @@ -28,7 +28,6 @@ use OC\SystemConfig; use Test\TestCase; class EventLoggerTest extends TestCase { - /** @var \OC\Diagnostics\EventLogger */ private $logger; diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/lib/Diagnostics/QueryLoggerTest.php index 50d62d3d0e6..9a614a4c441 100644 --- a/tests/lib/Diagnostics/QueryLoggerTest.php +++ b/tests/lib/Diagnostics/QueryLoggerTest.php @@ -25,7 +25,6 @@ use OC\Diagnostics\QueryLogger; use Test\TestCase; class QueryLoggerTest extends TestCase { - /** @var \OC\Diagnostics\QueryLogger */ private $logger; diff --git a/tests/lib/EmojiHelperTest.php b/tests/lib/EmojiHelperTest.php index 19197bce360..dba7e631e6f 100644 --- a/tests/lib/EmojiHelperTest.php +++ b/tests/lib/EmojiHelperTest.php @@ -29,7 +29,6 @@ use OCP\IDBConnection; use OCP\IEmojiHelper; class EmojiHelperTest extends TestCase { - /** @var IDBConnection|\PHPUnit\Framework\MockObject\MockObject */ private $db; diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 92ed2dcd701..f33f88eb214 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -43,7 +43,6 @@ use Test\TestCase; * @package Test\Encryption */ class DecryptAllTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | IUserManager */ protected $userManager; @@ -201,7 +200,6 @@ class DecryptAllTest extends TestCase { * @dataProvider dataTestDecryptAllUsersFiles */ public function testDecryptAllUsersFiles($user) { - /** @var DecryptAll | \PHPUnit\Framework\MockObject\MockObject | $instance */ $instance = $this->getMockBuilder('OC\Encryption\DecryptAll') ->setConstructorArgs( diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index 5d707ca6ec6..8c357e2a50d 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -29,7 +29,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class EncryptionWrapperTest extends TestCase { - /** @var EncryptionWrapper */ private $instance; diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index 00448db87d6..79d2c216080 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -13,7 +13,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var Manager */ private $manager; diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php index ca1d5493993..df7d137f0b6 100644 --- a/tests/lib/Encryption/UpdateTest.php +++ b/tests/lib/Encryption/UpdateTest.php @@ -31,7 +31,6 @@ use OC\Encryption\File; use OCP\Encryption\IEncryptionModule; class UpdateTest extends TestCase { - /** @var \OC\Encryption\Update */ private $update; diff --git a/tests/lib/ErrorHandlerTest.php b/tests/lib/ErrorHandlerTest.php index f6bf850f0b5..468273c4dea 100644 --- a/tests/lib/ErrorHandlerTest.php +++ b/tests/lib/ErrorHandlerTest.php @@ -31,7 +31,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class ErrorHandlerTest extends TestCase { - /** @var MockObject */ private LoggerInterface $logger; diff --git a/tests/lib/EventDispatcher/SymfonyAdapterTest.php b/tests/lib/EventDispatcher/SymfonyAdapterTest.php index 785b4bfdfcb..1b770c94e56 100644 --- a/tests/lib/EventDispatcher/SymfonyAdapterTest.php +++ b/tests/lib/EventDispatcher/SymfonyAdapterTest.php @@ -39,7 +39,6 @@ use Symfony\Component\EventDispatcher\GenericEvent as SymfonyGenericEvent; use Test\TestCase; class SymfonyAdapterTest extends TestCase { - /** @var EventDispatcher|MockObject */ private $eventDispatcher; diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index 42115c1c477..509b9d6ba2a 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -16,7 +16,6 @@ namespace Test\Files\Cache; * @package Test\Files\Cache */ class WatcherTest extends \Test\TestCase { - /** * @var \OC\Files\Storage\Storage[] $storages */ diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php index 7ce87140122..e53069ee2b8 100644 --- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php @@ -8,7 +8,6 @@ use OCP\IConfig; use OCP\IUser; class ObjectHomeMountProviderTest extends \Test\TestCase { - /** @var ObjectHomeMountProvider */ protected $provider; diff --git a/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php b/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php index ef2ede729ce..da9ba8bacaf 100644 --- a/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectStorePreviewCacheMountProviderTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; * The DB permission is needed for the fake root storage initialization */ class ObjectStorePreviewCacheMountProviderTest extends \Test\TestCase { - /** @var ObjectStorePreviewCacheMountProvider */ protected $provider; diff --git a/tests/lib/Files/ObjectStore/MapperTest.php b/tests/lib/Files/ObjectStore/MapperTest.php index d8427f993fe..dbe5fe5d32f 100644 --- a/tests/lib/Files/ObjectStore/MapperTest.php +++ b/tests/lib/Files/ObjectStore/MapperTest.php @@ -26,7 +26,6 @@ use OCP\IConfig; use OCP\IUser; class MapperTest extends \Test\TestCase { - /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */ private $user; diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTest.php b/tests/lib/Files/ObjectStore/ObjectStoreTest.php index 2333168d838..c5580e4a2bf 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreTest.php @@ -25,7 +25,6 @@ namespace Test\Files\ObjectStore; use Test\TestCase; abstract class ObjectStoreTest extends TestCase { - /** @var string[] */ private $cleanup = []; diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php index 3570acfaab4..ededab14d0b 100644 --- a/tests/lib/Files/PathVerificationTest.php +++ b/tests/lib/Files/PathVerificationTest.php @@ -19,7 +19,6 @@ use OCP\Files\InvalidPathException; * @package Test\Files */ class PathVerificationTest extends \Test\TestCase { - /** * @var \OC\Files\View */ diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php index f36958ad552..7d5d7d31808 100644 --- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php +++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php @@ -27,7 +27,6 @@ use OC\Files\Storage\Wrapper\Availability; use OCP\Files\StorageNotAvailableException; class AvailabilityTest extends \Test\TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject|StorageCache */ protected $storageCache; /** @var \PHPUnit\Framework\MockObject\MockObject|Temporary */ diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php index ebb97a25c77..ae776e40666 100644 --- a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php +++ b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php @@ -24,7 +24,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\Files\Storage\Storage; class EncryptionTest extends Storage { - /** * block size will always be 8192 for a PHP stream * @see https://bugs.php.net/bug.php?id=21641 @@ -497,13 +496,13 @@ class EncryptionTest extends Storage { $this->encryptionManager->expects($this->any())->method('isEnabled')->willReturn($encryptionEnabled); $encryptionStorage = new \OC\Files\Storage\Wrapper\Encryption( - [ - 'storage' => $sourceStorage, - 'root' => 'foo', - 'mountPoint' => '/mountPoint', - 'mount' => $this->mount - ], - $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update + [ + 'storage' => $sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/mountPoint', + 'mount' => $this->mount + ], + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update ); @@ -712,15 +711,15 @@ class EncryptionTest extends Storage { */ public function testParseRawHeader($rawHeader, $expected) { $instance = new \OC\Files\Storage\Wrapper\Encryption( - [ - 'storage' => $this->sourceStorage, - 'root' => 'foo', - 'mountPoint' => '/', - 'mount' => $this->mount - ], - $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache + [ + 'storage' => $this->sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/', + 'mount' => $this->mount + ], + $this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager, $this->arrayCache - ); + ); $result = $this->invokePrivate($instance, 'parseRawHeader', [$rawHeader]); $this->assertSameSize($expected, $result); diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php index 6c8905af765..148bd3a4f30 100644 --- a/tests/lib/Files/Storage/Wrapper/JailTest.php +++ b/tests/lib/Files/Storage/Wrapper/JailTest.php @@ -9,7 +9,6 @@ namespace Test\Files\Storage\Wrapper; class JailTest extends \Test\Files\Storage\Storage { - /** * @var \OC\Files\Storage\Temporary */ diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php index 1e69ee7165e..ea01a0e3e94 100644 --- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php +++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php @@ -16,7 +16,6 @@ use OCP\Files\Cache\IScanner; * @group DB */ class PermissionsMaskTest extends \Test\Files\Storage\Storage { - /** * @var \OC\Files\Storage\Temporary */ diff --git a/tests/lib/Files/Stream/DummyEncryptionWrapper.php b/tests/lib/Files/Stream/DummyEncryptionWrapper.php index e66fae3d15d..223e8256cd2 100644 --- a/tests/lib/Files/Stream/DummyEncryptionWrapper.php +++ b/tests/lib/Files/Stream/DummyEncryptionWrapper.php @@ -22,7 +22,6 @@ namespace Test\Files\Stream; class DummyEncryptionWrapper extends \OC\Files\Stream\Encryption { - /** * simulate a non-seekable stream wrapper by always return false * diff --git a/tests/lib/Files/Stream/EncryptionTest.php b/tests/lib/Files/Stream/EncryptionTest.php index 79a845fe7a6..67311e886e8 100644 --- a/tests/lib/Files/Stream/EncryptionTest.php +++ b/tests/lib/Files/Stream/EncryptionTest.php @@ -87,7 +87,6 @@ class EncryptionTest extends \Test\TestCase { $expectedSize, $expectedUnencryptedSize, $expectedReadOnly) { - // build mocks $encryptionModuleMock = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Files/Stream/QuotaTest.php b/tests/lib/Files/Stream/QuotaTest.php index 24b0e7f9474..69cd322a2b3 100644 --- a/tests/lib/Files/Stream/QuotaTest.php +++ b/tests/lib/Files/Stream/QuotaTest.php @@ -9,7 +9,6 @@ namespace Test\Files\Stream; class QuotaTest extends \Test\TestCase { - /** * @param string $mode * @param integer $limit diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index 5689fd0fb1f..e67cb392d64 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -26,7 +26,6 @@ use OCP\IConfig; use Test\TestCase; class ConfigTest extends TestCase { - /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php index b85496620b8..60f15a65732 100644 --- a/tests/lib/Group/GroupTest.php +++ b/tests/lib/Group/GroupTest.php @@ -15,7 +15,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class GroupTest extends \Test\TestCase { - /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 65210bcc0f7..5e29f974706 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -559,7 +559,7 @@ class ManagerTest extends TestCase { case 'user33': return true; default: return null; - } + } }); $this->userManager->expects($this->any()) @@ -611,14 +611,14 @@ class ManagerTest extends TestCase { ->method('inGroup') ->willReturnCallback(function ($uid, $gid) { switch ($uid) { - case 'user1': return false; - case 'user2': return true; - case 'user3': return false; - case 'user33': return true; - case 'user333': return true; - default: - return null; - } + case 'user1': return false; + case 'user2': return true; + case 'user3': return false; + case 'user33': return true; + case 'user333': return true; + default: + return null; + } }); $this->userManager->expects($this->any()) @@ -672,14 +672,14 @@ class ManagerTest extends TestCase { ->method('inGroup') ->willReturnCallback(function ($uid) { switch ($uid) { - case 'user1': return false; - case 'user2': return true; - case 'user3': return false; - case 'user33': return true; - case 'user333': return true; - default: - return null; - } + case 'user1': return false; + case 'user2': return true; + case 'user3': return false; + case 'user33': return true; + case 'user333': return true; + default: + return null; + } }); $this->userManager->expects($this->any()) diff --git a/tests/lib/Http/WellKnown/RequestManagerTest.php b/tests/lib/Http/WellKnown/RequestManagerTest.php index 1fa92804cfa..d3fd487aa60 100644 --- a/tests/lib/Http/WellKnown/RequestManagerTest.php +++ b/tests/lib/Http/WellKnown/RequestManagerTest.php @@ -43,7 +43,6 @@ use Test\TestCase; use function get_class; class RequestManagerTest extends TestCase { - /** @var Coordinator|MockObject */ private $coordinator; diff --git a/tests/lib/InitialStateServiceTest.php b/tests/lib/InitialStateServiceTest.php index db4c98b20cf..f4decb43e1e 100644 --- a/tests/lib/InitialStateServiceTest.php +++ b/tests/lib/InitialStateServiceTest.php @@ -34,7 +34,6 @@ use OC\InitialStateService; use stdClass; class InitialStateServiceTest extends TestCase { - /** @var InitialStateService */ private $service; diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index 37f6885c0ac..62938ad6c1b 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -139,13 +139,13 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - $this->equalTo(\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'), - $this->callback(function ($signature) use ($expectedSignatureFileData) { - $expectedArray = json_decode($expectedSignatureFileData, true); - $actualArray = json_decode($signature, true); - $this->assertEquals($expectedArray, $actualArray); - return true; - }) + $this->equalTo(\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'), + $this->callback(function ($signature) use ($expectedSignatureFileData) { + $expectedArray = json_decode($expectedSignatureFileData, true); + $actualArray = json_decode($signature, true); + $this->assertEquals($expectedArray, $actualArray); + return true; + }) ); $keyBundle = file_get_contents(__DIR__ .'/../../data/integritycheck/SomeApp.crt'); @@ -529,13 +529,13 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', - $this->callback(function ($signature) use ($expectedSignatureFileData) { - $expectedArray = json_decode($expectedSignatureFileData, true); - $actualArray = json_decode($signature, true); - $this->assertEquals($expectedArray, $actualArray); - return true; - }) + \OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', + $this->callback(function ($signature) use ($expectedSignatureFileData) { + $expectedArray = json_decode($expectedSignatureFileData, true); + $actualArray = json_decode($signature, true); + $this->assertEquals($expectedArray, $actualArray); + return true; + }) ); $keyBundle = file_get_contents(__DIR__ .'/../../data/integritycheck/core.crt'); @@ -564,7 +564,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified//core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified//core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); @@ -594,7 +594,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); @@ -629,7 +629,7 @@ class CheckerTest extends TestCase { ->expects($this->once()) ->method('file_put_contents') ->with( - \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', + \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', $this->callback(function ($signature) use ($expectedSignatureFileData) { $expectedArray = json_decode($expectedSignatureFileData, true); $actualArray = json_decode($signature, true); diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index 7af069cbff3..0b536971e90 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -23,7 +23,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class FactoryTest extends TestCase { - /** @var IConfig|MockObject */ protected $config; diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php index 4a253940931..08380dd50c9 100644 --- a/tests/lib/LegacyHelperTest.php +++ b/tests/lib/LegacyHelperTest.php @@ -112,9 +112,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - // Conflict on filename.ext - ['dir/filename.ext'], - ['dir/filename (2).ext'], + // Conflict on filename.ext + ['dir/filename.ext'], + ['dir/filename (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock)); @@ -123,9 +123,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename.ext'], - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], + ['dir/filename.ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock)); @@ -134,8 +134,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename (1).ext'], - ['dir/filename (2).ext'], + ['dir/filename (1).ext'], + ['dir/filename (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (1).ext', $viewMock)); @@ -144,8 +144,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock)); @@ -154,9 +154,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename (2).ext'], - ['dir/filename (3).ext'], - ['dir/filename (4).ext'], + ['dir/filename (2).ext'], + ['dir/filename (3).ext'], + ['dir/filename (4).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock)); @@ -165,8 +165,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1).ext'], - ['dir/filename(2).ext'], + ['dir/filename(1).ext'], + ['dir/filename(2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1).ext', $viewMock)); @@ -175,8 +175,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (1).ext'], - ['dir/filename(1) (2).ext'], + ['dir/filename(1) (1).ext'], + ['dir/filename(1) (2).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(1) (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock)); @@ -185,9 +185,9 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(3)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (1).ext'], - ['dir/filename(1) (2).ext'], - ['dir/filename(1) (3).ext'], + ['dir/filename(1) (1).ext'], + ['dir/filename(1) (2).ext'], + ['dir/filename(1) (3).ext'], ) ->will($this->onConsecutiveCalls(true, true, false)); $this->assertEquals('dir/filename(1) (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock)); @@ -196,8 +196,8 @@ class LegacyHelperTest extends \Test\TestCase { $viewMock->expects($this->exactly(2)) ->method('file_exists') ->withConsecutive( - ['dir/filename(1) (2) (3).ext'], - ['dir/filename(1) (2) (4).ext'], + ['dir/filename(1) (2) (3).ext'], + ['dir/filename(1) (2) (4).ext'], ) ->will($this->onConsecutiveCalls(true, false)); $this->assertEquals('dir/filename(1) (2) (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (2) (3).ext', $viewMock)); diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/lib/Lock/MemcacheLockingProviderTest.php index 7b7c649c886..b67be799d59 100644 --- a/tests/lib/Lock/MemcacheLockingProviderTest.php +++ b/tests/lib/Lock/MemcacheLockingProviderTest.php @@ -24,7 +24,6 @@ namespace Test\Lock; use OC\Memcache\ArrayCache; class MemcacheLockingProviderTest extends LockingProvider { - /** * @var \OCP\IMemcache */ diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/lib/Lockdown/Filesystem/NullCacheTest.php index 67d44c430f5..0f979350bac 100644 --- a/tests/lib/Lockdown/Filesystem/NullCacheTest.php +++ b/tests/lib/Lockdown/Filesystem/NullCacheTest.php @@ -30,7 +30,6 @@ use OCP\Files\Cache\ICache; use OCP\Files\FileInfo; class NulLCacheTest extends \Test\TestCase { - /** @var NullCache */ private $cache; diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index c0349814570..b46066ac536 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -32,7 +32,6 @@ use OCP\Files\Storage; use Test\TestCase; class NullStorageTest extends TestCase { - /** @var NullStorage */ private $storage; diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php index bec2119a8ad..367c34752c1 100644 --- a/tests/lib/LoggerTest.php +++ b/tests/lib/LoggerTest.php @@ -19,7 +19,6 @@ use OCP\Support\CrashReport\IRegistry; use PHPUnit\Framework\MockObject\MockObject; class LoggerTest extends TestCase implements IWriter { - /** @var SystemConfig|MockObject */ private $config; diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index e14b3179b27..2e68924a96d 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class TestRepairStep implements IRepairStep { - /** * Returns the step's name * @@ -58,7 +57,6 @@ class TestRepairStep implements IRepairStep { } class BackgroundRepairTest extends TestCase { - /** @var JobList|MockObject */ private $jobList; diff --git a/tests/lib/NaturalSortTest.php b/tests/lib/NaturalSortTest.php index f8e7f31a285..9474d5c077c 100644 --- a/tests/lib/NaturalSortTest.php +++ b/tests/lib/NaturalSortTest.php @@ -9,7 +9,6 @@ namespace Test; class NaturalSortTest extends \Test\TestCase { - /** * @dataProvider naturalSortDataProvider */ diff --git a/tests/lib/Notification/DummyApp.php b/tests/lib/Notification/DummyApp.php index b1281f6b7a0..564a1ff7d54 100644 --- a/tests/lib/Notification/DummyApp.php +++ b/tests/lib/Notification/DummyApp.php @@ -27,7 +27,6 @@ use OCP\Notification\IApp; use OCP\Notification\INotification; class DummyApp implements IApp { - /** * @param INotification $notification * @throws \InvalidArgumentException When the notification is not valid diff --git a/tests/lib/Notification/DummyNotifier.php b/tests/lib/Notification/DummyNotifier.php index 92c1ddfb310..2df97a9057d 100644 --- a/tests/lib/Notification/DummyNotifier.php +++ b/tests/lib/Notification/DummyNotifier.php @@ -28,7 +28,6 @@ use OCP\Notification\INotification; use OCP\Notification\INotifier; class DummyNotifier implements INotifier { - /** * Identifier of the notifier, only use [a-z0-9_] * diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index 195dac697e5..da3897163cb 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -28,7 +28,6 @@ use OCP\OCS\IDiscoveryService; use Test\TestCase; class DiscoveryServiceTest extends TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject | ICacheFactory */ private $cacheFactory; diff --git a/tests/lib/OCS/MapStatusCodeTest.php b/tests/lib/OCS/MapStatusCodeTest.php index 27ebfe209f7..3022323870a 100644 --- a/tests/lib/OCS/MapStatusCodeTest.php +++ b/tests/lib/OCS/MapStatusCodeTest.php @@ -24,7 +24,6 @@ namespace Test\OCS; use OCP\AppFramework\Http; class MapStatusCodeTest extends \Test\TestCase { - /** * @dataProvider providesStatusCodes */ diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index b673100be9e..1f6f43dce1e 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -39,7 +39,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class GeneratorTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php index 90287116512..a2e5170c82c 100644 --- a/tests/lib/Preview/Provider.php +++ b/tests/lib/Preview/Provider.php @@ -24,7 +24,6 @@ namespace Test\Preview; use OC\Files\Node\File; abstract class Provider extends \Test\TestCase { - /** @var string */ protected $imgPath; /** @var int */ diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/lib/Repair/CleanTagsTest.php index 3f3ac0bf18d..9fc3ef17150 100644 --- a/tests/lib/Repair/CleanTagsTest.php +++ b/tests/lib/Repair/CleanTagsTest.php @@ -20,7 +20,6 @@ use OCP\Migration\IOutput; * @see \OC\Repair\CleanTags */ class CleanTagsTest extends \Test\TestCase { - /** @var \OC\Repair\CleanTags */ protected $repair; diff --git a/tests/lib/Repair/ClearFrontendCachesTest.php b/tests/lib/Repair/ClearFrontendCachesTest.php index 09b96be7de3..0050f0e2340 100644 --- a/tests/lib/Repair/ClearFrontendCachesTest.php +++ b/tests/lib/Repair/ClearFrontendCachesTest.php @@ -29,7 +29,6 @@ use OCP\ICacheFactory; use OCP\Migration\IOutput; class ClearFrontendCachesTest extends \Test\TestCase { - /** @var ICacheFactory */ private $cacheFactory; diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index 71842547462..7aa7831e44e 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -30,7 +30,6 @@ use OCP\IConfig; use OCP\Migration\IOutput; class ClearGeneratedAvatarCacheTest extends \Test\TestCase { - /** @var AvatarManager */ private $avatarManager; diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index 33c3fc1da11..843cc31392c 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -36,7 +36,6 @@ use Test\TestCase; * @group DB */ class FixMountStoragesTest extends TestCase { - /** @var IDBConnection */ private $db; diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/lib/Repair/OldGroupMembershipSharesTest.php index adfba4a1ce7..7ebc12732d6 100644 --- a/tests/lib/Repair/OldGroupMembershipSharesTest.php +++ b/tests/lib/Repair/OldGroupMembershipSharesTest.php @@ -20,7 +20,6 @@ use OCP\Share\IShare; * @package Test\Repair */ class OldGroupMembershipSharesTest extends \Test\TestCase { - /** @var OldGroupMembershipShares */ protected $repair; diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php index 27d146fab43..902ddcd4539 100644 --- a/tests/lib/Repair/RepairCollationTest.php +++ b/tests/lib/Repair/RepairCollationTest.php @@ -33,7 +33,6 @@ class TestCollationRepair extends Collation { * @see \OC\Repair\RepairMimeTypes */ class RepairCollationTest extends TestCase { - /** * @var TestCollationRepair */ diff --git a/tests/lib/Repair/RepairDavSharesTest.php b/tests/lib/Repair/RepairDavSharesTest.php index f937a01f839..5eeafd7bf9f 100644 --- a/tests/lib/Repair/RepairDavSharesTest.php +++ b/tests/lib/Repair/RepairDavSharesTest.php @@ -38,7 +38,6 @@ use OCP\Migration\IOutput; use function in_array; class RepairDavSharesTest extends TestCase { - /** @var IOutput|\PHPUnit\Framework\MockObject\MockObject */ protected $output; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 64ae6322657..f93940cc3ed 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -23,7 +23,6 @@ use Test\TestCase; * @see \OC\Repair\RepairInvalidShares */ class RepairInvalidSharesTest extends TestCase { - /** @var IRepairStep */ private $repair; diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index 53c8e53d486..176bc0ec102 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -23,7 +23,6 @@ use OCP\Migration\IRepairStep; * @see \OC\Repair\RepairMimeTypes */ class RepairMimeTypesTest extends \Test\TestCase { - /** @var IRepairStep */ private $repair; diff --git a/tests/lib/Repair/RepairSqliteAutoincrementTest.php b/tests/lib/Repair/RepairSqliteAutoincrementTest.php index c03eb12b894..5b3a388dea3 100644 --- a/tests/lib/Repair/RepairSqliteAutoincrementTest.php +++ b/tests/lib/Repair/RepairSqliteAutoincrementTest.php @@ -17,7 +17,6 @@ use OCP\Migration\IOutput; * @group DB */ class RepairSqliteAutoincrementTest extends \Test\TestCase { - /** * @var \OC\Repair\SqliteAutoincrement */ diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index 5d3fd602fb2..2c430fc1273 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -27,7 +27,6 @@ namespace Test\Security; use OC\Security\Certificate; class CertificateTest extends \Test\TestCase { - /** @var Certificate That contains a valid certificate */ protected $goodCertificate; /** @var Certificate That contains an invalid certificate */ diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php index f81db330640..6f535c84275 100644 --- a/tests/lib/Security/CredentialsManagerTest.php +++ b/tests/lib/Security/CredentialsManagerTest.php @@ -28,7 +28,6 @@ namespace Test\Security; * @group DB */ class CredentialsManagerTest extends \Test\TestCase { - /** * @dataProvider credentialsProvider */ diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php index a81f98533ce..37e2adcc13c 100644 --- a/tests/lib/Security/HasherTest.php +++ b/tests/lib/Security/HasherTest.php @@ -18,7 +18,6 @@ use OCP\IConfig; * Class HasherTest */ class HasherTest extends \Test\TestCase { - /** * @return array */ diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index f9abf84071d..36b7ef97bb6 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -35,7 +35,6 @@ use OCP\IUserManager; use Test\TestCase; class SignerTest extends TestCase { - /** @var string */ private $private = '-----BEGIN PRIVATE KEY----- MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDImc6QvHBjBIoo diff --git a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php index 73cbbd7b0e8..3cf99161b77 100644 --- a/tests/lib/Security/RemoteHostValidatorIntegrationTest.php +++ b/tests/lib/Security/RemoteHostValidatorIntegrationTest.php @@ -35,7 +35,6 @@ use Psr\Log\NullLogger; use Test\TestCase; class RemoteHostValidatorIntegrationTest extends TestCase { - /** @var IConfig|IConfig&MockObject|MockObject */ private IConfig $config; private RemoteHostValidator $validator; diff --git a/tests/lib/Security/RemoteHostValidatorTest.php b/tests/lib/Security/RemoteHostValidatorTest.php index acaa7a4be30..030a75b1e79 100644 --- a/tests/lib/Security/RemoteHostValidatorTest.php +++ b/tests/lib/Security/RemoteHostValidatorTest.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RemoteHostValidatorTest extends TestCase { - /** @var IConfig|IConfig&MockObject|MockObject */ private IConfig $config; /** @var HostnameClassifier|HostnameClassifier&MockObject|MockObject */ diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 004fc9c866b..eacc165650c 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -19,7 +19,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; class SetupTest extends \Test\TestCase { - /** @var SystemConfig|MockObject */ protected $config; /** @var \bantu\IniGetWrapper\IniGetWrapper|MockObject */ diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index d7b5dbc9b74..0a6f106a5db 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -49,7 +49,6 @@ use PHPUnit\Framework\MockObject\MockObject; * @group DB */ class DefaultShareProviderTest extends \Test\TestCase { - /** @var IDBConnection */ protected $dbConn; diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php index 5afee588c34..c7ea141eaf8 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -34,7 +34,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; use Test\TestCase; class LegacyHooksTest extends TestCase { - /** @var LegacyHooks */ private $hooks; diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index a7bb6cbcefc..36680b7b926 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -70,7 +70,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; * @group DB */ class ManagerTest extends \Test\TestCase { - /** @var Manager */ protected $manager; /** @var LoggerInterface|MockObject */ @@ -552,7 +551,7 @@ class ManagerTest extends \Test\TestCase { /** @var ValidatePasswordPolicyEvent $event */ $this->assertSame('password', $event->getPassword()); } - ); + ); $result = self::invokePrivate($this->manager, 'verifyPassword', ['password']); $this->assertNull($result); @@ -575,7 +574,7 @@ class ManagerTest extends \Test\TestCase { $this->assertSame('password', $event->getPassword()); throw new HintException('message', 'password not accepted'); } - ); + ); self::invokePrivate($this->manager, 'verifyPassword', ['password']); } @@ -4639,7 +4638,6 @@ class ManagerTest extends \Test\TestCase { } class DummyFactory implements IProviderFactory { - /** @var IShareProvider */ protected $provider; diff --git a/tests/lib/Share20/ShareByMailProviderTest.php b/tests/lib/Share20/ShareByMailProviderTest.php index 3558be93a8b..5116dfe9e58 100644 --- a/tests/lib/Share20/ShareByMailProviderTest.php +++ b/tests/lib/Share20/ShareByMailProviderTest.php @@ -52,7 +52,6 @@ use Test\TestCase; * @group DB */ class ShareByMailProviderTest extends TestCase { - /** @var IDBConnection */ protected $dbConn; diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index b3e76735aaa..857810e7881 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -30,7 +30,6 @@ use OCP\Share\IManager; use Test\TestCase; class ShareHelperTest extends TestCase { - /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ private $manager; diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 907abf4b7d8..647141a73f7 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -29,7 +29,6 @@ use OCP\Group\Events\SubAdminRemovedEvent; * @group DB */ class SubAdminTest extends \Test\TestCase { - /** @var \OCP\IUserManager */ private $userManager; diff --git a/tests/lib/Support/CrashReport/RegistryTest.php b/tests/lib/Support/CrashReport/RegistryTest.php index f88902d7065..9424738cd70 100644 --- a/tests/lib/Support/CrashReport/RegistryTest.php +++ b/tests/lib/Support/CrashReport/RegistryTest.php @@ -36,7 +36,6 @@ use OCP\Support\CrashReport\IReporter; use Test\TestCase; class RegistryTest extends TestCase { - /** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */ private $serverContainer; diff --git a/tests/lib/Support/Subscription/DummySubscription.php b/tests/lib/Support/Subscription/DummySubscription.php index f4e7e3484bb..dfbee2e9a5e 100644 --- a/tests/lib/Support/Subscription/DummySubscription.php +++ b/tests/lib/Support/Subscription/DummySubscription.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace Test\Support\Subscription; class DummySubscription implements \OCP\Support\Subscription\ISubscription { - /** @var bool */ private $hasValidSubscription; /** @var bool */ diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php index 260232ac95d..f4a278cca4e 100644 --- a/tests/lib/Support/Subscription/RegistryTest.php +++ b/tests/lib/Support/Subscription/RegistryTest.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; use Test\TestCase; class RegistryTest extends TestCase { - /** @var Registry */ private $registry; diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index 698c2582b83..ef0546dbd88 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -27,7 +27,6 @@ use Test\TestCase; * @package Test\SystemTag */ class SystemTagManagerTest extends TestCase { - /** * @var ISystemTagManager **/ diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index a5158bbee68..c988db69c30 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -28,7 +28,6 @@ use Test\TestCase; * @package Test\SystemTag */ class SystemTagObjectMapperTest extends TestCase { - /** * @var ISystemTagManager **/ diff --git a/tests/lib/TagsTest.php b/tests/lib/TagsTest.php index 2a68dfe3124..28a8d4913f2 100644 --- a/tests/lib/TagsTest.php +++ b/tests/lib/TagsTest.php @@ -208,9 +208,9 @@ class TagsTest extends \Test\TestCase { $conn = \OC::$server->getDatabaseConnection(); $statement = $conn->prepare( - 'INSERT INTO `*PREFIX*vcategory_to_object` ' . - '(`objid`, `categoryid`, `type`) VALUES ' . - '(?, ?, ?)' + 'INSERT INTO `*PREFIX*vcategory_to_object` ' . + '(`objid`, `categoryid`, `type`) VALUES ' . + '(?, ?, ?)' ); // insert lots of entries diff --git a/tests/lib/TempManagerTest.php b/tests/lib/TempManagerTest.php index b85bbc8098b..4b342c365b5 100644 --- a/tests/lib/TempManagerTest.php +++ b/tests/lib/TempManagerTest.php @@ -170,7 +170,7 @@ class TempManagerTest extends \Test\TestCase { $logger = $this->createMock(LoggerInterface::class); $tmpManager = self::invokePrivate( $this->getManager($logger), - 'buildFileNameWithSuffix', + 'buildFileNameWithSuffix', ['/tmp/myTemporaryFile', ''] ); diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 2c98d33d543..1f2342f2b4e 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -435,11 +435,11 @@ var b = \'world\'; ->expects($this->once()) ->method('putContent') ->with($this->callback( - function ($content) { - $deps = json_decode($content, true); - return array_key_exists(__DIR__ . '/data//1.js', $deps) - && array_key_exists(__DIR__ . '/data//2.js', $deps); - })) + function ($content) { + $deps = json_decode($content, true); + return array_key_exists(__DIR__ . '/data//1.js', $deps) + && array_key_exists(__DIR__ . '/data//2.js', $deps); + })) ->willThrowException(new NotPermittedException()); $actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]); diff --git a/tests/lib/TestMoveableMountPoint.php b/tests/lib/TestMoveableMountPoint.php index 262016b76c1..80cc6255071 100644 --- a/tests/lib/TestMoveableMountPoint.php +++ b/tests/lib/TestMoveableMountPoint.php @@ -27,7 +27,6 @@ use OC\Files\Mount; * Test moveable mount for mocking */ class TestMoveableMountPoint extends Mount\MountPoint implements Mount\MoveableMount { - /** * Move the mount point to $target * diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 4c1cd29273f..420b2fe4eb9 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -22,7 +22,6 @@ use OCP\IUserSession; * @package Test */ class UrlGeneratorTest extends \Test\TestCase { - /** @var \PHPUnit\Framework\MockObject\MockObject|IConfig */ private $config; /** @var \PHPUnit\Framework\MockObject\MockObject|IUserSession */ diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index 19013c62be7..cf6f03a5a0d 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -28,7 +28,6 @@ use Test\TestCase; * @package Test\User */ class ManagerTest extends TestCase { - /** @var IConfig */ private $config; /** @var EventDispatcherInterface */ diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index cc65fbf3356..b8fa8efced0 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -33,7 +33,6 @@ use Test\TestCase; * @package Test\User */ class UserTest extends TestCase { - /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; @@ -217,7 +216,6 @@ class UserTest extends TestCase { } public function testDeleteWithDifferentHome() { - /** @var ObjectHomeMountProvider $homeProvider */ $homeProvider = \OC::$server->get(ObjectHomeMountProvider::class); $user = $this->createMock(IUser::class);