Skip to content

Commit 99f0b10

Browse files
ChristophWurstChristophWurst
authored
Merge pull request #26591 from nextcloud/techdebt/noid/less-ilogger
Less ILogger
2 parents 48c5027 + 2d75868 commit 99f0b10

52 files changed

Lines changed: 254 additions & 318 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/files_sharing/tests/TestCase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected static function loginHelper($user, $create = false, $password = false)
187187
$userObject = $userManager->createUser($user, $password);
188188
$group = $groupManager->createGroup('group');
189189

190-
if ($group and $userObject) {
190+
if ($group && $userObject) {
191191
$group->addUser($userObject);
192192
}
193193
}

‎console.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function exceptionHandler($exception) {
9393
\OC::$server->getConfig(),
9494
\OC::$server->getEventDispatcher(),
9595
\OC::$server->getRequest(),
96-
\OC::$server->getLogger(),
96+
\OC::$server->get(\Psr\Log\LoggerInterface::class),
9797
\OC::$server->query(\OC\MemoryInfo::class)
9898
);
9999
$application->loadCommands(new ArgvInput(), new ConsoleOutput());

‎core/Command/Maintenance/Install.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
use OC\Setup;
3838
use OC\SystemConfig;
3939
use OCP\Defaults;
40+
use Psr\Log\LoggerInterface;
4041
use Symfony\Component\Console\Command\Command;
4142
use Symfony\Component\Console\Helper\QuestionHelper;
4243
use Symfony\Component\Console\Input\InputInterface;
@@ -85,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8586
$this->iniGetWrapper,
8687
$server->getL10N('lib'),
8788
$server->query(Defaults::class),
88-
$server->getLogger(),
89+
$server->get(LoggerInterface::class),
8990
$server->getSecureRandom(),
9091
\OC::$server->query(Installer::class)
9192
);

‎core/Command/Upgrade.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
use OC\Installer;
3838
use OC\Updater;
3939
use OCP\IConfig;
40-
use OCP\ILogger;
4140
use OCP\Util;
41+
use Psr\Log\LoggerInterface;
4242
use Symfony\Component\Console\Command\Command;
4343
use Symfony\Component\Console\Helper\ProgressBar;
4444
use Symfony\Component\Console\Input\InputInterface;
@@ -56,15 +56,13 @@ class Upgrade extends Command {
5656
/** @var IConfig */
5757
private $config;
5858

59-
/** @var ILogger */
59+
/** @var LoggerInterface */
6060
private $logger;
6161

62-
/**
63-
* @param IConfig $config
64-
* @param ILogger $logger
65-
* @param Installer $installer
66-
*/
67-
public function __construct(IConfig $config, ILogger $logger, Installer $installer) {
62+
/** @var Installer */
63+
private $installer;
64+
65+
public function __construct(IConfig $config, LoggerInterface $logger, Installer $installer) {
6866
parent::__construct();
6967
$this->config = $config;
7068
$this->logger = $logger;

‎core/ajax/update.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function handleRepairFeedback($event) {
117117
// avoid side effects
118118
\OC_User::setIncognitoMode(true);
119119

120-
$logger = \OC::$server->getLogger();
120+
$logger = \OC::$server->get(\Psr\Log\LoggerInterface::class);
121121
$config = \OC::$server->getConfig();
122122
$updater = new \OC\Updater(
123123
$config,

‎core/register_command.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
161161
$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
162162

163-
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
163+
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->query(\OC\Installer::class)));
164164
$application->add(new OC\Core\Command\Maintenance\Repair(
165165
new \OC\Repair([], \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class)),
166166
\OC::$server->getConfig(),

‎lib/base.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ public static function handleRequest() {
929929
\OC::$server->get(\bantu\IniGetWrapper\IniGetWrapper::class),
930930
\OC::$server->getL10N('lib'),
931931
\OC::$server->query(\OCP\Defaults::class),
932-
\OC::$server->getLogger(),
932+
\OC::$server->get(\Psr\Log\LoggerInterface::class),
933933
\OC::$server->getSecureRandom(),
934934
\OC::$server->query(\OC\Installer::class)
935935
);

‎lib/private/App/AppManager.php‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
use OCP\IConfig;
4747
use OCP\IGroup;
4848
use OCP\IGroupManager;
49-
use OCP\ILogger;
5049
use OCP\IUser;
5150
use OCP\IUserSession;
51+
use Psr\Log\LoggerInterface;
5252
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
5353

5454
class AppManager implements IAppManager {
@@ -83,7 +83,7 @@ class AppManager implements IAppManager {
8383
/** @var EventDispatcherInterface */
8484
private $dispatcher;
8585

86-
/** @var ILogger */
86+
/** @var LoggerInterface */
8787
private $logger;
8888

8989
/** @var string[] $appId => $enabled */
@@ -104,21 +104,13 @@ class AppManager implements IAppManager {
104104
/** @var array */
105105
private $autoDisabledApps = [];
106106

107-
/**
108-
* @param IUserSession $userSession
109-
* @param IConfig $config
110-
* @param AppConfig $appConfig
111-
* @param IGroupManager $groupManager
112-
* @param ICacheFactory $memCacheFactory
113-
* @param EventDispatcherInterface $dispatcher
114-
*/
115107
public function __construct(IUserSession $userSession,
116108
IConfig $config,
117109
AppConfig $appConfig,
118110
IGroupManager $groupManager,
119111
ICacheFactory $memCacheFactory,
120112
EventDispatcherInterface $dispatcher,
121-
ILogger $logger) {
113+
LoggerInterface $logger) {
122114
$this->userSession = $userSession;
123115
$this->config = $config;
124116
$this->appConfig = $appConfig;
@@ -249,7 +241,7 @@ private function checkAppForUser($enabled, $user) {
249241

250242
if (!is_array($groupIds)) {
251243
$jsonError = json_last_error();
252-
$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
244+
$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError);
253245
return false;
254246
}
255247

@@ -282,7 +274,7 @@ private function checkAppForGroups(string $enabled, IGroup $group): bool {
282274

283275
if (!is_array($groupIds)) {
284276
$jsonError = json_last_error();
285-
$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
277+
$this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError);
286278
return false;
287279
}
288280

‎lib/private/App/AppStore/Fetcher/AppFetcher.php‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
use OCP\AppFramework\Utility\ITimeFactory;
3737
use OCP\Http\Client\IClientService;
3838
use OCP\IConfig;
39-
use OCP\ILogger;
39+
use Psr\Log\LoggerInterface;
4040

4141
class AppFetcher extends Fetcher {
4242

@@ -46,20 +46,12 @@ class AppFetcher extends Fetcher {
4646
/** @var bool */
4747
private $ignoreMaxVersion;
4848

49-
/**
50-
* @param Factory $appDataFactory
51-
* @param IClientService $clientService
52-
* @param ITimeFactory $timeFactory
53-
* @param IConfig $config
54-
* @param CompareVersion $compareVersion
55-
* @param ILogger $logger
56-
*/
5749
public function __construct(Factory $appDataFactory,
5850
IClientService $clientService,
5951
ITimeFactory $timeFactory,
6052
IConfig $config,
6153
CompareVersion $compareVersion,
62-
ILogger $logger) {
54+
LoggerInterface $logger) {
6355
parent::__construct(
6456
$appDataFactory,
6557
$clientService,
@@ -86,7 +78,7 @@ public function __construct(Factory $appDataFactory,
8678
protected function fetch($ETag, $content, $allowUnstable = false) {
8779
/** @var mixed[] $response */
8880
$response = parent::fetch($ETag, $content);
89-
81+
9082
if (empty($response)) {
9183
return [];
9284
}
@@ -134,7 +126,9 @@ protected function fetch($ETag, $content, $allowUnstable = false) {
134126
$releases[] = $release;
135127
}
136128
} catch (\InvalidArgumentException $e) {
137-
$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
129+
$this->logger->warning($e->getMessage(), [
130+
'exception' => $e,
131+
]);
138132
}
139133
}
140134
}

‎lib/private/App/AppStore/Fetcher/CategoryFetcher.php‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,14 @@
3131
use OCP\AppFramework\Utility\ITimeFactory;
3232
use OCP\Http\Client\IClientService;
3333
use OCP\IConfig;
34-
use OCP\ILogger;
34+
use Psr\Log\LoggerInterface;
3535

3636
class CategoryFetcher extends Fetcher {
37-
/**
38-
* @param Factory $appDataFactory
39-
* @param IClientService $clientService
40-
* @param ITimeFactory $timeFactory
41-
* @param IConfig $config
42-
* @param ILogger $logger
43-
*/
4437
public function __construct(Factory $appDataFactory,
4538
IClientService $clientService,
4639
ITimeFactory $timeFactory,
4740
IConfig $config,
48-
ILogger $logger) {
41+
LoggerInterface $logger) {
4942
parent::__construct(
5043
$appDataFactory,
5144
$clientService,

0 commit comments

Comments
 (0)