Merge pull request #18064 from nextcloud/feature/php74

Add php7.4 support

2 files changed, 23 insertions, 7 deletions

diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index e9a9e8e9885..aade0cdaf25 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -424,12 +424,26 @@ class Local extends \OC\Files\Storage\Common {
 	public function getETag($path) {
 		if ($this->is_file($path)) {
 			$stat = $this->stat($path);
-			return md5(
-				$stat['mtime'] .
-				$stat['ino'] .
-				$stat['dev'] .
-				$stat['size']
-			);
+
+			if ($stat === false) {
+				return md5('');
+			}
+
+			$toHash = '';
+			if (isset($stat['mtime'])) {
+				$toHash .= $stat['mtime'];
+			}
+			if (isset($stat['ino'])) {
+				$toHash .= $stat['ino'];
+			}
+			if (isset($stat['dev'])) {
+				$toHash .= $stat['dev'];
+			}
+			if (isset($stat['size'])) {
+				$toHash .= $stat['size'];
+			}
+
+			return md5($toHash);
 		} else {
 			return parent::getETag($path);
 		}
diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php
index 8cfdb57b225..a3b855aea26 100644
--- a/lib/private/Log/ExceptionSerializer.php
+++ b/lib/private/Log/ExceptionSerializer.php
@@ -92,7 +92,9 @@ class ExceptionSerializer {
 	];
 
 	private function editTrace(array &$sensitiveValues, array $traceLine): array {
-		$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+		if (isset($traceLine['args'])) {
+			$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+		}
 		$traceLine['args'] = ['*** sensitive parameters replaced ***'];
 		return $traceLine;
 	}