Browse Source
Merge pull request #22794 from nextcloud/version/20.0.0/rc1
20 RC1
pull/22924/head
v20.0.0RC1
Morris Jobke
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
12 additions and
4 deletions
-
lib/public/User/GetQuotaEvent.php
-
version.php
|
|
|
@ -28,6 +28,8 @@ use OCP\IUser; |
|
|
|
|
|
|
|
/** |
|
|
|
* Event to allow apps to |
|
|
|
* |
|
|
|
* @since 20.0.0 |
|
|
|
*/ |
|
|
|
class GetQuotaEvent extends Event { |
|
|
|
/** @var IUser */ |
|
|
|
@ -35,11 +37,17 @@ class GetQuotaEvent extends Event { |
|
|
|
/** @var string|null */ |
|
|
|
private $quota = null; |
|
|
|
|
|
|
|
/** |
|
|
|
* @since 20.0.0 |
|
|
|
*/ |
|
|
|
public function __construct(IUser $user) { |
|
|
|
parent::__construct(); |
|
|
|
$this->user = $user; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @since 20.0.0 |
|
|
|
*/ |
|
|
|
public function getUser(): IUser { |
|
|
|
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 |
|
|
|
* |
|
|
|
* @return string|null |
|
|
|
* @since 20.0.0 |
|
|
|
*/ |
|
|
|
public function getQuota(): ?string { |
|
|
|
return $this->quota; |
|
|
|
@ -56,7 +64,7 @@ class GetQuotaEvent extends Event { |
|
|
|
/** |
|
|
|
* Set the quota overwrite as human readable string |
|
|
|
* |
|
|
|
* @param string $quota |
|
|
|
* @since 20.0.0 |
|
|
|
*/ |
|
|
|
public function setQuota(string $quota): void { |
|
|
|
$this->quota = $quota; |
|
|
|
|
|
|
|
@ -29,10 +29,10 @@ |
|
|
|
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
|
|
|
|
// when updating major/minor version number.
|
|
|
|
|
|
|
|
$OC_Version = [20, 0, 0, 6]; |
|
|
|
$OC_Version = [20, 0, 0, 7]; |
|
|
|
|
|
|
|
// The human readable string
|
|
|
|
$OC_VersionString = '20.0.0 Beta 4'; |
|
|
|
$OC_VersionString = '20.0.0 RC1'; |
|
|
|
|
|
|
|
$OC_VersionCanBeUpgradedFrom = [ |
|
|
|
'nextcloud' => [ |
|
|
|
|