Skip to content

Commit

Permalink
Merge pull request #22794 from nextcloud/version/20.0.0/rc1
Browse files Browse the repository at this point in the history
20 RC1
  • Loading branch information
MorrisJobke authored Sep 17, 2020
2 parents dada6ec + cb735c6 commit e14ba58
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions lib/public/User/GetQuotaEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,34 @@

/**
* Event to allow apps to
*
* @since 20.0.0
*/
class GetQuotaEvent extends Event {
/** @var IUser */
private $user;
/** @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;
}

/**
* 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;
Expand All @@ -56,7 +64,7 @@ public function getQuota(): ?string {
/**
* Set the quota overwrite as human readable string
*
* @param string $quota
* @since 20.0.0
*/
public function setQuota(string $quota): void {
$this->quota = $quota;
Expand Down
4 changes: 2 additions & 2 deletions version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down

0 comments on commit e14ba58

Please sign in to comment.