Skip to content

Commit

Permalink
Merge pull request #19820 from nextcloud/fix/mismatching-docblock-ret…
Browse files Browse the repository at this point in the history
…urn-type

Fix mismatching docblock return types
  • Loading branch information
ChristophWurst authored Mar 9, 2020
2 parents 5b0dfd3 + df9e2b8 commit 1f7cb02
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
4 changes: 3 additions & 1 deletion apps/files_versions/lib/Versions/IVersionBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ public function read(IVersion $version);
* @param IUser $user
* @param FileInfo $sourceFile
* @param int|string $revision
* @return ISimpleFile
*
* @return File
*
* @since 15.0.0
*/
public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File;
Expand Down
3 changes: 2 additions & 1 deletion core/Migrations/Version16000Date20190212081545.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ class Version16000Date20190212081545 extends SimpleMigrationStep {
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
* @param array $options
* @return null|ISchemaWrapper
*
* @return ISchemaWrapper
*/
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
/** @var ISchemaWrapper $schema */
Expand Down
12 changes: 9 additions & 3 deletions lib/private/AllConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ public function getSystemValue($key, $default = '') {
*
* @param string $key the key of the value, under which it was saved
* @param mixed $default the default value to be returned if the value isn't set
* @return mixed the value or $default
*
* @return bool
*
* @since 16.0.0
*/
public function getSystemValueBool(string $key, bool $default = false): bool {
Expand All @@ -141,7 +143,9 @@ public function getSystemValueBool(string $key, bool $default = false): bool {
*
* @param string $key the key of the value, under which it was saved
* @param mixed $default the default value to be returned if the value isn't set
* @return mixed the value or $default
*
* @return int
*
* @since 16.0.0
*/
public function getSystemValueInt(string $key, int $default = 0): int {
Expand All @@ -153,7 +157,9 @@ public function getSystemValueInt(string $key, int $default = 0): int {
*
* @param string $key the key of the value, under which it was saved
* @param mixed $default the default value to be returned if the value isn't set
* @return mixed the value or $default
*
* @return string
*
* @since 16.0.0
*/
public function getSystemValueString(string $key, string $default = ''): string {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function __construct(bool $enforced,
}

/**
* @return string[]
* @return bool
*/
public function isEnforced(): bool {
return $this->enforced;
Expand Down
3 changes: 2 additions & 1 deletion lib/private/Group/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ public function countUsersInGroup(string $gid, string $search = ''): int {
* get the number of disabled users in a group
*
* @param string $search
* @return int|bool
*
* @return int
*/
public function countDisabledInGroup(string $gid): int {
$this->fixDI();
Expand Down
2 changes: 1 addition & 1 deletion lib/private/User/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public function getLoginName() {
}

/**
* @return mixed
* @return null|string
*/
public function getImpersonatingUserID(): ?string {

Expand Down

0 comments on commit 1f7cb02

Please sign in to comment.