diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-09-17 20:56:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-17 20:56:31 +0300 |
| commit | e14ba58b6d2fec3702e4ad1f8445ccc74d922beb (patch) | |
| tree | 86754d72711652547d172a26d6e4716500bef8e7 | |
| parent | dada6ec60a7a4a7092748bbce6fafd1936a57389 (diff) | |
| parent | cb735c671b7ecfec0741a7dc7b551b2fa78539ea (diff) | |
Merge pull request #22794 from nextcloud/version/20.0.0/rc1v20.0.0RC1
20 RC1
| -rw-r--r-- | lib/public/User/GetQuotaEvent.php | 12 | ||||
| -rw-r--r-- | version.php | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lib/public/User/GetQuotaEvent.php b/lib/public/User/GetQuotaEvent.php index e7706db1730..7f1cc39e5f8 100644 --- a/lib/public/User/GetQuotaEvent.php +++ b/lib/public/User/GetQuotaEvent.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; diff --git a/version.php b/version.php index bb27fba74fb..d817ce91ce7 100644 --- a/version.php +++ b/version.php @@ -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' => [ |