nextcloud / server

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -87,10 +87,10 @@
 	 * @return void
 	 */
 	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
+		$propFind->handle('{DAV:}supportedlock', function() {
 			return new SupportedLock(true);
 		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
 			return new LockDiscovery([]);
 		});
 	}

Indentation +99 added lines, -99 removed lines

@@ -47,113 +47,113 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	private $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	public function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    public function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
-			return new SupportedLock(true);
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function () {
+            return new SupportedLock(true);
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach ($conditions as &$fileCondition) {
-			if (isset($fileCondition['tokens'])) {
-				foreach ($fileCondition['tokens'] as &$token) {
-					if (isset($token['token'])) {
-						if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach ($conditions as &$fileCondition) {
+            if (isset($fileCondition['tokens'])) {
+                foreach ($fileCondition['tokens'] as &$token) {
+                    if (isset($token['token'])) {
+                        if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-			'{DAV:}lockdiscovery' =>
-					new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+            '{DAV:}lockdiscovery' =>
+                    new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(200);
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$response->setStatus(204);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $response->setStatus(204);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

apps/dav/lib/Connector/Sabre/ChecksumList.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

Indentation +33 added lines, -33 removed lines

@@ -32,40 +32,40 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $checksums;
 
-	/**
-	 * @param string $checksum
-	 */
-	public function __construct($checksum) {
-		$this->checksums = explode(',', $checksum);
-	}
+    /**
+     * @param string $checksum
+     */
+    public function __construct($checksum) {
+        $this->checksums = explode(',', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ShareTypeList.php

Spacing +3 added lines, -3 removed lines

@@ -71,8 +71,8 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') {
+				$shareTypes[] = (int) $elem['value'];
 			}
 		}
 		return new self($shareTypes);
@@ -86,7 +86,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType);
 		}
 	}
 }

Indentation +51 added lines, -51 removed lines

@@ -32,61 +32,61 @@
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * Share types
-	 *
-	 * @var int[]
-	 */
-	private $shareTypes;
+    /**
+     * Share types
+     *
+     * @var int[]
+     */
+    private $shareTypes;
 
-	/**
-	 * @param int[] $shareTypes
-	 */
-	public function __construct($shareTypes) {
-		$this->shareTypes = $shareTypes;
-	}
+    /**
+     * @param int[] $shareTypes
+     */
+    public function __construct($shareTypes) {
+        $this->shareTypes = $shareTypes;
+    }
 
-	/**
-	 * Returns the share types
-	 *
-	 * @return int[]
-	 */
-	public function getShareTypes() {
-		return $this->shareTypes;
-	}
+    /**
+     * Returns the share types
+     *
+     * @return int[]
+     */
+    public function getShareTypes() {
+        return $this->shareTypes;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$shareTypes = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $shareTypes = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
-			}
-		}
-		return new self($shareTypes);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
+                $shareTypes[] = (int)$elem['value'];
+            }
+        }
+        return new self($shareTypes);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shareTypes as $shareType) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+        }
+    }
 }

apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php

Indentation +50 added lines, -50 removed lines

@@ -25,58 +25,58 @@
 
 class Publisher implements XmlSerializable {
 
-	/**
-	 * @var string $publishUrl
-	 */
-	protected $publishUrl;
+    /**
+     * @var string $publishUrl
+     */
+    protected $publishUrl;
 
-	/**
-	 * @var boolean $isPublished
-	 */
-	protected $isPublished;
+    /**
+     * @var boolean $isPublished
+     */
+    protected $isPublished;
 
-	/**
-	 * @param string $publishUrl
-	 * @param boolean $isPublished
-	 */
-	public function __construct($publishUrl, $isPublished) {
-		$this->publishUrl = $publishUrl;
-		$this->isPublished = $isPublished;
-	}
+    /**
+     * @param string $publishUrl
+     * @param boolean $isPublished
+     */
+    public function __construct($publishUrl, $isPublished) {
+        $this->publishUrl = $publishUrl;
+        $this->isPublished = $isPublished;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getValue() {
-		return $this->publishUrl;
-	}
+    /**
+     * @return string
+     */
+    public function getValue() {
+        return $this->publishUrl;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		if (!$this->isPublished) {
-			// for pre-publish-url
-			$writer->write($this->publishUrl);
-		} else {
-			// for publish-url
-			$writer->writeElement('{DAV:}href', $this->publishUrl);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        if (!$this->isPublished) {
+            // for pre-publish-url
+            $writer->write($this->publishUrl);
+        } else {
+            // for publish-url
+            $writer->writeElement('{DAV:}href', $this->publishUrl);
+        }
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

@@ -23,11 +23,11 @@
 
 class PublicCalendarObject extends CalendarObject {
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
 
 class SearchTermFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}search-term has illegal value');
 		}
 
 		return $value;

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

Spacing +7 added lines, -7 removed lines

@@ -94,15 +94,15 @@ 
 			$tags = $this->tagManager->getTagsByIds([$tagId]);
 			$tag = current($tags);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+				throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 			}
 			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
+				throw new Forbidden('No permission to assign tag '.$tagId);
 			}
 
 			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
 		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+			throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 		}
 	}
 
@@ -119,11 +119,11 @@ 
 					return $this->makeNode($tag);
 				}
 			}
-			throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
+			throw new NotFound('Tag with id '.$tagId.' not present for object '.$this->objectId);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$tagId.' not found', 0, $e);
 		}
 	}
 
@@ -135,11 +135,11 @@ 
 		$tags = $this->tagManager->getTagsByIds($tagIds);
 
 		// filter out non-visible tags
-		$tags = array_filter($tags, function ($tag) {
+		$tags = array_filter($tags, function($tag) {
 			return $this->tagManager->canUserSeeTag($tag, $this->user);
 		});
 
-		return array_values(array_map(function ($tag) {
+		return array_values(array_map(function($tag) {
 			return $this->makeNode($tag);
 		}, $tags));
 	}

Indentation +165 added lines, -165 removed lines

@@ -41,169 +41,169 @@
  */
 class SystemTagsObjectMappingCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	private $user;
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectId object id
-	 * @param string $objectType object type
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager tag manager
-	 * @param ISystemTagObjectMapper $tagMapper tag mapper
-	 */
-	public function __construct(
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-	}
-
-	public function createFile($tagId, $data = null) {
-		try {
-			$tags = $this->tagManager->getTagsByIds([$tagId]);
-			$tag = current($tags);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-			}
-			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
-			}
-
-			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-		}
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	public function getChild($tagId) {
-		try {
-			if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
-				$tag = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tag);
-				if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return $this->makeNode($tag);
-				}
-			}
-			throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
-		}
-	}
-
-	public function getChildren() {
-		$tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
-		if (empty($tagIds)) {
-			return [];
-		}
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-
-		// filter out non-visible tags
-		$tags = array_filter($tags, function ($tag) {
-			return $this->tagManager->canUserSeeTag($tag, $this->user);
-		});
-
-		return array_values(array_map(function ($tag) {
-			return $this->makeNode($tag);
-		}, $tags));
-	}
-
-	public function childExists($tagId) {
-		try {
-			$result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
-
-			if ($result) {
-				$tags = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tags);
-				if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return false;
-				}
-			}
-
-			return $result;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return $this->objectId;
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the mapping of the
-	 * given system tag to the collection's object
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagMappingNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagMappingNode(
-			$tag,
-			$this->objectId,
-			$this->objectType,
-			$this->user,
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    private $user;
+
+
+    /**
+     * Constructor
+     *
+     * @param string $objectId object id
+     * @param string $objectType object type
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager tag manager
+     * @param ISystemTagObjectMapper $tagMapper tag mapper
+     */
+    public function __construct(
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+    }
+
+    public function createFile($tagId, $data = null) {
+        try {
+            $tags = $this->tagManager->getTagsByIds([$tagId]);
+            $tag = current($tags);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+            }
+            if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
+                throw new Forbidden('No permission to assign tag ' . $tagId);
+            }
+
+            $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+        }
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    public function getChild($tagId) {
+        try {
+            if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
+                $tag = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tag);
+                if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return $this->makeNode($tag);
+                }
+            }
+            throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
+        }
+    }
+
+    public function getChildren() {
+        $tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
+        if (empty($tagIds)) {
+            return [];
+        }
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+
+        // filter out non-visible tags
+        $tags = array_filter($tags, function ($tag) {
+            return $this->tagManager->canUserSeeTag($tag, $this->user);
+        });
+
+        return array_values(array_map(function ($tag) {
+            return $this->makeNode($tag);
+        }, $tags));
+    }
+
+    public function childExists($tagId) {
+        try {
+            $result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
+
+            if ($result) {
+                $tags = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tags);
+                if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return false;
+                }
+            }
+
+            return $result;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return $this->objectId;
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the mapping of the
+     * given system tag to the collection's object
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagMappingNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagMappingNode(
+            $tag,
+            $this->objectId,
+            $this->objectType,
+            $this->user,
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
 }

apps/dav/lib/SystemTag/SystemTagsByIdCollection.php

Indentation +140 added lines, -140 removed lines

@@ -35,144 +35,144 @@
 
 class SystemTagsByIdCollection implements ICollection {
 
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * SystemTagsByIdCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		$this->tagManager = $tagManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 *
-	 * @return bool true if the user is an admin
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create tags by id');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function getChild($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
-			}
-			return $this->makeNode($tag);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
-		}
-	}
-
-	public function getChildren() {
-		$visibilityFilter = true;
-		if ($this->isAdmin()) {
-			$visibilityFilter = null;
-		}
-
-		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
-			return $this->makeNode($tag);
-		}, $tags);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	public function childExists($name) {
-		try {
-			$tag = $this->tagManager->getTagsByIds([$name]);
-			$tag = current($tag);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				return false;
-			}
-			return true;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return 'systemtags';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the given system tag
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
-	}
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * SystemTagsByIdCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        $this->tagManager = $tagManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     *
+     * @return bool true if the user is an admin
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create tags by id');
+    }
+
+    /**
+     * @param string $name
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $name
+     */
+    public function getChild($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                throw new NotFound('Tag with id ' . $name . ' not found');
+            }
+            return $this->makeNode($tag);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+        }
+    }
+
+    public function getChildren() {
+        $visibilityFilter = true;
+        if ($this->isAdmin()) {
+            $visibilityFilter = null;
+        }
+
+        $tags = $this->tagManager->getAllTags($visibilityFilter);
+        return array_map(function ($tag) {
+            return $this->makeNode($tag);
+        }, $tags);
+    }
+
+    /**
+     * @param string $name
+     */
+    public function childExists($name) {
+        try {
+            $tag = $this->tagManager->getTagsByIds([$name]);
+            $tag = current($tag);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
+                return false;
+            }
+            return true;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return 'systemtags';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the given system tag
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagNode($tag, $this->userSession->getUser(), $this->isAdmin(), $this->tagManager);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -104,13 +104,13 @@ 
 			$tag = $this->tagManager->getTagsByIds([$name]);
 			$tag = current($tag);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->userSession->getUser())) {
-				throw new NotFound('Tag with id ' . $name . ' not found');
+				throw new NotFound('Tag with id '.$name.' not found');
 			}
 			return $this->makeNode($tag);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $name . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$name.' not found', 0, $e);
 		}
 	}
 
@@ -121,7 +121,7 @@ 
 		}
 
 		$tags = $this->tagManager->getAllTags($visibilityFilter);
-		return array_map(function ($tag) {
+		return array_map(function($tag) {
 			return $this->makeNode($tag);
 		}, $tags);
 	}

apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php

Indentation +132 added lines, -132 removed lines

@@ -38,136 +38,136 @@
  */
 class SystemTagsObjectTypeCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var \Closure
-	 **/
-	protected $childExistsFunction;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectType object type
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param \Closure $childExistsFunction
-	 */
-	public function __construct(
-		$objectType,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		\Closure $childExistsFunction
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectType = $objectType;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->childExistsFunction = $childExistsFunction;
-	}
-
-	/**
-	 * @param string $name
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create nodes');
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * @param string $objectId
-	 * @return SystemTagsObjectMappingCollection
-	 * @throws NotFound
-	 */
-	public function getChild($objectId) {
-		// make sure the object exists and is reachable
-		if (!$this->childExists($objectId)) {
-			throw new NotFound('Entity does not exist or is not available');
-		}
-		return new SystemTagsObjectMappingCollection(
-			$objectId,
-			$this->objectType,
-			$this->userSession->getUser(),
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
-
-	public function getChildren() {
-		// do not list object ids
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		return call_user_func($this->childExistsFunction, $name);
-	}
-
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	public function getName() {
-		return $this->objectType;
-	}
-
-	/**
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var \Closure
+     **/
+    protected $childExistsFunction;
+
+    /**
+     * Constructor
+     *
+     * @param string $objectType object type
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param \Closure $childExistsFunction
+     */
+    public function __construct(
+        $objectType,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        \Closure $childExistsFunction
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectType = $objectType;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->childExistsFunction = $childExistsFunction;
+    }
+
+    /**
+     * @param string $name
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create nodes');
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * @param string $objectId
+     * @return SystemTagsObjectMappingCollection
+     * @throws NotFound
+     */
+    public function getChild($objectId) {
+        // make sure the object exists and is reachable
+        if (!$this->childExists($objectId)) {
+            throw new NotFound('Entity does not exist or is not available');
+        }
+        return new SystemTagsObjectMappingCollection(
+            $objectId,
+            $this->objectType,
+            $this->userSession->getUser(),
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
+
+    public function getChildren() {
+        // do not list object ids
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        return call_user_func($this->childExistsFunction, $name);
+    }
+
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    public function getName() {
+        return $this->objectType;
+    }
+
+    /**
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
 }