nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Migrate last instances of $server::getLogger() from dav 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2022-03-31 15:51:29 +02:00
parent e2531f8503
commit 5fb9de6248
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/appinfo/v1/caldav.php
View File

@ -59,7 +59,7 @@ $principalBackend = new Principal(
$db = \OC::$server->getDatabaseConnection(); $db = \OC::$server->getDatabaseConnection();
$userManager = \OC::$server->getUserManager(); $userManager = \OC::$server->getUserManager();
$random = \OC::$server->getSecureRandom(); $random = \OC::$server->getSecureRandom();
$logger = \OC::$server->getLogger(); $logger = \OC::$server->get(LoggerInterface::class);
$dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class); $dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class);
$legacyDispatcher = \OC::$server->getEventDispatcher(); $legacyDispatcher = \OC::$server->getEventDispatcher();
$config = \OC::$server->get(\OCP\IConfig::class); $config = \OC::$server->get(\OCP\IConfig::class);
@ -84,7 +84,7 @@ $sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitation
$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend); $principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
$principalCollection->disableListing = !$debugging; // Disable listing $principalCollection->disableListing = !$debugging; // Disable listing
$addressBookRoot = new CalendarRoot($principalBackend, $calDavBackend, 'principals', \OC::$server->get(LoggerInterface::class)); $addressBookRoot = new CalendarRoot($principalBackend, $calDavBackend, 'principals', $logger);
$addressBookRoot->disableListing = !$debugging; // Disable listing $addressBookRoot->disableListing = !$debugging; // Disable listing
$nodes = [ $nodes = [
@ -115,7 +115,7 @@ $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig()
if ($sendInvitations) { if ($sendInvitations) {
$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class)); $server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
} }
$server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger())); $server->addPlugin(new ExceptionLoggerPlugin('caldav', $logger));
// And off we go! // And off we go!
$server->exec(); $server->exec();

5
apps/dav/appinfo/v1/carddav.php
View File

@ -36,6 +36,7 @@ use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
use OCA\DAV\Connector\Sabre\MaintenancePlugin; use OCA\DAV\Connector\Sabre\MaintenancePlugin;
use OCA\DAV\Connector\Sabre\Principal; use OCA\DAV\Connector\Sabre\Principal;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use Psr\Log\LoggerInterface;
use Sabre\CardDAV\Plugin; use Sabre\CardDAV\Plugin;
$authBackend = new Auth( $authBackend = new Auth(
@ -95,9 +96,9 @@ $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin()); $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache( $server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache(
\OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getAppDataDir('dav-photocache'),
\OC::$server->getLogger() \OC::$server->get(LoggerInterface::class)
))); )));
$server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger())); $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->get(LoggerInterface::class)));
// And off we go! // And off we go!
$server->exec(); $server->exec();

2
apps/dav/appinfo/v1/publicwebdav.php
View File

@ -48,7 +48,7 @@ $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
$serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(), \OC::$server->getConfig(),
\OC::$server->getLogger(), \OC::$server->get(Psr\Log\LoggerInterface::class),
\OC::$server->getDatabaseConnection(), \OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(), \OC::$server->getUserSession(),
\OC::$server->getMountManager(), \OC::$server->getMountManager(),

2
apps/dav/appinfo/v1/webdav.php
View File

@ -39,7 +39,7 @@ ignore_user_abort(true);
$serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory( $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(), \OC::$server->getConfig(),
\OC::$server->getLogger(), \OC::$server->get(Psr\Log\LoggerInterface::class),
\OC::$server->getDatabaseConnection(), \OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(), \OC::$server->getUserSession(),
\OC::$server->getMountManager(), \OC::$server->getMountManager(),

3
apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
View File

@ -35,6 +35,7 @@ use OCA\DAV\Connector\Sabre\DavAclPlugin;
use OCA\DAV\Events\SabrePluginAuthInitEvent; use OCA\DAV\Events\SabrePluginAuthInitEvent;
use OCA\DAV\RootCollection; use OCA\DAV\RootCollection;
use OCP\EventDispatcher\IEventDispatcher; use OCP\EventDispatcher\IEventDispatcher;
use Psr\Log\LoggerInterface;
use Sabre\VObject\ITip\Message; use Sabre\VObject\ITip\Message;
class InvitationResponseServer { class InvitationResponseServer {
@ -47,7 +48,7 @@ class InvitationResponseServer {
*/ */
public function __construct(bool $public = true) { public function __construct(bool $public = true) {
$baseUri = \OC::$WEBROOT . '/remote.php/dav/'; $baseUri = \OC::$WEBROOT . '/remote.php/dav/';
$logger = \OC::$server->getLogger(); $logger = \OC::$server->get(LoggerInterface::class);
/** @var IEventDispatcher $dispatcher */ /** @var IEventDispatcher $dispatcher */
$dispatcher = \OC::$server->query(IEventDispatcher::class); $dispatcher = \OC::$server->query(IEventDispatcher::class);

3
apps/dav/lib/Command/CreateCalendar.php
View File

@ -34,6 +34,7 @@ use OCP\IConfig;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IUserManager; use OCP\IUserManager;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -91,7 +92,7 @@ class CreateCalendar extends Command {
\OC::$server->getL10NFactory(), \OC::$server->getL10NFactory(),
); );
$random = \OC::$server->getSecureRandom(); $random = \OC::$server->getSecureRandom();
$logger = \OC::$server->getLogger(); $logger = \OC::$server->get(LoggerInterface::class);
$dispatcher = \OC::$server->get(IEventDispatcher::class); $dispatcher = \OC::$server->get(IEventDispatcher::class);
$legacyDispatcher = \OC::$server->getEventDispatcher(); $legacyDispatcher = \OC::$server->getEventDispatcher();
$config = \OC::$server->get(IConfig::class); $config = \OC::$server->get(IConfig::class);