Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20 RC1 #22794

Merged
merged 2 commits into from
Sep 17, 2020
Merged

20 RC1 #22794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b00e21
20 RC1
rullzer Sep 11, 2020
cb735c6
Provide correct PHPDoc tags for public namespace
MorrisJobke Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lib/public/User/GetQuotaEvent.php
View file
Open in desktop
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
View file
Open in desktop
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