nextcloud / server

lib/private/SystemTag/SystemTagObjectMapper.php

Spacing +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 		$result->closeCursor();
 
 		if ($all) {
-			return ((int)$row[0] === \count($objIds));
+			return ((int) $row[0] === \count($objIds));
 		}
 
 		return (bool) $row;
@@ -259,7 +259,7 @@ 
 		if (\count($tags) !== \count($tagIds)) {
 			// at least one tag missing, bail out
 			$foundTagIds = array_map(
-				function (ISystemTag $tag) {
+				function(ISystemTag $tag) {
 					return $tag->getId();
 				},
 				$tags

Indentation +231 added lines, -231 removed lines

@@ -39,235 +39,235 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class SystemTagObjectMapper implements ISystemTagObjectMapper {
-	public const RELATION_TABLE = 'systemtag_object_mapping';
-
-	/** @var ISystemTagManager */
-	protected $tagManager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param ISystemTagManager $tagManager system tag manager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
-		$this->connection = $connection;
-		$this->tagManager = $tagManager;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagIdsForObjects($objIds, string $objectType): array {
-		if (!\is_array($objIds)) {
-			$objIds = [$objIds];
-		} elseif (empty($objIds)) {
-			return [];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['systemtagid', 'objectid'])
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
-			->setParameter('objecttype', $objectType)
-			->addOrderBy('objectid', 'ASC')
-			->addOrderBy('systemtagid', 'ASC');
-
-		$mapping = [];
-		foreach ($objIds as $objId) {
-			$mapping[$objId] = [];
-		}
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$objectId = $row['objectid'];
-			$mapping[$objectId][] = $row['systemtagid'];
-		}
-
-		$result->closeCursor();
-
-		return $mapping;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->selectDistinct('objectid')
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
-
-		if ($limit) {
-			if (\count($tagIds) !== 1) {
-				throw new \InvalidArgumentException('Limit is only allowed with a single tag');
-			}
-
-			$query->setMaxResults($limit)
-				->orderBy('objectid', 'ASC');
-
-			if ($offset !== '') {
-				$query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
-			}
-		}
-
-		$objectIds = [];
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$objectIds[] = $row['objectid'];
-		}
-
-		return $objectIds;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function assignTags(string $objId, string $objectType, $tagIds) {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::RELATION_TABLE)
-			->values([
-				'objectid' => $query->createNamedParameter($objId),
-				'objecttype' => $query->createNamedParameter($objectType),
-				'systemtagid' => $query->createParameter('tagid'),
-			]);
-
-		$tagsAssigned = [];
-		foreach ($tagIds as $tagId) {
-			try {
-				$query->setParameter('tagid', $tagId);
-				$query->execute();
-				$tagsAssigned[] = $tagId;
-			} catch (UniqueConstraintViolationException $e) {
-				// ignore existing relations
-			}
-		}
-
-		if (empty($tagsAssigned)) {
-			return;
-		}
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
-			MapperEvent::EVENT_ASSIGN,
-			$objectType,
-			$objId,
-			$tagsAssigned
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unassignTags(string $objId, string $objectType, $tagIds) {
-		if (!\is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::RELATION_TABLE)
-			->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
-			->setParameter('objectid', $objId)
-			->setParameter('objecttype', $objectType)
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
-			MapperEvent::EVENT_UNASSIGN,
-			$objectType,
-			$objId,
-			$tagIds
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool {
-		$this->assertTagsExist([$tagId]);
-
-		if (!\is_array($objIds)) {
-			$objIds = [$objIds];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		if (!$all) {
-			// If we only need one entry, we make the query lighter, by not
-			// counting the elements
-			$query->select('*')
-				->setMaxResults(1);
-		} else {
-			$query->select($query->func()->count($query->expr()->literal(1)));
-		}
-
-		$query->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
-			->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
-			->setParameter('tagid', $tagId)
-			->setParameter('objecttype', $objectType);
-
-		$result = $query->execute();
-		$row = $result->fetch(\PDO::FETCH_NUM);
-		$result->closeCursor();
-
-		if ($all) {
-			return ((int)$row[0] === \count($objIds));
-		}
-
-		return (bool) $row;
-	}
-
-	/**
-	 * Asserts that all the given tag ids exist.
-	 *
-	 * @param string[] $tagIds tag ids to check
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
-	 */
-	private function assertTagsExist($tagIds) {
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-		if (\count($tags) !== \count($tagIds)) {
-			// at least one tag missing, bail out
-			$foundTagIds = array_map(
-				function (ISystemTag $tag) {
-					return $tag->getId();
-				},
-				$tags
-			);
-			$missingTagIds = array_diff($tagIds, $foundTagIds);
-			throw new TagNotFoundException(
-				'Tags not found', 0, null, $missingTagIds
-			);
-		}
-	}
+    public const RELATION_TABLE = 'systemtag_object_mapping';
+
+    /** @var ISystemTagManager */
+    protected $tagManager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $connection database connection
+     * @param ISystemTagManager $tagManager system tag manager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
+        $this->connection = $connection;
+        $this->tagManager = $tagManager;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagIdsForObjects($objIds, string $objectType): array {
+        if (!\is_array($objIds)) {
+            $objIds = [$objIds];
+        } elseif (empty($objIds)) {
+            return [];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['systemtagid', 'objectid'])
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
+            ->setParameter('objecttype', $objectType)
+            ->addOrderBy('objectid', 'ASC')
+            ->addOrderBy('systemtagid', 'ASC');
+
+        $mapping = [];
+        foreach ($objIds as $objId) {
+            $mapping[$objId] = [];
+        }
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $objectId = $row['objectid'];
+            $mapping[$objectId][] = $row['systemtagid'];
+        }
+
+        $result->closeCursor();
+
+        return $mapping;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->selectDistinct('objectid')
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
+
+        if ($limit) {
+            if (\count($tagIds) !== 1) {
+                throw new \InvalidArgumentException('Limit is only allowed with a single tag');
+            }
+
+            $query->setMaxResults($limit)
+                ->orderBy('objectid', 'ASC');
+
+            if ($offset !== '') {
+                $query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
+            }
+        }
+
+        $objectIds = [];
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $objectIds[] = $row['objectid'];
+        }
+
+        return $objectIds;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function assignTags(string $objId, string $objectType, $tagIds) {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::RELATION_TABLE)
+            ->values([
+                'objectid' => $query->createNamedParameter($objId),
+                'objecttype' => $query->createNamedParameter($objectType),
+                'systemtagid' => $query->createParameter('tagid'),
+            ]);
+
+        $tagsAssigned = [];
+        foreach ($tagIds as $tagId) {
+            try {
+                $query->setParameter('tagid', $tagId);
+                $query->execute();
+                $tagsAssigned[] = $tagId;
+            } catch (UniqueConstraintViolationException $e) {
+                // ignore existing relations
+            }
+        }
+
+        if (empty($tagsAssigned)) {
+            return;
+        }
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
+            MapperEvent::EVENT_ASSIGN,
+            $objectType,
+            $objId,
+            $tagsAssigned
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unassignTags(string $objId, string $objectType, $tagIds) {
+        if (!\is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::RELATION_TABLE)
+            ->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
+            ->setParameter('objectid', $objId)
+            ->setParameter('objecttype', $objectType)
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
+            MapperEvent::EVENT_UNASSIGN,
+            $objectType,
+            $objId,
+            $tagIds
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool {
+        $this->assertTagsExist([$tagId]);
+
+        if (!\is_array($objIds)) {
+            $objIds = [$objIds];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        if (!$all) {
+            // If we only need one entry, we make the query lighter, by not
+            // counting the elements
+            $query->select('*')
+                ->setMaxResults(1);
+        } else {
+            $query->select($query->func()->count($query->expr()->literal(1)));
+        }
+
+        $query->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
+            ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
+            ->setParameter('tagid', $tagId)
+            ->setParameter('objecttype', $objectType);
+
+        $result = $query->execute();
+        $row = $result->fetch(\PDO::FETCH_NUM);
+        $result->closeCursor();
+
+        if ($all) {
+            return ((int)$row[0] === \count($objIds));
+        }
+
+        return (bool) $row;
+    }
+
+    /**
+     * Asserts that all the given tag ids exist.
+     *
+     * @param string[] $tagIds tag ids to check
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
+     */
+    private function assertTagsExist($tagIds) {
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+        if (\count($tags) !== \count($tagIds)) {
+            // at least one tag missing, bail out
+            $foundTagIds = array_map(
+                function (ISystemTag $tag) {
+                    return $tag->getId();
+                },
+                $tags
+            );
+            $missingTagIds = array_diff($tagIds, $foundTagIds);
+            throw new TagNotFoundException(
+                'Tags not found', 0, null, $missingTagIds
+            );
+        }
+    }
 }

lib/private/Collaboration/Resources/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
+		array_map(function(IResource $r) use ($resource) {
 			if ($this->isSameResource($r, $resource)) {
 				throw new ResourceException('Already part of the collection');
 			}
@@ -158,7 +158,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+		$this->resources = array_filter($this->getResources(), function(IResource $r) use ($resource) {
 			return !$this->isSameResource($r, $resource);
 		});
 

Indentation +190 added lines, -190 removed lines

@@ -38,194 +38,194 @@
 
 class Collection implements ICollection {
 
-	/** @var IManager|Manager */
-	protected $manager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var int */
-	protected $id;
-
-	/** @var string */
-	protected $name;
-
-	/** @var IUser|null */
-	protected $userForAccess;
-
-	/** @var bool|null */
-	protected $access;
-
-	/** @var IResource[] */
-	protected $resources;
-
-	public function __construct(
-		IManager $manager,
-		IDBConnection $connection,
-		int $id,
-		string $name,
-		?IUser $userForAccess = null,
-		?bool $access = null
-	) {
-		$this->manager = $manager;
-		$this->connection = $connection;
-		$this->id = $id;
-		$this->name = $name;
-		$this->userForAccess = $userForAccess;
-		$this->access = $access;
-		$this->resources = [];
-	}
-
-	/**
-	 * @return int
-	 * @since 16.0.0
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @param string $name
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(Manager::TABLE_COLLECTIONS)
-			->set('name', $query->createNamedParameter($name))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->name = $name;
-	}
-
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array {
-		if (empty($this->resources)) {
-			$this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
-		}
-
-		return $this->resources;
-	}
-
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @param IResource $resource
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
-			if ($this->isSameResource($r, $resource)) {
-				throw new ResourceException('Already part of the collection');
-			}
-		}, $this->getResources());
-
-		$this->resources[] = $resource;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(Manager::TABLE_RESOURCES)
-			->values([
-				'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-			]);
-
-		try {
-			$query->execute();
-		} catch (ConstraintViolationException $e) {
-			throw new ResourceException('Already part of the collection');
-		}
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-	}
-
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @param IResource $resource
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
-			return !$this->isSameResource($r, $resource);
-		});
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_RESOURCES)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->execute();
-
-		if (empty($this->resources)) {
-			$this->removeCollection();
-		} else {
-			$this->manager->invalidateAccessCacheForCollection($this);
-		}
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function isSameResource(IResource $resource1, IResource $resource2): bool {
-		return $resource1->getType() === $resource2->getType() &&
-			$resource1->getId() === $resource2->getId();
-	}
-
-	protected function removeCollection(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-		$this->id = 0;
-	}
+    /** @var IManager|Manager */
+    protected $manager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var int */
+    protected $id;
+
+    /** @var string */
+    protected $name;
+
+    /** @var IUser|null */
+    protected $userForAccess;
+
+    /** @var bool|null */
+    protected $access;
+
+    /** @var IResource[] */
+    protected $resources;
+
+    public function __construct(
+        IManager $manager,
+        IDBConnection $connection,
+        int $id,
+        string $name,
+        ?IUser $userForAccess = null,
+        ?bool $access = null
+    ) {
+        $this->manager = $manager;
+        $this->connection = $connection;
+        $this->id = $id;
+        $this->name = $name;
+        $this->userForAccess = $userForAccess;
+        $this->access = $access;
+        $this->resources = [];
+    }
+
+    /**
+     * @return int
+     * @since 16.0.0
+     */
+    public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     * @since 16.0.0
+     */
+    public function setName(string $name): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(Manager::TABLE_COLLECTIONS)
+            ->set('name', $query->createNamedParameter($name))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->name = $name;
+    }
+
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array {
+        if (empty($this->resources)) {
+            $this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
+        }
+
+        return $this->resources;
+    }
+
+    /**
+     * Adds a resource to a collection
+     *
+     * @param IResource $resource
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void {
+        array_map(function (IResource $r) use ($resource) {
+            if ($this->isSameResource($r, $resource)) {
+                throw new ResourceException('Already part of the collection');
+            }
+        }, $this->getResources());
+
+        $this->resources[] = $resource;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(Manager::TABLE_RESOURCES)
+            ->values([
+                'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (ConstraintViolationException $e) {
+            throw new ResourceException('Already part of the collection');
+        }
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+    }
+
+    /**
+     * Removes a resource from a collection
+     *
+     * @param IResource $resource
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void {
+        $this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+            return !$this->isSameResource($r, $resource);
+        });
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_RESOURCES)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
+        $query->execute();
+
+        if (empty($this->resources)) {
+            $this->removeCollection();
+        } else {
+            $this->manager->invalidateAccessCacheForCollection($this);
+        }
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function isSameResource(IResource $resource1, IResource $resource2): bool {
+        return $resource1->getType() === $resource2->getType() &&
+            $resource1->getId() === $resource2->getId();
+    }
+
+    protected function removeCollection(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+        $this->id = 0;
+    }
 }

lib/public/Accounts/PropertyDoesNotExistException.php

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  */
 class PropertyDoesNotExistException extends \Exception {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 15.0.0
-	 */
-	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 15.0.0
+     */
+    public function __construct($property) {
+        parent::__construct('Property ' . $property . ' does not exist.');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 * @since 15.0.0
 	 */
 	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

lib/public/AppFramework/Http/StreamResponse.php

Indentation +26 added lines, -26 removed lines

@@ -35,35 +35,35 @@
  * @since 8.1.0
  */
 class StreamResponse extends Response implements ICallbackResponse {
-	/** @var string */
-	private $filePath;
+    /** @var string */
+    private $filePath;
 
-	/**
-	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
-	 * @since 8.1.0
-	 */
-	public function __construct($filePath) {
-		parent::__construct();
+    /**
+     * @param string|resource $filePath the path to the file or a file handle which should be streamed
+     * @since 8.1.0
+     */
+    public function __construct($filePath) {
+        parent::__construct();
 
-		$this->filePath = $filePath;
-	}
+        $this->filePath = $filePath;
+    }
 
 
-	/**
-	 * Streams the file using readfile
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback(IOutput $output) {
-		// handle caching
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
-				$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
-			} elseif ($output->setReadfile($this->filePath) === false) {
-				$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
-			}
-		}
-	}
+    /**
+     * Streams the file using readfile
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback(IOutput $output) {
+        // handle caching
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
+                $output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
+            } elseif ($output->setReadfile($this->filePath) === false) {
+                $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);
+            }
+        }
+    }
 
 }

lib/public/AppFramework/Db/DoesNotExistException.php

Indentation +8 added lines, -8 removed lines

@@ -34,13 +34,13 @@
  */
 class DoesNotExistException extends \Exception implements IMapperException {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg) {
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg) {
+        parent::__construct($msg);
+    }
 
 }

lib/public/AppFramework/Db/MultipleObjectsReturnedException.php

Indentation +8 added lines, -8 removed lines

@@ -34,13 +34,13 @@
  */
 class MultipleObjectsReturnedException extends \Exception implements IMapperException {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg) {
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg) {
+        parent::__construct($msg);
+    }
 
 }

lib/public/Diagnostics/IQueryLogger.php

Indentation +36 added lines, -36 removed lines

@@ -34,43 +34,43 @@
  * @since 8.0.0
  */
 interface IQueryLogger extends SQLLogger {
-	/**
-	 * Mark the start of a query providing query SQL statement, its parameters and types.
-	 * This method should be called as close to the DB as possible and after
-	 * query is finished finalized with stopQuery() method.
-	 *
-	 * @param string $sql
-	 * @param array|null $params
-	 * @param array|null $types
-	 * @since 8.0.0
-	 */
-	public function startQuery($sql, array $params = null, array $types = null);
+    /**
+     * Mark the start of a query providing query SQL statement, its parameters and types.
+     * This method should be called as close to the DB as possible and after
+     * query is finished finalized with stopQuery() method.
+     *
+     * @param string $sql
+     * @param array|null $params
+     * @param array|null $types
+     * @since 8.0.0
+     */
+    public function startQuery($sql, array $params = null, array $types = null);
 
-	/**
-	 * Mark the end of the current active query. Ending query should store \OCP\Diagnostics\IQuery to
-	 * be returned with getQueries() method.
-	 *
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function stopQuery();
+    /**
+     * Mark the end of the current active query. Ending query should store \OCP\Diagnostics\IQuery to
+     * be returned with getQueries() method.
+     *
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function stopQuery();
 
-	/**
-	 * This method should return all \OCP\Diagnostics\IQuery objects stored using
-	 * startQuery()/stopQuery() methods.
-	 *
-	 * @return \OCP\Diagnostics\IQuery[]
-	 * @since 8.0.0
-	 */
-	public function getQueries();
+    /**
+     * This method should return all \OCP\Diagnostics\IQuery objects stored using
+     * startQuery()/stopQuery() methods.
+     *
+     * @return \OCP\Diagnostics\IQuery[]
+     * @since 8.0.0
+     */
+    public function getQueries();
 
-	/**
-	 * Activate the module for the duration of the request. Deactivated module
-	 * does not create and store \OCP\Diagnostics\IQuery objects.
-	 * Only activated module should create and store objects to be
-	 * returned with getQueries() call.
-	 *
-	 * @since 12.0.0
-	 */
-	public function activate();
+    /**
+     * Activate the module for the duration of the request. Deactivated module
+     * does not create and store \OCP\Diagnostics\IQuery objects.
+     * Only activated module should create and store objects to be
+     * returned with getQueries() call.
+     *
+     * @since 12.0.0
+     */
+    public function activate();
 }

lib/private/Collaboration/Collaborators/RemotePlugin.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 							$searchResult->markExactIdMatch($resultType);
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -124,7 +124,7 @@ 
 						];
 					} else {
 						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -154,7 +154,7 @@ 
 				$localUser = $this->userManager->get($remoteUser);
 				if ($localUser === null || $search !== $localUser->getCloudId()) {
 					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
+						'label' => $remoteUser." ($serverUrl)",
 						'uuid' => $remoteUser,
 						'name' => $remoteUser,
 						'value' => [

Indentation +145 added lines, -145 removed lines

@@ -37,160 +37,160 @@
 use OCP\Share\IShare;
 
 class RemotePlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var string */
-	private $userId = '';
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var string */
+    private $userId = '';
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, IUserSession $userSession) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$user = $userSession->getUser();
-		if ($user !== null) {
-			$this->userId = $user->getUID();
-		}
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, IUserSession $userSession) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $user = $userSession->getUser();
+        if ($user !== null) {
+            $this->userId = $user->getUID();
+        }
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], [
-			'limit' => $limit,
-			'offset' => $offset,
-			'enumeration' => false,
-			'fullmatch' => false,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					$cloudIdType = '';
-					if (\is_array($cloudId)) {
-						$cloudIdData = $cloudId;
-						$cloudId = $cloudIdData['value'];
-						$cloudIdType = $cloudIdData['type'];
-					}
-					try {
-						[$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], [
+            'limit' => $limit,
+            'offset' => $offset,
+            'enumeration' => false,
+            'fullmatch' => false,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    $cloudIdType = '';
+                    if (\is_array($cloudId)) {
+                        $cloudIdData = $cloudId;
+                        $cloudId = $cloudIdData['value'];
+                        $cloudIdType = $cloudIdData['type'];
+                    }
+                    try {
+                        [$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					$localUser = $this->userManager->get($remoteUser);
-					/**
-					 * Add local share if remote cloud id matches a local user ones
-					 */
-					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
-						$result['wide'][] = [
-							'label' => $contact['FN'],
-							'uuid' => $contact['UID'],
-							'value' => [
-								'shareType' => IShare::TYPE_USER,
-								'shareWith' => $remoteUser
-							],
-							'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
-						];
-					}
+                    $localUser = $this->userManager->get($remoteUser);
+                    /**
+                     * Add local share if remote cloud id matches a local user ones
+                     */
+                    if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'],
+                            'uuid' => $contact['UID'],
+                            'value' => [
+                                'shareType' => IShare::TYPE_USER,
+                                'shareWith' => $remoteUser
+                            ],
+                            'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
+                        ];
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		/**
-		 * Add generic share with remote item for valid cloud ids that are not users of the local instance
-		 */
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			try {
-				[$remoteUser, $serverUrl] = $this->splitUserRemote($search);
-				$localUser = $this->userManager->get($remoteUser);
-				if ($localUser === null || $search !== $localUser->getCloudId()) {
-					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
-						'uuid' => $remoteUser,
-						'name' => $remoteUser,
-						'value' => [
-							'shareType' => IShare::TYPE_REMOTE,
-							'shareWith' => $search,
-							'server' => $serverUrl,
-						],
-					];
-				}
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
+        /**
+         * Add generic share with remote item for valid cloud ids that are not users of the local instance
+         */
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            try {
+                [$remoteUser, $serverUrl] = $this->splitUserRemote($search);
+                $localUser = $this->userManager->get($remoteUser);
+                if ($localUser === null || $search !== $localUser->getCloudId()) {
+                    $result['exact'][] = [
+                        'label' => $remoteUser . " ($serverUrl)",
+                        'uuid' => $remoteUser,
+                        'name' => $remoteUser,
+                        'value' => [
+                            'shareType' => IShare::TYPE_REMOTE,
+                            'shareWith' => $search,
+                            'server' => $serverUrl,
+                        ],
+                    ];
+                }
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Color.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC;
 
 class Color {
-	public $r;
-	public $g;
-	public $b;
-	public function __construct($r, $g, $b) {
-		$this->r = $r;
-		$this->g = $g;
-		$this->b = $b;
-	}
+    public $r;
+    public $g;
+    public $b;
+    public function __construct($r, $g, $b) {
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+    }
 }