From 8e4dbb6dd9d0d51e3f3f369270ac24f3ef79440e Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Mon, 20 Jan 2025 16:45:32 +0100 Subject: [PATCH 1/5] chore: Move away from depreacted/removed getLogger method Signed-off-by: Julius Knorr --- lib/AppConfig.php | 2 +- lib/Controller/JobListController.php | 4 ++-- lib/DocumentService.php | 2 +- lib/FileVersions.php | 18 +++++++++--------- lib/Hooks.php | 10 +++++----- lib/RemoteInstance.php | 6 +++--- lib/TemplateManager.php | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/AppConfig.php b/lib/AppConfig.php index ba2ea9bb..c19f7a0a 100644 --- a/lib/AppConfig.php +++ b/lib/AppConfig.php @@ -1195,7 +1195,7 @@ public function isUserAllowedToUse($userId = null) { // group unknown -> error and allow nobody $group = \OC::$server->getGroupManager()->get($groupName); if ($group === null) { - \OC::$server->getLogger()->error("Group is unknown $groupName", ["app" => $this->appName]); + \OCP\Log\logger('onlyoffice')->error("Group is unknown $groupName", ["app" => $this->appName]); $this->setLimitGroups(array_diff($groups, [$groupName])); } else { if ($group->inGroup($user)) { diff --git a/lib/Controller/JobListController.php b/lib/Controller/JobListController.php index ec6b6828..869a79eb 100644 --- a/lib/Controller/JobListController.php +++ b/lib/Controller/JobListController.php @@ -79,7 +79,7 @@ public function __construct($AppName, IRequest $request, AppConfig $config, IJob private function addJob($job) { if (!$this->jobList->has($job, null)) { $this->jobList->add($job); - \OC::$server->getLogger()->debug("Job '".$job."' added to JobList.", ["app" => $this->appName]); + \OCP\Log\logger('onlyoffice')->debug("Job '".$job."' added to JobList.", ["app" => $this->appName]); } } @@ -91,7 +91,7 @@ private function addJob($job) { private function removeJob($job) { if ($this->jobList->has($job, null)) { $this->jobList->remove($job); - \OC::$server->getLogger()->debug("Job '".$job."' removed from JobList.", ["app" => $this->appName]); + \OCP\Log\logger('onlyoffice')->debug("Job '".$job."' removed from JobList.", ["app" => $this->appName]); } } diff --git a/lib/DocumentService.php b/lib/DocumentService.php index 925bf4d8..a4df2251 100644 --- a/lib/DocumentService.php +++ b/lib/DocumentService.php @@ -402,7 +402,7 @@ public function request($url, $method = "get", $opts = null) { * @return array */ public function checkDocServiceUrl($urlGenerator, $crypt) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $version = null; try { diff --git a/lib/FileVersions.php b/lib/FileVersions.php index 6eef79ec..95960323 100644 --- a/lib/FileVersions.php +++ b/lib/FileVersions.php @@ -166,7 +166,7 @@ private static function getView($userId, $fileInfo, $createIfNotExist = false) { * @return array */ public static function getHistoryData($ownerId, $fileInfo, $versionId, $prevVersion) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); if ($ownerId === null || $fileInfo === null) { return null; @@ -262,7 +262,7 @@ public static function getChangesFile($ownerId, $fileInfo, $versionId) { $root = \OC::$server->get(IRootFolder::class); $changes = new File($root, $rootView, $view->getAbsolutePath($changesPath), $changesInfo); - \OC::$server->getLogger()->debug("getChangesFile: $fileId for $ownerId get changes $changesPath", ["app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->debug("getChangesFile: $fileId for $ownerId get changes $changesPath", ["app" => self::$appName]); return $changes; } @@ -276,7 +276,7 @@ public static function getChangesFile($ownerId, $fileInfo, $versionId) { * @param string $prevVersion - previous version for check */ public static function saveHistory($fileInfo, $history, $changes, $prevVersion) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); if ($fileInfo === null) { return; @@ -324,7 +324,7 @@ public static function saveHistory($fileInfo, $history, $changes, $prevVersion) * @param FileInfo $fileInfo - file info */ public static function deleteAllVersions($ownerId, $fileInfo = null) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $fileId = null; if ($fileInfo !== null) { $fileId = $fileInfo->getId(); @@ -359,7 +359,7 @@ public static function deleteVersion($ownerId, $fileInfo, $versionId) { return; } - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $fileId = $fileInfo->getId(); $logger->debug("deleteVersion $fileId ($versionId)", ["app" => self::$appName]); @@ -385,7 +385,7 @@ public static function deleteVersion($ownerId, $fileInfo, $versionId) { * Clear all version history */ public static function clearHistory() { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $userDatabase = new Database(); $userIds = $userDatabase->getUsers(); @@ -415,7 +415,7 @@ public static function clearHistory() { * @param IUser $author - version author */ public static function saveAuthor($fileInfo, $author) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); if ($fileInfo === null || $author === null) { return; @@ -480,7 +480,7 @@ public static function getAuthor($ownerId, $fileInfo, $versionId) { $authorDataString = $view->file_get_contents($authorPath); $author = json_decode($authorDataString, true); - \OC::$server->getLogger()->debug("getAuthor: $fileId v.$versionId for $ownerId get author $authorPath", ["app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->debug("getAuthor: $fileId v.$versionId for $ownerId get author $authorPath", ["app" => self::$appName]); return $author; } @@ -493,7 +493,7 @@ public static function getAuthor($ownerId, $fileInfo, $versionId) { * @param string $versionId - file version */ public static function deleteAuthor($ownerId, $fileInfo, $versionId) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $fileId = $fileInfo->getId(); diff --git a/lib/Hooks.php b/lib/Hooks.php index 3d6fa202..c8535e05 100644 --- a/lib/Hooks.php +++ b/lib/Hooks.php @@ -97,7 +97,7 @@ public static function fileUpdate($params) { KeyManager::delete($fileId); - \OC::$server->getLogger()->debug("Hook fileUpdate " . json_encode($params), ["app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->debug("Hook fileUpdate " . json_encode($params), ["app" => self::$appName]); } /** @@ -129,7 +129,7 @@ public static function fileDelete($params) { FileVersions::deleteAllVersions($ownerId, $fileInfo); } catch (\Exception $e) { - \OC::$server->getLogger()->logException($e, ["message" => "Hook: fileDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileDelete " . json_encode($params), "app" => self::$appName]); } } @@ -165,7 +165,7 @@ public static function fileVersionDelete($params) { FileVersions::deleteVersion($ownerId, $fileInfo, $versionId); FileVersions::deleteAuthor($ownerId, $fileInfo, $versionId); } catch (\Exception $e) { - \OC::$server->getLogger()->logException($e, ["message" => "Hook: fileVersionDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileVersionDelete " . json_encode($params), "app" => self::$appName]); } } @@ -200,7 +200,7 @@ public static function fileVersionRestore($params) { FileVersions::deleteVersion($ownerId, $fileInfo, $versionId); } catch (\Exception $e) { - \OC::$server->getLogger()->logException($e, ["message" => "Hook: fileVersionRestore " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileVersionRestore " . json_encode($params), "app" => self::$appName]); } } @@ -223,7 +223,7 @@ public static function extraPermissionsDelete($params) { ExtraPermissions::deleteList($shareIds); } catch (\Exception $e) { - \OC::$server->getLogger()->logException($e, ["message" => "Hook: extraPermissionsDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: extraPermissionsDelete " . json_encode($params), "app" => self::$appName]); } } } diff --git a/lib/RemoteInstance.php b/lib/RemoteInstance.php index 3f6d6d48..184d7e15 100644 --- a/lib/RemoteInstance.php +++ b/lib/RemoteInstance.php @@ -124,7 +124,7 @@ private static function update($remote, $status) { * @return bool */ public static function healthCheck($remote) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $remote = rtrim($remote, "/") . "/"; if (array_key_exists($remote, self::$healthRemote)) { @@ -177,7 +177,7 @@ public static function healthCheck($remote) { * @return string */ public static function getRemoteKey($file) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $remote = rtrim($file->getStorage()->getRemote(), "/") . "/"; $shareToken = $file->getStorage()->getToken(); @@ -229,7 +229,7 @@ public static function getRemoteKey($file) { * @return bool */ public static function lockRemoteKey($file, $lock, $fs) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); $action = $lock ? "lock" : "unlock"; $remote = rtrim($file->getStorage()->getRemote(), "/") . "/"; diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php index 460ebc96..2aea9794 100644 --- a/lib/TemplateManager.php +++ b/lib/TemplateManager.php @@ -101,7 +101,7 @@ public static function getGlobalTemplates($mimetype = null) { * @return File */ public static function getTemplate($templateId) { - $logger = \OC::$server->getLogger(); + $logger = \OCP\Log\logger('onlyoffice'); if (empty($templateId)) { $logger->info("templateId is empty", ["app" => self::$appName]); From 2be0131cecf55e575d23fbd9e5227a70e4dec49c Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Mon, 20 Jan 2025 16:46:11 +0100 Subject: [PATCH 2/5] chore: Move to public API to get services Signed-off-by: Julius Knorr --- lib/AppConfig.php | 4 ++-- lib/Cron/EditorsCheck.php | 6 +++--- lib/FileVersions.php | 4 ++-- templates/editor.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/AppConfig.php b/lib/AppConfig.php index c19f7a0a..2800a9b9 100644 --- a/lib/AppConfig.php +++ b/lib/AppConfig.php @@ -374,8 +374,8 @@ public function __construct($AppName) { $this->appName = $AppName; $this->config = \OC::$server->getConfig(); - $this->logger = \OC::$server->get(LoggerInterface::class); - $cacheFactory = \OC::$server->get(ICacheFactory::class); + $this->logger = \OCP\Server::get(LoggerInterface::class); + $cacheFactory = \OCP\Server::get(ICacheFactory::class); $this->cache = $cacheFactory->createLocal($this->appName); } diff --git a/lib/Cron/EditorsCheck.php b/lib/Cron/EditorsCheck.php index 8ad7c15e..ed1e1349 100644 --- a/lib/Cron/EditorsCheck.php +++ b/lib/Cron/EditorsCheck.php @@ -127,15 +127,15 @@ public function __construct( $this->appName = $AppName; $this->urlGenerator = $urlGenerator; - $this->logger = \OC::$server->get(LoggerInterface::class); + $this->logger = \OCP\Server::get(LoggerInterface::class); $this->config = $config; $this->trans = $trans; $this->crypt = $crypt; $this->groupManager = $groupManager; $this->setInterval($this->config->getEditorsCheckInterval()); $this->setTimeSensitivity(IJob::TIME_SENSITIVE); - $mailer = \OC::$server->get(IMailer::class); - $userManager = \OC::$server->get(IUserManager::class); + $mailer = \OCP\Server::get(IMailer::class); + $userManager = \OCP\Server::get(IUserManager::class); $this->emailManager = new EmailManager($AppName, $trans, $logger, $mailer, $userManager, $urlGenerator); } diff --git a/lib/FileVersions.php b/lib/FileVersions.php index 95960323..5bd84c04 100644 --- a/lib/FileVersions.php +++ b/lib/FileVersions.php @@ -258,8 +258,8 @@ public static function getChangesFile($ownerId, $fileInfo, $versionId) { } $changesInfo = $view->getFileInfo($changesPath); - $rootView = \OC::$server->get(View::class); - $root = \OC::$server->get(IRootFolder::class); + $rootView = \OCP\Server::get(View::class); + $root = \OCP\Server::get(IRootFolder::class); $changes = new File($root, $rootView, $view->getAbsolutePath($changesPath), $changesInfo); \OCP\Log\logger('onlyoffice')->debug("getChangesFile: $fileId for $ownerId get changes $changesPath", ["app" => self::$appName]); diff --git a/templates/editor.php b/templates/editor.php index 2f8fe4cb..4f4757a3 100644 --- a/templates/editor.php +++ b/templates/editor.php @@ -51,7 +51,7 @@ class="onlyoffice-inviewer" data-inviewer=""> - From d2b82a569314781515d6ecf21bd43ed9940e7dae Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Mon, 20 Jan 2025 16:58:25 +0100 Subject: [PATCH 3/5] chore: Move logException to error method Signed-off-by: Julius Knorr --- lib/AppConfig.php | 2 +- lib/DocumentService.php | 10 +++++----- lib/EmailManager.php | 2 +- lib/FileVersions.php | 6 +++--- lib/Hooks.php | 8 ++++---- lib/RemoteInstance.php | 6 +++--- lib/TemplateManager.php | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/AppConfig.php b/lib/AppConfig.php index 2800a9b9..eec6f78d 100644 --- a/lib/AppConfig.php +++ b/lib/AppConfig.php @@ -1437,7 +1437,7 @@ private function buildOnlyofficeFormats() { } return $result; } catch (\Exception $e) { - $this->logger->logException($e, ["message" => "Format matrix error", "app" => $this->appName]); + $this->logger->error("Format matrix error", ['exception' => $e]); return []; } } diff --git a/lib/DocumentService.php b/lib/DocumentService.php index a4df2251..566f8b93 100644 --- a/lib/DocumentService.php +++ b/lib/DocumentService.php @@ -411,7 +411,7 @@ public function checkDocServiceUrl($urlGenerator, $crypt) { throw new \Exception($this->trans->t("Mixed Active Content is not allowed. HTTPS address for ONLYOFFICE Docs is required.")); } } catch (\Exception $e) { - $logger->logException($e, ["message" => "Protocol on check error", "app" => self::$appName]); + $logger->error("Protocol on check error", ['exception' => $e]); return [$e->getMessage(), $version]; } @@ -421,7 +421,7 @@ public function checkDocServiceUrl($urlGenerator, $crypt) { throw new \Exception($this->trans->t("Bad healthcheck status")); } } catch (\Exception $e) { - $logger->logException($e, ["message" => "healthcheckRequest on check error", "app" => self::$appName]); + $logger->error("healthcheckRequest on check error", ['exception' => $e]); return [$e->getMessage(), $version]; } @@ -437,7 +437,7 @@ public function checkDocServiceUrl($urlGenerator, $crypt) { throw new \Exception($this->trans->t("Not supported version")); } } catch (\Exception $e) { - $logger->logException($e, ["message" => "commandRequest on check error", "app" => self::$appName]); + $logger->error("commandRequest on check error", ['exception' => $e]); return [$e->getMessage(), $version]; } @@ -455,14 +455,14 @@ public function checkDocServiceUrl($urlGenerator, $crypt) { $logger->debug("getConvertedUri skipped", ["app" => self::$appName]); } } catch (\Exception $e) { - $logger->logException($e, ["message" => "getConvertedUri on check error", "app" => self::$appName]); + $logger->error("getConvertedUri on check error", ['exception' => $e]); return [$e->getMessage(), $version]; } try { $this->request($convertedFileUri); } catch (\Exception $e) { - $logger->logException($e, ["message" => "Request converted file on check error", "app" => self::$appName]); + $logger->error("Request converted file on check error", ['exception' => $e]); return [$e->getMessage(), $version]; } diff --git a/lib/EmailManager.php b/lib/EmailManager.php index 89b97af6..4f97efe6 100644 --- a/lib/EmailManager.php +++ b/lib/EmailManager.php @@ -247,7 +247,7 @@ private function sendEmailNotification(IEMailTemplate $template, string $email, return false; } } catch (\Exception $e) { - $this->logger->logException($e, ["message" => "Send email", "app" => $this->appName]); + $this->logger->error("Send email", ['exception' => $e]); return false; } diff --git a/lib/FileVersions.php b/lib/FileVersions.php index 5bd84c04..c276b5da 100644 --- a/lib/FileVersions.php +++ b/lib/FileVersions.php @@ -204,7 +204,7 @@ public static function getHistoryData($ownerId, $fileInfo, $versionId, $prevVers return $historyData; } catch (\Exception $e) { - $logger->logException($e, ["message" => "getHistoryData: $fileId $versionId", "app" => self::$appName]); + $logger->error("getHistoryData: $fileId $versionId", ['exception' => $e]); return null; } } @@ -313,7 +313,7 @@ public static function saveHistory($fileInfo, $history, $changes, $prevVersion) $logger->debug("saveHistory: $fileId for $ownerId stored changes $changesPath history $historyPath", ["app" => self::$appName]); } catch (\Exception $e) { - $logger->logException($e, ["message" => "saveHistory: save $fileId history error", "app" => self::$appName]); + $logger->error("saveHistory: save $fileId history error", ['exception' => $e]); } } @@ -448,7 +448,7 @@ public static function saveAuthor($fileInfo, $author) { $logger->debug("saveAuthor: $fileId for $ownerId stored author $authorPath", ["app" => self::$appName]); } catch (\Exception $e) { - $logger->logException($e, ["message" => "saveAuthor: save $fileId author error", "app" => self::$appName]); + $logger->error("saveAuthor: save $fileId author error", ['exception' => $e]); } } diff --git a/lib/Hooks.php b/lib/Hooks.php index c8535e05..9e984c2b 100644 --- a/lib/Hooks.php +++ b/lib/Hooks.php @@ -129,7 +129,7 @@ public static function fileDelete($params) { FileVersions::deleteAllVersions($ownerId, $fileInfo); } catch (\Exception $e) { - \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->error("Hook: fileDelete " . json_encode($params), ['exception' => $e]); } } @@ -165,7 +165,7 @@ public static function fileVersionDelete($params) { FileVersions::deleteVersion($ownerId, $fileInfo, $versionId); FileVersions::deleteAuthor($ownerId, $fileInfo, $versionId); } catch (\Exception $e) { - \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileVersionDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->error("Hook: fileVersionDelete " . json_encode($params), ['exception' => $e]); } } @@ -200,7 +200,7 @@ public static function fileVersionRestore($params) { FileVersions::deleteVersion($ownerId, $fileInfo, $versionId); } catch (\Exception $e) { - \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: fileVersionRestore " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->error("Hook: fileVersionRestore " . json_encode($params), ['exception' => $e]); } } @@ -223,7 +223,7 @@ public static function extraPermissionsDelete($params) { ExtraPermissions::deleteList($shareIds); } catch (\Exception $e) { - \OCP\Log\logger('onlyoffice')->logException($e, ["message" => "Hook: extraPermissionsDelete " . json_encode($params), "app" => self::$appName]); + \OCP\Log\logger('onlyoffice')->error("Hook: extraPermissionsDelete " . json_encode($params), ['exception' => $e]); } } } diff --git a/lib/RemoteInstance.php b/lib/RemoteInstance.php index 184d7e15..d070d11d 100644 --- a/lib/RemoteInstance.php +++ b/lib/RemoteInstance.php @@ -153,7 +153,7 @@ public static function healthCheck($remote) { $status = $data["alive"] === true; } } catch (\Exception $e) { - $logger->logException($e, ["message" => "Failed to request federated health check for" . $remote, "app" => self::APP_NAME]); + $logger->error("Failed to request federated health check for" . $remote, ['exception' => $e]); } if (empty($dbremote)) { @@ -208,7 +208,7 @@ public static function getRemoteKey($file) { return $key; } catch (\Exception $e) { - $logger->logException($e, ["message" => "Failed to request federated key " . $file->getId(), "app" => self::APP_NAME]); + $logger->error("Failed to request federated key " . $file->getId(), ['exception' => $e]); if ($e->getResponse()->getStatusCode() === 404) { self::update($remote, false); @@ -266,7 +266,7 @@ public static function lockRemoteKey($file, $lock, $fs) { return false; } } catch (\Exception $e) { - $logger->logException($e, ["message" => "Failed to request federated " . $action . " for " . $file->getFileInfo()->getId(), "app" => self::APP_NAME]); + $logger->error("Failed to request federated " . $action . " for " . $file->getFileInfo()->getId(), ['exception' => $e]); return false; } } diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php index 2aea9794..1f2b952a 100644 --- a/lib/TemplateManager.php +++ b/lib/TemplateManager.php @@ -112,7 +112,7 @@ public static function getTemplate($templateId) { try { $templates = $templateDir->getById($templateId); } catch (\Exception $e) { - $logger->logException($e, ["message" => "getTemplate: $templateId", "app" => self::$appName]); + $logger->error("getTemplate: $templateId", ['exception' => $e]); return null; } From 0860cc71b5e0052040ac7cedfcc9311f335ad7f2 Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Mon, 20 Jan 2025 17:03:46 +0100 Subject: [PATCH 4/5] chore: Cleanup service registration that is no longer needed Signed-off-by: Julius Knorr --- lib/AppInfo/Application.php | 150 +----------------------------------- 1 file changed, 4 insertions(+), 146 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 4a237def..312f8bbe 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -65,7 +65,6 @@ use OCA\Onlyoffice\Listeners\DirectEditorListener; use OCA\Onlyoffice\Listeners\ViewerListener; use OCA\Onlyoffice\Listeners\WidgetListener; -use OCA\Onlyoffice\Crypt; use OCA\Onlyoffice\DirectEditor; use OCA\Onlyoffice\Hooks; use OCA\Onlyoffice\Notifier; @@ -76,28 +75,14 @@ use Psr\Log\LoggerInterface; class Application extends App implements IBootstrap { + public const APP_ID = "onlyoffice"; - /** - * Application configuration - * - * @var AppConfig - */ - public $appConfig; - - /** - * Hash generator - * - * @var Crypt - */ - public $crypt; + private AppConfig $appConfig; public function __construct(array $urlParams = []) { - $appName = "onlyoffice"; - - parent::__construct($appName, $urlParams); + parent::__construct(self::APP_ID, $urlParams); - $this->appConfig = new AppConfig($appName); - $this->crypt = new Crypt($this->appConfig); + $this->appConfig = \OCP\Server::get(AppConfig::class); } public function register(IRegistrationContext $context): void { @@ -126,133 +111,6 @@ public function register(IRegistrationContext $context): void { // Set the leeway for the JWT library in case the system clock is a second off \Firebase\JWT\JWT::$leeway = $this->appConfig->getJwtLeeway(); - $context->registerService("L10N", function (ContainerInterface $c) { - return $c->get("ServerContainer")->getL10N($c->get("AppName")); - }); - - $context->registerService("RootStorage", function (ContainerInterface $c) { - return $c->get("ServerContainer")->getRootFolder(); - }); - - $context->registerService("UserSession", function (ContainerInterface $c) { - return $c->get("ServerContainer")->getUserSession(); - }); - - $context->registerService("UserManager", function (ContainerInterface $c) { - return $c->get("ServerContainer")->getUserManager(); - }); - - $context->registerService("URLGenerator", function (ContainerInterface $c) { - return $c->get("ServerContainer")->getURLGenerator(); - }); - - $context->registerService("DirectEditor", function (ContainerInterface $c) { - return new DirectEditor( - $c->get("AppName"), - $c->get("URLGenerator"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $this->appConfig, - $this->crypt - ); - }); - - $context->registerService("SettingsData", function (ContainerInterface $c) { - return new SettingsData($this->appConfig); - }); - - // Controllers - $context->registerService("SettingsController", function (ContainerInterface $c) { - return new SettingsController( - $c->get("AppName"), - $c->get("Request"), - $c->get("URLGenerator"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $this->appConfig, - $this->crypt, - $c->get(IMimeIconProvider::class) - ); - }); - - $context->registerService("EditorController", function (ContainerInterface $c) { - return new EditorController( - $c->get("AppName"), - $c->get("Request"), - $c->get("RootStorage"), - $c->get("UserSession"), - $c->get("UserManager"), - $c->get("URLGenerator"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $this->appConfig, - $this->crypt, - $c->get("IManager"), - $c->get("Session"), - $c->get("GroupManager"), - $c->get(IMailer::class) - ); - }); - - $context->registerService("SharingApiController", function (ContainerInterface $c) { - return new SharingApiController( - $c->get("AppName"), - $c->get("Request"), - $c->get("RootStorage"), - $c->get(LoggerInterface::class), - $c->get("UserSession"), - $c->get("UserManager"), - $c->get("IManager"), - $this->appConfig - ); - }); - - $context->registerService("EditorApiController", function (ContainerInterface $c) { - return new EditorApiController( - $c->get("AppName"), - $c->get("Request"), - $c->get("RootStorage"), - $c->get("UserSession"), - $c->get("UserManager"), - $c->get("URLGenerator"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $this->appConfig, - $this->crypt, - $c->get("IManager"), - $c->get("Session"), - $c->get(ITagManager::class), - $c->get(ILockManager::class) - ); - }); - - $context->registerService("CallbackController", function (ContainerInterface $c) { - return new CallbackController( - $c->get("AppName"), - $c->get("Request"), - $c->get("RootStorage"), - $c->get("UserSession"), - $c->get("UserManager"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $this->appConfig, - $this->crypt, - $c->get("IManager"), - $c->get(ILockManager::class) - ); - }); - - $context->registerService("TemplateController", function (ContainerInterface $c) { - return new TemplateController( - $c->get("AppName"), - $c->get("Request"), - $c->get("L10N"), - $c->get(LoggerInterface::class), - $c->get(IPreview::class), - $c->get(IMimeIconProvider::class) - ); - }); - $context->registerEventListener(FileCreatedFromTemplateEvent::class, CreateFromTemplateListener::class); $context->registerEventListener(LoadAdditionalScriptsEvent::class, FilesListener::class); $context->registerEventListener(RegisterDirectEditorEvent::class, DirectEditorListener::class); From da7c15c89aec37072dbb0e1dcfb5c8e1ea385441 Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Mon, 20 Jan 2025 17:08:46 +0100 Subject: [PATCH 5/5] chore: Move to constructor property promotion Signed-off-by: Julius Knorr --- lib/AppConfig.php | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/lib/AppConfig.php b/lib/AppConfig.php index eec6f78d..c968931f 100644 --- a/lib/AppConfig.php +++ b/lib/AppConfig.php @@ -36,6 +36,7 @@ use OCP\ICacheFactory; use OCP\IConfig; use Psr\Log\LoggerInterface; +use OCA\Onlyoffice\AppInfo\Application; /** * Application configutarion @@ -43,28 +44,6 @@ * @package OCA\Onlyoffice */ class AppConfig { - - /** - * Application name - * - * @var string - */ - private $appName; - - /** - * Config service - * - * @var IConfig - */ - private $config; - - /** - * Logger - * - * @var LoggerInterface - */ - private $logger; - /** * The config key for the demo server * @@ -361,22 +340,16 @@ class AppConfig { /** * The config key for store cache - * - * @var ICache */ - private $cache; - - /** - * @param string $AppName - application name - */ - public function __construct($AppName) { - - $this->appName = $AppName; + private ICache $cache; - $this->config = \OC::$server->getConfig(); - $this->logger = \OCP\Server::get(LoggerInterface::class); - $cacheFactory = \OCP\Server::get(ICacheFactory::class); - $this->cache = $cacheFactory->createLocal($this->appName); + public function __construct( + private string $appName, + private IConfig $config, + private LoggerInterface $logger, + ICacheFactory $cacheFactory, + ) { + $this->cache = $cacheFactory->createLocal(Application::APP_ID); } /**