Merge pull request #43671 from nextcloud/fix/migrate-away-from-ilogger-in-trashbin

chore(files_trashbin): Migrate away from deprecated ILogger
pull/43760/head
Joas Schilling 3 months ago committed by GitHub
commit 60d9f30a3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -38,8 +38,8 @@ use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\ILogger;
use OCP\IServerContainer;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
class Application extends App implements IBootstrap {
public const APP_ID = 'files_trashbin';
@ -77,7 +77,7 @@ class Application extends App implements IBootstrap {
\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Trashbin\Trashbin', 'ensureFileScannedHook');
}
public function registerTrashBackends(IServerContainer $serverContainer, ILogger $logger, IAppManager $appManager, ITrashManager $trashManager) {
public function registerTrashBackends(ContainerInterface $serverContainer, LoggerInterface $logger, IAppManager $appManager, ITrashManager $trashManager): void {
foreach ($appManager->getInstalledApps() as $app) {
$appInfo = $appManager->getAppInfo($app);
if (isset($appInfo['trash'])) {
@ -87,10 +87,10 @@ class Application extends App implements IBootstrap {
$for = $backend['@attributes']['for'];
try {
$backendObject = $serverContainer->query($class);
$backendObject = $serverContainer->get($class);
$trashManager->registerBackend($for, $backendObject);
} catch (\Exception $e) {
$logger->logException($e);
$logger->error($e->getMessage(), ['exception' => $e]);
}
}
}

Loading…
Cancel
Save