cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Aug 13, 2020 · 9bba102 · 9bba102
1 parent ff2991a
commit 9bba102
Show file tree

Hide file tree

Showing 37 changed files with 200 additions and 217 deletions.
diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php
@@ -25,6 +25,7 @@
  *
  */
 
+
 namespace OCA\Circles\Activity;
 
 use Exception;
@@ -39,8 +40,13 @@
 use OCP\Activity\IEvent;
 use OCP\Activity\IManager;
 use OCP\Activity\IProvider;
-use OpenCloud\Common\Exceptions\InvalidArgumentError;
 
+
+/**
+ * Class Provider
+ *
+ * @package OCA\Circles\Activity
+ */
 class Provider implements IProvider {
 
 
@@ -132,7 +138,6 @@ private function setIcon(IEvent $event, Circle $circle) {
 	}
 
 
-
 	/**
 	 * @param IEvent $event
 	 * @param Circle $circle
@@ -189,10 +194,9 @@ private function parseAsModerator(IEvent $event, Circle $circle, $params) {
 	 * @param Circle $circle
 	 * @param array $params
 	 *
-	 * @throws InvalidArgumentError
+	 * @throws FakeException
 	 */
 	private function parseMemberAsMember(IEvent $event, Circle $circle, $params) {
-
 		if (!key_exists('member', $params)) {
 			return;
 		}
@@ -210,6 +214,8 @@ private function parseMemberAsMember(IEvent $event, Circle $circle, $params) {
 	 * @param IEvent $event
 	 * @param Circle $circle
 	 * @param array $params
+	 *
+	 * @throws FakeException
 	 */
 	private function parseGroupAsModerator(IEvent $event, Circle $circle, $params) {
 		if (!key_exists('group', $params)) {
@@ -228,6 +234,8 @@ private function parseGroupAsModerator(IEvent $event, Circle $circle, $params) {
 	 * @param IEvent $event
 	 * @param Circle $circle
 	 * @param array $params
+	 *
+	 * @throws FakeException
 	 */
 	private function parseMemberAsModerator(IEvent $event, Circle $circle, $params) {
 		if (!key_exists('member', $params)) {
@@ -247,6 +255,8 @@ private function parseMemberAsModerator(IEvent $event, Circle $circle, $params)
 	 * @param IEvent $event
 	 * @param Circle $circle
 	 * @param array $params
+	 *
+	 * @throws FakeException
 	 */
 	private function parseLinkAsModerator(IEvent $event, Circle $circle, $params) {
 

diff --git a/lib/Api/Circles.php b/lib/Api/Circles.php
@@ -27,6 +27,7 @@
 namespace OCA\Circles\Api;
 
 
+use OC;
 use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\FederatedLink;
@@ -47,7 +48,7 @@ class Circles {
 	 * @return Circle
 	 */
 	public static function detailsCircle($circleId) {
-		$app = \OC::$server->query(Application::class);
+		$app = OC::$server->query(Application::class);
 		$c = $app->getContainer();
 
 		return $c->query(CirclesService::class)

diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php
@@ -30,6 +30,7 @@
 namespace OCA\Circles\Api\v1;
 
 
+use OC;
 use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Exceptions\ApiVersionIncompatibleException;
 use OCA\Circles\Model\Circle;
@@ -65,10 +66,10 @@ class Circles {
 	const LEVEL_MODERATOR = Member::LEVEL_MODERATOR;
 	const LEVEL_ADMIN = Member::LEVEL_ADMIN;
 	const LEVEL_OWNER = Member::LEVEL_OWNER;
-	
+
 
 	protected static function getContainer() {
-		$app = \OC::$server->query(Application::class);
+		$app = OC::$server->query(Application::class);
 
 		return $app->getContainer();
 	}
@@ -130,7 +131,6 @@ public static function compareVersion($apiVersion) {
 	 * @param string $name
 	 *
 	 * @return Circle
-	 * @throws QueryException
 	 */
 	public static function createCircle($type, $name) {
 		$c = self::getContainer();
@@ -148,7 +148,6 @@ public static function createCircle($type, $name) {
 	 * @param string $circleUniqueId
 	 *
 	 * @return Member
-	 * @throws QueryException
 	 */
 	public static function joinCircle($circleUniqueId) {
 		$c = self::getContainer();
@@ -167,7 +166,6 @@ public static function joinCircle($circleUniqueId) {
 	 * @param string $circleUniqueId
 	 *
 	 * @return Member
-	 * @throws QueryException
 	 */
 	public static function leaveCircle($circleUniqueId) {
 		$c = self::getContainer();
@@ -195,13 +193,12 @@ public static function leaveCircle($circleUniqueId) {
 	 * @param bool $forceAll
 	 *
 	 * @return Circle[]
-	 * @throws QueryException
 	 */
 	public static function listCircles($type, $name = '', $level = 0, $userId = '', $forceAll = false) {
 		$c = self::getContainer();
 
 		if ($userId === '') {
-			$userId = \OC::$server->getUserSession()
+			$userId = OC::$server->getUserSession()
 								  ->getUser()
 								  ->getUID();
 		}
@@ -261,7 +258,6 @@ public static function joinedCircleIds($userId = '') {
 	 * @param bool $forceAll
 	 *
 	 * @return Circle
-	 * @throws QueryException
 	 */
 	public static function detailsCircle($circleUniqueId, $forceAll = false) {
 		$c = self::getContainer();
@@ -280,7 +276,6 @@ public static function detailsCircle($circleUniqueId, $forceAll = false) {
 	 * @param array $settings
 	 *
 	 * @return Circle
-	 * @throws QueryException
 	 */
 	public static function settingsCircle($circleUniqueId, array $settings) {
 		$c = self::getContainer();
@@ -298,7 +293,6 @@ public static function settingsCircle($circleUniqueId, array $settings) {
 	 * @param string $circleUniqueId
 	 *
 	 * @return mixed
-	 * @throws QueryException
 	 */
 	public static function destroyCircle($circleUniqueId) {
 		$c = self::getContainer();
@@ -319,7 +313,6 @@ public static function destroyCircle($circleUniqueId) {
 	 * @param int $type
 	 *
 	 * @return Member[]
-	 * @throws QueryException
 	 */
 	public static function addMember($circleUniqueId, $ident, $type) {
 		$c = self::getContainer();
@@ -341,7 +334,6 @@ public static function addMember($circleUniqueId, $ident, $type) {
 	 * @param bool $forceAll
 	 *
 	 * @return Member
-	 * @throws QueryException
 	 */
 	public static function getMember($circleUniqueId, $ident, $type, $forceAll = false) {
 		$c = self::getContainer();
@@ -362,7 +354,6 @@ public static function getMember($circleUniqueId, $ident, $type, $forceAll = fal
 	 * @param int $type
 	 *
 	 * @return Member[]
-	 * @throws QueryException
 	 */
 	public static function removeMember($circleUniqueId, $ident, $type) {
 		$c = self::getContainer();
@@ -386,7 +377,6 @@ public static function removeMember($circleUniqueId, $ident, $type) {
 	 * @param int $level
 	 *
 	 * @return Member[]
-	 * @throws QueryException
 	 */
 	public static function levelMember($circleUniqueId, $ident, $type, $level) {
 		$c = self::getContainer();
@@ -410,7 +400,6 @@ public static function levelMember($circleUniqueId, $ident, $type, $level) {
 	 * @param string $broadcaster
 	 *
 	 * @return mixed
-	 * @throws QueryException
 	 */
 	public static function shareToCircle(
 		$circleUniqueId, $source, $type, array $payload, $broadcaster
@@ -434,7 +423,6 @@ public static function shareToCircle(
 	 * @param string $circleUniqueId
 	 *
 	 * @return mixed
-	 * @throws QueryException
 	 */
 	public static function getSharesFromCircle($circleUniqueId) {
 		$c = self::getContainer();
@@ -456,7 +444,6 @@ public static function getSharesFromCircle($circleUniqueId) {
 	 * @param string $remote
 	 *
 	 * @return FederatedLink
-	 * @throws QueryException
 	 */
 	public static function linkCircle($circleUniqueId, $remote) {
 		$c = self::getContainer();
@@ -476,7 +463,7 @@ public static function linkCircle($circleUniqueId, $remote) {
 	 * @return string
 	 */
 	public static function generateLink($circleUniqueId) {
-		return \OC::$server->getURLGenerator()
+		return OC::$server->getURLGenerator()
 						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
 	}
 
@@ -491,7 +478,7 @@ public static function generateLink($circleUniqueId) {
 	 * @return string
 	 */
 	public static function generateAbsoluteLink($circleUniqueId) {
-		return \OC::$server->getURLGenerator()
+		return OC::$server->getURLGenerator()
 						   ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
 	}
 
@@ -506,7 +493,7 @@ public static function generateAbsoluteLink($circleUniqueId) {
 	 * @return string
 	 */
 	public static function generateRemoteLink(FederatedLink $link) {
-		return \OC::$server->getURLGenerator()
+		return OC::$server->getURLGenerator()
 						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
 			   . '-' . $link->getToken();
 	}
@@ -560,7 +547,6 @@ public static function generateCircleParameter(SharingFrame $frame) {
 	 * @param array $circleUniqueIds
 	 *
 	 * @return string[] array of object ids or empty array if none found
-	 * @throws QueryException
 	 */
 	public static function getFilesForCircles($circleUniqueIds) {
 		$c = self::getContainer();

diff --git a/lib/Circles/FileSharingBroadcaster.php b/lib/Circles/FileSharingBroadcaster.php
@@ -44,8 +44,6 @@
 use OCA\FederatedFileSharing\Notifications;
 use OCP\AppFramework\QueryException;
 use OCP\Defaults;
-use OCP\Federation\ICloudFederationFactory;
-use OCP\Federation\ICloudFederationProviderManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -79,12 +77,6 @@ class FileSharingBroadcaster implements IBroadcaster {
 	/** @var IUserManager */
 	private $userManager;
 
-	/** @var ICloudFederationFactory */
-	private $federationFactory;
-
-	/** @var ICloudFederationProviderManager */
-	private $federationProviderManager;
-
 	/** @var ICloudIdManager */
 	private $federationCloudIdManager;
 
@@ -115,6 +107,7 @@ class FileSharingBroadcaster implements IBroadcaster {
 	/** @var bool */
 	private $federatedEnabled = false;
 
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -128,8 +121,6 @@ public function init() {
 		$this->mailer = OC::$server->getMailer();
 		$this->rootFolder = OC::$server->getLazyRootFolder();
 		$this->userManager = OC::$server->getUserManager();
-		$this->federationFactory = OC::$server->getCloudFederationFactory();
-		$this->federationProviderManager = OC::$server->getCloudFederationProviderManager();
 		$this->federationCloudIdManager = OC::$server->getCloudIdManager();
 		$this->logger = OC::$server->getLogger();
 		$this->urlGenerator = OC::$server->getURLGenerator();
@@ -348,7 +339,7 @@ private function generateShare($data): IShare {
 	 * @param Circle $circle
 	 * @param IShare $share
 	 * @param string $address
-	 * @param string $token
+	 * @param SharesToken $token
 	 *
 	 * @return bool
 	 */
@@ -361,11 +352,11 @@ public function sharedByFederated(Circle $circle, IShare $share, string $address
 			$sharedByFederatedId = $share->getSharedBy();
 			if ($this->userManager->userExists($sharedByFederatedId)) {
 				$cloudId = $this->federationCloudIdManager->getCloudId($sharedByFederatedId, $localUrl);
-				$sharedByFederatedId = $cloudId->getId();
 			}
+			$sharedByFederatedId = $cloudId->getId();
 			$ownerCloudId = $this->federationCloudIdManager->getCloudId($share->getShareOwner(), $localUrl);
 
-			$send = $this->federationNotifications->sendRemoteShare(
+			return $this->federationNotifications->sendRemoteShare(
 				$token->getToken(),
 				$address,
 				$share->getNode()
@@ -377,8 +368,6 @@ public function sharedByFederated(Circle $circle, IShare $share, string $address
 				$sharedByFederatedId,
 				Share::TYPE_USER
 			);
-
-			return $send;
 		} catch (\Exception $e) {
 			$this->logger->logException(
 				$e, [

diff --git a/lib/Command/Groups.php b/lib/Command/Groups.php
@@ -32,7 +32,6 @@
 use OCA\Circles\Exceptions\CommandMissingArgumentException;
 use OCA\Circles\Exceptions\FakeException;
 use OCP\IL10N;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -106,6 +105,7 @@ private function listLinkedGroups(InputInterface $input, OutputInterface $output
 	 * @param OutputInterface $output
 	 *
 	 * @throws FakeException
+	 * @throws CommandMissingArgumentException
 	 */
 	private function addLinkedGroups(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('link') !== true) {

diff --git a/lib/Controller/BaseController.php b/lib/Controller/BaseController.php
@@ -98,6 +98,7 @@ class BaseController extends Controller {
 	 * @param SearchService $searchService
 	 * @param MembersService $membersService
 	 * @param GSUpstreamService $gsUpstreamService
+	 * @param GSDownstreamService $gsDownstreamService
 	 * @param GroupsService $groupsService
 	 * @param SharingFrameService $sharingFrameService
 	 * @param BroadcastService $broadcastService

diff --git a/lib/Controller/FederatedController.php b/lib/Controller/FederatedController.php
@@ -30,6 +30,7 @@
 use OC\AppFramework\Http;
 use OCA\Circles\Api\v1\Circles;
 use OCA\Circles\Exceptions\CircleDoesNotExistException;
+use OCA\Circles\Exceptions\MissingKeyInArrayException;
 use OCA\Circles\Exceptions\SharingFrameAlreadyExistException;
 use OCA\Circles\Model\FederatedLink;
 use OCA\Circles\Model\SharingFrame;
@@ -144,6 +145,7 @@ public function requestedLink($data) {
 	 * @param $data
 	 *
 	 * @return FederatedLink
+	 * @throws MissingKeyInArrayException
 	 */
 	private function generateNewLink($data) {
 		MiscService::mustContains($data, ['token', 'uniqueId', 'sourceName', 'address']);
@@ -176,6 +178,7 @@ private function generateNewLink($data) {
 	 * @param string $item
 	 *
 	 * @return DataResponse
+	 * @throws Exception
 	 */
 	public function receiveFederatedDelivery($apiVersion, $token, $uniqueId, $item) {
 

diff --git a/lib/Controller/GroupsController.php b/lib/Controller/GroupsController.php
@@ -27,6 +27,7 @@
 namespace OCA\Circles\Controller;
 
 use Exception;
+use OCA\Circles\Exceptions\GSStatusException;
 use OCA\Circles\Exceptions\LinkedGroupNotAllowedException;
 use OCP\AppFramework\Http\DataResponse;
 
@@ -42,6 +43,7 @@ class GroupsController extends BaseController {
 	 *
 	 * @return DataResponse
 	 * @throws LinkedGroupNotAllowedException
+	 * @throws GSStatusException
 	 */
 	public function add($uniqueId, $name) {
 		if (!$this->configService->isLinkedGroupsAllowed()) {