mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4001 from nextcloud/backport-27389 

Ensure that FileInfo return values as required by its phpdoc.
This commit is contained in:
Morris Jobke 2017-03-23 13:00:49 -06:00 committed by GitHub
parent 9039b71a23 88015bc51f
commit eee7e97a6e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/Files/FileInfo.php
View File

@ -148,10 +148,12 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
} }
/** /**
* @return int * Get FileInfo ID or null in case of part file
*
* @return int|null
*/ */
public function getId() { public function getId() {
return $this->data['fileid']; return isset($this->data['fileid']) ? (int) $this->data['fileid'] : null;
} }
/** /**
@ -193,7 +195,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
*/ */
public function getSize() { public function getSize() {
$this->updateEntryfromSubMounts(); $this->updateEntryfromSubMounts();
return isset($this->data['size']) ? $this->data['size'] : 0; return isset($this->data['size']) ? (int) $this->data['size'] : 0;
} }
/** /**
@ -201,7 +203,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
*/ */
public function getMTime() { public function getMTime() {
$this->updateEntryfromSubMounts(); $this->updateEntryfromSubMounts();
return $this->data['mtime']; return (int) $this->data['mtime'];
} }
/** /**
@ -224,11 +226,11 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
* @return int * @return int
*/ */
public function getPermissions() { public function getPermissions() {
$perms = $this->data['permissions']; $perms = (int) $this->data['permissions'];
if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) { if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) {
$perms = $perms & ~\OCP\Constants::PERMISSION_SHARE; $perms = $perms & ~\OCP\Constants::PERMISSION_SHARE;
} }
return $perms; return (int) $perms;
} }
/** /**

2
lib/public/Files/FileInfo.php
View File

@ -144,7 +144,7 @@ interface FileInfo {
/** /**
* Get the file id of the file or folder * Get the file id of the file or folder
* *
* @return int * @return int|null
* @since 7.0.0 * @since 7.0.0
*/ */
public function getId(); public function getId();