nextcloud / server

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/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;
 
 
 }

lib/private/FullTextSearch/FullTextSearchManager.php

Indentation +188 added lines, -188 removed lines

@@ -48,194 +48,194 @@
 class FullTextSearchManager implements IFullTextSearchManager {
 
 
-	/** @var IProviderService */
-	private $providerService;
-
-	/** @var IIndexService */
-	private $indexService;
-
-	/** @var ISearchService */
-	private $searchService;
-
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param IProviderService $providerService
-	 */
-	public function registerProviderService(IProviderService $providerService) {
-		$this->providerService = $providerService;
-	}
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param IIndexService $indexService
-	 */
-	public function registerIndexService(IIndexService $indexService) {
-		$this->indexService = $indexService;
-	}
-
-	/**
-	 * @since 15.0.0
-	 *
-	 * @param ISearchService $searchService
-	 */
-	public function registerSearchService(ISearchService $searchService) {
-		$this->searchService = $searchService;
-	}
-
-	/**
-	 * @since 16.0.0
-	 *
-	 * @return bool
-	 */
-	public function isAvailable(): bool {
-		if ($this->indexService === null ||
-			$this->providerService === null ||
-			$this->searchService === null) {
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * @return IProviderService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getProviderService(): IProviderService {
-		if ($this->providerService === null) {
-			throw new FullTextSearchAppNotAvailableException('No IProviderService registered');
-		}
-
-		return $this->providerService;
-	}
-
-
-	/**
-	 * @return IIndexService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getIndexService(): IIndexService {
-		if ($this->indexService === null) {
-			throw new FullTextSearchAppNotAvailableException('No IIndexService registered');
-		}
-
-		return $this->indexService;
-	}
-
-
-	/**
-	 * @return ISearchService
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	private function getSearchService(): ISearchService {
-		if ($this->searchService === null) {
-			throw new FullTextSearchAppNotAvailableException('No ISearchService registered');
-		}
-
-		return $this->searchService;
-	}
-
-
-	/**
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function addJavascriptAPI() {
-		$this->getProviderService()->addJavascriptAPI();
-	}
-
-
-	/**
-	 * @param string $providerId
-	 *
-	 * @return bool
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function isProviderIndexed(string $providerId): bool {
-		return $this->getProviderService()->isProviderIndexed($providerId);
-	}
-
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @return IIndex
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function getIndex(string $providerId, string $documentId): IIndex {
-		return $this->getIndexService()->getIndex($providerId, $documentId);
-	}
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param string $userId
-	 * @param int $status
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @return IIndex
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex {
-		return $this->getIndexService()->createIndex($providerId, $documentId, $userId, $status);
-	}
-
-
-	/**
-	 * @param string $providerId
-	 * @param string $documentId
-	 * @param int $status
-	 * @param bool $reset
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false) {
-		$this->getIndexService()->updateIndexStatus($providerId, $documentId, $status, $reset);
-	}
-
-	/**
-	 * @param string $providerId
-	 * @param array $documentIds
-	 * @param int $status
-	 * @param bool $reset
-	 *
-	 * @see IIndex for available value for $status.
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false) {
-		$this->getIndexService()->updateIndexesStatus($providerId, $documentIds, $status, $reset);
-	}
-
-
-	/**
-	 * @param IIndex[] $indexes
-	 *
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function updateIndexes(array $indexes) {
-		$this->getIndexService()->updateIndexes($indexes);
-	}
-
-
-	/**
-	 * @param array $request
-	 * @param string $userId
-	 *
-	 * @return ISearchResult[]
-	 * @throws FullTextSearchAppNotAvailableException
-	 */
-	public function search(array $request, string $userId = ''): array {
-		$searchRequest = $this->getSearchService()->generateSearchRequest($request);
-
-		return $this->getSearchService()->search($userId, $searchRequest);
-	}
+    /** @var IProviderService */
+    private $providerService;
+
+    /** @var IIndexService */
+    private $indexService;
+
+    /** @var ISearchService */
+    private $searchService;
+
+
+    /**
+     * @since 15.0.0
+     *
+     * @param IProviderService $providerService
+     */
+    public function registerProviderService(IProviderService $providerService) {
+        $this->providerService = $providerService;
+    }
+
+    /**
+     * @since 15.0.0
+     *
+     * @param IIndexService $indexService
+     */
+    public function registerIndexService(IIndexService $indexService) {
+        $this->indexService = $indexService;
+    }
+
+    /**
+     * @since 15.0.0
+     *
+     * @param ISearchService $searchService
+     */
+    public function registerSearchService(ISearchService $searchService) {
+        $this->searchService = $searchService;
+    }
+
+    /**
+     * @since 16.0.0
+     *
+     * @return bool
+     */
+    public function isAvailable(): bool {
+        if ($this->indexService === null ||
+            $this->providerService === null ||
+            $this->searchService === null) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * @return IProviderService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getProviderService(): IProviderService {
+        if ($this->providerService === null) {
+            throw new FullTextSearchAppNotAvailableException('No IProviderService registered');
+        }
+
+        return $this->providerService;
+    }
+
+
+    /**
+     * @return IIndexService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getIndexService(): IIndexService {
+        if ($this->indexService === null) {
+            throw new FullTextSearchAppNotAvailableException('No IIndexService registered');
+        }
+
+        return $this->indexService;
+    }
+
+
+    /**
+     * @return ISearchService
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    private function getSearchService(): ISearchService {
+        if ($this->searchService === null) {
+            throw new FullTextSearchAppNotAvailableException('No ISearchService registered');
+        }
+
+        return $this->searchService;
+    }
+
+
+    /**
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function addJavascriptAPI() {
+        $this->getProviderService()->addJavascriptAPI();
+    }
+
+
+    /**
+     * @param string $providerId
+     *
+     * @return bool
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function isProviderIndexed(string $providerId): bool {
+        return $this->getProviderService()->isProviderIndexed($providerId);
+    }
+
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @return IIndex
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function getIndex(string $providerId, string $documentId): IIndex {
+        return $this->getIndexService()->getIndex($providerId, $documentId);
+    }
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @param string $userId
+     * @param int $status
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @return IIndex
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function createIndex(string $providerId, string $documentId, string $userId, int $status = 0): IIndex {
+        return $this->getIndexService()->createIndex($providerId, $documentId, $userId, $status);
+    }
+
+
+    /**
+     * @param string $providerId
+     * @param string $documentId
+     * @param int $status
+     * @param bool $reset
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexStatus(string $providerId, string $documentId, int $status, bool $reset = false) {
+        $this->getIndexService()->updateIndexStatus($providerId, $documentId, $status, $reset);
+    }
+
+    /**
+     * @param string $providerId
+     * @param array $documentIds
+     * @param int $status
+     * @param bool $reset
+     *
+     * @see IIndex for available value for $status.
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexesStatus(string $providerId, array $documentIds, int $status, bool $reset = false) {
+        $this->getIndexService()->updateIndexesStatus($providerId, $documentIds, $status, $reset);
+    }
+
+
+    /**
+     * @param IIndex[] $indexes
+     *
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function updateIndexes(array $indexes) {
+        $this->getIndexService()->updateIndexes($indexes);
+    }
+
+
+    /**
+     * @param array $request
+     * @param string $userId
+     *
+     * @return ISearchResult[]
+     * @throws FullTextSearchAppNotAvailableException
+     */
+    public function search(array $request, string $userId = ''): array {
+        $searchRequest = $this->getSearchService()->generateSearchRequest($request);
+
+        return $this->getSearchService()->search($userId, $searchRequest);
+    }
 
 
 }

lib/public/AppFramework/Http/OCSResponse.php

Spacing +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
 	 */
 	public function __construct($format, $statuscode, $message,
-								$data=[], $itemscount='',
-								$itemsperpage='') {
+								$data = [], $itemscount = '',
+								$itemsperpage = '') {
 		parent::__construct();
 
 		$this->format = $format;

Indentation +50 added lines, -50 removed lines

@@ -37,59 +37,59 @@
  * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
  */
 class OCSResponse extends Response {
-	private $data;
-	private $format;
-	private $statuscode;
-	private $message;
-	private $itemscount;
-	private $itemsperpage;
+    private $data;
+    private $format;
+    private $statuscode;
+    private $message;
+    private $itemscount;
+    private $itemsperpage;
 
-	/**
-	 * generates the xml or json response for the API call from an multidimenional data array.
-	 * @param string $format
-	 * @param int $statuscode
-	 * @param string $message
-	 * @param array $data
-	 * @param int|string $itemscount
-	 * @param int|string $itemsperpage
-	 * @since 8.1.0
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
-	 */
-	public function __construct($format, $statuscode, $message,
-								$data=[], $itemscount='',
-								$itemsperpage='') {
-		parent::__construct();
+    /**
+     * generates the xml or json response for the API call from an multidimenional data array.
+     * @param string $format
+     * @param int $statuscode
+     * @param string $message
+     * @param array $data
+     * @param int|string $itemscount
+     * @param int|string $itemsperpage
+     * @since 8.1.0
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
+     */
+    public function __construct($format, $statuscode, $message,
+                                $data=[], $itemscount='',
+                                $itemsperpage='') {
+        parent::__construct();
 
-		$this->format = $format;
-		$this->statuscode = $statuscode;
-		$this->message = $message;
-		$this->data = $data;
-		$this->itemscount = $itemscount;
-		$this->itemsperpage = $itemsperpage;
+        $this->format = $format;
+        $this->statuscode = $statuscode;
+        $this->message = $message;
+        $this->data = $data;
+        $this->itemscount = $itemscount;
+        $this->itemsperpage = $itemsperpage;
 
-		// set the correct header based on the format parameter
-		if ($format === 'json') {
-			$this->addHeader(
-				'Content-Type', 'application/json; charset=utf-8'
-			);
-		} else {
-			$this->addHeader(
-				'Content-Type', 'application/xml; charset=utf-8'
-			);
-		}
-	}
+        // set the correct header based on the format parameter
+        if ($format === 'json') {
+            $this->addHeader(
+                'Content-Type', 'application/json; charset=utf-8'
+            );
+        } else {
+            $this->addHeader(
+                'Content-Type', 'application/xml; charset=utf-8'
+            );
+        }
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
-	 * @suppress PhanDeprecatedClass
-	 */
-	public function render() {
-		$r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
-		$r->setTotalItems($this->itemscount);
-		$r->setItemsPerPage($this->itemsperpage);
+    /**
+     * @return string
+     * @since 8.1.0
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
+     * @suppress PhanDeprecatedClass
+     */
+    public function render() {
+        $r = new \OC\OCS\Result($this->data, $this->statuscode, $this->message);
+        $r->setTotalItems($this->itemscount);
+        $r->setItemsPerPage($this->itemsperpage);
 
-		return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
-	}
+        return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
+    }
 }

lib/public/AppFramework/Http/ZipResponse.php

Indentation +43 added lines, -43 removed lines

@@ -34,56 +34,56 @@
  * @since 15.0.0
  */
 class ZipResponse extends Response implements ICallbackResponse {
-	/** @var resource[] Files to be added to the zip response */
-	private $resources;
-	/** @var string Filename that the zip file should have */
-	private $name;
-	private $request;
+    /** @var resource[] Files to be added to the zip response */
+    private $resources;
+    /** @var string Filename that the zip file should have */
+    private $name;
+    private $request;
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(IRequest $request, string $name = 'output') {
-		parent::__construct();
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(IRequest $request, string $name = 'output') {
+        parent::__construct();
 
-		$this->name = $name;
-		$this->request = $request;
-	}
+        $this->name = $name;
+        $this->request = $request;
+    }
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function addResource($r, string $internalName, int $size, int $time = -1) {
-		if (!\is_resource($r)) {
-			throw new \InvalidArgumentException('No resource provided');
-		}
+    /**
+     * @since 15.0.0
+     */
+    public function addResource($r, string $internalName, int $size, int $time = -1) {
+        if (!\is_resource($r)) {
+            throw new \InvalidArgumentException('No resource provided');
+        }
 
-		$this->resources[] = [
-			'resource' => $r,
-			'internalName' => $internalName,
-			'size' => $size,
-			'time' => $time,
-		];
-	}
+        $this->resources[] = [
+            'resource' => $r,
+            'internalName' => $internalName,
+            'size' => $size,
+            'time' => $time,
+        ];
+    }
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function callback(IOutput $output) {
-		$size = 0;
-		$files = count($this->resources);
+    /**
+     * @since 15.0.0
+     */
+    public function callback(IOutput $output) {
+        $size = 0;
+        $files = count($this->resources);
 
-		foreach ($this->resources as $resource) {
-			$size += $resource['size'];
-		}
+        foreach ($this->resources as $resource) {
+            $size += $resource['size'];
+        }
 
-		$zip = new Streamer($this->request, $size, $files);
-		$zip->sendHeaders($this->name);
+        $zip = new Streamer($this->request, $size, $files);
+        $zip->sendHeaders($this->name);
 
-		foreach ($this->resources as $resource) {
-			$zip->addFileFromStream($resource['resource'], $resource['internalName'], $resource['size'], $resource['time']);
-		}
+        foreach ($this->resources as $resource) {
+            $zip->addFileFromStream($resource['resource'], $resource['internalName'], $resource['size'], $resource['time']);
+        }
 
-		$zip->finalize();
-	}
+        $zip->finalize();
+    }
 }

lib/public/AppFramework/Http/FileDisplayResponse.php

Indentation +32 added lines, -32 removed lines

@@ -32,40 +32,40 @@
  */
 class FileDisplayResponse extends Response implements ICallbackResponse {
 
-	/** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
-	private $file;
+    /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */
+    private $file;
 
-	/**
-	 * FileDisplayResponse constructor.
-	 *
-	 * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
-	 * @param int $statusCode
-	 * @param array $headers
-	 * @since 11.0.0
-	 */
-	public function __construct($file, $statusCode=Http::STATUS_OK,
-								$headers=[]) {
-		parent::__construct();
+    /**
+     * FileDisplayResponse constructor.
+     *
+     * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file
+     * @param int $statusCode
+     * @param array $headers
+     * @since 11.0.0
+     */
+    public function __construct($file, $statusCode=Http::STATUS_OK,
+                                $headers=[]) {
+        parent::__construct();
 
-		$this->file = $file;
-		$this->setStatus($statusCode);
-		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+        $this->file = $file;
+        $this->setStatus($statusCode);
+        $this->setHeaders(array_merge($this->getHeaders(), $headers));
+        $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
 
-		$this->setETag($file->getEtag());
-		$lastModified = new \DateTime();
-		$lastModified->setTimestamp($file->getMTime());
-		$this->setLastModified($lastModified);
-	}
+        $this->setETag($file->getEtag());
+        $lastModified = new \DateTime();
+        $lastModified->setTimestamp($file->getMTime());
+        $this->setLastModified($lastModified);
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @since 11.0.0
-	 */
-	public function callback(IOutput $output) {
-		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
-			$output->setOutput($this->file->getContent());
-		}
-	}
+    /**
+     * @param IOutput $output
+     * @since 11.0.0
+     */
+    public function callback(IOutput $output) {
+        if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
+            $output->setHeader('Content-Length: ' . $this->file->getSize());
+            $output->setOutput($this->file->getContent());
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -43,14 +43,14 @@ 
 	 * @param array $headers
 	 * @since 11.0.0
 	 */
-	public function __construct($file, $statusCode=Http::STATUS_OK,
-								$headers=[]) {
+	public function __construct($file, $statusCode = Http::STATUS_OK,
+								$headers = []) {
 		parent::__construct();
 
 		$this->file = $file;
 		$this->setStatus($statusCode);
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
+		$this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"');
 
 		$this->setETag($file->getEtag());
 		$lastModified = new \DateTime();
@@ -64,7 +64,7 @@ 
 	 */
 	public function callback(IOutput $output) {
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
+			$output->setHeader('Content-Length: '.$this->file->getSize());
 			$output->setOutput($this->file->getContent());
 		}
 	}

lib/private/Files/ObjectStore/Swift.php

Indentation +102 added lines, -102 removed lines

@@ -33,106 +33,106 @@
 use OpenStack\Common\Error\BadResponseError;
 
 class Swift implements IObjectStore {
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/** @var SwiftFactory */
-	private $swiftFactory;
-
-	public function __construct($params, SwiftFactory $connectionFactory = null) {
-		$this->swiftFactory = $connectionFactory ?: new SwiftFactory(
-			\OC::$server->getMemCacheFactory()->createDistributed('swift::'),
-			$params,
-			\OC::$server->getLogger()
-		);
-		$this->params = $params;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function getContainer() {
-		return $this->swiftFactory->getContainer();
-	}
-
-	/**
-	 * @return string the container name where objects are stored
-	 */
-	public function getStorageId() {
-		if (isset($this->params['bucket'])) {
-			return $this->params['bucket'];
-		}
-
-		return $this->params['container'];
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function writeObject($urn, $stream) {
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
-		file_put_contents($tmpFile, $stream);
-		$handle = fopen($tmpFile, 'rb');
-
-		$this->getContainer()->createObject([
-			'name' => $urn,
-			'stream' => stream_for($handle)
-		]);
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception from openstack lib when something goes wrong
-	 * @throws NotFoundException if file does not exist
-	 */
-	public function readObject($urn) {
-		try {
-			$object = $this->getContainer()->getObject($urn);
-
-			// we need to keep a reference to objectContent or
-			// the stream will be closed before we can do anything with it
-			$objectContent = $object->download();
-		} catch (BadResponseError $e) {
-			if ($e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException("object $urn not found in object store");
-			} else {
-				throw $e;
-			}
-		}
-		$objectContent->rewind();
-
-		$stream = $objectContent->detach();
-		// save the object content in the context of the stream to prevent it being gc'd until the stream is closed
-		stream_context_set_option($stream, 'swift', 'content', $objectContent);
-
-		return RetryWrapper::wrap($stream);
-	}
-
-	/**
-	 * @param string $urn Unified Resource Name
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteObject($urn) {
-		$this->getContainer()->getObject($urn)->delete();
-	}
-
-	/**
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteContainer() {
-		$this->getContainer()->delete();
-	}
-
-	public function objectExists($urn) {
-		return $this->getContainer()->objectExists($urn);
-	}
+    /**
+     * @var array
+     */
+    private $params;
+
+    /** @var SwiftFactory */
+    private $swiftFactory;
+
+    public function __construct($params, SwiftFactory $connectionFactory = null) {
+        $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
+            \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
+            $params,
+            \OC::$server->getLogger()
+        );
+        $this->params = $params;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function getContainer() {
+        return $this->swiftFactory->getContainer();
+    }
+
+    /**
+     * @return string the container name where objects are stored
+     */
+    public function getStorageId() {
+        if (isset($this->params['bucket'])) {
+            return $this->params['bucket'];
+        }
+
+        return $this->params['container'];
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function writeObject($urn, $stream) {
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
+        file_put_contents($tmpFile, $stream);
+        $handle = fopen($tmpFile, 'rb');
+
+        $this->getContainer()->createObject([
+            'name' => $urn,
+            'stream' => stream_for($handle)
+        ]);
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception from openstack lib when something goes wrong
+     * @throws NotFoundException if file does not exist
+     */
+    public function readObject($urn) {
+        try {
+            $object = $this->getContainer()->getObject($urn);
+
+            // we need to keep a reference to objectContent or
+            // the stream will be closed before we can do anything with it
+            $objectContent = $object->download();
+        } catch (BadResponseError $e) {
+            if ($e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException("object $urn not found in object store");
+            } else {
+                throw $e;
+            }
+        }
+        $objectContent->rewind();
+
+        $stream = $objectContent->detach();
+        // save the object content in the context of the stream to prevent it being gc'd until the stream is closed
+        stream_context_set_option($stream, 'swift', 'content', $objectContent);
+
+        return RetryWrapper::wrap($stream);
+    }
+
+    /**
+     * @param string $urn Unified Resource Name
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteObject($urn) {
+        $this->getContainer()->getObject($urn)->delete();
+    }
+
+    /**
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteContainer() {
+        $this->getContainer()->delete();
+    }
+
+    public function objectExists($urn) {
+        return $this->getContainer()->objectExists($urn);
+    }
 }

apps/oauth2/lib/Db/AccessToken.php

Indentation +15 added lines, -15 removed lines

@@ -34,20 +34,20 @@
  * @method void setHashedCode(string $token)
  */
 class AccessToken extends Entity {
-	/** @var int */
-	protected $tokenId;
-	/** @var int */
-	protected $clientId;
-	/** @var string */
-	protected $hashedCode;
-	/** @var string */
-	protected $encryptedToken;
+    /** @var int */
+    protected $tokenId;
+    /** @var int */
+    protected $clientId;
+    /** @var string */
+    protected $hashedCode;
+    /** @var string */
+    protected $encryptedToken;
 
-	public function __construct() {
-		$this->addType('id', 'int');
-		$this->addType('tokenId', 'int');
-		$this->addType('clientId', 'int');
-		$this->addType('hashedCode', 'string');
-		$this->addType('encryptedToken', 'string');
-	}
+    public function __construct() {
+        $this->addType('id', 'int');
+        $this->addType('tokenId', 'int');
+        $this->addType('clientId', 'int');
+        $this->addType('hashedCode', 'string');
+        $this->addType('encryptedToken', 'string');
+    }
 }