Skip to content

Ensure that FileInfo return values as required by its phpdoc. #4001

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

Merged
MorrisJobke merged 2 commits into from
Mar 23, 2017
Merged

Ensure that FileInfo return values as required by its phpdoc. #4001

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
5c7079f
Ensure that FileInfo return values as required by its phpdoc.
mrow4a Mar 14, 2017
88015bc
Fix type hints and doc blocks
nickvergessen Mar 23, 2017
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
14 changes: 8 additions & 6 deletions lib/private/Files/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,12 @@ public function getInternalPath() {
}

/**
* @return int
* Get FileInfo ID or null in case of part file
*
* @return int|null
*/
public function getId() {
return $this->data['fileid'];
return isset($this->data['fileid']) ? (int) $this->data['fileid'] : null;
}

/**
Expand Down Expand Up @@ -193,15 +195,15 @@ public function getEtag() {
*/
public function getSize() {
$this->updateEntryfromSubMounts();
return isset($this->data['size']) ? $this->data['size'] : 0;
return isset($this->data['size']) ? (int) $this->data['size'] : 0;
}

/**
* @return int
*/
public function getMTime() {
$this->updateEntryfromSubMounts();
return $this->data['mtime'];
return (int) $this->data['mtime'];
}

/**
Expand All @@ -224,11 +226,11 @@ public function getEncryptedVersion() {
* @return int
*/
public function getPermissions() {
$perms = $this->data['permissions'];
$perms = (int) $this->data['permissions'];
if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) {
$perms = $perms & ~\OCP\Constants::PERMISSION_SHARE;
}
return $perms;
return (int) $perms;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Files/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function getStorage();
/**
* Get the file id of the file or folder
*
* @return int
* @return int|null
* @since 7.0.0
*/
public function getId();
Expand Down