2 files changed, 50 insertions, 30 deletions

diff --git a/apps/dav/lib/Storage/PublicOwnerWrapper.php b/apps/dav/lib/Storage/PublicOwnerWrapper.php
index 10bcd20de05..a0f1607d971 100644
--- a/apps/dav/lib/Storage/PublicOwnerWrapper.php
+++ b/apps/dav/lib/Storage/PublicOwnerWrapper.php
@@ -3,25 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2020, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * 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
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\DAV\Storage;
 
@@ -29,27 +12,25 @@ use OC\Files\Storage\Wrapper\Wrapper;
 
 class PublicOwnerWrapper extends Wrapper {
 
-	/** @var string */
-	private $owner;
+	private string $owner;
 
 	/**
-	 * @param array $arguments ['storage' => $storage, 'owner' => $owner]
+	 * @param array $parameters ['storage' => $storage, 'owner' => $owner]
 	 *
 	 * $storage: The storage the permissions mask should be applied on
 	 * $owner: The owner to use in case no owner is found
 	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->owner = $arguments['owner'];
+	public function __construct(array $parameters) {
+		parent::__construct($parameters);
+		$this->owner = $parameters['owner'];
 	}
 
-	public function getOwner($path) {
+	public function getOwner(string $path): string|false {
 		$owner = parent::getOwner($path);
-
-		if ($owner === null || $owner === false) {
-			return $this->owner;
+		if ($owner !== false) {
+			return $owner;
 		}
 
-		return $owner;
+		return $this->owner;
 	}
 }
diff --git a/apps/dav/lib/Storage/PublicShareWrapper.php b/apps/dav/lib/Storage/PublicShareWrapper.php
new file mode 100644
index 00000000000..fb0db4dca4c
--- /dev/null
+++ b/apps/dav/lib/Storage/PublicShareWrapper.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\DAV\Storage;
+
+use OC\Files\Storage\Wrapper\Wrapper;
+use OCP\Files\Storage\ISharedStorage;
+use OCP\Share\IShare;
+
+class PublicShareWrapper extends Wrapper implements ISharedStorage {
+
+	private IShare $share;
+
+	/**
+	 * @param array $parameters ['storage' => $storage, 'share' => $share]
+	 *
+	 * $storage: The storage the permissions mask should be applied on
+	 * $share: The share to use in case no share is found
+	 */
+	public function __construct(array $parameters) {
+		parent::__construct($parameters);
+		$this->share = $parameters['share'];
+	}
+
+	public function getShare(): IShare {
+		$storage = parent::getWrapperStorage();
+		if (method_exists($storage, 'getShare')) {
+			/** @var ISharedStorage $storage */
+			return $storage->getShare();
+		}
+
+		return $this->share;
+	}
+}