From fcec88177d028068c3dd6d72c3547a9871f668d7 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 26 Jul 2021 23:47:37 -0100 Subject: [PATCH 1/2] phpdoc Signed-off-by: Maxence Lange --- lib/Command/MembersList.php | 16 ++++++++++------ lib/FederatedItems/Files/FileShare.php | 2 ++ lib/FederatedItems/Files/FileUnshare.php | 2 ++ lib/Service/FederatedShareService.php | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/Command/MembersList.php b/lib/Command/MembersList.php index 31768e9c4..3a346d755 100644 --- a/lib/Command/MembersList.php +++ b/lib/Command/MembersList.php @@ -40,6 +40,7 @@ use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree; use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; +use Exception; use OC\Core\Command\Base; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Exceptions\CircleNotFoundException; @@ -361,9 +362,9 @@ private function getMembers( $node = new NC22TreeNode( $tree, new SimpleDataStore( [ - 'circle' => $circle, - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds), + 'circle' => $circle, + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds), ] ) ); @@ -381,8 +382,8 @@ private function getMembers( new NC22TreeNode( $tree, new SimpleDataStore( [ - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds) + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds) ] ) ); @@ -412,7 +413,10 @@ public function displayLeaf(SimpleDataStore $data, int $lineNumber): string { $circle = null; if ($data->hasKey('circle')) { /** @var Circle $circle */ - $circle = $data->gObj('circle', Circle::class); + try { + $circle = $data->gObj('circle', Circle::class); + } catch (Exception $e) { + } } if ($data->hasKey('member')) { diff --git a/lib/FederatedItems/Files/FileShare.php b/lib/FederatedItems/Files/FileShare.php index 5e534bb81..3e18e252b 100644 --- a/lib/FederatedItems/Files/FileShare.php +++ b/lib/FederatedItems/Files/FileShare.php @@ -32,6 +32,7 @@ namespace OCA\Circles\FederatedItems\Files; use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; +use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; @@ -104,6 +105,7 @@ public function verify(FederatedEvent $event): void { * @throws InvalidItemException * @throws UnknownTypeException * @throws CircleNotFoundException + * @throws ItemNotFoundException */ public function manage(FederatedEvent $event): void { $mount = null; diff --git a/lib/FederatedItems/Files/FileUnshare.php b/lib/FederatedItems/Files/FileUnshare.php index b194d26b9..d9520651c 100644 --- a/lib/FederatedItems/Files/FileUnshare.php +++ b/lib/FederatedItems/Files/FileUnshare.php @@ -32,6 +32,7 @@ namespace OCA\Circles\FederatedItems\Files; use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException; +use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException; use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger; use ArtificialOwl\MySmallPhpTools\Traits\TStringTools; @@ -101,6 +102,7 @@ public function verify(FederatedEvent $event): void { * * @throws InvalidItemException * @throws UnknownTypeException + * @throws ItemNotFoundException */ public function manage(FederatedEvent $event): void { if ($this->configService->isLocalInstance($event->getOrigin())) { diff --git a/lib/Service/FederatedShareService.php b/lib/Service/FederatedShareService.php index f55f6b866..a8f047b95 100644 --- a/lib/Service/FederatedShareService.php +++ b/lib/Service/FederatedShareService.php @@ -69,6 +69,7 @@ class FederatedShareService extends NC22Signature { * FederatedEventService constructor. * * @param FederatedEventService $federatedEventService + * @param CircleService $circleService */ public function __construct(FederatedEventService $federatedEventService, CircleService $circleService) { $this->federatedEventService = $federatedEventService; From 3535053497335c83b3f496df7856437e182c036a Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 26 Jul 2021 23:59:22 -0100 Subject: [PATCH 2/2] cs-fix Signed-off-by: Maxence Lange --- composer.lock | 1 + lib/Command/MembersList.php | 10 +++++----- lib/Model/ModelManager.php | 3 --- lib/Service/InterfaceService.php | 1 - lib/Service/ShareTokenService.php | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 979c7861a..fe7321aac 100644 --- a/composer.lock +++ b/composer.lock @@ -2540,6 +2540,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { diff --git a/lib/Command/MembersList.php b/lib/Command/MembersList.php index 3a346d755..80d3b2c52 100644 --- a/lib/Command/MembersList.php +++ b/lib/Command/MembersList.php @@ -362,9 +362,9 @@ private function getMembers( $node = new NC22TreeNode( $tree, new SimpleDataStore( [ - 'circle' => $circle, - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds), + 'circle' => $circle, + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds), ] ) ); @@ -382,8 +382,8 @@ private function getMembers( new NC22TreeNode( $tree, new SimpleDataStore( [ - 'member' => $member, - 'cycling' => in_array($member->getSingleId(), $knownIds) + 'member' => $member, + 'cycling' => in_array($member->getSingleId(), $knownIds) ] ) ); diff --git a/lib/Model/ModelManager.php b/lib/Model/ModelManager.php index 697ec4ccc..8b041a752 100644 --- a/lib/Model/ModelManager.php +++ b/lib/Model/ModelManager.php @@ -57,15 +57,12 @@ use OCA\Circles\Service\RemoteService; use OCP\IURLGenerator; - /** * Class ModelManager * * @package OCA\Circles\Model */ class ModelManager { - - use TNC22Logger; diff --git a/lib/Service/InterfaceService.php b/lib/Service/InterfaceService.php index 6df08b960..7e556be90 100644 --- a/lib/Service/InterfaceService.php +++ b/lib/Service/InterfaceService.php @@ -506,5 +506,4 @@ public function getFrontalPath(string $route, array $args): string { private function getTestingInstance(): string { return $this->configService->getAppValue(ConfigService::IFACE_TEST_ID); } - } diff --git a/lib/Service/ShareTokenService.php b/lib/Service/ShareTokenService.php index 2c36f0dc4..6d15ee772 100644 --- a/lib/Service/ShareTokenService.php +++ b/lib/Service/ShareTokenService.php @@ -35,7 +35,6 @@ use OCA\Circles\Db\ShareTokenRequest; use OCA\Circles\Exceptions\ShareTokenAlreadyExistException; use OCA\Circles\Exceptions\ShareTokenNotFoundException; -use OCA\Circles\Exceptions\UnknownInterfaceException; use OCA\Circles\Model\Member; use OCA\Circles\Model\ShareToken; use OCA\Circles\Model\ShareWrapper;