Skip to content

Make File compatible with SplFileInfo #5040

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
merged 1 commit into from
Aug 30, 2021
Merged

Make File compatible with SplFileInfo #5040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions system/Files/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use CodeIgniter\Files\Exceptions\FileException;
use CodeIgniter\Files\Exceptions\FileNotFoundException;
use Config\Mimes;
use ReturnTypeWillChange;
use SplFileInfo;

/**
Expand All @@ -29,15 +30,15 @@ class File extends SplFileInfo
protected $size;

/**
* Original MimeType
*
* @var string|null
*/
protected $originalMimeType;

/**
* Run our SplFileInfo constructor with an optional verification
* that the path is really a file.
*
* @throws FileNotFoundException
*/
public function __construct(string $path, bool $checkFile = false)
{
Expand All @@ -55,8 +56,9 @@ public function __construct(string $path, bool $checkFile = false)
* the file in the $_FILES array if available, as PHP calculates this based
* on the actual size transmitted.
*
* @return int The file size in bytes
* @return false|int The file size in bytes, or false on failure
*/
#[ReturnTypeWillChange]
public function getSize()
{
return $this->size ?? ($this->size = parent::getSize());
Expand All @@ -65,7 +67,7 @@ public function getSize()
/**
* Retrieve the file size by unit.
*
* @return int|string
* @return false|int|string
*/
public function getSizeByUnit(string $unit = 'b')
{
Expand Down