Skip to content

Use 11.0 instead 9.2 #2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 4 commits into from
Nov 15, 2016
Merged

Use 11.0 instead 9.2 #2139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc1008a
Use 11.0 instead 9.2
LukasReschke Nov 15, 2016
5fd4284
Adjust previous fallbacks
LukasReschke Nov 15, 2016
b775d93
Endpoint is now 11.0.0
LukasReschke Nov 15, 2016
f07d75a
@since 9.2.0 to @since 11.0.0
rullzer Nov 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
@SInCE 9.2.0 to @SInCE 11.0.0 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Nov 15, 2016
commit f07d75a4dda0b6c6de126561d74da6e5a449fb99
8 changes: 4 additions & 4 deletions core/js/files/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@
/**
* Returns the dav.Client instance used internally
*
* @since 9.2
* @since 11.0.0
* @return {dav.Client}
*/
getClient: function() {
Expand All @@ -744,7 +744,7 @@
/**
* Returns the user name
*
* @since 9.2
* @since 11.0.0
* @return {String} userName
*/
getUserName: function() {
Expand All @@ -754,7 +754,7 @@
/**
* Returns the password
*
* @since 9.2
* @since 11.0.0
* @return {String} password
*/
getPassword: function() {
Expand All @@ -764,7 +764,7 @@
/**
* Returns the base URL
*
* @since 9.2
* @since 11.0.0
* @return {String} base URL
*/
getBaseUrl: function() {
Expand Down
12 changes: 6 additions & 6 deletions core/js/public/appconfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

/**
* @namespace
* @since 9.2.0
* @since 11.0.0
*/
OCP.AppConfig = {
/**
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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 || {};
Expand All @@ -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 || {};
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/private/AppFramework/Db/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ public function escapeLikeParameter($param) {
* 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();
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Comments/Comment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public function setMessage($message) {
* 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:
* [
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Comments/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ public function registerEventHandler(\Closure $closure) {
* @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.
Expand All @@ -790,7 +790,7 @@ public function registerDisplayNameResolver($type, \Closure $closure) {
* @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
Expand Down
2 changes: 1 addition & 1 deletion lib/private/DB/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public function escapeLikeParameter($param) {
* 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');
Expand Down
16 changes: 8 additions & 8 deletions lib/private/Notification/Notification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public function getParsedSubject() {
* @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 === '') {
Expand All @@ -304,15 +304,15 @@ public function setRichSubject($subject, array $parameters = []) {

/**
* @return string
* @since 9.2.0
* @since 11.0.0
*/
public function getRichSubject() {
return $this->subjectRich;
}

/**
* @return array[]
* @since 9.2.0
* @since 11.0.0
*/
public function getRichSubjectParameters() {
return $this->subjectRichParameters;
Expand Down Expand Up @@ -379,7 +379,7 @@ public function getParsedMessage() {
* @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 === '') {
Expand All @@ -394,15 +394,15 @@ public function setRichMessage($message, array $parameters = []) {

/**
* @return string
* @since 9.2.0
* @since 11.0.0
*/
public function getRichMessage() {
return $this->messageRich;
}

/**
* @return array[]
* @since 9.2.0
* @since 11.0.0
*/
public function getRichMessageParameters() {
return $this->messageRichParameters;
Expand Down Expand Up @@ -434,7 +434,7 @@ public function getLink() {
* @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])) {
Expand All @@ -446,7 +446,7 @@ public function setIcon($icon) {

/**
* @return string
* @since 9.2.0
* @since 11.0.0
*/
public function getIcon() {
return $this->icon;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/PreviewManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false)
* @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) {
Expand Down
4 changes: 2 additions & 2 deletions lib/private/RichObjectStrings/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* Class Validator
*
* @package OCP\RichObjectStrings
* @since 9.2.0
* @since 11.0.0
*/
class Validator implements IValidator {

Expand All @@ -53,7 +53,7 @@ public function __construct(Definitions $definitions) {
* @param string $subject
* @param array[] $parameters
* @throws InvalidObjectExeption
* @since 9.2.0
* @since 11.0.0
*/
public function validate($subject, array $parameters) {
$matches = [];
Expand Down
4 changes: 2 additions & 2 deletions lib/private/User/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = fa
* 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();
Expand All @@ -395,7 +395,7 @@ public function countSeenUsers() {

/**
* @param \Closure $callback
* @since 9.2.0
* @since 11.0.0
*/
public function callForSeenUsers(\Closure $callback) {
$limit = 1000;
Expand Down
2 changes: 1 addition & 1 deletion lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function allowInlineScript($state = false) {
*
* @param string $nonce
* @return $this
* @since 9.2.0
* @since 11.0.0
*/
public function useJsNonce($nonce) {
$this->useJsNonce = $nonce;
Expand Down
6 changes: 3 additions & 3 deletions lib/public/AppFramework/Http/FileDisplayResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* Class FileDisplayResponse
*
* @package OCP\AppFramework\Http
* @since 9.2.0
* @since 11.0.0
*/
class FileDisplayResponse extends Response implements ICallbackResponse {

Expand All @@ -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=[]) {
Expand All @@ -58,7 +58,7 @@ public function __construct($file, $statusCode=Http::STATUS_OK,

/**
* @param IOutput $output
* @since 9.2.0
* @since 11.0.0
*/
public function callback(IOutput $output) {
if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
Expand Down
2 changes: 1 addition & 1 deletion lib/public/AppFramework/OCSController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function __construct($appName,

/**
* @param int $version
* @since 9.2.0
* @since 11.0.0
* @internal
*/
public function setOCSVersion($version) {
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Comments/IComment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function setMessage($message);
* 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:
* [
Expand Down
4 changes: 2 additions & 2 deletions lib/public/Comments/ICommentsEventHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
* 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);
}
6 changes: 3 additions & 3 deletions lib/public/Comments/ICommentsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function deleteReadMarksOnObject($objectType, $objectId);
* to consumers of the comments infrastructure
*
* @param \Closure $closure
* @since 9.2.0
* @since 11.0.0
*/
public function registerEventHandler(\Closure $closure);

Expand All @@ -252,7 +252,7 @@ public function registerEventHandler(\Closure $closure);
* @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.
Expand All @@ -266,7 +266,7 @@ public function registerDisplayNameResolver($type, \Closure $closure);
* @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
Expand Down
4 changes: 2 additions & 2 deletions lib/public/Diagnostics/IQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public function getDuration();

/**
* @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();
}
2 changes: 1 addition & 1 deletion lib/public/Files/Config/ICachedMountInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function getMountId();
* 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();
}
2 changes: 1 addition & 1 deletion lib/public/Files/IAppData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* 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 {
Expand Down
Loading