GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[FILE] Fix Return value of File::getFileOrThumbnailSize() must be of the type int, null returned

Browse Source
This commit is contained in:
Diogo Cordeiro 2019-10-19 01:16:37 +01:00 committed by Diogo Peralta Cordeiro
parent 81711a18d9
commit 4a78510e37
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classes/File.php
View File

@ -309,9 +309,9 @@ class File extends Managed_DataObject
return self::tryFilename($this->filename); return self::tryFilename($this->filename);
} }
public function getSize() public function getSize(): int
{ {
return intval($this->size); return (int)$this->size;
} }
// where should the file go? // where should the file go?
@ -342,6 +342,7 @@ class File extends Managed_DataObject
/** /**
* @param string $filename * @param string $filename
* @return string|bool Value from the 'extblacklist' array, in the config * @return string|bool Value from the 'extblacklist' array, in the config
* @throws ServerException
*/ */
public static function getSafeExtension(string $filename) public static function getSafeExtension(string $filename)
{ {
@ -373,6 +374,7 @@ class File extends Managed_DataObject
* @param $filename string An optional filename which we can use on failure. * @param $filename string An optional filename which we can use on failure.
* @return mixed|string * @return mixed|string
* @throws ClientException * @throws ClientException
* @throws ServerException
*/ */
public static function guessMimeExtension($mimetype, $filename=null) public static function guessMimeExtension($mimetype, $filename=null)
{ {
@ -431,6 +433,7 @@ class File extends Managed_DataObject
* @param $filename * @param $filename
* @return string * @return string
* @throws InvalidFilenameException * @throws InvalidFilenameException
* @throws ServerException
*/ */
public static function path($filename) public static function path($filename)
{ {
@ -561,7 +564,7 @@ class File extends Managed_DataObject
* @throws UnsupportedMediaException if, despite trying, we can't understand how to make a thumbnail for this format * @throws UnsupportedMediaException if, despite trying, we can't understand how to make a thumbnail for this format
* @throws ServerException on various other errors * @throws ServerException on various other errors
*/ */
public function getThumbnail($width=null, $height=null, $crop=false, $force_still=true, $upscale=null) public function getThumbnail($width=null, $height=null, $crop=false, $force_still=true, $upscale=null): File_thumbnail
{ {
// Get some more information about this file through our ImageFile class // Get some more information about this file through our ImageFile class
$image = ImageFile::fromFileObject($this); $image = ImageFile::fromFileObject($this);
@ -600,13 +603,14 @@ class File extends Managed_DataObject
* Returns the path to either a file, or it's thumbnail if the file doesn't exist. * Returns the path to either a file, or it's thumbnail if the file doesn't exist.
* This is useful in case the original file is deleted, or, as is the case for Embed * This is useful in case the original file is deleted, or, as is the case for Embed
* thumbnails, we only have a thumbnail and not a file * thumbnails, we only have a thumbnail and not a file
* @param File_thumbnail|null $thumbnail
* @return string Path * @return string Path
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws FileNotStoredLocallyException * @throws FileNotStoredLocallyException
* @throws InvalidFilenameException * @throws InvalidFilenameException
* @throws ServerException * @throws ServerException
*/ */
public function getFileOrThumbnailPath($thumbnail = null) : string public function getFileOrThumbnailPath(?File_thumbnail $thumbnail = null) : string
{ {
if (!empty($thumbnail)) { if (!empty($thumbnail)) {
return $thumbnail->getPath(); return $thumbnail->getPath();
@ -630,13 +634,15 @@ class File extends Managed_DataObject
/** /**
* Return the mime type of the thumbnail if we have it, or, if not, of the File * Return the mime type of the thumbnail if we have it, or, if not, of the File
* @param File_thumbnail|null $thumbnail
* @return string * @return string
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws NoResultException * @throws NoResultException
* @throws ServerException * @throws ServerException
* @throws UnsupportedMediaException * @throws UnsupportedMediaException
* @throws Exception
*/ */
public function getFileOrThumbnailMimetype($thumbnail = null) : string public function getFileOrThumbnailMimetype(?File_thumbnail $thumbnail = null) : string
{ {
if (!empty($thumbnail)) { if (!empty($thumbnail)) {
$filepath = $thumbnail->getPath(); $filepath = $thumbnail->getPath();
@ -656,17 +662,18 @@ class File extends Managed_DataObject
/** /**
* Return the size of the thumbnail if we have it, or, if not, of the File * Return the size of the thumbnail if we have it, or, if not, of the File
* @param File_thumbnail|null $thumbnail
* @return int * @return int
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws NoResultException * @throws NoResultException
* @throws ServerException * @throws ServerException
*/ */
public function getFileOrThumbnailSize($thumbnail = null) : int public function getFileOrThumbnailSize(?File_thumbnail $thumbnail = null) : int
{ {
if (!empty($thumbnail)) { if (!empty($thumbnail)) {
return filesize($thumbnail->getPath()); return filesize($thumbnail->getPath());
} elseif (!empty($this->filename)) { } elseif (!empty($this->filename)) {
return $this->size; return $this->getSize();
} else { } else {
return filesize(File_thumbnail::byFile($this)->getPath()); return filesize(File_thumbnail::byFile($this)->getPath());
} }