diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-09-26 12:09:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 12:09:21 +0200 |
| commit | 3a56ecc8cb6556372d7615679f0ec84bc95e8af5 (patch) | |
| tree | 1b0469ec77c8acfbf3d9bfe12972d72c91546b75 /core | |
| parent | f18e73137c6112ac81b151c0670333aec88bf2ed (diff) | |
| parent | f68d4f7300af493d52c85a36561551ca6d6e63de (diff) | |
| download | nextcloud-server-3a56ecc8cb6556372d7615679f0ec84bc95e8af5.tar.gz nextcloud-server-3a56ecc8cb6556372d7615679f0ec84bc95e8af5.zip | |
Merge pull request #40565 from nextcloud/fix/remove-writelog
Remove deprecated methods Util::writeLog and DIContainer::log
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/SetupController.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index 69c3b2f2a23..c6da7ca26f7 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -32,13 +32,14 @@ namespace OC\Core\Controller; use OC\Setup; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class SetupController { private string $autoConfigFile; public function __construct( protected Setup $setupHelper, + protected LoggerInterface $logger, ) { $this->autoConfigFile = \OC::$configDir.'autoconfig.php'; } @@ -78,7 +79,7 @@ class SetupController { } } - private function displaySetupForbidden() { + private function displaySetupForbidden(): void { \OC_Template::printGuestPage('', 'installation_forbidden'); } @@ -98,7 +99,7 @@ class SetupController { \OC_Template::printGuestPage('', 'installation', $parameters); } - private function finishSetup() { + private function finishSetup(): void { if (file_exists($this->autoConfigFile)) { unlink($this->autoConfigFile); } @@ -114,7 +115,7 @@ class SetupController { public function loadAutoConfig(array $post): array { if (file_exists($this->autoConfigFile)) { - \OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO); + $this->logger->info('Autoconfig file found, setting up Nextcloud…'); $AUTOCONFIG = []; include $this->autoConfigFile; $post = array_merge($post, $AUTOCONFIG); |