Skip to content

refactor: Breaking: Differentiate between kilobyte/kibibyte and megabyte/mebibyte #9271

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

Closed
wants to merge 1 commit into from
Closed

refactor: Breaking: Differentiate between kilobyte/kibibyte and megabyte/mebibyte #9271

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions system/Files/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,18 @@ public function getSize()

/**
* Retrieve the file size by unit.
* Supports the metric units "kb" and "mb"
* and the IEC units "kib" and "mib".
*
* @return false|int|string
*/
public function getSizeByUnit(string $unit = 'b')
{
return match (strtolower($unit)) {
'kb' => number_format($this->getSize() / 1024, 3),
'mb' => number_format(($this->getSize() / 1024) / 1024, 3),
'kb' => number_format($this->getSize() / 1000, 3),
'kib' => number_format($this->getSize() / 1024, 3),
'mb' => number_format(($this->getSize() / 1000) / 1000, 3),
'mib' => number_format(($this->getSize() / 1024) / 1024, 3),
default => $this->getSize(),
};
}
Expand Down
18 changes: 16 additions & 2 deletions tests/system/Files/FileTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,31 @@ public function testCanAccessSplFileInfoMethods(): void
$this->assertSame('file', $file->getType());
}

public function testGetSizeReturnsKB(): void
public function testGetSizeReturnsKiB(): void
{
$file = new File(SYSTEMPATH . 'Common.php');
$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
$this->assertSame($size, $file->getSizeByUnit('kib'));
}

public function testGetSizeReturnsKB(): void
{
$file = new File(SYSTEMPATH . 'Common.php');
$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1000, 3);
$this->assertSame($size, $file->getSizeByUnit('kb'));
}

public function testGetSizeReturnsMB(): void
public function testGetSizeReturnsMiB(): void
{
$file = new File(SYSTEMPATH . 'Common.php');
$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
$this->assertSame($size, $file->getSizeByUnit('mib'));
}

public function testGetSizeReturnsMB(): void
{
$file = new File(SYSTEMPATH . 'Common.php');
$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1000 / 1000, 3);
$this->assertSame($size, $file->getSizeByUnit('mb'));
}

Expand Down