diff options
60 files changed, 141 insertions, 133 deletions
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml index 0da8b115dc8..14bce64aabc 100644 --- a/apps/admin_audit/appinfo/info.xml +++ b/apps/admin_audit/appinfo/info.xml @@ -9,7 +9,7 @@ <author>Nextcloud</author> <version>1.1.0</version> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <types> <logging/> diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml index 39584694e23..1c0a38e5668 100644 --- a/apps/comments/appinfo/info.xml +++ b/apps/comments/appinfo/info.xml @@ -8,7 +8,7 @@ <default_enable/> <version>1.1.0</version> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <types> <logging/> diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 4d3b1757284..314391a1448 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -15,7 +15,7 @@ <webdav>appinfo/v1/publicwebdav.php</webdav> </public> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <background-jobs> <job>OCA\DAV\CardDAV\SyncJob</job> diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index f6632b2ae92..0bb3efebf5f 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -25,7 +25,7 @@ </types> <dependencies> <lib>openssl</lib> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <settings> <admin>OCA\Encryption\Settings\Admin</admin> diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml index 984235f0851..6a414496f37 100644 --- a/apps/federatedfilesharing/appinfo/info.xml +++ b/apps/federatedfilesharing/appinfo/info.xml @@ -9,7 +9,7 @@ <namespace>FederatedFileSharing</namespace> <category>other</category> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <settings> <admin>OCA\FederatedFileSharing\Settings\Admin</admin> diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index cec3f8341a9..a5eeb133d9e 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -9,7 +9,7 @@ <namespace>Federation</namespace> <category>other</category> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <default_enable/> <types> diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 37a85f33afc..0bf4388b395 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -11,7 +11,7 @@ <filesystem/> </types> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <documentation> <user>user-files</user> diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index 375d660bf62..c221ba4145f 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -22,7 +22,7 @@ <namespace>Files_External</namespace> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <settings> diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index cc97f65a5e6..65b8d4af5d1 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -15,7 +15,7 @@ Turning the feature off removes shared files and folders on the server for all s <filesystem/> </types> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <public> <files>public.php</files> diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index 2fd88ff7765..04b8a7293cb 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -16,7 +16,7 @@ To prevent a user from running out of disk space, the Deleted files app will not </types> <namespace>Files_Trashbin</namespace> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <documentation> <user>user-trashbin</user> diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index 026ed406d7c..5eb0df91d8d 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/apps/files_versions/appinfo/info.xml @@ -14,7 +14,7 @@ In addition to the expiry of versions, the versions app makes certain never to u </types> <namespace>Files_Versions</namespace> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <documentation> <user>user-versions</user> diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml index 009bdca0c1e..0ebcee9a7f7 100644 --- a/apps/provisioning_api/appinfo/info.xml +++ b/apps/provisioning_api/appinfo/info.xml @@ -23,6 +23,6 @@ <prevent_group_restriction/> </types> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> </info> diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml index f1771fc9551..6c4882d349f 100644 --- a/apps/sharebymail/appinfo/info.xml +++ b/apps/sharebymail/appinfo/info.xml @@ -9,7 +9,7 @@ <namespace>ShareByMail</namespace> <category>other</category> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <default_enable/> </info> diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml index 0a98d7ae680..3ed01d3d8c0 100644 --- a/apps/systemtags/appinfo/info.xml +++ b/apps/systemtags/appinfo/info.xml @@ -9,7 +9,7 @@ <default_enable/> <version>1.1.3</version> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <namespace>SystemTags</namespace> <types> diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml index 0acccf357fb..41b07447d55 100644 --- a/apps/testing/appinfo/info.xml +++ b/apps/testing/appinfo/info.xml @@ -7,6 +7,6 @@ <author>Joas Schilling</author> <version>1.1.0</version> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> </info> diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml index 423d11d2aef..3a8867dc6f4 100644 --- a/apps/theming/appinfo/info.xml +++ b/apps/theming/appinfo/info.xml @@ -10,7 +10,7 @@ <category>other</category> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <types> diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index 7b9ef2d90e4..d5dd3f4db9e 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -14,6 +14,6 @@ </two-factor-providers> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> </info> diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml index 2fe400a3587..4cd84ac827b 100644 --- a/apps/updatenotification/appinfo/info.xml +++ b/apps/updatenotification/appinfo/info.xml @@ -9,7 +9,7 @@ <namespace>UpdateNotification</namespace> <default_enable/> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <background-jobs> diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml index b16824925c0..87eb61a0fba 100644 --- a/apps/user_ldap/appinfo/info.xml +++ b/apps/user_ldap/appinfo/info.xml @@ -18,7 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce </documentation> <dependencies> <lib>ldap</lib> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <namespace>User_LDAP</namespace> diff --git a/apps/workflowengine/appinfo/info.xml b/apps/workflowengine/appinfo/info.xml index aae234cc717..83f4be9e398 100644 --- a/apps/workflowengine/appinfo/info.xml +++ b/apps/workflowengine/appinfo/info.xml @@ -18,7 +18,7 @@ </types> <dependencies> - <owncloud min-version="9.2" max-version="9.2" /> + <nextcloud min-version="11" max-version="11" /> </dependencies> <settings> diff --git a/core/js/files/client.js b/core/js/files/client.js index fdc51c4a197..87559b2084c 100644 --- a/core/js/files/client.js +++ b/core/js/files/client.js @@ -734,7 +734,7 @@ /** * Returns the dav.Client instance used internally * - * @since 9.2 + * @since 11.0.0 * @return {dav.Client} */ getClient: function() { @@ -744,7 +744,7 @@ /** * Returns the user name * - * @since 9.2 + * @since 11.0.0 * @return {String} userName */ getUserName: function() { @@ -754,7 +754,7 @@ /** * Returns the password * - * @since 9.2 + * @since 11.0.0 * @return {String} password */ getPassword: function() { @@ -764,7 +764,7 @@ /** * Returns the base URL * - * @since 9.2 + * @since 11.0.0 * @return {String} base URL */ getBaseUrl: function() { diff --git a/core/js/public/appconfig.js b/core/js/public/appconfig.js index cde2700c86c..de04f334ca8 100644 --- a/core/js/public/appconfig.js +++ b/core/js/public/appconfig.js @@ -20,7 +20,7 @@ /** * @namespace - * @since 9.2.0 + * @since 11.0.0 */ OCP.AppConfig = { /** @@ -46,7 +46,7 @@ OCP.AppConfig = { /** * @param {Object} [options] * @param {function} [options.success] - * @since 9.2.0 + * @since 11.0.0 */ getApps: function(options) { this._call('get', '', options); @@ -57,7 +57,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ getKeys: function(app, options) { this._call('get', '/' + app, options); @@ -70,7 +70,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ getValue: function(app, key, defaultValue, options) { options = options || {}; @@ -88,7 +88,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ setValue: function(app, key, value, options) { options = options || {}; @@ -105,7 +105,7 @@ OCP.AppConfig = { * @param {Object} [options] * @param {function} [options.success] * @param {function} [options.error] - * @since 9.2.0 + * @since 11.0.0 */ deleteKey: function(app, key, options) { this._call('delete', '/' + app + '/' + key, options); diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php index c24b25ff14d..84d87efa3d3 100644 --- a/lib/private/App/DependencyAnalyzer.php +++ b/lib/private/App/DependencyAnalyzer.php @@ -336,13 +336,9 @@ class DependencyAnalyzer { switch ($version) { case '9.1': return '10'; - case '9.2': - return '11'; default: if (strpos($version, '9.1.') === 0) { $version = '10.0.' . substr($version, 4); - } else if (strpos($version, '9.2.') === 0) { - $version = '11.0.' . substr($version, 4); } return $version; } diff --git a/lib/private/AppFramework/Db/Db.php b/lib/private/AppFramework/Db/Db.php index 450549ffdbb..5aacdc517a2 100644 --- a/lib/private/AppFramework/Db/Db.php +++ b/lib/private/AppFramework/Db/Db.php @@ -306,7 +306,7 @@ class Db implements IDb { * Check whether or not the current database support 4byte wide unicode * * @return bool - * @since 9.2.0 + * @since 11.0.0 */ public function supports4ByteText() { return $this->connection->supports4ByteText(); diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index b5f063be323..b9a6103f67f 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -207,7 +207,7 @@ class Comment implements IComment { * returns an array containing mentions that are included in the comment * * @return array each mention provides a 'type' and an 'id', see example below - * @since 9.2.0 + * @since 11.0.0 * * The return array looks like: * [ diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 001f4f9441c..1467fef727b 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -768,7 +768,7 @@ class Manager implements ICommentsManager { * @param string $type * @param \Closure $closure * @throws \OutOfBoundsException - * @since 9.2.0 + * @since 11.0.0 * * Only one resolver shall be registered per type. Otherwise a * \OutOfBoundsException has to thrown. @@ -790,7 +790,7 @@ class Manager implements ICommentsManager { * @param string $id * @return string * @throws \OutOfBoundsException - * @since 9.2.0 + * @since 11.0.0 * * If a provided type was not registered, an \OutOfBoundsException shall * be thrown. It is upon the resolver discretion what to return of the diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 497ff0c8a26..a39dbe3783c 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -412,7 +412,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection { * Check whether or not the current database support 4byte wide unicode * * @return bool - * @since 9.2.0 + * @since 11.0.0 */ public function supports4ByteText() { return ! ($this->getDatabasePlatform() instanceof MySqlPlatform && $this->getParams()['charset'] !== 'utf8mb4'); diff --git a/lib/private/Notification/Notification.php b/lib/private/Notification/Notification.php index ffcb36af6e5..e5a8976f54d 100644 --- a/lib/private/Notification/Notification.php +++ b/lib/private/Notification/Notification.php @@ -289,7 +289,7 @@ class Notification implements INotification { * @param array $parameters * @return $this * @throws \InvalidArgumentException if the subject or parameters are invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setRichSubject($subject, array $parameters = []) { if (!is_string($subject) || $subject === '') { @@ -304,7 +304,7 @@ class Notification implements INotification { /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getRichSubject() { return $this->subjectRich; @@ -312,7 +312,7 @@ class Notification implements INotification { /** * @return array[] - * @since 9.2.0 + * @since 11.0.0 */ public function getRichSubjectParameters() { return $this->subjectRichParameters; @@ -379,7 +379,7 @@ class Notification implements INotification { * @param array $parameters * @return $this * @throws \InvalidArgumentException if the message or parameters are invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setRichMessage($message, array $parameters = []) { if (!is_string($message) || $message === '') { @@ -394,7 +394,7 @@ class Notification implements INotification { /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getRichMessage() { return $this->messageRich; @@ -402,7 +402,7 @@ class Notification implements INotification { /** * @return array[] - * @since 9.2.0 + * @since 11.0.0 */ public function getRichMessageParameters() { return $this->messageRichParameters; @@ -434,7 +434,7 @@ class Notification implements INotification { * @param string $icon * @return $this * @throws \InvalidArgumentException if the icon is invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setIcon($icon) { if (!is_string($icon) || $icon === '' || isset($icon[4000])) { @@ -446,7 +446,7 @@ class Notification implements INotification { /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getIcon() { return $this->icon; diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index a2ef9659b3b..600557da5a0 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -155,7 +155,7 @@ class PreviewManager implements IPreview { * @param string $mimeType * @return ISimpleFile * @throws NotFoundException - * @since 9.2.0 + * @since 11.0.0 */ public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) { if ($this->generator === null) { diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php index 11d17fef645..d90a6780ea8 100644 --- a/lib/private/RichObjectStrings/Validator.php +++ b/lib/private/RichObjectStrings/Validator.php @@ -30,7 +30,7 @@ use OCP\RichObjectStrings\IValidator; * Class Validator * * @package OCP\RichObjectStrings - * @since 9.2.0 + * @since 11.0.0 */ class Validator implements IValidator { @@ -53,7 +53,7 @@ class Validator implements IValidator { * @param string $subject * @param array[] $parameters * @throws InvalidObjectExeption - * @since 9.2.0 + * @since 11.0.0 */ public function validate($subject, array $parameters) { $matches = []; diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 43e09cdabcf..3d016700ee3 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -375,7 +375,7 @@ class Manager extends PublicEmitter implements IUserManager { * returns how many users have logged in once * * @return int - * @since 9.2.0 + * @since 11.0.0 */ public function countSeenUsers() { $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); @@ -395,7 +395,7 @@ class Manager extends PublicEmitter implements IUserManager { /** * @param \Closure $callback - * @since 9.2.0 + * @since 11.0.0 */ public function callForSeenUsers(\Closure $callback) { $limit = 1000; diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php index ae4ceef1923..90ba47a2f3f 100644 --- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php @@ -88,7 +88,7 @@ class EmptyContentSecurityPolicy { * * @param string $nonce * @return $this - * @since 9.2.0 + * @since 11.0.0 */ public function useJsNonce($nonce) { $this->useJsNonce = $nonce; diff --git a/lib/public/AppFramework/Http/FileDisplayResponse.php b/lib/public/AppFramework/Http/FileDisplayResponse.php index 03a6fbec2dd..ab23701f893 100644 --- a/lib/public/AppFramework/Http/FileDisplayResponse.php +++ b/lib/public/AppFramework/Http/FileDisplayResponse.php @@ -28,7 +28,7 @@ use OCP\AppFramework\Http; * Class FileDisplayResponse * * @package OCP\AppFramework\Http - * @since 9.2.0 + * @since 11.0.0 */ class FileDisplayResponse extends Response implements ICallbackResponse { @@ -41,7 +41,7 @@ class FileDisplayResponse extends Response implements ICallbackResponse { * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file * @param int $statusCode * @param array $headers - * @since 9.2.0 + * @since 11.0.0 */ public function __construct($file, $statusCode=Http::STATUS_OK, $headers=[]) { @@ -58,7 +58,7 @@ class FileDisplayResponse extends Response implements ICallbackResponse { /** * @param IOutput $output - * @since 9.2.0 + * @since 11.0.0 */ public function callback(IOutput $output) { if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index 9b3b12e2b94..700d9ea1a22 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -76,7 +76,7 @@ abstract class OCSController extends ApiController { /** * @param int $version - * @since 9.2.0 + * @since 11.0.0 * @internal */ public function setOCSVersion($version) { diff --git a/lib/public/Comments/IComment.php b/lib/public/Comments/IComment.php index 8210d4c8c7e..f93bed13ea0 100644 --- a/lib/public/Comments/IComment.php +++ b/lib/public/Comments/IComment.php @@ -136,7 +136,7 @@ interface IComment { * returns an array containing mentions that are included in the comment * * @return array each mention provides a 'type' and an 'id', see example below - * @since 9.2.0 + * @since 11.0.0 * * The return array looks like: * [ diff --git a/lib/public/Comments/ICommentsEventHandler.php b/lib/public/Comments/ICommentsEventHandler.php index 33524199012..79b0d0d883c 100644 --- a/lib/public/Comments/ICommentsEventHandler.php +++ b/lib/public/Comments/ICommentsEventHandler.php @@ -27,13 +27,13 @@ namespace OCP\Comments; * Interface ICommentsEventHandler * * @package OCP\Comments - * @since 9.2.0 + * @since 11.0.0 */ interface ICommentsEventHandler { /** * @param CommentsEvent $event - * @since 9.2.0 + * @since 11.0.0 */ public function handle(CommentsEvent $event); } diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index 6a32cfd803d..b43d5e8800b 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -242,7 +242,7 @@ interface ICommentsManager { * to consumers of the comments infrastructure * * @param \Closure $closure - * @since 9.2.0 + * @since 11.0.0 */ public function registerEventHandler(\Closure $closure); @@ -252,7 +252,7 @@ interface ICommentsManager { * @param string $type * @param \Closure $closure * @throws \OutOfBoundsException - * @since 9.2.0 + * @since 11.0.0 * * Only one resolver shall be registered per type. Otherwise a * \OutOfBoundsException has to thrown. @@ -266,7 +266,7 @@ interface ICommentsManager { * @param string $id * @return string * @throws \OutOfBoundsException - * @since 9.2.0 + * @since 11.0.0 * * If a provided type was not registered, an \OutOfBoundsException shall * be thrown. It is upon the resolver discretion what to return of the diff --git a/lib/public/Diagnostics/IQuery.php b/lib/public/Diagnostics/IQuery.php index 0bd1a6d9685..7f26bd7f1b8 100644 --- a/lib/public/Diagnostics/IQuery.php +++ b/lib/public/Diagnostics/IQuery.php @@ -50,13 +50,13 @@ interface IQuery { /** * @return float - * @since 9.2.0 + * @since 11.0.0 */ public function getStartTime(); /** * @return array - * @since 9.2.0 + * @since 11.0.0 */ public function getStacktrace(); } diff --git a/lib/public/Files/Config/ICachedMountInfo.php b/lib/public/Files/Config/ICachedMountInfo.php index f5c5bb87ead..2df79a7d642 100644 --- a/lib/public/Files/Config/ICachedMountInfo.php +++ b/lib/public/Files/Config/ICachedMountInfo.php @@ -73,7 +73,7 @@ interface ICachedMountInfo { * Get the internal path (within the storage) of the root of the mount * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getRootInternalPath(); } diff --git a/lib/public/Files/IAppData.php b/lib/public/Files/IAppData.php index 92e54fee366..bf612996c53 100644 --- a/lib/public/Files/IAppData.php +++ b/lib/public/Files/IAppData.php @@ -28,7 +28,7 @@ use OCP\Files\SimpleFS\ISimpleRoot; * Interface IAppData * * @package OCP\Files - * @since 9.2.0 + * @since 11.0.0 * @internal This interface is experimental and might change for NC12 */ interface IAppData extends ISimpleRoot { diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php index efd682e7855..660580ae464 100644 --- a/lib/public/Files/SimpleFS/ISimpleFile.php +++ b/lib/public/Files/SimpleFS/ISimpleFile.php @@ -28,7 +28,7 @@ use OCP\Files\NotPermittedException; * Interface ISimpleFile * * @package OCP\Files\SimpleFS - * @since 9.2.0 + * @since 11.0.0 * @internal This interface is experimental and might change for NC12 */ interface ISimpleFile { @@ -37,7 +37,7 @@ interface ISimpleFile { * Get the name * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getName(); @@ -45,7 +45,7 @@ interface ISimpleFile { * Get the size in bytes * * @return int - * @since 9.2.0 + * @since 11.0.0 */ public function getSize(); @@ -53,7 +53,7 @@ interface ISimpleFile { * Get the ETag * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getETag(); @@ -61,7 +61,7 @@ interface ISimpleFile { * Get the last modification time * * @return int - * @since 9.2.0 + * @since 11.0.0 */ public function getMTime(); @@ -69,7 +69,7 @@ interface ISimpleFile { * Get the content * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getContent(); @@ -78,7 +78,7 @@ interface ISimpleFile { * * @param string $data * @throws NotPermittedException - * @since 9.2.0 + * @since 11.0.0 */ public function putContent($data); @@ -86,7 +86,7 @@ interface ISimpleFile { * Delete the file * * @throws NotPermittedException - * @since 9.2.0 + * @since 11.0.0 */ public function delete(); @@ -94,7 +94,7 @@ interface ISimpleFile { * Get the MimeType * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getMimeType(); } diff --git a/lib/public/Files/SimpleFS/ISimpleFolder.php b/lib/public/Files/SimpleFS/ISimpleFolder.php index 406bb631159..66f80816216 100644 --- a/lib/public/Files/SimpleFS/ISimpleFolder.php +++ b/lib/public/Files/SimpleFS/ISimpleFolder.php @@ -29,7 +29,7 @@ use OCP\Files\NotPermittedException; * Interface ISimpleFolder * * @package OCP\Files\SimpleFS - * @since 9.2.0 + * @since 11.0.0 * @internal This interface is experimental and might change for NC12 */ interface ISimpleFolder { @@ -37,7 +37,7 @@ interface ISimpleFolder { * Get all the files in a folder * * @return ISimpleFile[] - * @since 9.2.0 + * @since 11.0.0 */ public function getDirectoryListing(); @@ -46,7 +46,7 @@ interface ISimpleFolder { * * @param string $name * @return bool - * @since 9.2.0 + * @since 11.0.0 */ public function fileExists($name); @@ -56,7 +56,7 @@ interface ISimpleFolder { * @param string $name * @return ISimpleFile * @throws NotFoundException - * @since 9.2.0 + * @since 11.0.0 */ public function getFile($name); @@ -66,7 +66,7 @@ interface ISimpleFolder { * @param string $name * @return ISimpleFile * @throws NotPermittedException - * @since 9.2.0 + * @since 11.0.0 */ public function newFile($name); @@ -74,7 +74,7 @@ interface ISimpleFolder { * Remove the folder and all the files in it * * @throws NotPermittedException - * @since 9.2.0 + * @since 11.0.0 */ public function delete(); @@ -82,7 +82,7 @@ interface ISimpleFolder { * Get the folder name * * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getName(); } diff --git a/lib/public/Files/SimpleFS/ISimpleRoot.php b/lib/public/Files/SimpleFS/ISimpleRoot.php index c2f9d4ff05d..3bfea656965 100644 --- a/lib/public/Files/SimpleFS/ISimpleRoot.php +++ b/lib/public/Files/SimpleFS/ISimpleRoot.php @@ -29,7 +29,7 @@ use OCP\Files\NotPermittedException; * Interface ISimpleRoot * * @package OCP\Files\SimpleFS - * @since 9.2.0 + * @since 11.0.0 * @internal This interface is experimental and might change for NC12 */ interface ISimpleRoot { @@ -40,7 +40,7 @@ interface ISimpleRoot { * @return ISimpleFolder * @throws NotFoundException * @throws \RuntimeException - * @since 9.2.0 + * @since 11.0.0 */ public function getFolder($name); @@ -50,7 +50,7 @@ interface ISimpleRoot { * @return ISimpleFolder[] * @throws NotFoundException * @throws \RuntimeException - * @since 9.2.0 + * @since 11.0.0 */ public function getDirectoryListing(); @@ -61,7 +61,7 @@ interface ISimpleRoot { * @return ISimpleFolder * @throws NotPermittedException * @throws \RuntimeException - * @since 9.2.0 + * @since 11.0.0 */ public function newFolder($name); } diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index 31706342228..efd65d55f7e 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -256,7 +256,7 @@ interface IDBConnection { * Check whether or not the current database support 4byte wide unicode * * @return bool - * @since 9.2.0 + * @since 11.0.0 */ public function supports4ByteText(); } diff --git a/lib/public/IPreview.php b/lib/public/IPreview.php index c6417b4d182..cddf7fc6a66 100644 --- a/lib/public/IPreview.php +++ b/lib/public/IPreview.php @@ -99,7 +99,7 @@ interface IPreview { * @param string $mimeType To force a given mimetype for the file (files_versions needs this) * @return ISimpleFile * @throws NotFoundException - * @since 9.2.0 + * @since 11.0.0 */ public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null); diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index 5220a0c65c7..1f8c23dbedf 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -148,13 +148,13 @@ interface IUserManager { * returns how many users have logged in once * * @return int - * @since 9.2.0 + * @since 11.0.0 */ public function countSeenUsers(); /** * @param \Closure $callback - * @since 9.2.0 + * @since 11.0.0 */ public function callForSeenUsers(\Closure $callback); diff --git a/lib/public/LDAP/IDeletionFlagSupport.php b/lib/public/LDAP/IDeletionFlagSupport.php index 5f7d3909195..26b90a3493d 100644 --- a/lib/public/LDAP/IDeletionFlagSupport.php +++ b/lib/public/LDAP/IDeletionFlagSupport.php @@ -26,20 +26,20 @@ namespace OCP\LDAP; * Interface IDeletionFlagSupport * * @package OCP\LDAP - * @since 9.2.0 + * @since 11.0.0 */ interface IDeletionFlagSupport { /** * Flag record for deletion. * @param string $uid user id - * @since 9.2.0 + * @since 11.0.0 */ public function flagRecord($uid); /** * Unflag record for deletion. * @param string $uid user id - * @since 9.2.0 + * @since 11.0.0 */ public function unflagRecord($uid); } diff --git a/lib/public/LDAP/ILDAPProvider.php b/lib/public/LDAP/ILDAPProvider.php index 473afb13885..3c07dfcbe8e 100644 --- a/lib/public/LDAP/ILDAPProvider.php +++ b/lib/public/LDAP/ILDAPProvider.php @@ -26,14 +26,14 @@ namespace OCP\LDAP; * Interface ILDAPProvider * * @package OCP\LDAP - * @since 9.2.0 + * @since 11.0.0 */ interface ILDAPProvider { /** * Translate a user id to LDAP DN. * @param string $uid user id * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getUserDN($uid); @@ -42,7 +42,7 @@ interface ILDAPProvider { * @param string $dn LDAP DN * @return string with the internal user name * @throws \Exception if translation was unsuccessful - * @since 9.2.0 + * @since 11.0.0 */ public function getUserName($dn); @@ -50,7 +50,7 @@ interface ILDAPProvider { * Convert a stored DN so it can be used as base parameter for LDAP queries. * @param string $dn the DN * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function DNasBaseParameter($dn); @@ -58,7 +58,7 @@ interface ILDAPProvider { * Sanitize a DN received from the LDAP server. * @param array $dn the DN in question * @return array the sanitized DN - * @since 9.2.0 + * @since 11.0.0 */ public function sanitizeDN($dn); @@ -66,7 +66,7 @@ interface ILDAPProvider { * Return a new LDAP connection resource for the specified user. * @param string $uid user id * @return resource of the LDAP connection - * @since 9.2.0 + * @since 11.0.0 */ public function getLDAPConnection($uid); @@ -75,7 +75,7 @@ interface ILDAPProvider { * @param string $uid user id * @return string the base for users * @throws \Exception if user id was not found in LDAP - * @since 9.2.0 + * @since 11.0.0 */ public function getLDAPBaseUsers($uid); @@ -84,7 +84,7 @@ interface ILDAPProvider { * @param string $uid user id * @return string the base for groups * @throws \Exception if user id was not found in LDAP - * @since 9.2.0 + * @since 11.0.0 */ public function getLDAPBaseGroups($uid); @@ -92,14 +92,14 @@ interface ILDAPProvider { * Check whether a LDAP DN exists * @param string $dn LDAP DN * @return bool whether the DN exists - * @since 9.2.0 + * @since 11.0.0 */ public function dnExists($dn); /** * Clear the cache if a cache is used, otherwise do nothing. * @param string $uid user id - * @since 9.2.0 + * @since 11.0.0 */ public function clearCache($uid); } diff --git a/lib/public/LDAP/ILDAPProviderFactory.php b/lib/public/LDAP/ILDAPProviderFactory.php index 99e7b8d27ea..74f84bff503 100644 --- a/lib/public/LDAP/ILDAPProviderFactory.php +++ b/lib/public/LDAP/ILDAPProviderFactory.php @@ -31,7 +31,7 @@ use OCP\IServerContainer; * instance. * * @package OCP\LDAP - * @since 9.2.0 + * @since 11.0.0 */ interface ILDAPProviderFactory { @@ -39,7 +39,7 @@ interface ILDAPProviderFactory { * Constructor for the LDAP provider factory * * @param IServerContainer $serverContainer server container - * @since 9.2.0 + * @since 11.0.0 */ public function __construct(IServerContainer $serverContainer); @@ -47,7 +47,7 @@ interface ILDAPProviderFactory { * creates and returns an instance of the ILDAPProvider * * @return ILDAPProvider - * @since 9.2.0 + * @since 11.0.0 */ public function getLDAPProvider(); } diff --git a/lib/public/Notification/INotification.php b/lib/public/Notification/INotification.php index 55109a5ee2e..8d3f15c2380 100644 --- a/lib/public/Notification/INotification.php +++ b/lib/public/Notification/INotification.php @@ -132,19 +132,19 @@ interface INotification { * @param array $parameters * @return $this * @throws \InvalidArgumentException if the subject or parameters are invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setRichSubject($subject, array $parameters = []); /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getRichSubject(); /** * @return array[] - * @since 9.2.0 + * @since 11.0.0 */ public function getRichSubjectParameters(); @@ -188,19 +188,19 @@ interface INotification { * @param array $parameters * @return $this * @throws \InvalidArgumentException if the message or parameters are invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setRichMessage($message, array $parameters = []); /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getRichMessage(); /** * @return array[] - * @since 9.2.0 + * @since 11.0.0 */ public function getRichMessageParameters(); @@ -222,13 +222,13 @@ interface INotification { * @param string $icon * @return $this * @throws \InvalidArgumentException if the icon is invalid - * @since 9.2.0 + * @since 11.0.0 */ public function setIcon($icon); /** * @return string - * @since 9.2.0 + * @since 11.0.0 */ public function getIcon(); diff --git a/lib/public/RichObjectStrings/Definitions.php b/lib/public/RichObjectStrings/Definitions.php index d3e6b15cf99..2b35f9ceed1 100644 --- a/lib/public/RichObjectStrings/Definitions.php +++ b/lib/public/RichObjectStrings/Definitions.php @@ -26,12 +26,12 @@ namespace OCP\RichObjectStrings; * Class Definitions * * @package OCP\RichObjectStrings - * @since 9.2.0 + * @since 11.0.0 */ class Definitions { /** * @var array - * @since 9.2.0 + * @since 11.0.0 */ public $definitions = [ 'addressbook' => [ @@ -284,7 +284,7 @@ class Definitions { * @param string $type * @return array * @throws InvalidObjectExeption - * @since 9.2.0 + * @since 11.0.0 */ public function getDefinition($type) { if (isset($this->definitions[$type])) { diff --git a/lib/public/RichObjectStrings/IValidator.php b/lib/public/RichObjectStrings/IValidator.php index bba098bdfc1..8d9b86cfba3 100644 --- a/lib/public/RichObjectStrings/IValidator.php +++ b/lib/public/RichObjectStrings/IValidator.php @@ -25,7 +25,7 @@ namespace OCP\RichObjectStrings; * Class Validator * * @package OCP\RichObjectStrings - * @since 9.2.0 + * @since 11.0.0 */ interface IValidator { @@ -33,7 +33,7 @@ interface IValidator { * @param string $subject * @param array[] $parameters * @throws InvalidObjectExeption - * @since 9.2.0 + * @since 11.0.0 */ public function validate($subject, array $parameters); } diff --git a/lib/public/RichObjectStrings/InvalidObjectExeption.php b/lib/public/RichObjectStrings/InvalidObjectExeption.php index 8bf597ebe90..7d6ea6bc976 100644 --- a/lib/public/RichObjectStrings/InvalidObjectExeption.php +++ b/lib/public/RichObjectStrings/InvalidObjectExeption.php @@ -25,7 +25,7 @@ namespace OCP\RichObjectStrings; * Class InvalidObjectExeption * * @package OCP\RichObjectStrings - * @since 9.2.0 + * @since 11.0.0 */ class InvalidObjectExeption extends \InvalidArgumentException { } diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php index e8b123cafb6..a15020bbd69 100644 --- a/lib/public/Share/IManager.php +++ b/lib/public/Share/IManager.php @@ -95,7 +95,7 @@ interface IManager { * @param Folder $node * @param bool $reshares * @return IShare[][] [$fileId => IShare[], ...] - * @since 9.2.0 + * @since 11.0.0 */ public function getSharesInFolder($userId, Folder $node, $reshares = false); @@ -290,7 +290,7 @@ interface IManager { * Check if a given share provider exists * @param int $shareType * @return bool - * @since 9.2.0 + * @since 11.0.0 */ public function shareProviderExists($shareType); diff --git a/lib/public/Share/IProviderFactory.php b/lib/public/Share/IProviderFactory.php index 928298a7860..7227fdea1f1 100644 --- a/lib/public/Share/IProviderFactory.php +++ b/lib/public/Share/IProviderFactory.php @@ -58,7 +58,7 @@ interface IProviderFactory { /** * @return IShareProvider[] - * @since 9.2.0 + * @since 11.0.0 */ public function getAllProviders(); } diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index 7d134583317..6257c97eb77 100644 --- a/lib/public/Share/IShareProvider.php +++ b/lib/public/Share/IShareProvider.php @@ -99,7 +99,7 @@ interface IShareProvider { * @param Folder $node * @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator * @return \OCP\Share\IShare[] - * @since 9.2.0 + * @since 11.0.0 */ public function getSharesInFolder($userId, Folder $node, $reshares); diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index 8164dd1fcfa..b668c5cfb38 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -169,10 +169,10 @@ class AppSettingsController extends Controller { $nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']); $nextCloudVersionDependencies = []; if($nextCloudVersion->getMinimumVersion() !== '') { - $nextCloudVersionDependencies['owncloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion(); + $nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion(); } if($nextCloudVersion->getMaximumVersion() !== '') { - $nextCloudVersionDependencies['owncloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion(); + $nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion(); } $phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']); $existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false; @@ -331,8 +331,8 @@ class AppSettingsController extends Controller { $app['canInstall'] = empty($missing); $app['missingDependencies'] = $missing; - $app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['min-version']); - $app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['max-version']); + $app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['min-version']); + $app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['max-version']); return $app; }, $apps); diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index 3b0418a7eba..fb2617cbfe8 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -27,7 +27,7 @@ class AppFetcherTest extends FetcherBase { public function setUp() { parent::setUp(); $this->fileName = 'apps.json'; - $this->endpoint = 'https://apps.nextcloud.com/api/v1/platform/9.2.0/apps.json'; + $this->endpoint = 'https://apps.nextcloud.com/api/v1/platform/11.0.0/apps.json'; $this->fetcher = new AppFetcher( $this->appData, diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index fd44954eaf4..65b45a002d4 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -295,7 +295,7 @@ class DependencyAnalyzerTest extends TestCase { ], [ [ - 'Server version 11 or higher is required.', + 'Server version 9.2 or higher is required.', ], [ 'nextcloud' => [ @@ -307,6 +307,18 @@ class DependencyAnalyzerTest extends TestCase { ], [ [ + 'Server version 11 or higher is required.', + ], + [ + 'nextcloud' => [ + '@attributes' => [ + 'min-version' => '11', + ], + ], + ], + ], + [ + [ 'Server version 8.0.1 or lower is required.', ], [ @@ -388,7 +400,7 @@ class DependencyAnalyzerTest extends TestCase { ], [ [ - 'Server version 11 or higher is required.', + 'Server version 9.2 or higher is required.', ], [ 'owncloud' => [ diff --git a/version.php b/version.php index e6de2e2bde0..42a0e7c9bdb 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 2, 0, 5); +$OC_Version = array(11, 0, 0, 0); // The human readable string $OC_VersionString = '11.0 alpha'; |