From af88dc9ed7d92006734ba02989022bc6e3ce3d0c Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Tue, 10 Sep 2024 12:06:00 +0200
Subject: [PATCH] fix(ACL): Actually return in ACLStorageWrapper methods

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 lib/ACL/ACLStorageWrapper.php | 4 ++--
 tests/psalm-baseline.xml      | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/ACL/ACLStorageWrapper.php b/lib/ACL/ACLStorageWrapper.php
index 668b9cd9a..4a00aa8c0 100644
--- a/lib/ACL/ACLStorageWrapper.php
+++ b/lib/ACL/ACLStorageWrapper.php
@@ -248,7 +248,7 @@ public function filemtime($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
-		parent::filemtime($path);
+		return parent::filemtime($path);
 	}
 
 	public function file_get_contents($path) {
@@ -269,7 +269,7 @@ public function hash($type, $path, $raw = false) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
-		parent::hash($type, $path, $raw);
+		return parent::hash($type, $path, $raw);
 	}
 
 	public function getETag($path) {
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 63b8ea0a4..5ba587881 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/ACL/ACLStorageWrapper.php">
-    <InvalidNullableReturnType>
-      <code>filemtime</code>
-      <code>hash</code>
-    </InvalidNullableReturnType>
     <UndefinedClass>
-      <code>IteratorDirectory</code>
+      <code><![CDATA[IteratorDirectory]]></code>
     </UndefinedClass>
   </file>
   <file src="lib/Versions/ExpireManager.php">