1 files changed, 18 insertions, 44 deletions

diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php
index a9c5a329620..fa4c72da756 100755
--- a/lib/private/LargeFileHelper.php
+++ b/lib/private/LargeFileHelper.php
@@ -1,31 +1,9 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Andreas Fischer <bantu@owncloud.com>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author marco44 <cousinmarc@gmail.com>
- * @author Michael Roitzsch <reactorcontrol@icloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OC;
 
@@ -73,7 +51,7 @@ class LargeFileHelper {
 	 *
 	 * @return string Unsigned integer base-10 string
 	 */
-	public function formatUnsignedInteger($number) {
+	public function formatUnsignedInteger(int|float|string $number): string {
 		if (is_float($number)) {
 			// Undo the effect of the php.ini setting 'precision'.
 			return number_format($number, 0, '', '');
@@ -95,10 +73,9 @@ class LargeFileHelper {
 	 *
 	 * @param string $filename Path to the file.
 	 *
-	 * @return null|int|float Number of bytes as number (float or int) or
-	 *                        null on failure.
+	 * @return int|float Number of bytes as number (float or int)
 	 */
-	public function getFileSize($filename) {
+	public function getFileSize(string $filename): int|float {
 		$fileSize = $this->getFileSizeViaCurl($filename);
 		if (!is_null($fileSize)) {
 			return $fileSize;
@@ -118,7 +95,7 @@ class LargeFileHelper {
 	 * @return null|int|float Number of bytes as number (float or int) or
 	 *                        null on failure.
 	 */
-	public function getFileSizeViaCurl($fileName) {
+	public function getFileSizeViaCurl(string $fileName): null|int|float {
 		if (\OC::$server->get(IniGetWrapper::class)->getString('open_basedir') === '') {
 			$encodedFileName = rawurlencode($fileName);
 			$ch = curl_init("file:///$encodedFileName");
@@ -146,14 +123,14 @@ class LargeFileHelper {
 	 * @return null|int|float Number of bytes as number (float or int) or
 	 *                        null on failure.
 	 */
-	public function getFileSizeViaExec($filename) {
+	public function getFileSizeViaExec(string $filename): null|int|float {
 		if (\OCP\Util::isFunctionEnabled('exec')) {
 			$os = strtolower(php_uname('s'));
 			$arg = escapeshellarg($filename);
 			$result = null;
-			if (strpos($os, 'linux') !== false) {
+			if (str_contains($os, 'linux')) {
 				$result = $this->exec("stat -c %s $arg");
-			} elseif (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
+			} elseif (str_contains($os, 'bsd') || str_contains($os, 'darwin')) {
 				$result = $this->exec("stat -f %z $arg");
 			}
 			return $result;
@@ -171,41 +148,38 @@ class LargeFileHelper {
 	 *
 	 * @return int|float Number of bytes as number (float or int).
 	 */
-	public function getFileSizeNative($filename) {
+	public function getFileSizeNative(string $filename): int|float {
 		$result = filesize($filename);
 		if ($result < 0) {
 			// For file sizes between 2 GiB and 4 GiB, filesize() will return a
 			// negative int, as the PHP data type int is signed. Interpret the
 			// returned int as an unsigned integer and put it into a float.
-			return (float) sprintf('%u', $result);
+			return (float)sprintf('%u', $result);
 		}
 		return $result;
 	}
 
 	/**
 	 * Returns the current mtime for $fullPath
-	 *
-	 * @param string $fullPath
-	 * @return int
 	 */
-	public function getFileMtime($fullPath) {
+	public function getFileMtime(string $fullPath): int {
 		try {
-			$result = filemtime($fullPath);
+			$result = filemtime($fullPath) ?: -1;
 		} catch (\Exception $e) {
 			$result = - 1;
 		}
 		if ($result < 0) {
 			if (\OCP\Util::isFunctionEnabled('exec')) {
 				$os = strtolower(php_uname('s'));
-				if (strpos($os, 'linux') !== false) {
-					return $this->exec('stat -c %Y ' . escapeshellarg($fullPath));
+				if (str_contains($os, 'linux')) {
+					return (int)($this->exec('stat -c %Y ' . escapeshellarg($fullPath)) ?? -1);
 				}
 			}
 		}
 		return $result;
 	}
 
-	protected function exec($cmd) {
+	protected function exec(string $cmd): null|int|float {
 		$result = trim(exec($cmd));
 		return ctype_digit($result) ? 0 + $result : null;
 	}