Address minor comments

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Dec 9, 2020 · c4ea37b · c4ea37b
1 parent 676d2b7
commit c4ea37b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
@@ -222,7 +222,7 @@ private function getShareTypes(Node $node) {
 			IShare::TYPE_REMOTE,
 			IShare::TYPE_EMAIL,
 			IShare::TYPE_ROOM,
-			IShare::TYPE_DECK
+			IShare::TYPE_DECK,
 		];
 		foreach ($requestedShareTypes as $requestedShareType) {
 			// one of each type is enough to find out about the types

diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
@@ -220,7 +220,7 @@ private function getRoomShareHelper() {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController');
+		return $this->serverContainer->get('\OCA\Talk\Share\Helper\DeletedShareAPIController');
 	}
 
 	/**
@@ -237,6 +237,6 @@ private function getDeckShareHelper() {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Deck\Sharing\ShareAPIHelper');
+		return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
 	}
 }
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -1558,7 +1558,7 @@ private function getRoomShareHelper() {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
+		return $this->serverContainer->get('\OCA\Talk\Share\Helper\ShareAPIController');
 	}
 
 	/**
@@ -1575,7 +1575,7 @@ private function getDeckShareHelper() {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Deck\Sharing\ShareAPIHelper');
+		return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
 	}
 
 	/**

diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -1558,7 +1558,7 @@ public function testCanAccessRoomShare(bool $expected, \OCP\Share\IShare $share,
 				->with($share, $this->currentUser)
 				->willReturn($canAccessShareByHelper);
 
-			$this->serverContainer->method('query')
+			$this->serverContainer->method('get')
 				->with('\OCA\Talk\Share\Helper\ShareAPIController')
 				->willReturn($helper);
 		}
@@ -2222,7 +2222,7 @@ function ($share) {
 				}
 			);
 
-		$this->serverContainer->method('query')
+		$this->serverContainer->method('get')
 			->with('\OCA\Talk\Share\Helper\ShareAPIController')
 			->willReturn($helper);
 
@@ -2340,7 +2340,7 @@ function ($share) {
 				}
 			);
 
-		$this->serverContainer->method('query')
+		$this->serverContainer->method('get')
 			->with('\OCA\Talk\Share\Helper\ShareAPIController')
 			->willReturn($helper);
 
@@ -4404,7 +4404,7 @@ public function testFormatRoomShare(array $expects, \OCP\Share\IShare $share, bo
 				->with($share)
 				->willReturn($formatShareByHelper);
 
-			$this->serverContainer->method('query')
+			$this->serverContainer->method('get')
 				->with('\OCA\Talk\Share\Helper\ShareAPIController')
 				->willReturn($helper);
 		}

diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php
@@ -71,9 +71,10 @@ class Constants {
 	public const SHARE_TYPE_ROOM = 10;
 	// const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
 	/**
-	 * @deprecated 21.0.0 - use IShare::TYPE_ROOM instead
+	 * @deprecated 21.0.0 - use IShare::TYPE_DECK instead
 	 */
 	public const SHARE_TYPE_DECK = 12;
+	// const SHARE_TYPE_DECK_USER = 13; // Internal type used by DeckShareProvider
 
 	public const FORMAT_NONE = -1;
 	public const FORMAT_STATUSES = -2;

diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php
@@ -111,7 +111,8 @@ interface IShare {
 	public const TYPE_DECK = 12;
 
 	/**
-	 * @internal 21.00
+	 * @internal
+	 * @since 21.0.0
 	 */
 	public const TYPE_DECK_USER = 13;