diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-06-13 12:48:35 +0200 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-07-28 16:53:24 +0200 |
| commit | 2ee659e54787c938e57787261442ad4037270322 (patch) | |
| tree | ddc2a94bb966c5790bf14eb31ecc1d73d20fc951 /apps/dav/lib | |
| parent | 2fb7a1feebb6b8a2c524c75e688cec00d4e3d50e (diff) | |
| download | nextcloud-server-2ee659e54787c938e57787261442ad4037270322.tar.gz nextcloud-server-2ee659e54787c938e57787261442ad4037270322.zip | |
Fix view-only code after code review comments
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/ServerFactory.php | 2 | ||||
| -rw-r--r-- | apps/dav/lib/DAV/ViewOnlyPlugin.php | 8 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index 5b9471d537c..4c57f3412e3 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -161,7 +161,7 @@ class ServerFactory { // Allow view-only plugin for webdav requests $server->addPlugin(new ViewOnlyPlugin( - \OC::$server->getLogger() + $this->logger )); if ($this->userSession->isLoggedIn()) { diff --git a/apps/dav/lib/DAV/ViewOnlyPlugin.php b/apps/dav/lib/DAV/ViewOnlyPlugin.php index cd322572dcc..17b0823b7d7 100644 --- a/apps/dav/lib/DAV/ViewOnlyPlugin.php +++ b/apps/dav/lib/DAV/ViewOnlyPlugin.php @@ -26,7 +26,7 @@ use OCA\DAV\Connector\Sabre\File as DavFile; use OCA\DAV\Meta\MetaFile; use OCP\Files\FileInfo; use OCP\Files\NotFoundException; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; use Sabre\HTTP\RequestInterface; @@ -40,13 +40,13 @@ class ViewOnlyPlugin extends ServerPlugin { /** @var Server $server */ private $server; - /** @var ILogger $logger */ + /** @var LoggerInterface $logger */ private $logger; /** - * @param ILogger $logger + * @param LoggerInterface $logger */ - public function __construct(ILogger $logger) { + public function __construct(LoggerInterface $logger) { $this->logger = $logger; $this->server = null; } diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 5c83e5c2963..2cfcb3f5393 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -232,7 +232,7 @@ class Server { // Allow view-only plugin for webdav requests $this->server->addPlugin(new ViewOnlyPlugin( - \OC::$server->getLogger() + $logger )); if (BrowserErrorPagePlugin::isBrowserRequest($request)) { |