Merge pull request #2139 from nextcloud/increase-version-to-ELF
Use 11.0 instead 9.2
This commit is contained in:
commit
51688986df
|
@ -9,7 +9,7 @@
|
||||||
<author>Nextcloud</author>
|
<author>Nextcloud</author>
|
||||||
<version>1.1.0</version>
|
<version>1.1.0</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<types>
|
<types>
|
||||||
<logging/>
|
<logging/>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
<version>1.1.0</version>
|
<version>1.1.0</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<types>
|
<types>
|
||||||
<logging/>
|
<logging/>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<webdav>appinfo/v1/publicwebdav.php</webdav>
|
<webdav>appinfo/v1/publicwebdav.php</webdav>
|
||||||
</public>
|
</public>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<background-jobs>
|
<background-jobs>
|
||||||
<job>OCA\DAV\CardDAV\SyncJob</job>
|
<job>OCA\DAV\CardDAV\SyncJob</job>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
</types>
|
</types>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<lib>openssl</lib>
|
<lib>openssl</lib>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<settings>
|
<settings>
|
||||||
<admin>OCA\Encryption\Settings\Admin</admin>
|
<admin>OCA\Encryption\Settings\Admin</admin>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<namespace>FederatedFileSharing</namespace>
|
<namespace>FederatedFileSharing</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<settings>
|
<settings>
|
||||||
<admin>OCA\FederatedFileSharing\Settings\Admin</admin>
|
<admin>OCA\FederatedFileSharing\Settings\Admin</admin>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<namespace>Federation</namespace>
|
<namespace>Federation</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
<types>
|
<types>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<filesystem/>
|
<filesystem/>
|
||||||
</types>
|
</types>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<documentation>
|
<documentation>
|
||||||
<user>user-files</user>
|
<user>user-files</user>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<namespace>Files_External</namespace>
|
<namespace>Files_External</namespace>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
|
|
@ -15,7 +15,7 @@ Turning the feature off removes shared files and folders on the server for all s
|
||||||
<filesystem/>
|
<filesystem/>
|
||||||
</types>
|
</types>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<public>
|
<public>
|
||||||
<files>public.php</files>
|
<files>public.php</files>
|
||||||
|
|
|
@ -16,7 +16,7 @@ To prevent a user from running out of disk space, the Deleted files app will not
|
||||||
</types>
|
</types>
|
||||||
<namespace>Files_Trashbin</namespace>
|
<namespace>Files_Trashbin</namespace>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<documentation>
|
<documentation>
|
||||||
<user>user-trashbin</user>
|
<user>user-trashbin</user>
|
||||||
|
|
|
@ -14,7 +14,7 @@ In addition to the expiry of versions, the versions app makes certain never to u
|
||||||
</types>
|
</types>
|
||||||
<namespace>Files_Versions</namespace>
|
<namespace>Files_Versions</namespace>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<documentation>
|
<documentation>
|
||||||
<user>user-versions</user>
|
<user>user-versions</user>
|
||||||
|
|
|
@ -23,6 +23,6 @@
|
||||||
<prevent_group_restriction/>
|
<prevent_group_restriction/>
|
||||||
</types>
|
</types>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<namespace>ShareByMail</namespace>
|
<namespace>ShareByMail</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
<version>1.1.3</version>
|
<version>1.1.3</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<namespace>SystemTags</namespace>
|
<namespace>SystemTags</namespace>
|
||||||
<types>
|
<types>
|
||||||
|
|
|
@ -7,6 +7,6 @@
|
||||||
<author>Joas Schilling</author>
|
<author>Joas Schilling</author>
|
||||||
<version>1.1.0</version>
|
<version>1.1.0</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<types>
|
<types>
|
||||||
|
|
|
@ -14,6 +14,6 @@
|
||||||
</two-factor-providers>
|
</two-factor-providers>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<namespace>UpdateNotification</namespace>
|
<namespace>UpdateNotification</namespace>
|
||||||
<default_enable/>
|
<default_enable/>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<background-jobs>
|
<background-jobs>
|
||||||
|
|
|
@ -18,7 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
|
||||||
</documentation>
|
</documentation>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<lib>ldap</lib>
|
<lib>ldap</lib>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<namespace>User_LDAP</namespace>
|
<namespace>User_LDAP</namespace>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
</types>
|
</types>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<owncloud min-version="9.2" max-version="9.2" />
|
<nextcloud min-version="11" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
|
|
@ -734,7 +734,7 @@
|
||||||
/**
|
/**
|
||||||
* Returns the dav.Client instance used internally
|
* Returns the dav.Client instance used internally
|
||||||
*
|
*
|
||||||
* @since 9.2
|
* @since 11.0.0
|
||||||
* @return {dav.Client}
|
* @return {dav.Client}
|
||||||
*/
|
*/
|
||||||
getClient: function() {
|
getClient: function() {
|
||||||
|
@ -744,7 +744,7 @@
|
||||||
/**
|
/**
|
||||||
* Returns the user name
|
* Returns the user name
|
||||||
*
|
*
|
||||||
* @since 9.2
|
* @since 11.0.0
|
||||||
* @return {String} userName
|
* @return {String} userName
|
||||||
*/
|
*/
|
||||||
getUserName: function() {
|
getUserName: function() {
|
||||||
|
@ -754,7 +754,7 @@
|
||||||
/**
|
/**
|
||||||
* Returns the password
|
* Returns the password
|
||||||
*
|
*
|
||||||
* @since 9.2
|
* @since 11.0.0
|
||||||
* @return {String} password
|
* @return {String} password
|
||||||
*/
|
*/
|
||||||
getPassword: function() {
|
getPassword: function() {
|
||||||
|
@ -764,7 +764,7 @@
|
||||||
/**
|
/**
|
||||||
* Returns the base URL
|
* Returns the base URL
|
||||||
*
|
*
|
||||||
* @since 9.2
|
* @since 11.0.0
|
||||||
* @return {String} base URL
|
* @return {String} base URL
|
||||||
*/
|
*/
|
||||||
getBaseUrl: function() {
|
getBaseUrl: function() {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @namespace
|
* @namespace
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
OCP.AppConfig = {
|
OCP.AppConfig = {
|
||||||
/**
|
/**
|
||||||
|
@ -46,7 +46,7 @@ OCP.AppConfig = {
|
||||||
/**
|
/**
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {function} [options.success]
|
* @param {function} [options.success]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
getApps: function(options) {
|
getApps: function(options) {
|
||||||
this._call('get', '', options);
|
this._call('get', '', options);
|
||||||
|
@ -57,7 +57,7 @@ OCP.AppConfig = {
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {function} [options.success]
|
* @param {function} [options.success]
|
||||||
* @param {function} [options.error]
|
* @param {function} [options.error]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
getKeys: function(app, options) {
|
getKeys: function(app, options) {
|
||||||
this._call('get', '/' + app, options);
|
this._call('get', '/' + app, options);
|
||||||
|
@ -70,7 +70,7 @@ OCP.AppConfig = {
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {function} [options.success]
|
* @param {function} [options.success]
|
||||||
* @param {function} [options.error]
|
* @param {function} [options.error]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
getValue: function(app, key, defaultValue, options) {
|
getValue: function(app, key, defaultValue, options) {
|
||||||
options = options || {};
|
options = options || {};
|
||||||
|
@ -88,7 +88,7 @@ OCP.AppConfig = {
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {function} [options.success]
|
* @param {function} [options.success]
|
||||||
* @param {function} [options.error]
|
* @param {function} [options.error]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
setValue: function(app, key, value, options) {
|
setValue: function(app, key, value, options) {
|
||||||
options = options || {};
|
options = options || {};
|
||||||
|
@ -105,7 +105,7 @@ OCP.AppConfig = {
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {function} [options.success]
|
* @param {function} [options.success]
|
||||||
* @param {function} [options.error]
|
* @param {function} [options.error]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
deleteKey: function(app, key, options) {
|
deleteKey: function(app, key, options) {
|
||||||
this._call('delete', '/' + app + '/' + key, options);
|
this._call('delete', '/' + app + '/' + key, options);
|
||||||
|
|
|
@ -336,13 +336,9 @@ class DependencyAnalyzer {
|
||||||
switch ($version) {
|
switch ($version) {
|
||||||
case '9.1':
|
case '9.1':
|
||||||
return '10';
|
return '10';
|
||||||
case '9.2':
|
|
||||||
return '11';
|
|
||||||
default:
|
default:
|
||||||
if (strpos($version, '9.1.') === 0) {
|
if (strpos($version, '9.1.') === 0) {
|
||||||
$version = '10.0.' . substr($version, 4);
|
$version = '10.0.' . substr($version, 4);
|
||||||
} else if (strpos($version, '9.2.') === 0) {
|
|
||||||
$version = '11.0.' . substr($version, 4);
|
|
||||||
}
|
}
|
||||||
return $version;
|
return $version;
|
||||||
}
|
}
|
||||||
|
|
|
@ -306,7 +306,7 @@ class Db implements IDb {
|
||||||
* Check whether or not the current database support 4byte wide unicode
|
* Check whether or not the current database support 4byte wide unicode
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function supports4ByteText() {
|
public function supports4ByteText() {
|
||||||
return $this->connection->supports4ByteText();
|
return $this->connection->supports4ByteText();
|
||||||
|
|
|
@ -207,7 +207,7 @@ class Comment implements IComment {
|
||||||
* returns an array containing mentions that are included in the comment
|
* returns an array containing mentions that are included in the comment
|
||||||
*
|
*
|
||||||
* @return array each mention provides a 'type' and an 'id', see example below
|
* @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:
|
* The return array looks like:
|
||||||
* [
|
* [
|
||||||
|
|
|
@ -768,7 +768,7 @@ class Manager implements ICommentsManager {
|
||||||
* @param string $type
|
* @param string $type
|
||||||
* @param \Closure $closure
|
* @param \Closure $closure
|
||||||
* @throws \OutOfBoundsException
|
* @throws \OutOfBoundsException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*
|
*
|
||||||
* Only one resolver shall be registered per type. Otherwise a
|
* Only one resolver shall be registered per type. Otherwise a
|
||||||
* \OutOfBoundsException has to thrown.
|
* \OutOfBoundsException has to thrown.
|
||||||
|
@ -790,7 +790,7 @@ class Manager implements ICommentsManager {
|
||||||
* @param string $id
|
* @param string $id
|
||||||
* @return string
|
* @return string
|
||||||
* @throws \OutOfBoundsException
|
* @throws \OutOfBoundsException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*
|
*
|
||||||
* If a provided type was not registered, an \OutOfBoundsException shall
|
* If a provided type was not registered, an \OutOfBoundsException shall
|
||||||
* be thrown. It is upon the resolver discretion what to return of the
|
* be thrown. It is upon the resolver discretion what to return of the
|
||||||
|
|
|
@ -412,7 +412,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
|
||||||
* Check whether or not the current database support 4byte wide unicode
|
* Check whether or not the current database support 4byte wide unicode
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function supports4ByteText() {
|
public function supports4ByteText() {
|
||||||
return ! ($this->getDatabasePlatform() instanceof MySqlPlatform && $this->getParams()['charset'] !== 'utf8mb4');
|
return ! ($this->getDatabasePlatform() instanceof MySqlPlatform && $this->getParams()['charset'] !== 'utf8mb4');
|
||||||
|
|
|
@ -289,7 +289,7 @@ class Notification implements INotification {
|
||||||
* @param array $parameters
|
* @param array $parameters
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the subject or parameters are invalid
|
* @throws \InvalidArgumentException if the subject or parameters are invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setRichSubject($subject, array $parameters = []) {
|
public function setRichSubject($subject, array $parameters = []) {
|
||||||
if (!is_string($subject) || $subject === '') {
|
if (!is_string($subject) || $subject === '') {
|
||||||
|
@ -304,7 +304,7 @@ class Notification implements INotification {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichSubject() {
|
public function getRichSubject() {
|
||||||
return $this->subjectRich;
|
return $this->subjectRich;
|
||||||
|
@ -312,7 +312,7 @@ class Notification implements INotification {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichSubjectParameters() {
|
public function getRichSubjectParameters() {
|
||||||
return $this->subjectRichParameters;
|
return $this->subjectRichParameters;
|
||||||
|
@ -379,7 +379,7 @@ class Notification implements INotification {
|
||||||
* @param array $parameters
|
* @param array $parameters
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the message or parameters are invalid
|
* @throws \InvalidArgumentException if the message or parameters are invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setRichMessage($message, array $parameters = []) {
|
public function setRichMessage($message, array $parameters = []) {
|
||||||
if (!is_string($message) || $message === '') {
|
if (!is_string($message) || $message === '') {
|
||||||
|
@ -394,7 +394,7 @@ class Notification implements INotification {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichMessage() {
|
public function getRichMessage() {
|
||||||
return $this->messageRich;
|
return $this->messageRich;
|
||||||
|
@ -402,7 +402,7 @@ class Notification implements INotification {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichMessageParameters() {
|
public function getRichMessageParameters() {
|
||||||
return $this->messageRichParameters;
|
return $this->messageRichParameters;
|
||||||
|
@ -434,7 +434,7 @@ class Notification implements INotification {
|
||||||
* @param string $icon
|
* @param string $icon
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the icon is invalid
|
* @throws \InvalidArgumentException if the icon is invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setIcon($icon) {
|
public function setIcon($icon) {
|
||||||
if (!is_string($icon) || $icon === '' || isset($icon[4000])) {
|
if (!is_string($icon) || $icon === '' || isset($icon[4000])) {
|
||||||
|
@ -446,7 +446,7 @@ class Notification implements INotification {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getIcon() {
|
public function getIcon() {
|
||||||
return $this->icon;
|
return $this->icon;
|
||||||
|
|
|
@ -155,7 +155,7 @@ class PreviewManager implements IPreview {
|
||||||
* @param string $mimeType
|
* @param string $mimeType
|
||||||
* @return ISimpleFile
|
* @return ISimpleFile
|
||||||
* @throws NotFoundException
|
* @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) {
|
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
|
||||||
if ($this->generator === null) {
|
if ($this->generator === null) {
|
||||||
|
|
|
@ -30,7 +30,7 @@ use OCP\RichObjectStrings\IValidator;
|
||||||
* Class Validator
|
* Class Validator
|
||||||
*
|
*
|
||||||
* @package OCP\RichObjectStrings
|
* @package OCP\RichObjectStrings
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
class Validator implements IValidator {
|
class Validator implements IValidator {
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class Validator implements IValidator {
|
||||||
* @param string $subject
|
* @param string $subject
|
||||||
* @param array[] $parameters
|
* @param array[] $parameters
|
||||||
* @throws InvalidObjectExeption
|
* @throws InvalidObjectExeption
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function validate($subject, array $parameters) {
|
public function validate($subject, array $parameters) {
|
||||||
$matches = [];
|
$matches = [];
|
||||||
|
|
|
@ -375,7 +375,7 @@ class Manager extends PublicEmitter implements IUserManager {
|
||||||
* returns how many users have logged in once
|
* returns how many users have logged in once
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function countSeenUsers() {
|
public function countSeenUsers() {
|
||||||
$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
|
$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
|
||||||
|
@ -395,7 +395,7 @@ class Manager extends PublicEmitter implements IUserManager {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \Closure $callback
|
* @param \Closure $callback
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function callForSeenUsers(\Closure $callback) {
|
public function callForSeenUsers(\Closure $callback) {
|
||||||
$limit = 1000;
|
$limit = 1000;
|
||||||
|
|
|
@ -88,7 +88,7 @@ class EmptyContentSecurityPolicy {
|
||||||
*
|
*
|
||||||
* @param string $nonce
|
* @param string $nonce
|
||||||
* @return $this
|
* @return $this
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function useJsNonce($nonce) {
|
public function useJsNonce($nonce) {
|
||||||
$this->useJsNonce = $nonce;
|
$this->useJsNonce = $nonce;
|
||||||
|
|
|
@ -28,7 +28,7 @@ use OCP\AppFramework\Http;
|
||||||
* Class FileDisplayResponse
|
* Class FileDisplayResponse
|
||||||
*
|
*
|
||||||
* @package OCP\AppFramework\Http
|
* @package OCP\AppFramework\Http
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
class FileDisplayResponse extends Response implements ICallbackResponse {
|
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 \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
|
||||||
* @param int $statusCode
|
* @param int $statusCode
|
||||||
* @param array $headers
|
* @param array $headers
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function __construct($file, $statusCode=Http::STATUS_OK,
|
public function __construct($file, $statusCode=Http::STATUS_OK,
|
||||||
$headers=[]) {
|
$headers=[]) {
|
||||||
|
@ -58,7 +58,7 @@ class FileDisplayResponse extends Response implements ICallbackResponse {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param IOutput $output
|
* @param IOutput $output
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function callback(IOutput $output) {
|
public function callback(IOutput $output) {
|
||||||
if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
|
if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
|
||||||
|
|
|
@ -76,7 +76,7 @@ abstract class OCSController extends ApiController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param int $version
|
* @param int $version
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
* @internal
|
* @internal
|
||||||
*/
|
*/
|
||||||
public function setOCSVersion($version) {
|
public function setOCSVersion($version) {
|
||||||
|
|
|
@ -136,7 +136,7 @@ interface IComment {
|
||||||
* returns an array containing mentions that are included in the comment
|
* returns an array containing mentions that are included in the comment
|
||||||
*
|
*
|
||||||
* @return array each mention provides a 'type' and an 'id', see example below
|
* @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:
|
* The return array looks like:
|
||||||
* [
|
* [
|
||||||
|
|
|
@ -27,13 +27,13 @@ namespace OCP\Comments;
|
||||||
* Interface ICommentsEventHandler
|
* Interface ICommentsEventHandler
|
||||||
*
|
*
|
||||||
* @package OCP\Comments
|
* @package OCP\Comments
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
interface ICommentsEventHandler {
|
interface ICommentsEventHandler {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param CommentsEvent $event
|
* @param CommentsEvent $event
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function handle(CommentsEvent $event);
|
public function handle(CommentsEvent $event);
|
||||||
}
|
}
|
||||||
|
|
|
@ -242,7 +242,7 @@ interface ICommentsManager {
|
||||||
* to consumers of the comments infrastructure
|
* to consumers of the comments infrastructure
|
||||||
*
|
*
|
||||||
* @param \Closure $closure
|
* @param \Closure $closure
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function registerEventHandler(\Closure $closure);
|
public function registerEventHandler(\Closure $closure);
|
||||||
|
|
||||||
|
@ -252,7 +252,7 @@ interface ICommentsManager {
|
||||||
* @param string $type
|
* @param string $type
|
||||||
* @param \Closure $closure
|
* @param \Closure $closure
|
||||||
* @throws \OutOfBoundsException
|
* @throws \OutOfBoundsException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*
|
*
|
||||||
* Only one resolver shall be registered per type. Otherwise a
|
* Only one resolver shall be registered per type. Otherwise a
|
||||||
* \OutOfBoundsException has to thrown.
|
* \OutOfBoundsException has to thrown.
|
||||||
|
@ -266,7 +266,7 @@ interface ICommentsManager {
|
||||||
* @param string $id
|
* @param string $id
|
||||||
* @return string
|
* @return string
|
||||||
* @throws \OutOfBoundsException
|
* @throws \OutOfBoundsException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*
|
*
|
||||||
* If a provided type was not registered, an \OutOfBoundsException shall
|
* If a provided type was not registered, an \OutOfBoundsException shall
|
||||||
* be thrown. It is upon the resolver discretion what to return of the
|
* be thrown. It is upon the resolver discretion what to return of the
|
||||||
|
|
|
@ -50,13 +50,13 @@ interface IQuery {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return float
|
* @return float
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getStartTime();
|
public function getStartTime();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getStacktrace();
|
public function getStacktrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ interface ICachedMountInfo {
|
||||||
* Get the internal path (within the storage) of the root of the mount
|
* Get the internal path (within the storage) of the root of the mount
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRootInternalPath();
|
public function getRootInternalPath();
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ use OCP\Files\SimpleFS\ISimpleRoot;
|
||||||
* Interface IAppData
|
* Interface IAppData
|
||||||
*
|
*
|
||||||
* @package OCP\Files
|
* @package OCP\Files
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
* @internal This interface is experimental and might change for NC12
|
* @internal This interface is experimental and might change for NC12
|
||||||
*/
|
*/
|
||||||
interface IAppData extends ISimpleRoot {
|
interface IAppData extends ISimpleRoot {
|
||||||
|
|
|
@ -28,7 +28,7 @@ use OCP\Files\NotPermittedException;
|
||||||
* Interface ISimpleFile
|
* Interface ISimpleFile
|
||||||
*
|
*
|
||||||
* @package OCP\Files\SimpleFS
|
* @package OCP\Files\SimpleFS
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
* @internal This interface is experimental and might change for NC12
|
* @internal This interface is experimental and might change for NC12
|
||||||
*/
|
*/
|
||||||
interface ISimpleFile {
|
interface ISimpleFile {
|
||||||
|
@ -37,7 +37,7 @@ interface ISimpleFile {
|
||||||
* Get the name
|
* Get the name
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getName();
|
public function getName();
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ interface ISimpleFile {
|
||||||
* Get the size in bytes
|
* Get the size in bytes
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getSize();
|
public function getSize();
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ interface ISimpleFile {
|
||||||
* Get the ETag
|
* Get the ETag
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getETag();
|
public function getETag();
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ interface ISimpleFile {
|
||||||
* Get the last modification time
|
* Get the last modification time
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getMTime();
|
public function getMTime();
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ interface ISimpleFile {
|
||||||
* Get the content
|
* Get the content
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getContent();
|
public function getContent();
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ interface ISimpleFile {
|
||||||
*
|
*
|
||||||
* @param string $data
|
* @param string $data
|
||||||
* @throws NotPermittedException
|
* @throws NotPermittedException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function putContent($data);
|
public function putContent($data);
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ interface ISimpleFile {
|
||||||
* Delete the file
|
* Delete the file
|
||||||
*
|
*
|
||||||
* @throws NotPermittedException
|
* @throws NotPermittedException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function delete();
|
public function delete();
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ interface ISimpleFile {
|
||||||
* Get the MimeType
|
* Get the MimeType
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getMimeType();
|
public function getMimeType();
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ use OCP\Files\NotPermittedException;
|
||||||
* Interface ISimpleFolder
|
* Interface ISimpleFolder
|
||||||
*
|
*
|
||||||
* @package OCP\Files\SimpleFS
|
* @package OCP\Files\SimpleFS
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
* @internal This interface is experimental and might change for NC12
|
* @internal This interface is experimental and might change for NC12
|
||||||
*/
|
*/
|
||||||
interface ISimpleFolder {
|
interface ISimpleFolder {
|
||||||
|
@ -37,7 +37,7 @@ interface ISimpleFolder {
|
||||||
* Get all the files in a folder
|
* Get all the files in a folder
|
||||||
*
|
*
|
||||||
* @return ISimpleFile[]
|
* @return ISimpleFile[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getDirectoryListing();
|
public function getDirectoryListing();
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ interface ISimpleFolder {
|
||||||
*
|
*
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @return bool
|
* @return bool
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function fileExists($name);
|
public function fileExists($name);
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ interface ISimpleFolder {
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @return ISimpleFile
|
* @return ISimpleFile
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getFile($name);
|
public function getFile($name);
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ interface ISimpleFolder {
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @return ISimpleFile
|
* @return ISimpleFile
|
||||||
* @throws NotPermittedException
|
* @throws NotPermittedException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function newFile($name);
|
public function newFile($name);
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ interface ISimpleFolder {
|
||||||
* Remove the folder and all the files in it
|
* Remove the folder and all the files in it
|
||||||
*
|
*
|
||||||
* @throws NotPermittedException
|
* @throws NotPermittedException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function delete();
|
public function delete();
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ interface ISimpleFolder {
|
||||||
* Get the folder name
|
* Get the folder name
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getName();
|
public function getName();
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ use OCP\Files\NotPermittedException;
|
||||||
* Interface ISimpleRoot
|
* Interface ISimpleRoot
|
||||||
*
|
*
|
||||||
* @package OCP\Files\SimpleFS
|
* @package OCP\Files\SimpleFS
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
* @internal This interface is experimental and might change for NC12
|
* @internal This interface is experimental and might change for NC12
|
||||||
*/
|
*/
|
||||||
interface ISimpleRoot {
|
interface ISimpleRoot {
|
||||||
|
@ -40,7 +40,7 @@ interface ISimpleRoot {
|
||||||
* @return ISimpleFolder
|
* @return ISimpleFolder
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getFolder($name);
|
public function getFolder($name);
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ interface ISimpleRoot {
|
||||||
* @return ISimpleFolder[]
|
* @return ISimpleFolder[]
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getDirectoryListing();
|
public function getDirectoryListing();
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ interface ISimpleRoot {
|
||||||
* @return ISimpleFolder
|
* @return ISimpleFolder
|
||||||
* @throws NotPermittedException
|
* @throws NotPermittedException
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function newFolder($name);
|
public function newFolder($name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -256,7 +256,7 @@ interface IDBConnection {
|
||||||
* Check whether or not the current database support 4byte wide unicode
|
* Check whether or not the current database support 4byte wide unicode
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function supports4ByteText();
|
public function supports4ByteText();
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ interface IPreview {
|
||||||
* @param string $mimeType To force a given mimetype for the file (files_versions needs this)
|
* @param string $mimeType To force a given mimetype for the file (files_versions needs this)
|
||||||
* @return ISimpleFile
|
* @return ISimpleFile
|
||||||
* @throws NotFoundException
|
* @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);
|
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null);
|
||||||
|
|
||||||
|
|
|
@ -148,13 +148,13 @@ interface IUserManager {
|
||||||
* returns how many users have logged in once
|
* returns how many users have logged in once
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function countSeenUsers();
|
public function countSeenUsers();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \Closure $callback
|
* @param \Closure $callback
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function callForSeenUsers(\Closure $callback);
|
public function callForSeenUsers(\Closure $callback);
|
||||||
|
|
||||||
|
|
|
@ -26,20 +26,20 @@ namespace OCP\LDAP;
|
||||||
* Interface IDeletionFlagSupport
|
* Interface IDeletionFlagSupport
|
||||||
*
|
*
|
||||||
* @package OCP\LDAP
|
* @package OCP\LDAP
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
interface IDeletionFlagSupport {
|
interface IDeletionFlagSupport {
|
||||||
/**
|
/**
|
||||||
* Flag record for deletion.
|
* Flag record for deletion.
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function flagRecord($uid);
|
public function flagRecord($uid);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unflag record for deletion.
|
* Unflag record for deletion.
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function unflagRecord($uid);
|
public function unflagRecord($uid);
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,14 +26,14 @@ namespace OCP\LDAP;
|
||||||
* Interface ILDAPProvider
|
* Interface ILDAPProvider
|
||||||
*
|
*
|
||||||
* @package OCP\LDAP
|
* @package OCP\LDAP
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
interface ILDAPProvider {
|
interface ILDAPProvider {
|
||||||
/**
|
/**
|
||||||
* Translate a user id to LDAP DN.
|
* Translate a user id to LDAP DN.
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getUserDN($uid);
|
public function getUserDN($uid);
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ interface ILDAPProvider {
|
||||||
* @param string $dn LDAP DN
|
* @param string $dn LDAP DN
|
||||||
* @return string with the internal user name
|
* @return string with the internal user name
|
||||||
* @throws \Exception if translation was unsuccessful
|
* @throws \Exception if translation was unsuccessful
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getUserName($dn);
|
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.
|
* Convert a stored DN so it can be used as base parameter for LDAP queries.
|
||||||
* @param string $dn the DN
|
* @param string $dn the DN
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function DNasBaseParameter($dn);
|
public function DNasBaseParameter($dn);
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ interface ILDAPProvider {
|
||||||
* Sanitize a DN received from the LDAP server.
|
* Sanitize a DN received from the LDAP server.
|
||||||
* @param array $dn the DN in question
|
* @param array $dn the DN in question
|
||||||
* @return array the sanitized DN
|
* @return array the sanitized DN
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function sanitizeDN($dn);
|
public function sanitizeDN($dn);
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ interface ILDAPProvider {
|
||||||
* Return a new LDAP connection resource for the specified user.
|
* Return a new LDAP connection resource for the specified user.
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @return resource of the LDAP connection
|
* @return resource of the LDAP connection
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getLDAPConnection($uid);
|
public function getLDAPConnection($uid);
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ interface ILDAPProvider {
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @return string the base for users
|
* @return string the base for users
|
||||||
* @throws \Exception if user id was not found in LDAP
|
* @throws \Exception if user id was not found in LDAP
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getLDAPBaseUsers($uid);
|
public function getLDAPBaseUsers($uid);
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ interface ILDAPProvider {
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @return string the base for groups
|
* @return string the base for groups
|
||||||
* @throws \Exception if user id was not found in LDAP
|
* @throws \Exception if user id was not found in LDAP
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getLDAPBaseGroups($uid);
|
public function getLDAPBaseGroups($uid);
|
||||||
|
|
||||||
|
@ -92,14 +92,14 @@ interface ILDAPProvider {
|
||||||
* Check whether a LDAP DN exists
|
* Check whether a LDAP DN exists
|
||||||
* @param string $dn LDAP DN
|
* @param string $dn LDAP DN
|
||||||
* @return bool whether the DN exists
|
* @return bool whether the DN exists
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function dnExists($dn);
|
public function dnExists($dn);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear the cache if a cache is used, otherwise do nothing.
|
* Clear the cache if a cache is used, otherwise do nothing.
|
||||||
* @param string $uid user id
|
* @param string $uid user id
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function clearCache($uid);
|
public function clearCache($uid);
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@ use OCP\IServerContainer;
|
||||||
* instance.
|
* instance.
|
||||||
*
|
*
|
||||||
* @package OCP\LDAP
|
* @package OCP\LDAP
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
interface ILDAPProviderFactory {
|
interface ILDAPProviderFactory {
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ interface ILDAPProviderFactory {
|
||||||
* Constructor for the LDAP provider factory
|
* Constructor for the LDAP provider factory
|
||||||
*
|
*
|
||||||
* @param IServerContainer $serverContainer server container
|
* @param IServerContainer $serverContainer server container
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function __construct(IServerContainer $serverContainer);
|
public function __construct(IServerContainer $serverContainer);
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ interface ILDAPProviderFactory {
|
||||||
* creates and returns an instance of the ILDAPProvider
|
* creates and returns an instance of the ILDAPProvider
|
||||||
*
|
*
|
||||||
* @return ILDAPProvider
|
* @return ILDAPProvider
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getLDAPProvider();
|
public function getLDAPProvider();
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,19 +132,19 @@ interface INotification {
|
||||||
* @param array $parameters
|
* @param array $parameters
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the subject or parameters are invalid
|
* @throws \InvalidArgumentException if the subject or parameters are invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setRichSubject($subject, array $parameters = []);
|
public function setRichSubject($subject, array $parameters = []);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichSubject();
|
public function getRichSubject();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichSubjectParameters();
|
public function getRichSubjectParameters();
|
||||||
|
|
||||||
|
@ -188,19 +188,19 @@ interface INotification {
|
||||||
* @param array $parameters
|
* @param array $parameters
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the message or parameters are invalid
|
* @throws \InvalidArgumentException if the message or parameters are invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setRichMessage($message, array $parameters = []);
|
public function setRichMessage($message, array $parameters = []);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichMessage();
|
public function getRichMessage();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getRichMessageParameters();
|
public function getRichMessageParameters();
|
||||||
|
|
||||||
|
@ -222,13 +222,13 @@ interface INotification {
|
||||||
* @param string $icon
|
* @param string $icon
|
||||||
* @return $this
|
* @return $this
|
||||||
* @throws \InvalidArgumentException if the icon is invalid
|
* @throws \InvalidArgumentException if the icon is invalid
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function setIcon($icon);
|
public function setIcon($icon);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getIcon();
|
public function getIcon();
|
||||||
|
|
||||||
|
|
|
@ -26,12 +26,12 @@ namespace OCP\RichObjectStrings;
|
||||||
* Class Definitions
|
* Class Definitions
|
||||||
*
|
*
|
||||||
* @package OCP\RichObjectStrings
|
* @package OCP\RichObjectStrings
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
class Definitions {
|
class Definitions {
|
||||||
/**
|
/**
|
||||||
* @var array
|
* @var array
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public $definitions = [
|
public $definitions = [
|
||||||
'addressbook' => [
|
'addressbook' => [
|
||||||
|
@ -284,7 +284,7 @@ class Definitions {
|
||||||
* @param string $type
|
* @param string $type
|
||||||
* @return array
|
* @return array
|
||||||
* @throws InvalidObjectExeption
|
* @throws InvalidObjectExeption
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getDefinition($type) {
|
public function getDefinition($type) {
|
||||||
if (isset($this->definitions[$type])) {
|
if (isset($this->definitions[$type])) {
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace OCP\RichObjectStrings;
|
||||||
* Class Validator
|
* Class Validator
|
||||||
*
|
*
|
||||||
* @package OCP\RichObjectStrings
|
* @package OCP\RichObjectStrings
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
interface IValidator {
|
interface IValidator {
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ interface IValidator {
|
||||||
* @param string $subject
|
* @param string $subject
|
||||||
* @param array[] $parameters
|
* @param array[] $parameters
|
||||||
* @throws InvalidObjectExeption
|
* @throws InvalidObjectExeption
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function validate($subject, array $parameters);
|
public function validate($subject, array $parameters);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace OCP\RichObjectStrings;
|
||||||
* Class InvalidObjectExeption
|
* Class InvalidObjectExeption
|
||||||
*
|
*
|
||||||
* @package OCP\RichObjectStrings
|
* @package OCP\RichObjectStrings
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
class InvalidObjectExeption extends \InvalidArgumentException {
|
class InvalidObjectExeption extends \InvalidArgumentException {
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,7 +95,7 @@ interface IManager {
|
||||||
* @param Folder $node
|
* @param Folder $node
|
||||||
* @param bool $reshares
|
* @param bool $reshares
|
||||||
* @return IShare[][] [$fileId => IShare[], ...]
|
* @return IShare[][] [$fileId => IShare[], ...]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getSharesInFolder($userId, Folder $node, $reshares = false);
|
public function getSharesInFolder($userId, Folder $node, $reshares = false);
|
||||||
|
|
||||||
|
@ -290,7 +290,7 @@ interface IManager {
|
||||||
* Check if a given share provider exists
|
* Check if a given share provider exists
|
||||||
* @param int $shareType
|
* @param int $shareType
|
||||||
* @return bool
|
* @return bool
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function shareProviderExists($shareType);
|
public function shareProviderExists($shareType);
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ interface IProviderFactory {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return IShareProvider[]
|
* @return IShareProvider[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getAllProviders();
|
public function getAllProviders();
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ interface IShareProvider {
|
||||||
* @param Folder $node
|
* @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
|
* @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[]
|
* @return \OCP\Share\IShare[]
|
||||||
* @since 9.2.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getSharesInFolder($userId, Folder $node, $reshares);
|
public function getSharesInFolder($userId, Folder $node, $reshares);
|
||||||
|
|
||||||
|
|
|
@ -169,10 +169,10 @@ class AppSettingsController extends Controller {
|
||||||
$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
|
$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
|
||||||
$nextCloudVersionDependencies = [];
|
$nextCloudVersionDependencies = [];
|
||||||
if($nextCloudVersion->getMinimumVersion() !== '') {
|
if($nextCloudVersion->getMinimumVersion() !== '') {
|
||||||
$nextCloudVersionDependencies['owncloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
|
$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
|
||||||
}
|
}
|
||||||
if($nextCloudVersion->getMaximumVersion() !== '') {
|
if($nextCloudVersion->getMaximumVersion() !== '') {
|
||||||
$nextCloudVersionDependencies['owncloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
|
$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
|
||||||
}
|
}
|
||||||
$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
|
$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
|
||||||
$existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
|
$existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
|
||||||
|
@ -331,8 +331,8 @@ class AppSettingsController extends Controller {
|
||||||
$app['canInstall'] = empty($missing);
|
$app['canInstall'] = empty($missing);
|
||||||
$app['missingDependencies'] = $missing;
|
$app['missingDependencies'] = $missing;
|
||||||
|
|
||||||
$app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['min-version']);
|
$app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['min-version']);
|
||||||
$app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['max-version']);
|
$app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['nextcloud']['@attributes']['max-version']);
|
||||||
|
|
||||||
return $app;
|
return $app;
|
||||||
}, $apps);
|
}, $apps);
|
||||||
|
|
|
@ -27,7 +27,7 @@ class AppFetcherTest extends FetcherBase {
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
$this->fileName = 'apps.json';
|
$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->fetcher = new AppFetcher(
|
||||||
$this->appData,
|
$this->appData,
|
||||||
|
|
|
@ -295,7 +295,7 @@ class DependencyAnalyzerTest extends TestCase {
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
[
|
[
|
||||||
'Server version 11 or higher is required.',
|
'Server version 9.2 or higher is required.',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'nextcloud' => [
|
'nextcloud' => [
|
||||||
|
@ -305,6 +305,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.',
|
'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' => [
|
'owncloud' => [
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
|
// 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
|
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
|
||||||
// when updating major/minor version number.
|
// when updating major/minor version number.
|
||||||
$OC_Version = array(9, 2, 0, 5);
|
$OC_Version = array(11, 0, 0, 0);
|
||||||
|
|
||||||
// The human readable string
|
// The human readable string
|
||||||
$OC_VersionString = '11.0 alpha';
|
$OC_VersionString = '11.0 alpha';
|
||||||
|
|
Loading…
Reference in New Issue