Fix share attribute related tests + code style

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

4 files changed, 11 insertions, 24 deletions

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index d0120a299be..a46126b7ac4 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -70,7 +70,6 @@ use OCP\Share;
 use OCP\Share\Exceptions\AlreadySharedException;
 use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
-use OCP\Share\IAttributes;
 use OCP\Share\IManager;
 use OCP\Share\IProviderFactory;
 use OCP\Share\IShare;
@@ -1094,7 +1093,7 @@ class Manager implements IManager {
 				'shareWith' => $share->getSharedWith(),
 				'uidOwner' => $share->getSharedBy(),
 				'permissions' => $share->getPermissions(),
-				'attributes' => $share->getAttributes(),
+				'attributes' => $share->getAttributes() !== null ? $share->getAttributes()->toArray() : null,
 				'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
 			]);
 		}
@@ -2089,16 +2088,4 @@ class Manager implements IManager {
 			yield from $provider->getAllShares();
 		}
 	}
-
-	/**
-	 * @param IAttributes|null $perms
-	 * @return string
-	 */
-	private function hashAttributes($perms) {
-		if ($perms === null || empty($perms->toArray())) {
-			return "";
-		}
-
-		return \md5(\json_encode($perms->toArray()));
-	}
 }
diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php
index 1aeb79d4d31..9ba5db5252e 100644
--- a/lib/private/Share20/Share.php
+++ b/lib/private/Share20/Share.php
@@ -345,7 +345,7 @@ class Share implements IShare {
 	/**
 	 * @inheritdoc
 	 */
-	public function setAttributes(IAttributes $attributes) {
+	public function setAttributes(?IAttributes $attributes) {
 		$this->attributes = $attributes;
 		return $this;
 	}
@@ -353,7 +353,7 @@ class Share implements IShare {
 	/**
 	 * @inheritdoc
 	 */
-	public function getAttributes() {
+	public function getAttributes(): ?IAttributes {
 		return $this->attributes;
 	}
 
diff --git a/lib/public/Share/IAttributes.php b/lib/public/Share/IAttributes.php
index 9f2556e4005..6e4cee08b12 100644
--- a/lib/public/Share/IAttributes.php
+++ b/lib/public/Share/IAttributes.php
@@ -24,7 +24,7 @@ namespace OCP\Share;
  * Interface IAttributes
  *
  * @package OCP\Share
- * @since 10.2.0
+ * @since 25.0.0
  */
 interface IAttributes {
 
@@ -35,7 +35,7 @@ interface IAttributes {
 	 * @param string $key key
 	 * @param bool $enabled enabled
 	 * @return IAttributes The modified object
-	 * @since 10.2.0
+	 * @since 25.0.0
 	 */
 	public function setAttribute($scope, $key, $enabled);
 
@@ -46,7 +46,7 @@ interface IAttributes {
 	 * @param string $scope scope
 	 * @param string $key key
 	 * @return bool|null
-	 * @since 10.2.0
+	 * @since 25.0.0
 	 */
 	public function getAttribute($scope, $key);
 
@@ -62,7 +62,7 @@ interface IAttributes {
 	 * ]
 	 *
 	 * @return array formatted IAttributes
-	 * @since 10.2.0
+	 * @since 25.0.0
 	 */
 	public function toArray();
 }
diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php
index d81f263b464..f86e1ec542d 100644
--- a/lib/public/Share/IShare.php
+++ b/lib/public/Share/IShare.php
@@ -325,19 +325,19 @@ interface IShare {
 	/**
 	 * Set share attributes
 	 *
-	 * @param IAttributes $attributes
+	 * @param ?IAttributes $attributes
 	 * @since 25.0.0
 	 * @return IShare The modified object
 	 */
-	public function setAttributes(IAttributes $attributes);
+	public function setAttributes(?IAttributes $attributes);
 
 	/**
 	 * Get share attributes
 	 *
 	 * @since 25.0.0
-	 * @return IAttributes
+	 * @return ?IAttributes
 	 */
-	public function getAttributes();
+	public function getAttributes(): ?IAttributes;
 
 	/**
 	 * Set the accepted status