Skip to content

[stable22] fix phpdoc+lint #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 2 commits into from
Jul 27, 2021
Merged

[stable22] fix phpdoc+lint #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcec881
phpdoc
ArtificialOwl Jul 27, 2021
3535053
cs-fix
ArtificialOwl Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion lib/Command/MembersList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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')) {
Expand Down
2 changes: 2 additions & 0 deletions lib/FederatedItems/Files/FileShare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions lib/FederatedItems/Files/FileUnshare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())) {
Expand Down
3 changes: 0 additions & 3 deletions lib/Model/ModelManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,12 @@
use OCA\Circles\Service\RemoteService;
use OCP\IURLGenerator;


/**
* Class ModelManager
*
* @package OCA\Circles\Model
*/
class ModelManager {


use TNC22Logger;


Expand Down
1 change: 1 addition & 0 deletions lib/Service/FederatedShareService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion lib/Service/InterfaceService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,5 +506,4 @@ public function getFrontalPath(string $route, array $args): string {
private function getTestingInstance(): string {
return $this->configService->getAppValue(ConfigService::IFACE_TEST_ID);
}

}
1 change: 0 additions & 1 deletion lib/Service/ShareTokenService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down