mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use INode instead of Node for custom properties 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2020-02-03 13:23:40 +01:00 committed by Roeland Jago Douma
parent 7819a904d7
commit 451c8761a7
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dav/lib/DAV/CustomPropertiesBackend.php
View File

@ -32,6 +32,7 @@ use OCP\IDBConnection;
use OCP\IUser;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\INode;
use Sabre\DAV\PropertyStorage\Backend\BackendInterface;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
@ -103,7 +104,7 @@ class CustomPropertiesBackend implements BackendInterface {
public function propFind($path, PropFind $propFind) {
try {
$node = $this->tree->getNodeForPath($path);
if (!($node instanceof Node)) {
if (!($node instanceof INode)) {
return;
}
} catch (ServiceUnavailable $e) {
@ -168,7 +169,7 @@ class CustomPropertiesBackend implements BackendInterface {
*/
public function propPatch($path, PropPatch $propPatch) {
$node = $this->tree->getNodeForPath($path);
if (!($node instanceof Node)) {
if (!($node instanceof INode)) {
return;
}
@ -220,7 +221,7 @@ class CustomPropertiesBackend implements BackendInterface {
* http://www.example.org/namespace#author If the array is empty, all
* properties should be returned
*/
private function getProperties(Node $node, array $requestedProperties) {
private function getProperties(INode $node, array $requestedProperties) {
$path = $node->getPath();
if (isset($this->cache[$path])) {
return $this->cache[$path];
@ -259,12 +260,12 @@ class CustomPropertiesBackend implements BackendInterface {
/**
* Update properties
*
* @param Node $node node for which to update properties
* @param INode $node node for which to update properties
* @param array $properties array of properties to update
*
* @return bool
*/
private function updateProperties($node, $properties) {
private function updateProperties(INode $node, array $properties) {
$path = $node->getPath();
$deleteStatement = 'DELETE FROM `*PREFIX*properties`' .

15
apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
View File

@ -29,6 +29,7 @@ use OCA\DAV\DAV\CustomPropertiesBackend;
use OCP\IDBConnection;
use OCP\IUser;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\INode;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
use Sabre\DAV\Tree;
@ -82,9 +83,21 @@ class CustomPropertiesBackendTest extends TestCase {
/**
* @param string $path
* @return Node|\PHPUnit\Framework\MockObject\MockObject
* @return INode|\PHPUnit\Framework\MockObject\MockObject
*/
private function addNode($path) {
$node = $this->createMock(INode::class);
$node->method('getPath')
->willReturn($path);
$this->nodes[$path] = $node;
return $node;
}
/**
* @param string $path
* @return Node|\PHPUnit\Framework\MockObject\MockObject
*/
private function addCalendar($path) {
$node = $this->createMock(Node::class);
$node->method('getPath')
->willReturn($path);