Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>tags/v25.0.0beta1
@@ -59,7 +59,7 @@ $principalBackend = new Principal( | |||
$db = \OC::$server->getDatabaseConnection(); | |||
$userManager = \OC::$server->getUserManager(); | |||
$random = \OC::$server->getSecureRandom(); | |||
$logger = \OC::$server->getLogger(); | |||
$logger = \OC::$server->get(LoggerInterface::class); | |||
$dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class); | |||
$legacyDispatcher = \OC::$server->getEventDispatcher(); | |||
$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->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 | |||
$nodes = [ | |||
@@ -115,7 +115,7 @@ $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OC::$server->getConfig() | |||
if ($sendInvitations) { | |||
$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! | |||
$server->exec(); |
@@ -36,6 +36,7 @@ use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin; | |||
use OCA\DAV\Connector\Sabre\MaintenancePlugin; | |||
use OCA\DAV\Connector\Sabre\Principal; | |||
use OCP\App\IAppManager; | |||
use Psr\Log\LoggerInterface; | |||
use Sabre\CardDAV\Plugin; | |||
$authBackend = new Auth( | |||
@@ -95,9 +96,9 @@ $server->addPlugin(new \Sabre\DAV\Sync\Plugin()); | |||
$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin()); | |||
$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\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! | |||
$server->exec(); |
@@ -48,7 +48,7 @@ $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend); | |||
$serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory( | |||
\OC::$server->getConfig(), | |||
\OC::$server->getLogger(), | |||
\OC::$server->get(Psr\Log\LoggerInterface::class), | |||
\OC::$server->getDatabaseConnection(), | |||
\OC::$server->getUserSession(), | |||
\OC::$server->getMountManager(), |
@@ -39,7 +39,7 @@ ignore_user_abort(true); | |||
$serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory( | |||
\OC::$server->getConfig(), | |||
\OC::$server->getLogger(), | |||
\OC::$server->get(Psr\Log\LoggerInterface::class), | |||
\OC::$server->getDatabaseConnection(), | |||
\OC::$server->getUserSession(), | |||
\OC::$server->getMountManager(), |
@@ -35,6 +35,7 @@ use OCA\DAV\Connector\Sabre\DavAclPlugin; | |||
use OCA\DAV\Events\SabrePluginAuthInitEvent; | |||
use OCA\DAV\RootCollection; | |||
use OCP\EventDispatcher\IEventDispatcher; | |||
use Psr\Log\LoggerInterface; | |||
use Sabre\VObject\ITip\Message; | |||
class InvitationResponseServer { | |||
@@ -47,7 +48,7 @@ class InvitationResponseServer { | |||
*/ | |||
public function __construct(bool $public = true) { | |||
$baseUri = \OC::$WEBROOT . '/remote.php/dav/'; | |||
$logger = \OC::$server->getLogger(); | |||
$logger = \OC::$server->get(LoggerInterface::class); | |||
/** @var IEventDispatcher $dispatcher */ | |||
$dispatcher = \OC::$server->query(IEventDispatcher::class); | |||
@@ -34,6 +34,7 @@ use OCP\IConfig; | |||
use OCP\IDBConnection; | |||
use OCP\IGroupManager; | |||
use OCP\IUserManager; | |||
use Psr\Log\LoggerInterface; | |||
use Symfony\Component\Console\Command\Command; | |||
use Symfony\Component\Console\Input\InputArgument; | |||
use Symfony\Component\Console\Input\InputInterface; | |||
@@ -91,7 +92,7 @@ class CreateCalendar extends Command { | |||
\OC::$server->getL10NFactory(), | |||
); | |||
$random = \OC::$server->getSecureRandom(); | |||
$logger = \OC::$server->getLogger(); | |||
$logger = \OC::$server->get(LoggerInterface::class); | |||
$dispatcher = \OC::$server->get(IEventDispatcher::class); | |||
$legacyDispatcher = \OC::$server->getEventDispatcher(); | |||
$config = \OC::$server->get(IConfig::class); |