chore: code clean up

lib/Commands/Connect.php

@@ -27,8 +27,8 @@
 class Connect extends Command {
 
 	public function __construct(
-		private IUserManager $userManager,
-		private CoreService $CoreService,
+		private readonly IUserManager $userManager,
+		private readonly CoreService $CoreService,
 	) {
 		parent::__construct();
 	}

lib/Commands/Debug.php

@@ -22,8 +22,8 @@
  */
 class Debug extends Command {
 	public function __construct(
-		private IUserManager $userManager,
-		private ServicesService $servicesService,
+		private readonly IUserManager $userManager,
+		private readonly ServicesService $servicesService,
 	) {
 		parent::__construct();
 	}

lib/Commands/Disconnect.php

@@ -23,9 +23,9 @@
 class Disconnect extends Command {
 
 	public function __construct(
-		private IUserManager $userManager,
-		private CoreService $CoreService,
-		private ServicesService $servicesService,
+		private readonly IUserManager $userManager,
+		private readonly CoreService $CoreService,
+		private readonly ServicesService $servicesService,
 	) {
 		parent::__construct();
 	}

lib/Commands/Harmonize.php

@@ -22,8 +22,8 @@
 class Harmonize extends Command {
 
 	public function __construct(
-		private IUserManager $userManager,
-		private HarmonizationService $HarmonizationService,
+		private readonly IUserManager $userManager,
+		private readonly HarmonizationService $HarmonizationService,
 	) {
 		parent::__construct();
 	}

lib/Commands/Show.php

@@ -23,8 +23,8 @@
 class Show extends Command {
 
 	public function __construct(
-		private IUserManager $userManager,
-		private ServicesService $servicesService,
+		private readonly IUserManager $userManager,
+		private readonly ServicesService $servicesService,
 	) {
 		parent::__construct();
 	}

lib/Controller/AdminConfigurationController.php

@@ -20,14 +20,12 @@
  */
 class AdminConfigurationController extends Controller {
 
-	private ConfigurationService $ConfigurationService;
-
-	public function __construct(string $appName, IRequest $request, ConfigurationService $ConfigurationService) {
-
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private readonly ConfigurationService $ConfigurationService,
+	) {
 		parent::__construct($appName, $request);
-
-		$this->ConfigurationService = $ConfigurationService;
-
 	}
 
 	/**

lib/Controller/AdminTemplateController.php

@@ -25,7 +25,7 @@ class AdminTemplateController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private ServicesTemplateService $templateService,
+		private readonly ServicesTemplateService $templateService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -37,7 +37,6 @@ public function __construct(
 	 */
 	#[FrontpageRoute(verb: 'GET', url: '/admin/templates')]
 	public function list(): DataResponse {
-
 		return new DataResponse($this->templateService->list());
 	}
 
@@ -51,7 +50,6 @@ public function list(): DataResponse {
 	 */
 	#[FrontpageRoute(verb: 'POST', url: '/admin/templates/create')]
 	public function create(string $domain, array $connection = []): DataResponse {
-
 		$domain = trim($domain);
 		if (!Validator::fqdn($domain)) {
 			return new DataResponse('Invalid domain provided.', Http::STATUS_BAD_REQUEST);
@@ -73,7 +71,6 @@ public function create(string $domain, array $connection = []): DataResponse {
 	 */
 	#[FrontpageRoute(verb: 'POST', url: '/admin/templates/modify')]
 	public function modify(string $id, string $domain, array $connection = []): DataResponse {
-
 		$domain = trim($domain);
 		if ($id === '') {
 			return new DataResponse('Invalid template id.', Http::STATUS_BAD_REQUEST);

lib/Controller/UserConfigurationController.php

@@ -27,9 +27,9 @@ class UserConfigurationController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private CoreService $CoreService,
-		private HarmonizationService $HarmonizationService,
-		private ServicesService $ServicesService,
+		private readonly CoreService $CoreService,
+		private readonly HarmonizationService $HarmonizationService,
+		private readonly ServicesService $ServicesService,
 		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);

lib/Events/UserDeletedListener.php

@@ -23,9 +23,9 @@
 class UserDeletedListener implements IEventListener {
 
 	public function __construct(
-		private LoggerInterface $logger,
-		private ServicesService $servicesService,
-		private CoreService $coreService,
+		private readonly LoggerInterface $logger,
+		private readonly ServicesService $servicesService,
+		private readonly CoreService $coreService,
 	) {
 	}
 

lib/Logging/FileLogger.php

@@ -18,7 +18,6 @@
 final class FileLogger implements LoggerInterface {
 	public function __construct(
 		private string $path,
-		private ?string $app = null,
 	) {
 	}
 

lib/Migration/DefaultServiceTemplates.php

@@ -19,7 +19,7 @@
 class DefaultServiceTemplates implements IRepairStep {
 
 	public function __construct(
-		private ServicesTemplateStore $store,
+		private readonly ServicesTemplateStore $store,
 	) {
 	}
 
@@ -28,9 +28,6 @@ public function getName(): string {
 		return 'Create or update default Dav Connector service templates';
 	}
 
-	/**
-	 * @return void
-	 */
 	#[\Override]
 	public function run(IOutput $output) {
 		// load the default service templates from file

lib/Migration/Version0010Date20260501000001.php

@@ -12,7 +12,6 @@
 use Closure;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\Types;
-use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
@@ -21,11 +20,6 @@
  */
 class Version0010Date20260501000001 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $db,
-	) {
-	}
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`

lib/Service/CoreService.php

@@ -9,14 +9,11 @@
 
 namespace OCA\DAVC\Service;
 
-use DateTime;
-use OCA\DAVC\AppInfo\Application;
 use OCA\DAVC\Constants;
 use OCA\DAVC\Service\Local\LocalFactory;
 use OCA\DAVC\Service\Remote\RemoteFactory;
 use OCA\DAVC\Store\Local\ServiceEntity;
 use OCP\BackgroundJob\IJobList;
-use OCP\Notification\IManager as INotificationManager;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -26,14 +23,13 @@
 
 class CoreService {
 	public function __construct(
-		private LoggerInterface $logger,
-		private IJobList $TaskService,
-		private INotificationManager $notificationManager,
-		private ConfigurationService $ConfigurationService,
-		private ServicesService $ServicesService,
-		private ServicesTemplateService $ServicesTemplateService,
-		private RemoteFactory $remoteFactory,
-		private LocalFactory $localFactory,
+		private readonly LoggerInterface $logger,
+		private readonly IJobList $TaskService,
+		private readonly ConfigurationService $ConfigurationService,
+		private readonly ServicesService $ServicesService,
+		private readonly ServicesTemplateService $ServicesTemplateService,
+		private readonly RemoteFactory $remoteFactory,
+		private readonly LocalFactory $localFactory,
 	) {
 	}
 
@@ -483,24 +479,4 @@ public function localCollectionsDeposit(string $uid, int $sid, array $cc, array
 		}
 	}
 
-	/**
-	 * publish user notification
-	 *
-	 * @param string $uid nextcloud user id
-	 * @param string $subject notification type
-	 * @param array $params notification parameters to pass
-	 */
-	public function publishNotice(string $uid, string $subject, array $params): void {
-		// construct notification object
-		$notification = $this->notificationManager->createNotification();
-		// assign attributes
-		$notification->setApp(Application::APP_ID)
-			->setUser($uid)
-			->setDateTime(new DateTime())
-			->setObject('eas', 'eas')
-			->setSubject($subject, $params);
-		// submit notification
-		$this->notificationManager->notify($notification);
-	}
-
 }

lib/Service/HarmonizationService.php

@@ -15,12 +15,12 @@
 
 class HarmonizationService {
 	public function __construct(
-		private LoggerInterface $logger,
-		private ConfigurationService $configurationService,
-		private ServicesService $servicesService,
-		private ContactsService $contactsService,
-		private EventsService $eventsService,
-		private RemoteFactory $remoteFactory,
+		private readonly LoggerInterface $logger,
+		private readonly ConfigurationService $configurationService,
+		private readonly ServicesService $servicesService,
+		private readonly ContactsService $contactsService,
+		private readonly EventsService $eventsService,
+		private readonly RemoteFactory $remoteFactory,
 	) {
 	}
 

lib/Service/Remote/RemoteFactory.php

@@ -21,9 +21,9 @@ class RemoteFactory {
 	public static string $clientTransportAgent = 'NextcloudDAVC/1.0 (1.0; x64)';
 
 	public function __construct(
-		private IClientService $clientService,
-		private IConfig $config,
-		private ConfigurationService $configurationService,
+		private readonly IClientService $clientService,
+		private readonly IConfig $config,
+		private readonly ConfigurationService $configurationService,
 	) {
 	}
 
@@ -76,16 +76,6 @@ private function logger(ServiceEntity $service): LoggerInterface {
 		return new FileLogger($path);
 	}
 
-	/**
-	 * Appropriate Core Service for Connection
-	 */
-	public function coreService(RemoteClient $client): RemoteCoreService {
-		$service = new RemoteCoreService();
-		$service->initialize($client);
-
-		return $service;
-	}
-
 	/**
 	 * Appropriate Contacts Service for Connection
 	 */

lib/Service/ServicesTemplateService.php

@@ -16,13 +16,10 @@ class ServicesTemplateService {
 	private ServicesTemplateStore $_Store;
 
 	public function __construct(ServicesTemplateStore $store) {
-
 		$this->_Store = $store;
-
 	}
 
 	public function findByDomain(string $domain): array {
-
 		return $this->_Store->fetchByDomain($domain);
 	}
 
@@ -32,7 +29,6 @@ public function findByDomain(string $domain): array {
 	 * @return array
 	 */
 	public function list(): array {
-
 		return array_map(static function (array $template): array {
 			$template['connection'] = json_decode((string)$template['connection'], true) ?: [];
 			return $template;
@@ -48,7 +44,6 @@ public function list(): array {
 	 * @return bool
 	 */
 	public function create(string $domain, array $connection): bool {
-
 		return $this->_Store->create(UUID::v4(), $domain, $connection);
 	}
 
@@ -62,7 +57,6 @@ public function create(string $domain, array $connection): bool {
 	 * @return bool
 	 */
 	public function modify(string $id, string $domain, array $connection): bool {
-
 		return $this->_Store->modify($id, $domain, $connection);
 	}
 
@@ -74,7 +68,6 @@ public function modify(string $id, string $domain, array $connection): bool {
 	 * @return bool
 	 */
 	public function delete(string $id): bool {
-
 		return $this->_Store->delete($id);
 	}
 

lib/Settings/AdminSection.php

@@ -18,51 +18,27 @@
  */
 class AdminSection implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private readonly IURLGenerator $urlGenerator,
+		private readonly IL10N $l,
+	) {
 	}
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string
-	 *
-	 * @returns string
-	 */
 	#[\Override]
 	public function getID(): string {
 		return 'integration-davc';
 	}
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
 	#[\Override]
 	public function getName(): string {
 		return $this->l->t('DAV Connector');
 	}
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the settings navigation. The sections are arranged in ascending order of
-	 *             the priority values. It is required to return a value between 0 and 99.
-	 */
 	#[\Override]
 	public function getPriority(): int {
 		return 80;
 	}
 
-	/**
-	 * @return ?string The relative path to a an icon describing the section
-	 */
 	#[\Override]
 	public function getIcon(): ?string {
 		return $this->urlGenerator->imagePath('core', 'categories/integration.svg');