Skip to content

Commit

Permalink
chore: Apply rector fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Julius Knorr <[email protected]>
  • Loading branch information
@juliushaertl
juliushaertl committed Sep 18, 2024
1 parent dd7e2e5 commit 62c6c04
Show file tree
Hide file tree
Showing 38 changed files with 177 additions and 496 deletions.
12 changes: 4 additions & 8 deletions lib/AppConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function getAppSettings() {

$keys = $this->config->getAppKeys(self::WATERMARK_APP_NAMESPACE);
foreach ($keys as $key) {
if (strpos($key, 'watermark_') === 0) {
if (str_starts_with($key, 'watermark_')) {
$value = $this->getAppValueArray($key);
$value = $value === 'yes' ? true : $value;
$result[$key] = $value === 'no' ? false : $value;
Expand Down Expand Up @@ -209,22 +209,18 @@ private function getFederationDomains(): array {
}

$federationService = \OCP\Server::get(FederationService::class);
$trustedNextcloudDomains = array_filter(array_map(function ($server) use ($federationService) {
return $federationService->isTrustedRemote($server) ? $server : null;
}, $federationService->getTrustedServers()));
$trustedNextcloudDomains = array_filter(array_map(fn ($server) => $federationService->isTrustedRemote($server) ? $server : null, $federationService->getTrustedServers()));

$trustedCollaboraDomains = array_filter(array_map(function ($server) use ($federationService) {
try {
return $federationService->getRemoteCollaboraURL($server);
} catch (\Exception $e) {
} catch (\Exception) {
// If there is no remote collabora server we can just skip that
return null;
}
}, $trustedNextcloudDomains));

return array_map(function ($url) {
return $this->domainOnly($url);
}, array_merge($trustedNextcloudDomains, $trustedCollaboraDomains));
return array_map(fn ($url) => $this->domainOnly($url), array_merge($trustedNextcloudDomains, $trustedCollaboraDomains));
}

private function getGSDomains(): array {
Expand Down
9 changes: 1 addition & 8 deletions lib/Backgroundjobs/Cleanup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@
use OCP\IDBConnection;

class Cleanup extends TimedJob {
/** @var IDBConnection */
private $db;
/** @var WopiMapper $wopiMapper */
private $wopiMapper;

public function __construct(ITimeFactory $time, IDBConnection $db, WopiMapper $wopiMapper) {
public function __construct(ITimeFactory $time, private IDBConnection $db, private WopiMapper $wopiMapper) {
parent::__construct($time);
$this->db = $db;
$this->wopiMapper = $wopiMapper;

$this->setInterval(60 * 60);
}
Expand Down
6 changes: 1 addition & 5 deletions lib/Command/UpdateEmptyTemplates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
use Symfony\Component\Console\Output\OutputInterface;

class UpdateEmptyTemplates extends Command {
/** @var TemplateManager */
private $templateManager;

public function __construct(TemplateManager $templateManager) {
$this->templateManager = $templateManager;
public function __construct(private TemplateManager $templateManager) {
parent::__construct();
}

Expand Down
26 changes: 7 additions & 19 deletions lib/Controller/AssetsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,14 @@
use OCP\IURLGenerator;

class AssetsController extends Controller {
private AssetMapper $assetMapper;
private IRootFolder $rootFolder;
private ?string $userId;
private UserScopeService $userScopeService;
private IURLGenerator $urlGenerator;

public function __construct($appName,
IRequest $request,
AssetMapper $assetMapper,
IRootFolder $rootFolder,
$userId,
UserScopeService $userScopeService,
IURLGenerator $urlGenerator) {
private AssetMapper $assetMapper,
private IRootFolder $rootFolder,
private ?string $userId,
private UserScopeService $userScopeService,
private IURLGenerator $urlGenerator) {
parent::__construct($appName, $request);

$this->assetMapper = $assetMapper;
$this->rootFolder = $rootFolder;
$this->userId = $userId;
$this->userScopeService = $userScopeService;
$this->urlGenerator = $urlGenerator;
}

/**
Expand All @@ -56,7 +44,7 @@ public function create($path) {

try {
$node = $userFolder->get($path);
} catch (NotFoundException $e) {
} catch (NotFoundException) {
return new JSONResponse([], Http::STATUS_NOT_FOUND);
}

Expand All @@ -80,7 +68,7 @@ public function create($path) {
public function get($token) {
try {
$asset = $this->assetMapper->getAssetByToken($token);
} catch (DoesNotExistException $e) {
} catch (DoesNotExistException) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}

Expand Down
21 changes: 3 additions & 18 deletions lib/Controller/DocumentAPIController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,8 @@
use Throwable;

class DocumentAPIController extends \OCP\AppFramework\OCSController {
private $rootFolder;
private $shareManager;
private $templateManager;
private $l10n;
private $logger;
private $lockManager;
private $userId;

public function __construct(IRequest $request, IRootFolder $rootFolder, IManager $shareManager, TemplateManager $templateManager, IL10N $l10n, LoggerInterface $logger, ILockManager $lockManager, $userId) {
public function __construct(IRequest $request, private IRootFolder $rootFolder, private IManager $shareManager, private TemplateManager $templateManager, private IL10N $l10n, private LoggerInterface $logger, private ILockManager $lockManager, private $userId) {
parent::__construct(Application::APPNAME, $request);
$this->rootFolder = $rootFolder;
$this->shareManager = $shareManager;
$this->templateManager = $templateManager;
$this->l10n = $l10n;
$this->logger = $logger;
$this->lockManager = $lockManager;
$this->userId = $userId;
}

/**
Expand Down Expand Up @@ -153,9 +138,9 @@ public function openLocal(int $fileId): DataResponse {
Application::APPNAME
));
return new DataResponse([]);
} catch (NoLockProviderException|PreConditionNotMetException $e) {
} catch (NoLockProviderException|PreConditionNotMetException) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
} catch (\Exception $e) {
} catch (\Exception) {
return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/DocumentController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function createFromTemplate(int $templateId, string $fileName, string $di
$userFolder = $this->rootFolder->getUserFolder($this->userId);
try {
$folder = $userFolder->get($dir);
} catch (NotFoundException $e) {
} catch (NotFoundException) {
return new TemplateResponse('core', '403', [], 'guest');
}

Expand Down Expand Up @@ -286,7 +286,7 @@ public function remote(string $shareToken, string $remoteServer, string $remoteS
$response->addHeader('X-Frame-Options', 'ALLOW');
return $response;
}
} catch (ShareNotFound $e) {
} catch (ShareNotFound) {
return new TemplateResponse('core', '404', [], 'guest');
} catch (Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/DocumentTrait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private function applyPolicies($response) {
private function domainOnly(string $url): string {
$parsed_url = parse_url($url);
$scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
$host = isset($parsed_url['host']) ? $parsed_url['host'] : '';
$host = $parsed_url['host'] ?? '';
$port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
return "$scheme$host$port";
}
Expand Down
38 changes: 9 additions & 29 deletions lib/Controller/FederationController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,16 @@
use Psr\Log\LoggerInterface;

class FederationController extends OCSController {
/** @var IConfig */
private $config;

/** @var LoggerInterface */
private $logger;

/** @var WopiMapper */
private $wopiMapper;

/** @var IUserManager */
private $userManager;

/** @var IURLGenerator */
private $urlGenerator;

public function __construct(
string $appName,
IRequest $request,
IConfig $config,
LoggerInterface $logger,
WopiMapper $wopiMapper,
IUserManager $userManager,
IURLGenerator $urlGenerator
private IConfig $config,
private LoggerInterface $logger,
private WopiMapper $wopiMapper,
private IUserManager $userManager,
private IURLGenerator $urlGenerator
) {
parent::__construct($appName, $request);
$this->config = $config;
$this->logger = $logger;
$this->wopiMapper = $wopiMapper;
$this->userManager = $userManager;
$this->urlGenerator = $urlGenerator;
}

/**
Expand Down Expand Up @@ -97,10 +77,10 @@ public function remoteWopiToken($token): DataResponse {
}
$this->logger->debug('COOL-Federation-Initiator: Token ' . $token . ' returned');
return new DataResponse($initiatorWopi);
} catch (UnknownTokenException $e) {
} catch (UnknownTokenException) {
$this->logger->debug('COOL-Federation-Initiator: Token ' . $token . 'not found');
throw new OCSNotFoundException();
} catch (ExpiredTokenException $e) {
} catch (ExpiredTokenException) {
$this->logger->debug('COOL-Federation-Initiator: Token ' . $token . ' is expired');
throw new OCSNotFoundException();
}
Expand Down Expand Up @@ -132,10 +112,10 @@ public function initiatorUser($token): DataResponse {
'displayName' => $user->getDisplayName(),
'avatar' => $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => WopiController::WOPI_AVATAR_SIZE])
]);
} catch (UnknownTokenException $e) {
} catch (UnknownTokenException) {
$this->logger->debug('COOL-Federation-Initiator-User: Token ' . $token . 'not found');
throw new OCSNotFoundException();
} catch (ExpiredTokenException $e) {
} catch (ExpiredTokenException) {
$this->logger->debug('COOL-Federation-Initiator-User: Token ' . $token . ' is expired.');
throw new OCSNotFoundException();
}
Expand Down
70 changes: 18 additions & 52 deletions lib/Controller/OCSController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,56 +30,22 @@
use Psr\Log\LoggerInterface;

class OCSController extends \OCP\AppFramework\OCSController {
/** @var IRootFolder */
private $rootFolder;

/** @var string */
private $userId;

/** @var DirectMapper */
private $directMapper;

/** @var IURLGenerator */
private $urlGenerator;

/** @var TemplateManager */
private $manager;

/** @var TokenManager */
private $tokenManager;

/** @var IManager */
private $shareManager;

/** @var FederationService */
private $federationService;

/** @var LoggerInterface */
private $logger;

/**
* @param string $userId
*/
public function __construct(string $appName,
IRequest $request,
IRootFolder $rootFolder,
$userId,
DirectMapper $directMapper,
IURLGenerator $urlGenerator,
TemplateManager $manager,
TokenManager $tokenManager,
IManager $shareManager,
FederationService $federationService,
LoggerInterface $logger
private IRootFolder $rootFolder,
private $userId,
private DirectMapper $directMapper,
private IURLGenerator $urlGenerator,
private TemplateManager $manager,
private TokenManager $tokenManager,
private IManager $shareManager,
private FederationService $federationService,
private LoggerInterface $logger
) {
parent::__construct($appName, $request);

$this->rootFolder = $rootFolder;
$this->userId = $userId;
$this->directMapper = $directMapper;
$this->urlGenerator = $urlGenerator;
$this->manager = $manager;
$this->tokenManager = $tokenManager;
$this->shareManager = $shareManager;
$this->federationService = $federationService;
$this->logger = $logger;
}

/**
Expand Down Expand Up @@ -111,7 +77,7 @@ public function createDirect($fileId) {
'token' => $direct->getToken()
])
]);
} catch (NotFoundException $e) {
} catch (NotFoundException) {
throw new OCSNotFoundException();
}
}
Expand Down Expand Up @@ -174,7 +140,7 @@ public function createPublic(

try {
$share = $this->shareManager->getShareByToken($shareToken);
} catch (ShareNotFound $ex) {
} catch (ShareNotFound) {
$response = new DataResponse([], HTTP::STATUS_NOT_FOUND);
$response->throttle();
return $response;
Expand Down Expand Up @@ -220,7 +186,7 @@ public function createPublicFromInitiator(
): DataResponse {
try {
$share = $this->shareManager->getShareByToken($shareToken);
} catch (ShareNotFound $ex) {
} catch (ShareNotFound) {
$response = new DataResponse([], HTTP::STATUS_NOT_FOUND);
$response->throttle();
return $response;
Expand Down Expand Up @@ -261,11 +227,11 @@ public function updateGuestName(string $access_token, string $guestName): DataRe
try {
$this->tokenManager->updateGuestName($access_token, $guestName);
return new DataResponse([], Http::STATUS_OK);
} catch (UnknownTokenException $e) {
} catch (UnknownTokenException) {
$response = new DataResponse([], Http::STATUS_FORBIDDEN);
$response->throttle();
return $response;
} catch (ExpiredTokenException $e) {
} catch (ExpiredTokenException) {
$response = new DataResponse([], Http::STATUS_UNAUTHORIZED);
$response->throttle();
return $response;
Expand Down Expand Up @@ -318,7 +284,7 @@ public function createFromTemplate($path, $template) {
'token' => $direct->getToken()
])
]);
} catch (NotFoundException $e) {
} catch (NotFoundException) {
throw new OCSNotFoundException();
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
Expand Down
Loading

0 comments on commit 62c6c04

Please sign in to comment.