Skip to content

Commit

Permalink
chore: Apply code style fixes by php-cs-fixer
Browse files Browse the repository at this point in the history
Signed-off-by: Jonas <[email protected]>
  • Loading branch information
mejo- committed Sep 23, 2024
1 parent a2ec6ec commit a944a1a
Show file tree
Hide file tree
Showing 59 changed files with 220 additions and 100 deletions.
6 changes: 4 additions & 2 deletions lib/BackgroundJob/CleanupSessions.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
use OCP\BackgroundJob\TimedJob;

class CleanupSessions extends TimedJob {
public function __construct(ITimeFactory $time,
private SessionService $sessionService) {
public function __construct(
ITimeFactory $time,
private SessionService $sessionService,
) {
parent::__construct($time);

$this->setInterval(SessionService::SESSION_VALID_TIME);
Expand Down
6 changes: 4 additions & 2 deletions lib/BackgroundJob/ExpirePageVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
use OCP\BackgroundJob\TimedJob;

class ExpirePageVersions extends TimedJob {
public function __construct(ITimeFactory $time,
private CollectiveVersionsExpireManager $expireManager) {
public function __construct(
ITimeFactory $time,
private CollectiveVersionsExpireManager $expireManager,
) {
parent::__construct($time);

// Run once per hour
Expand Down
6 changes: 4 additions & 2 deletions lib/BackgroundJob/IndexCollectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
use Psr\Log\LoggerInterface;

class IndexCollectives extends TimedJob {
public function __construct(ITimeFactory $time,
public function __construct(
ITimeFactory $time,
private CollectiveMapper $collectiveMapper,
private CollectiveFolderManager $collectiveFolderManager,
private LoggerInterface $logger,
private SearchService $searchService) {
private SearchService $searchService,
) {
parent::__construct($time);

$this->setInterval(60 * 5);
Expand Down
6 changes: 4 additions & 2 deletions lib/BackgroundJob/PurgeObsoletePages.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
use OCP\BackgroundJob\TimedJob;

class PurgeObsoletePages extends TimedJob {
public function __construct(ITimeFactory $time,
private PageGarbageCollector $garbageCollector) {
public function __construct(
ITimeFactory $time,
private PageGarbageCollector $garbageCollector,
) {
parent::__construct($time);

// Run once every two days
Expand Down
4 changes: 3 additions & 1 deletion lib/CacheListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
use OCP\Files\Cache\ICacheEvent;

class CacheListener {
public function __construct(private IEventDispatcher $eventDispatcher) {
public function __construct(
private IEventDispatcher $eventDispatcher,
) {
}

public function listen(): void {
Expand Down
6 changes: 4 additions & 2 deletions lib/Command/CreateCollective.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
use Symfony\Component\Console\Output\OutputInterface;

class CreateCollective extends Base {
public function __construct(private CollectiveService $collectiveService,
public function __construct(
private CollectiveService $collectiveService,
private NodeHelper $nodeHelper,
private IUserManager $userManager,
private IUserSession $userSession,
private IFactory $l10nFactory) {
private IFactory $l10nFactory,
) {
parent::__construct();
}

Expand Down
4 changes: 3 additions & 1 deletion lib/Command/ExpirePageVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
use Symfony\Component\Console\Output\OutputInterface;

class ExpirePageVersions extends Base {
public function __construct(private CollectiveVersionsExpireManager $expireManager) {
public function __construct(
private CollectiveVersionsExpireManager $expireManager,
) {
parent::__construct();
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Command/IndexCollectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
use Symfony\Component\Console\Output\OutputInterface;

class IndexCollectives extends Base {
public function __construct(private SearchService $searchService,
private CollectiveMapper $collectiveMapper) {
public function __construct(
private SearchService $searchService,
private CollectiveMapper $collectiveMapper,
) {
parent::__construct();
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Command/PageTrashCleanup.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
class PageTrashCleanup extends Base {
private ?PageTrashBackend $trashBackend = null;

public function __construct(IAppManager $appManager,
private CollectiveMapper $collectiveMapper) {
public function __construct(
IAppManager $appManager,
private CollectiveMapper $collectiveMapper,
) {
parent::__construct();
if ($appManager->isEnabledForUser('files_trashbin')) {
$this->trashBackend = OC::$server->get(PageTrashBackend::class);
Expand Down
4 changes: 3 additions & 1 deletion lib/Command/PurgeObsoletePages.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
use Symfony\Component\Console\Output\OutputInterface;

class PurgeObsoletePages extends Base {
public function __construct(private PageGarbageCollector $garbageCollector) {
public function __construct(
private PageGarbageCollector $garbageCollector,
) {
parent::__construct();
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/CollectiveController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
class CollectiveController extends Controller {
use ErrorHelper;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private CollectiveService $service,
private IUserSession $userSession,
private IFactory $l10nFactory,
private LoggerInterface $logger,
private NodeHelper $nodeHelper) {
private NodeHelper $nodeHelper,
) {
parent::__construct($AppName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/CollectiveUserSettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
class CollectiveUserSettingsController extends Controller {
use ErrorHelper;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private CollectiveUserSettingsService $service,
private IUserSession $userSession,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($AppName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
class PageController extends Controller {
use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private PageService $service,
private AttachmentService $attachmentService,
private IUserSession $userSession,
private SearchService $indexedSearchService,
private CollectiveService $collectiveService,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($appName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PageTrashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ class PageTrashController extends Controller {

use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private PageService $service,
IUserSession $userSession,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($appName, $request);
$this->userSession = $userSession;
}
Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PublicCollectiveController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ class PublicCollectiveController extends PublicShareController {

private ?IShare $share = null;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private ShareManager $shareManager,
private CollectiveShareMapper $collectiveShareMapper,
private CollectiveService $service,
ISession $session,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($AppName, $request, $session);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PublicPageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ class PublicPageController extends PublicShareController {

use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private ShareManager $shareManager,
private CollectiveShareMapper $collectiveShareMapper,
private CollectiveShareService $collectiveShareService,
private PageService $service,
private AttachmentService $attachmentService,
ISession $session,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($appName, $request, $session);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PublicPageTrashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,16 @@ class PublicPageTrashController extends PublicShareController {

use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private ShareManager $shareManager,
private CollectiveShareMapper $collectiveShareMapper,
private CollectiveShareService $collectiveShareService,
private PageService $service,
ISession $session,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($appName, $request, $session);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/PublicStartController.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,16 @@
class PublicStartController extends AuthPublicShareController {
protected ?IShare $share = null;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
ISession $session,
IURLGenerator $urlGenerator,
private ShareManager $shareManager,
private CollectiveShareMapper $collectiveShareMapper,
private IAppManager $appManager,
private IEventDispatcher $eventDispatcher) {
private IEventDispatcher $eventDispatcher,
) {
parent::__construct($AppName, $request, $session, $urlGenerator);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/SessionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
class SessionController extends OCSController {
use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private SessionService $sessionService,
private LoggerInterface $logger,
private IUserSession $userSession) {
private IUserSession $userSession,
) {
parent::__construct($appName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
class SettingsController extends OCSController {
use ErrorHelper;

public function __construct(string $appName,
public function __construct(
string $appName,
IRequest $request,
private IConfig $config,
private LoggerInterface $logger,
private string $userId) {
private string $userId,
) {
parent::__construct($appName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/ShareController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
class ShareController extends Controller {
use ErrorHelper;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private CollectiveService $collectiveService,
private PageService $pageService,
private IUserSession $userSession,
private LoggerInterface $logger,
private CollectiveShareService $shareService) {
private CollectiveShareService $shareService,
) {
parent::__construct($AppName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/StartController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
use OCP\IRequest;

class StartController extends Controller {
public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private IAppManager $appManager,
private IEventDispatcher $eventDispatcher) {
private IEventDispatcher $eventDispatcher,
) {
parent::__construct($AppName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Controller/TrashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
class TrashController extends Controller {
use ErrorHelper;

public function __construct(string $AppName,
public function __construct(
string $AppName,
IRequest $request,
private CollectiveService $service,
private IUserSession $userSession,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
parent::__construct($AppName, $request);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Dashboard/RecentPagesWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
class RecentPagesWidget implements IReloadableWidget, IIconWidget {
public const REFRESH_INTERVAL_IN_SECS = 33;

public function __construct(protected IL10N $l10n,
public function __construct(
protected IL10N $l10n,
protected IURLGenerator $urlGenerator,
protected IUserSession $userSession,
protected RecentPagesService $recentPagesService) {
protected RecentPagesService $recentPagesService,
) {
}

public function getItemsV2(string $userId, ?string $since = null, int $limit = 7): WidgetItems {
Expand Down
5 changes: 4 additions & 1 deletion lib/Db/CollectiveMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
* @template-extends QBMapper<Collective>
*/
class CollectiveMapper extends QBMapper {
public function __construct(IDBConnection $db, private CircleHelper $circleHelper) {
public function __construct(
IDBConnection $db,
private CircleHelper $circleHelper,
) {
parent::__construct($db, 'collectives', Collective::class);
}

Expand Down
5 changes: 4 additions & 1 deletion lib/Db/PageGarbageCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
use OCA\Collectives\Mount\CollectiveFolderManager;

class PageGarbageCollector {
public function __construct(private PageMapper $pageMapper, private CollectiveFolderManager $folderManager) {
public function __construct(
private PageMapper $pageMapper,
private CollectiveFolderManager $folderManager,
) {
}

public function purgeObsoletePages(): int {
Expand Down
Loading

0 comments on commit a944a1a

Please sign in to comment.