wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused UserFolder

Browse source
This commit is contained in:
Joas Schilling 2016-02-24 12:43:23 +01:00
parent 357d342467
commit 3a8e537946
No known key found for this signature in database
GPG key ID: 70A0B324C41C0946
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/dav/lib/Comments/EntityCollection.php
View file

@ -22,11 +22,12 @@
namespace OCA\DAV\Comments; namespace OCA\DAV\Comments;
use OCP\Comments\ICommentsManager; use OCP\Comments\ICommentsManager;
use OCP\Files\Folder; use OCP\Comments\NotFoundException;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\IProperties;
use Sabre\DAV\PropPatch; use Sabre\DAV\PropPatch;
/** /**
@ -37,12 +38,9 @@ use Sabre\DAV\PropPatch;
* *
* @package OCA\DAV\Comments * @package OCA\DAV\Comments
*/ */
class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties { class EntityCollection extends RootCollection implements IProperties {
const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker'; const PROPERTY_NAME_READ_MARKER = '{http://owncloud.org/ns}readMarker';
/** @var Folder */
protected $fileRoot;
/** @var string */ /** @var string */
protected $id; protected $id;
@ -53,7 +51,6 @@ class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties
* @param string $id * @param string $id
* @param string $name * @param string $name
* @param ICommentsManager $commentsManager * @param ICommentsManager $commentsManager
* @param Folder $fileRoot
* @param IUserManager $userManager * @param IUserManager $userManager
* @param IUserSession $userSession * @param IUserSession $userSession
* @param ILogger $logger * @param ILogger $logger
@ -62,7 +59,6 @@ class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties
$id, $id,
$name, $name,
ICommentsManager $commentsManager, ICommentsManager $commentsManager,
Folder $fileRoot,
IUserManager $userManager, IUserManager $userManager,
IUserSession $userSession, IUserSession $userSession,
ILogger $logger ILogger $logger
@ -76,7 +72,6 @@ class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties
$this->id = $id; $this->id = $id;
$this->name = $name; $this->name = $name;
$this->commentsManager = $commentsManager; $this->commentsManager = $commentsManager;
$this->fileRoot = $fileRoot;
$this->logger = $logger; $this->logger = $logger;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->userSession = $userSession; $this->userSession = $userSession;
@ -111,7 +106,7 @@ class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties
$this->userSession, $this->userSession,
$this->logger $this->logger
); );
} catch (\OCP\Comments\NotFoundException $e) { } catch (NotFoundException $e) {
throw new NotFound(); throw new NotFound();
} }
} }
@ -159,7 +154,7 @@ class EntityCollection extends RootCollection implements \Sabre\DAV\IProperties
try { try {
$this->commentsManager->get($name); $this->commentsManager->get($name);
return true; return true;
} catch (\OCP\Comments\NotFoundException $e) { } catch (NotFoundException $e) {
return false; return false;
} }
} }

5
apps/dav/lib/Comments/EntityTypeCollection.php
View file

@ -22,7 +22,6 @@
namespace OCA\DAV\Comments; namespace OCA\DAV\Comments;
use OCP\Comments\ICommentsManager; use OCP\Comments\ICommentsManager;
use OCP\Files\Folder;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
@ -41,8 +40,6 @@ use Sabre\DAV\Exception\NotFound;
* @package OCA\DAV\Comments * @package OCA\DAV\Comments
*/ */
class EntityTypeCollection extends RootCollection { class EntityTypeCollection extends RootCollection {
/** @var Folder */
protected $fileRoot;
/** @var ILogger */ /** @var ILogger */
protected $logger; protected $logger;
@ -93,7 +90,6 @@ class EntityTypeCollection extends RootCollection {
$name, $name,
$this->name, $this->name,
$this->commentsManager, $this->commentsManager,
$this->fileRoot,
$this->userManager, $this->userManager,
$this->userSession, $this->userSession,
$this->logger $this->logger
@ -121,5 +117,4 @@ class EntityTypeCollection extends RootCollection {
return !empty($nodes); return !empty($nodes);
} }
} }