Merge pull request #2552 from thanhtaivtt/develop

Update File.php

Author: lonnieezell

system/Files/File.php

@@ -86,29 +86,36 @@ 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.
 	 *
-	 * @param string $unit The unit to return:
-	 *      - b   Bytes
-	 *      - kb  Kilobytes
-	 *      - mb  Megabytes
-	 *
-	 * @return integer|null The file size in bytes or null if unknown.
+	 * @return integer The file size in bytes
 	 */
-	public function getSize(string $unit = 'b')
+	public function getSize()
 	{
 		if (is_null($this->size))
 		{
-			$this->size = filesize($this->getPathname());
+			$this->size = parent::getSize();
 		}
 
+		return $this->size;
+	}
+
+	/**
+	 * Retrieve the file size by unit.
+	 *
+	 * @param string $unit
+	 *
+	 * @return integer|string
+	 */
+	public function getSizeByUnit(string $unit = 'b')
+	{
 		switch (strtolower($unit))
 		{
 			case 'kb':
-				return number_format($this->size / 1024, 3);
+				return number_format($this->getSize() / 1024, 3);
 			case 'mb':
-				return number_format(($this->size / 1024) / 1024, 3);
+				return number_format(($this->getSize() / 1024) / 1024, 3);
+			default:
+				return $this->getSize();
 		}
-
-		return (int) $this->size;
 	}
 
 	//--------------------------------------------------------------------

tests/system/Files/FileTest.php

@@ -51,14 +51,14 @@ public function testGetSizeReturnsKB()
 	{
 		$file = new File(SYSTEMPATH . 'Common.php');
 		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
-		$this->assertEquals($size, $file->getSize('kb'));
+		$this->assertEquals($size, $file->getSizeByUnit('kb'));
 	}
 
 	public function testGetSizeReturnsMB()
 	{
 		$file = new File(SYSTEMPATH . 'Common.php');
 		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
-		$this->assertEquals($size, $file->getSize('mb'));
+		$this->assertEquals($size, $file->getSizeByUnit('mb'));
 	}
 
 	/**

user_guide_src/source/libraries/files.rst

@@ -68,6 +68,15 @@ the results in kilobytes or megabytes, respectively::
 	$kilobytes = $file->getSize('kb');  // 250.880
 	$megabytes = $file->getSize('mb');  // 0.245
 
+**getSizeByUnit()**
+
+Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
+the results in kilobytes or megabytes, respectively::
+
+	$bytes     = $file->getSizeByUnit();      // 256901
+	$kilobytes = $file->getSizeByUnit('kb');  // 250.880
+	$megabytes = $file->getSizeByUnit('mb');  // 0.245
+
 **getMimeType()**
 
 Retrieve the media type (mime type) of the file. Uses methods that are considered as secure as possible when determining