From 5b00e21e303438656ee50e9660ef9228a63b18a0 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 11 Sep 2020 08:56:14 +0200 Subject: [PATCH 1/2] 20 RC1 Signed-off-by: Roeland Jago Douma --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index bb27fba74f..d817ce91ce 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' => [ From cb735c671b7ecfec0741a7dc7b551b2fa78539ea Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 17 Sep 2020 19:50:44 +0200 Subject: [PATCH 2/2] Provide correct PHPDoc tags for public namespace Signed-off-by: Morris Jobke --- lib/public/User/GetQuotaEvent.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/public/User/GetQuotaEvent.php b/lib/public/User/GetQuotaEvent.php index e7706db173..7f1cc39e5f 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;