nextcloud / server

lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 class PgSqlExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return string
-	 */
-	public function castColumn($column, $type) {
-		switch ($type) {
-			case IQueryBuilder::PARAM_INT:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
-			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
-			default:
-				return parent::castColumn($column, $type);
-		}
-	}
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return string
+     */
+    public function castColumn($column, $type) {
+        switch ($type) {
+            case IQueryBuilder::PARAM_INT:
+                return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
+            case IQueryBuilder::PARAM_STR:
+                return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
+            default:
+                return parent::castColumn($column, $type);
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
+    }
 
 }

apps/user_ldap/templates/renewpassword.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php /** @var $l OC_L10N */ ?>
 <?php
 script('user_ldap', [
-	'renewPassword',
+    'renewPassword',
 ]);
 style('user_ldap', 'renewPassword');
 ?>

lib/private/Collaboration/Resources/Resource.php

Indentation +125 added lines, -125 removed lines

@@ -31,129 +31,129 @@
 
 class Resource implements IResource {
 
-	/** @var IManager */
-	protected $manager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var string */
-	protected $type;
-
-	/** @var string */
-	protected $id;
-
-	/** @var IUser|null */
-	protected $userForAccess;
-
-	/** @var bool|null */
-	protected $access;
-
-	/** @var array|null */
-	protected $data;
-
-	public function __construct(
-		IManager $manager,
-		IDBConnection $connection,
-		string $type,
-		string $id,
-		?IUser $userForAccess = null,
-		?bool $access = null
-	) {
-		$this->manager = $manager;
-		$this->connection = $connection;
-		$this->type = $type;
-		$this->id = $id;
-		$this->userForAccess = $userForAccess;
-		$this->access = $access;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string {
-		return $this->type;
-	}
-
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
-
-	/**
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getRichObject(): array {
-		if ($this->data === null) {
-			$this->data = $this->manager->getResourceRichObject($this);
-		}
-
-		return $this->data;
-	}
-
-	/**
-	 * Can a user/guest access the resource
-	 *
-	 * @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->canAccessResource($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->canAccessResource($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	/**
-	 * @return ICollection[]
-	 * @since 16.0.0
-	 */
-	public function getCollections(): array {
-		$collections = [];
-
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select('collection_id')
-			->from('collres_resources')
-			->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$collections[] = $this->manager->getCollection((int) $row['collection_id']);
-		}
-		$result->closeCursor();
-
-		return $collections;
-	}
+    /** @var IManager */
+    protected $manager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var string */
+    protected $type;
+
+    /** @var string */
+    protected $id;
+
+    /** @var IUser|null */
+    protected $userForAccess;
+
+    /** @var bool|null */
+    protected $access;
+
+    /** @var array|null */
+    protected $data;
+
+    public function __construct(
+        IManager $manager,
+        IDBConnection $connection,
+        string $type,
+        string $id,
+        ?IUser $userForAccess = null,
+        ?bool $access = null
+    ) {
+        $this->manager = $manager;
+        $this->connection = $connection;
+        $this->type = $type;
+        $this->id = $id;
+        $this->userForAccess = $userForAccess;
+        $this->access = $access;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getId(): string {
+        return $this->id;
+    }
+
+    /**
+     * @return array
+     * @since 16.0.0
+     */
+    public function getRichObject(): array {
+        if ($this->data === null) {
+            $this->data = $this->manager->getResourceRichObject($this);
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Can a user/guest access the resource
+     *
+     * @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->canAccessResource($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->canAccessResource($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    /**
+     * @return ICollection[]
+     * @since 16.0.0
+     */
+    public function getCollections(): array {
+        $collections = [];
+
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select('collection_id')
+            ->from('collres_resources')
+            ->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $collections[] = $this->manager->getCollection((int) $row['collection_id']);
+        }
+        $result->closeCursor();
+
+        return $collections;
+    }
 }

lib/public/Collaboration/Resources/IResource.php

Indentation +28 added lines, -28 removed lines

@@ -29,36 +29,36 @@
  */
 interface IResource {
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getType(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getType(): string;
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getId(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getId(): string;
 
-	/**
-	 * @return array
-	 * @since 16.0.0
-	 */
-	public function getRichObject(): array;
+    /**
+     * @return array
+     * @since 16.0.0
+     */
+    public function getRichObject(): array;
 
-	/**
-	 * Can a user/guest access the resource
-	 *
-	 * @param IUser|null $user
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool;
+    /**
+     * Can a user/guest access the resource
+     *
+     * @param IUser|null $user
+     * @return bool
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool;
 
-	/**
-	 * @return ICollection[]
-	 * @since 16.0.0
-	 */
-	public function getCollections(): array;
+    /**
+     * @return ICollection[]
+     * @since 16.0.0
+     */
+    public function getCollections(): array;
 }

apps/dav/lib/Migration/Version1004Date20170924124212.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 
 class Version1004Date20170924124212 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('cards');
-		$table->addIndex(['addressbookid'], 'cards_abid');
+        $table = $schema->getTable('cards');
+        $table->addIndex(['addressbookid'], 'cards_abid');
 
-		$table = $schema->getTable('cards_properties');
-		$table->addIndex(['addressbookid'], 'cards_prop_abid');
+        $table = $schema->getTable('cards_properties');
+        $table->addIndex(['addressbookid'], 'cards_prop_abid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Controller/CollaborationResourcesController.php

Indentation +252 added lines, -252 removed lines

@@ -37,256 +37,256 @@
 
 class CollaborationResourcesController extends OCSController {
 
-	/** @var IManager */
-	private $manager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $manager,
-		IUserSession $userSession,
-		ILogger $logger
-	) {
-		parent::__construct($appName, $request);
-
-		$this->manager = $manager;
-		$this->userSession = $userSession;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param int $collectionId
-	 * @return ICollection
-	 * @throws CollectionException when the collection was not found for the user
-	 */
-	protected function getCollection(int $collectionId): ICollection {
-		$collection = $this->manager->getCollectionForUser($collectionId, $this->userSession->getUser());
-
-		if (!$collection->canAccess($this->userSession->getUser())) {
-			throw new CollectionException('Not found');
-		}
-
-		return $collection;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @return DataResponse
-	 */
-	public function listCollection(int $collectionId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $filter
-	 * @return DataResponse
-	 */
-	public function searchCollections(string $filter): DataResponse {
-		try {
-			$collections = $this->manager->searchCollections($this->userSession->getUser(), $filter);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return new DataResponse($this->prepareCollections($collections));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function addResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$resource = $this->manager->createResource($resourceType, $resourceId);
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		try {
-			$collection->addResource($resource);
-		} catch (ResourceException $e) {
-		}
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function removeResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		try {
-			$resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection->removeResource($resource);
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $resourceType
-	 * @param string $resourceId
-	 * @return DataResponse
-	 */
-	public function getCollectionsByResource(string $resourceType, string $resourceId): DataResponse {
-		try {
-			$resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
-		} catch (ResourceException $e) {
-			$resource = $this->manager->createResource($resourceType, $resourceId);
-		}
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		return new DataResponse($this->prepareCollections($resource->getCollections()));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $baseResourceType
-	 * @param string $baseResourceId
-	 * @param string $name
-	 * @return DataResponse
-	 */
-	public function createCollectionOnResource(string $baseResourceType, string $baseResourceId, string $name): DataResponse {
-		if (!isset($name[0]) || isset($name[64])) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$resource = $this->manager->createResource($baseResourceType, $baseResourceId);
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection = $this->manager->newCollection($name);
-		$collection->addResource($resource);
-
-		return $this->respondCollection($collection);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $collectionId
-	 * @param string $collectionName
-	 * @return DataResponse
-	 */
-	public function renameCollection(int $collectionId, string $collectionName): DataResponse {
-		try {
-			$collection = $this->getCollection($collectionId);
-		} catch (CollectionException $exception) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$collection->setName($collectionName);
-
-		return $this->respondCollection($collection);
-	}
-
-	protected function respondCollection(ICollection $collection): DataResponse {
-		try {
-			return new DataResponse($this->prepareCollection($collection));
-		} catch (CollectionException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (Exception $e) {
-			$this->logger->logException($e);
-			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	protected function prepareCollections(array $collections): array {
-		$result = [];
-
-		foreach ($collections as $collection) {
-			try {
-				$result[] = $this->prepareCollection($collection);
-			} catch (CollectionException $e) {
-			} catch (Exception $e) {
-				$this->logger->logException($e);
-			}
-		}
-
-		return $result;
-	}
-
-	protected function prepareCollection(ICollection $collection): array {
-		if (!$collection->canAccess($this->userSession->getUser())) {
-			throw new CollectionException('Can not access collection');
-		}
-
-		return [
-			'id' => $collection->getId(),
-			'name' => $collection->getName(),
-			'resources' => $this->prepareResources($collection->getResources()),
-		];
-	}
-
-	protected function prepareResources(array $resources): ?array {
-		$result = [];
-
-		foreach ($resources as $resource) {
-			try {
-				$result[] = $this->prepareResource($resource);
-			} catch (ResourceException $e) {
-			} catch (Exception $e) {
-				$this->logger->logException($e);
-			}
-		}
-
-		return $result;
-	}
-
-	protected function prepareResource(IResource $resource): array {
-		if (!$resource->canAccess($this->userSession->getUser())) {
-			throw new ResourceException('Can not access resource');
-		}
-
-		return $resource->getRichObject();
-	}
+    /** @var IManager */
+    private $manager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $manager,
+        IUserSession $userSession,
+        ILogger $logger
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->manager = $manager;
+        $this->userSession = $userSession;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param int $collectionId
+     * @return ICollection
+     * @throws CollectionException when the collection was not found for the user
+     */
+    protected function getCollection(int $collectionId): ICollection {
+        $collection = $this->manager->getCollectionForUser($collectionId, $this->userSession->getUser());
+
+        if (!$collection->canAccess($this->userSession->getUser())) {
+            throw new CollectionException('Not found');
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @return DataResponse
+     */
+    public function listCollection(int $collectionId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $filter
+     * @return DataResponse
+     */
+    public function searchCollections(string $filter): DataResponse {
+        try {
+            $collections = $this->manager->searchCollections($this->userSession->getUser(), $filter);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return new DataResponse($this->prepareCollections($collections));
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function addResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $resource = $this->manager->createResource($resourceType, $resourceId);
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        try {
+            $collection->addResource($resource);
+        } catch (ResourceException $e) {
+        }
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function removeResource(int $collectionId, string $resourceType, string $resourceId): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        try {
+            $resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection->removeResource($resource);
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $resourceType
+     * @param string $resourceId
+     * @return DataResponse
+     */
+    public function getCollectionsByResource(string $resourceType, string $resourceId): DataResponse {
+        try {
+            $resource = $this->manager->getResourceForUser($resourceType, $resourceId, $this->userSession->getUser());
+        } catch (ResourceException $e) {
+            $resource = $this->manager->createResource($resourceType, $resourceId);
+        }
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        return new DataResponse($this->prepareCollections($resource->getCollections()));
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $baseResourceType
+     * @param string $baseResourceId
+     * @param string $name
+     * @return DataResponse
+     */
+    public function createCollectionOnResource(string $baseResourceType, string $baseResourceId, string $name): DataResponse {
+        if (!isset($name[0]) || isset($name[64])) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $resource = $this->manager->createResource($baseResourceType, $baseResourceId);
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection = $this->manager->newCollection($name);
+        $collection->addResource($resource);
+
+        return $this->respondCollection($collection);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $collectionId
+     * @param string $collectionName
+     * @return DataResponse
+     */
+    public function renameCollection(int $collectionId, string $collectionName): DataResponse {
+        try {
+            $collection = $this->getCollection($collectionId);
+        } catch (CollectionException $exception) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $collection->setName($collectionName);
+
+        return $this->respondCollection($collection);
+    }
+
+    protected function respondCollection(ICollection $collection): DataResponse {
+        try {
+            return new DataResponse($this->prepareCollection($collection));
+        } catch (CollectionException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (Exception $e) {
+            $this->logger->logException($e);
+            return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    protected function prepareCollections(array $collections): array {
+        $result = [];
+
+        foreach ($collections as $collection) {
+            try {
+                $result[] = $this->prepareCollection($collection);
+            } catch (CollectionException $e) {
+            } catch (Exception $e) {
+                $this->logger->logException($e);
+            }
+        }
+
+        return $result;
+    }
+
+    protected function prepareCollection(ICollection $collection): array {
+        if (!$collection->canAccess($this->userSession->getUser())) {
+            throw new CollectionException('Can not access collection');
+        }
+
+        return [
+            'id' => $collection->getId(),
+            'name' => $collection->getName(),
+            'resources' => $this->prepareResources($collection->getResources()),
+        ];
+    }
+
+    protected function prepareResources(array $resources): ?array {
+        $result = [];
+
+        foreach ($resources as $resource) {
+            try {
+                $result[] = $this->prepareResource($resource);
+            } catch (ResourceException $e) {
+            } catch (Exception $e) {
+                $this->logger->logException($e);
+            }
+        }
+
+        return $result;
+    }
+
+    protected function prepareResource(IResource $resource): array {
+        if (!$resource->canAccess($this->userSession->getUser())) {
+            throw new ResourceException('Can not access resource');
+        }
+
+        return $resource->getRichObject();
+    }
 }

lib/private/App/CodeChecker/NodeVisitor.php

Indentation +276 added lines, -276 removed lines

@@ -29,280 +29,280 @@
 use PhpParser\NodeVisitorAbstract;
 
 class NodeVisitor extends NodeVisitorAbstract {
-	/** @var ICheck */
-	protected $list;
-
-	/** @var string */
-	protected $blackListDescription;
-	/** @var string[] */
-	protected $blackListedClassNames;
-	/** @var string[] */
-	protected $blackListedConstants;
-	/** @var string[] */
-	protected $blackListedFunctions;
-	/** @var string[] */
-	protected $blackListedMethods;
-	/** @var bool */
-	protected $checkEqualOperatorUsage;
-	/** @var string[] */
-	protected $errorMessages;
-
-	/**
-	 * @param ICheck $list
-	 */
-	public function __construct(ICheck $list) {
-		$this->list = $list;
-
-		$this->blackListedClassNames = [];
-		foreach ($list->getClasses() as $class => $blackListInfo) {
-			if (is_numeric($class) && is_string($blackListInfo)) {
-				$class = $blackListInfo;
-				$blackListInfo = null;
-			}
-
-			$class = strtolower($class);
-			$this->blackListedClassNames[$class] = $class;
-		}
-
-		$this->blackListedConstants = [];
-		foreach ($list->getConstants() as $constantName => $blackListInfo) {
-			$constantName = strtolower($constantName);
-			$this->blackListedConstants[$constantName] = $constantName;
-		}
-
-		$this->blackListedFunctions = [];
-		foreach ($list->getFunctions() as $functionName => $blackListInfo) {
-			$functionName = strtolower($functionName);
-			$this->blackListedFunctions[$functionName] = $functionName;
-		}
-
-		$this->blackListedMethods = [];
-		foreach ($list->getMethods() as $functionName => $blackListInfo) {
-			$functionName = strtolower($functionName);
-			$this->blackListedMethods[$functionName] = $functionName;
-		}
-
-		$this->checkEqualOperatorUsage = $list->checkStrongComparisons();
-
-		$this->errorMessages = [
-			CodeChecker::CLASS_EXTENDS_NOT_ALLOWED => "%s class must not be extended",
-			CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED => "%s interface must not be implemented",
-			CodeChecker::STATIC_CALL_NOT_ALLOWED => "Static method of %s class must not be called",
-			CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED => "Constant of %s class must not not be fetched",
-			CodeChecker::CLASS_NEW_NOT_ALLOWED => "%s class must not be instantiated",
-			CodeChecker::CLASS_USE_NOT_ALLOWED => "%s class must not be imported with a use statement",
-			CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED => "Method of %s class must not be called",
-
-			CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED => "is discouraged",
-		];
-	}
-
-	/** @var array */
-	public $errors = [];
-
-	public function enterNode(Node $node) {
-		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
-			$this->errors[]= [
-				'disallowedToken' => '==',
-				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason('==', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
-			];
-		}
-		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
-			$this->errors[]= [
-				'disallowedToken' => '!=',
-				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason('!=', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
-			];
-		}
-		if ($node instanceof Node\Stmt\Class_) {
-			if (!is_null($node->extends)) {
-				$this->checkBlackList($node->extends->toString(), CodeChecker::CLASS_EXTENDS_NOT_ALLOWED, $node);
-			}
-			foreach ($node->implements as $implements) {
-				$this->checkBlackList($implements->toString(), CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED, $node);
-			}
-		}
-		if ($node instanceof Node\Expr\StaticCall) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::STATIC_CALL_NOT_ALLOWED, $node);
-
-					$this->checkBlackListFunction($node->class->toString(), $node->name, $node);
-					$this->checkBlackListMethod($node->class->toString(), $node->name, $node);
-				}
-
-				if ($node->class instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = $c::call();
-					 */
-					// $this->checkBlackListMethod($node->class->..., $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\MethodCall) {
-			if (!is_null($node->var)) {
-				if ($node->var instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = new OC_API();
-					 *       $n = $c::call();
-					 *       $n = $c->call();
-					 */
-					// $this->checkBlackListMethod($node->var->..., $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\ClassConstFetch) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED, $node);
-				}
-				if ($node->class instanceof Node\Expr\Variable || $node->class instanceof Node\Expr\PropertyFetch) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = $i::ADMIN_AUTH;
-					 */
-				} else {
-					$this->checkBlackListConstant($node->class->toString(), $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\New_) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::CLASS_NEW_NOT_ALLOWED, $node);
-				}
-				if ($node->class instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = new $i;
-					 */
-				}
-			}
-		}
-		if ($node instanceof Node\Stmt\UseUse) {
-			$this->checkBlackList($node->name->toString(), CodeChecker::CLASS_USE_NOT_ALLOWED, $node);
-			if ($node->alias) {
-				$this->addUseNameToBlackList($node->name->toString(), $node->alias);
-			} else {
-				$this->addUseNameToBlackList($node->name->toString(), $node->name->getLast());
-			}
-		}
-	}
-
-	/**
-	 * Check whether an alias was introduced for a namespace of a blacklisted class
-	 *
-	 * Example:
-	 * - Blacklist entry:      OCP\AppFramework\IApi
-	 * - Name:                 OCP\AppFramework
-	 * - Alias:                OAF
-	 * =>  new blacklist entry:  OAF\IApi
-	 *
-	 * @param string $name
-	 * @param string $alias
-	 */
-	private function addUseNameToBlackList($name, $alias) {
-		$name = strtolower($name);
-		$alias = strtolower($alias);
-
-		foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
-			if (strpos($blackListedClassName, $name . '\\') === 0) {
-				$aliasedClassName = str_replace($name, $alias, $blackListedClassName);
-				$this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
-			}
-		}
-
-		foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
-			if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
-				$aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
-				$this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
-			}
-		}
-
-		foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
-			if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
-				$aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
-				$this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
-			}
-		}
-
-		foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
-			if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
-				$aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
-				$this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
-			}
-		}
-	}
-
-	private function checkBlackList($name, $errorCode, Node $node) {
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedClassNames[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => $errorCode,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedClassNames[$lowerName], $errorCode)
-			];
-		}
-	}
-
-	private function checkBlackListConstant($class, $constantName, Node $node) {
-		$name = $class . '::' . $constantName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedConstants[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedConstants[$lowerName], CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function checkBlackListFunction($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedFunctions[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedFunctions[$lowerName], CodeChecker::STATIC_CALL_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function checkBlackListMethod($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedMethods[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedMethods[$lowerName], CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function buildReason($name, $errorCode) {
-		if (isset($this->errorMessages[$errorCode])) {
-			$desc = $this->list->getDescription($errorCode, $name);
-			return sprintf($this->errorMessages[$errorCode], $desc);
-		}
-
-		return "$name usage not allowed - error: $errorCode";
-	}
+    /** @var ICheck */
+    protected $list;
+
+    /** @var string */
+    protected $blackListDescription;
+    /** @var string[] */
+    protected $blackListedClassNames;
+    /** @var string[] */
+    protected $blackListedConstants;
+    /** @var string[] */
+    protected $blackListedFunctions;
+    /** @var string[] */
+    protected $blackListedMethods;
+    /** @var bool */
+    protected $checkEqualOperatorUsage;
+    /** @var string[] */
+    protected $errorMessages;
+
+    /**
+     * @param ICheck $list
+     */
+    public function __construct(ICheck $list) {
+        $this->list = $list;
+
+        $this->blackListedClassNames = [];
+        foreach ($list->getClasses() as $class => $blackListInfo) {
+            if (is_numeric($class) && is_string($blackListInfo)) {
+                $class = $blackListInfo;
+                $blackListInfo = null;
+            }
+
+            $class = strtolower($class);
+            $this->blackListedClassNames[$class] = $class;
+        }
+
+        $this->blackListedConstants = [];
+        foreach ($list->getConstants() as $constantName => $blackListInfo) {
+            $constantName = strtolower($constantName);
+            $this->blackListedConstants[$constantName] = $constantName;
+        }
+
+        $this->blackListedFunctions = [];
+        foreach ($list->getFunctions() as $functionName => $blackListInfo) {
+            $functionName = strtolower($functionName);
+            $this->blackListedFunctions[$functionName] = $functionName;
+        }
+
+        $this->blackListedMethods = [];
+        foreach ($list->getMethods() as $functionName => $blackListInfo) {
+            $functionName = strtolower($functionName);
+            $this->blackListedMethods[$functionName] = $functionName;
+        }
+
+        $this->checkEqualOperatorUsage = $list->checkStrongComparisons();
+
+        $this->errorMessages = [
+            CodeChecker::CLASS_EXTENDS_NOT_ALLOWED => "%s class must not be extended",
+            CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED => "%s interface must not be implemented",
+            CodeChecker::STATIC_CALL_NOT_ALLOWED => "Static method of %s class must not be called",
+            CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED => "Constant of %s class must not not be fetched",
+            CodeChecker::CLASS_NEW_NOT_ALLOWED => "%s class must not be instantiated",
+            CodeChecker::CLASS_USE_NOT_ALLOWED => "%s class must not be imported with a use statement",
+            CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED => "Method of %s class must not be called",
+
+            CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED => "is discouraged",
+        ];
+    }
+
+    /** @var array */
+    public $errors = [];
+
+    public function enterNode(Node $node) {
+        if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
+            $this->errors[]= [
+                'disallowedToken' => '==',
+                'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason('==', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
+            ];
+        }
+        if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
+            $this->errors[]= [
+                'disallowedToken' => '!=',
+                'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason('!=', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
+            ];
+        }
+        if ($node instanceof Node\Stmt\Class_) {
+            if (!is_null($node->extends)) {
+                $this->checkBlackList($node->extends->toString(), CodeChecker::CLASS_EXTENDS_NOT_ALLOWED, $node);
+            }
+            foreach ($node->implements as $implements) {
+                $this->checkBlackList($implements->toString(), CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED, $node);
+            }
+        }
+        if ($node instanceof Node\Expr\StaticCall) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::STATIC_CALL_NOT_ALLOWED, $node);
+
+                    $this->checkBlackListFunction($node->class->toString(), $node->name, $node);
+                    $this->checkBlackListMethod($node->class->toString(), $node->name, $node);
+                }
+
+                if ($node->class instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = $c::call();
+                     */
+                    // $this->checkBlackListMethod($node->class->..., $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\MethodCall) {
+            if (!is_null($node->var)) {
+                if ($node->var instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = new OC_API();
+                     *       $n = $c::call();
+                     *       $n = $c->call();
+                     */
+                    // $this->checkBlackListMethod($node->var->..., $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\ClassConstFetch) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED, $node);
+                }
+                if ($node->class instanceof Node\Expr\Variable || $node->class instanceof Node\Expr\PropertyFetch) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = $i::ADMIN_AUTH;
+                     */
+                } else {
+                    $this->checkBlackListConstant($node->class->toString(), $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\New_) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_NEW_NOT_ALLOWED, $node);
+                }
+                if ($node->class instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = new $i;
+                     */
+                }
+            }
+        }
+        if ($node instanceof Node\Stmt\UseUse) {
+            $this->checkBlackList($node->name->toString(), CodeChecker::CLASS_USE_NOT_ALLOWED, $node);
+            if ($node->alias) {
+                $this->addUseNameToBlackList($node->name->toString(), $node->alias);
+            } else {
+                $this->addUseNameToBlackList($node->name->toString(), $node->name->getLast());
+            }
+        }
+    }
+
+    /**
+     * Check whether an alias was introduced for a namespace of a blacklisted class
+     *
+     * Example:
+     * - Blacklist entry:      OCP\AppFramework\IApi
+     * - Name:                 OCP\AppFramework
+     * - Alias:                OAF
+     * =>  new blacklist entry:  OAF\IApi
+     *
+     * @param string $name
+     * @param string $alias
+     */
+    private function addUseNameToBlackList($name, $alias) {
+        $name = strtolower($name);
+        $alias = strtolower($alias);
+
+        foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
+            if (strpos($blackListedClassName, $name . '\\') === 0) {
+                $aliasedClassName = str_replace($name, $alias, $blackListedClassName);
+                $this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
+            }
+        }
+
+        foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
+            if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
+                $aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
+                $this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
+            }
+        }
+
+        foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
+            if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
+                $aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
+                $this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
+            }
+        }
+
+        foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
+            if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
+                $aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
+                $this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
+            }
+        }
+    }
+
+    private function checkBlackList($name, $errorCode, Node $node) {
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedClassNames[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => $errorCode,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedClassNames[$lowerName], $errorCode)
+            ];
+        }
+    }
+
+    private function checkBlackListConstant($class, $constantName, Node $node) {
+        $name = $class . '::' . $constantName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedConstants[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedConstants[$lowerName], CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function checkBlackListFunction($class, $functionName, Node $node) {
+        $name = $class . '::' . $functionName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedFunctions[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedFunctions[$lowerName], CodeChecker::STATIC_CALL_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function checkBlackListMethod($class, $functionName, Node $node) {
+        $name = $class . '::' . $functionName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedMethods[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedMethods[$lowerName], CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function buildReason($name, $errorCode) {
+        if (isset($this->errorMessages[$errorCode])) {
+            $desc = $this->list->getDescription($errorCode, $name);
+            return sprintf($this->errorMessages[$errorCode], $desc);
+        }
+
+        return "$name usage not allowed - error: $errorCode";
+    }
 }

lib/public/Files/SimpleFS/ISimpleFile.php

Indentation +76 added lines, -76 removed lines

@@ -33,89 +33,89 @@
  */
 interface ISimpleFile {
 
-	/**
-	 * Get the name
-	 *
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getName();
+    /**
+     * Get the name
+     *
+     * @return string
+     * @since 11.0.0
+     */
+    public function getName();
 
-	/**
-	 * Get the size in bytes
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getSize();
+    /**
+     * Get the size in bytes
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function getSize();
 
-	/**
-	 * Get the ETag
-	 *
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getETag();
+    /**
+     * Get the ETag
+     *
+     * @return string
+     * @since 11.0.0
+     */
+    public function getETag();
 
-	/**
-	 * Get the last modification time
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getMTime();
+    /**
+     * Get the last modification time
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function getMTime();
 
-	/**
-	 * Get the content
-	 *
-	 * @throws NotPermittedException
-	 * @throws NotFoundException
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getContent();
+    /**
+     * Get the content
+     *
+     * @throws NotPermittedException
+     * @throws NotFoundException
+     * @return string
+     * @since 11.0.0
+     */
+    public function getContent();
 
-	/**
-	 * Overwrite the file
-	 *
-	 * @param string|resource $data
-	 * @throws NotPermittedException
-	 * @throws NotFoundException
-	 * @since 11.0.0
-	 */
-	public function putContent($data);
+    /**
+     * Overwrite the file
+     *
+     * @param string|resource $data
+     * @throws NotPermittedException
+     * @throws NotFoundException
+     * @since 11.0.0
+     */
+    public function putContent($data);
 
-	/**
-	 * Delete the file
-	 *
-	 * @throws NotPermittedException
-	 * @since 11.0.0
-	 */
-	public function delete();
+    /**
+     * Delete the file
+     *
+     * @throws NotPermittedException
+     * @since 11.0.0
+     */
+    public function delete();
 
-	/**
-	 * Get the MimeType
-	 *
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getMimeType();
+    /**
+     * Get the MimeType
+     *
+     * @return string
+     * @since 11.0.0
+     */
+    public function getMimeType();
 
-	/**
-	 * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function read();
+    /**
+     * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function read();
 
-	/**
-	 * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function write();
+    /**
+     * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function write();
 }

lib/public/FullTextSearch/IFullTextSearchManager.php

Indentation +139 added lines, -139 removed lines

@@ -51,145 +51,145 @@
 interface IFullTextSearchManager {
 
 
-	/**
-	 * Register a IProviderService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IProviderService $providerService
-	 */
-	public function registerProviderService(IProviderService $providerService);
-
-	/**
-	 * Register a IIndexService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IIndexService $indexService
-	 */
-	public function registerIndexService(IIndexService $indexService);
-
-	/**
-	 * Register a ISearchService.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param ISearchService $searchService
-	 */
-	public function registerSearchService(ISearchService $searchService);
-
-	/**
-	 * returns true is Full Text Search is available (app is present and Service
-	 * are registered)
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return bool
-	 */
-	public function isAvailable(): bool;
-
-
-	/**
-	 * Add the Javascript API in the navigation page of an app.
-	 * Needed to replace the default search.
-	 *
-	 * @since 15.0.0
-	 */
-	public function addJavascriptAPI();
-
-
-	/**
-	 * Check if the provider $providerId is already indexed.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 *
-	 * @return bool
-	 */
-	public function isProviderIndexed(string $providerId): bool;
-
-
-	/**
-	 * Retrieve an Index from the database, based on the Id of the Provider
-	 * and the Id of the Document
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 *
-	 * @return IIndex
-	 */
-	public function getIndex(string $providerId, string $documentId): IIndex;
-
-
-	/**
-	 * Create a new Index.
-	 *
-	 * This method must be called when a new document is created.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param string $userId
-	 * @param int $status
-	 *
-	 * @return IIndex
-	 */
-	public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex;
-
-
-	/**
-	 * Update the status of an Index. status is a bitflag, setting $reset to
-	 * true will reset the status to the value defined in the parameter.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param int $status
-	 * @param bool $reset
-	 */
-	public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false);
-
-
-	/**
-	 * Update the status of an array of Index. status is a bit flag, setting $reset to
-	 * true will reset the status to the value defined in the parameter.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $providerId
-	 * @param array $documentIds
-	 * @param int $status
-	 * @param bool $reset
-	 */
-	public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false);
-
-	/**
-	 * Update an array of Index.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param IIndex[] $indexes
-	 */
-	public function updateIndexes(array $indexes);
-
-	/**
-	 * Search using an array as request. If $userId is empty, will use the
-	 * current session.
-	 *
-	 * @see ISearchService::generateSearchRequest
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $request
-	 * @param string $userId
-	 * @return ISearchResult[]
-	 */
-	public function search(array $request, string $userId = ''): array;
+    /**
+     * Register a IProviderService.
+     *
+     * @since 15.0.0
+     *
+     * @param IProviderService $providerService
+     */
+    public function registerProviderService(IProviderService $providerService);
+
+    /**
+     * Register a IIndexService.
+     *
+     * @since 15.0.0
+     *
+     * @param IIndexService $indexService
+     */
+    public function registerIndexService(IIndexService $indexService);
+
+    /**
+     * Register a ISearchService.
+     *
+     * @since 15.0.0
+     *
+     * @param ISearchService $searchService
+     */
+    public function registerSearchService(ISearchService $searchService);
+
+    /**
+     * returns true is Full Text Search is available (app is present and Service
+     * are registered)
+     *
+     * @since 16.0.0
+     *
+     * @return bool
+     */
+    public function isAvailable(): bool;
+
+
+    /**
+     * Add the Javascript API in the navigation page of an app.
+     * Needed to replace the default search.
+     *
+     * @since 15.0.0
+     */
+    public function addJavascriptAPI();
+
+
+    /**
+     * Check if the provider $providerId is already indexed.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     *
+     * @return bool
+     */
+    public function isProviderIndexed(string $providerId): bool;
+
+
+    /**
+     * Retrieve an Index from the database, based on the Id of the Provider
+     * and the Id of the Document
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     *
+     * @return IIndex
+     */
+    public function getIndex(string $providerId, string $documentId): IIndex;
+
+
+    /**
+     * Create a new Index.
+     *
+     * This method must be called when a new document is created.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     * @param string $userId
+     * @param int $status
+     *
+     * @return IIndex
+     */
+    public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex;
+
+
+    /**
+     * Update the status of an Index. status is a bitflag, setting $reset to
+     * true will reset the status to the value defined in the parameter.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param string $documentId
+     * @param int $status
+     * @param bool $reset
+     */
+    public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false);
+
+
+    /**
+     * Update the status of an array of Index. status is a bit flag, setting $reset to
+     * true will reset the status to the value defined in the parameter.
+     *
+     * @since 15.0.0
+     *
+     * @param string $providerId
+     * @param array $documentIds
+     * @param int $status
+     * @param bool $reset
+     */
+    public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false);
+
+    /**
+     * Update an array of Index.
+     *
+     * @since 15.0.0
+     *
+     * @param IIndex[] $indexes
+     */
+    public function updateIndexes(array $indexes);
+
+    /**
+     * Search using an array as request. If $userId is empty, will use the
+     * current session.
+     *
+     * @see ISearchService::generateSearchRequest
+     *
+     * @since 15.0.0
+     *
+     * @param array $request
+     * @param string $userId
+     * @return ISearchResult[]
+     */
+    public function search(array $request, string $userId = ''): array;
 
 
 }