mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22794 from nextcloud/version/20.0.0/rc1 

20 RC1
This commit is contained in:
Morris Jobke 2020-09-17 19:56:31 +02:00 committed by GitHub
parent dada6ec60a cb735c671b
commit e14ba58b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/public/User/GetQuotaEvent.php
View File

@ -28,6 +28,8 @@ use OCP\IUser;
/** /**
* Event to allow apps to * Event to allow apps to
*
* @since 20.0.0
*/ */
class GetQuotaEvent extends Event { class GetQuotaEvent extends Event {
/** @var IUser */ /** @var IUser */
@ -35,11 +37,17 @@ class GetQuotaEvent extends Event {
/** @var string|null */ /** @var string|null */
private $quota = null; private $quota = null;
/**
* @since 20.0.0
*/
public function __construct(IUser $user) { public function __construct(IUser $user) {
parent::__construct(); parent::__construct();
$this->user = $user; $this->user = $user;
} }
/**
* @since 20.0.0
*/
public function getUser(): IUser { public function getUser(): IUser {
return $this->user; return $this->user;
} }
@ -47,7 +55,7 @@ class GetQuotaEvent extends Event {
/** /**
* Get the set quota as human readable string, or null if no overwrite is set * Get the set quota as human readable string, or null if no overwrite is set
* *
* @return string|null * @since 20.0.0
*/ */
public function getQuota(): ?string { public function getQuota(): ?string {
return $this->quota; return $this->quota;
@ -56,7 +64,7 @@ class GetQuotaEvent extends Event {
/** /**
* Set the quota overwrite as human readable string * Set the quota overwrite as human readable string
* *
* @param string $quota * @since 20.0.0
*/ */
public function setQuota(string $quota): void { public function setQuota(string $quota): void {
$this->quota = $quota; $this->quota = $quota;

4
version.php
View File

@ -29,10 +29,10 @@
// 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 = [20, 0, 0, 6]; $OC_Version = [20, 0, 0, 7];
// The human readable string // The human readable string
$OC_VersionString = '20.0.0 Beta 4'; $OC_VersionString = '20.0.0 RC1';
$OC_VersionCanBeUpgradedFrom = [ $OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [ 'nextcloud' => [