From b539bb15e1ef3a7d65d33ab7b99492e4f91e680e Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Thu, 18 Feb 2016 13:55:28 +0100
Subject: [PATCH] Make scrutinizer happy
---
lib/private/files/node/root.php | 2 +-
lib/private/server.php | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index 40ed531d5df..a9343e72220 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -71,7 +71,7 @@ class Root extends Folder implements IRootFolder {
/**
* @param \OC\Files\Mount\Manager $manager
* @param \OC\Files\View $view
- * @param \OC\User\User $user
+ * @param \OC\User\User|null $user
*/
public function __construct($manager, $view, $user) {
parent::__construct($this, $view, '');
diff --git a/lib/private/server.php b/lib/private/server.php
index 96eb5386ad6..7c8ecce71a5 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -40,7 +40,6 @@ namespace OC;
use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
-use OC\AppFramework\Utility\SimpleContainer;
use OC\AppFramework\Utility\TimeFactory;
use OC\Command\AsyncBus;
use OC\Diagnostics\EventLogger;
@@ -164,7 +163,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('SystemTagObjectMapper', function (Server $c) {
return $c->query('SystemTagManagerFactory')->getObjectMapper();
});
- $this->registerService('RootFolder', function (Server $c) {
+ $this->registerService('RootFolder', function () {
$manager = \OC\Files\Filesystem::getMountManager(null);
$view = new View();
$root = new Root($manager, $view, null);
--
GitLab