nextcloud / server

core/Controller/UnifiedSearchController.php

Indentation +110 added lines, -110 removed lines

@@ -41,114 +41,114 @@
 
 class UnifiedSearchController extends OCSController {
 
-	/** @var SearchComposer */
-	private $composer;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IRouter */
-	private $router;
-
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								SearchComposer $composer,
-								IRouter $router) {
-		parent::__construct('core', $request);
-
-		$this->composer = $composer;
-		$this->userSession = $userSession;
-		$this->router = $router;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $from the url the user is currently at
-	 *
-	 * @return DataResponse
-	 */
-	public function getProviders(string $from = ''): DataResponse {
-		[$route, $parameters] = $this->getRouteInformation($from);
-
-		$result = $this->composer->getProviders($route, $parameters);
-		$response = new DataResponse($result);
-		$response->setETag(md5(json_encode($result)));
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $providerId
-	 * @param string $term
-	 * @param int|null $sortOrder
-	 * @param int|null $limit
-	 * @param int|string|null $cursor
-	 * @param string $from
-	 *
-	 * @return DataResponse
-	 */
-	public function search(string $providerId,
-						   string $term = '',
-						   ?int $sortOrder = null,
-						   ?int $limit = null,
-						   $cursor = null,
-						   string $from = ''): DataResponse {
-		if (empty(trim($term))) {
-			return new DataResponse(null, Http::STATUS_BAD_REQUEST);
-		}
-		[$route, $routeParameters] = $this->getRouteInformation($from);
-
-		return new DataResponse(
-			$this->composer->search(
-				$this->userSession->getUser(),
-				$providerId,
-				new SearchQuery(
-					$term,
-					$sortOrder ?? ISearchQuery::SORT_DATE_DESC,
-					$limit ?? SearchQuery::LIMIT_DEFAULT,
-					$cursor,
-					$route,
-					$routeParameters
-				)
-			)
-		);
-	}
-
-	protected function getRouteInformation(string $url): array {
-		$routeStr = '';
-		$parameters = [];
-
-		if ($url !== '') {
-			$urlParts = parse_url($url);
-
-			try {
-				$parameters = $this->router->findMatchingRoute($urlParts['path']);
-
-				// contacts.PageController.index => contacts.Page.index
-				$route = $parameters['caller'];
-				if (substr($route[1], -10) === 'Controller') {
-					$route[1] = substr($route[1], 0, -10);
-				}
-				$routeStr = implode('.', $route);
-
-				// cleanup
-				unset($parameters['_route'], $parameters['action'], $parameters['caller']);
-			} catch (ResourceNotFoundException $exception) {
-			}
-
-			if (isset($urlParts['query'])) {
-				parse_str($urlParts['query'], $queryParameters);
-				$parameters = array_merge($parameters, $queryParameters);
-			}
-		}
-
-		return [
-			$routeStr,
-			$parameters,
-		];
-	}
+    /** @var SearchComposer */
+    private $composer;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IRouter */
+    private $router;
+
+    public function __construct(IRequest $request,
+                                IUserSession $userSession,
+                                SearchComposer $composer,
+                                IRouter $router) {
+        parent::__construct('core', $request);
+
+        $this->composer = $composer;
+        $this->userSession = $userSession;
+        $this->router = $router;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $from the url the user is currently at
+     *
+     * @return DataResponse
+     */
+    public function getProviders(string $from = ''): DataResponse {
+        [$route, $parameters] = $this->getRouteInformation($from);
+
+        $result = $this->composer->getProviders($route, $parameters);
+        $response = new DataResponse($result);
+        $response->setETag(md5(json_encode($result)));
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $providerId
+     * @param string $term
+     * @param int|null $sortOrder
+     * @param int|null $limit
+     * @param int|string|null $cursor
+     * @param string $from
+     *
+     * @return DataResponse
+     */
+    public function search(string $providerId,
+                            string $term = '',
+                           ?int $sortOrder = null,
+                           ?int $limit = null,
+                            $cursor = null,
+                            string $from = ''): DataResponse {
+        if (empty(trim($term))) {
+            return new DataResponse(null, Http::STATUS_BAD_REQUEST);
+        }
+        [$route, $routeParameters] = $this->getRouteInformation($from);
+
+        return new DataResponse(
+            $this->composer->search(
+                $this->userSession->getUser(),
+                $providerId,
+                new SearchQuery(
+                    $term,
+                    $sortOrder ?? ISearchQuery::SORT_DATE_DESC,
+                    $limit ?? SearchQuery::LIMIT_DEFAULT,
+                    $cursor,
+                    $route,
+                    $routeParameters
+                )
+            )
+        );
+    }
+
+    protected function getRouteInformation(string $url): array {
+        $routeStr = '';
+        $parameters = [];
+
+        if ($url !== '') {
+            $urlParts = parse_url($url);
+
+            try {
+                $parameters = $this->router->findMatchingRoute($urlParts['path']);
+
+                // contacts.PageController.index => contacts.Page.index
+                $route = $parameters['caller'];
+                if (substr($route[1], -10) === 'Controller') {
+                    $route[1] = substr($route[1], 0, -10);
+                }
+                $routeStr = implode('.', $route);
+
+                // cleanup
+                unset($parameters['_route'], $parameters['action'], $parameters['caller']);
+            } catch (ResourceNotFoundException $exception) {
+            }
+
+            if (isset($urlParts['query'])) {
+                parse_str($urlParts['query'], $queryParameters);
+                $parameters = array_merge($parameters, $queryParameters);
+            }
+        }
+
+        return [
+            $routeStr,
+            $parameters,
+        ];
+    }
 }

apps/comments/lib/Search/CommentsSearchProvider.php

Indentation +66 added lines, -66 removed lines

@@ -41,78 +41,78 @@
 
 class CommentsSearchProvider implements IProvider {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var LegacyProvider */
-	private $legacyProvider;
+    /** @var LegacyProvider */
+    private $legacyProvider;
 
-	public function __construct(IUserManager $userManager,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								LegacyProvider $legacyProvider) {
-		$this->userManager = $userManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->legacyProvider = $legacyProvider;
-	}
+    public function __construct(IUserManager $userManager,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                LegacyProvider $legacyProvider) {
+        $this->userManager = $userManager;
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->legacyProvider = $legacyProvider;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'comments';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'comments';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Comments');
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Comments');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'files.View.index') {
-			// Files first
-			return 0;
-		}
-		return 10;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'files.View.index') {
+            // Files first
+            return 0;
+        }
+        return 10;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		return SearchResult::complete(
-			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
-				$path = $result->path;
-				$pathInfo = pathinfo($path);
-				$isUser = $this->userManager->userExists($result->authorId);
-				$avatarUrl = $isUser
-					? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
-					: $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
-				return new SearchResultEntry(
-					$avatarUrl,
-					$result->name,
-					$path,
-					$this->urlGenerator->linkToRouteAbsolute('files.view.index',[
-						'dir' => $pathInfo['dirname'],
-						'scrollto' => $pathInfo['basename'],
-					]),
-					'',
-					true
-				);
-			}, $this->legacyProvider->search($query->getTerm()))
-		);
-	}
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        return SearchResult::complete(
+            $this->l10n->t('Comments'),
+            array_map(function (Result $result) {
+                $path = $result->path;
+                $pathInfo = pathinfo($path);
+                $isUser = $this->userManager->userExists($result->authorId);
+                $avatarUrl = $isUser
+                    ? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
+                    : $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
+                return new SearchResultEntry(
+                    $avatarUrl,
+                    $result->name,
+                    $path,
+                    $this->urlGenerator->linkToRouteAbsolute('files.view.index',[
+                        'dir' => $pathInfo['dirname'],
+                        'scrollto' => $pathInfo['basename'],
+                    ]),
+                    '',
+                    true
+                );
+            }, $this->legacyProvider->search($query->getTerm()))
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		return SearchResult::complete(
 			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
+			array_map(function(Result $result) {
 				$path = $result->path;
 				$pathInfo = pathinfo($path);
 				$isUser = $this->userManager->userExists($result->authorId);
@@ -105,7 +105,7 @@ 
 					$avatarUrl,
 					$result->name,
 					$path,
-					$this->urlGenerator->linkToRouteAbsolute('files.view.index',[
+					$this->urlGenerator->linkToRouteAbsolute('files.view.index', [
 						'dir' => $pathInfo['dirname'],
 						'scrollto' => $pathInfo['basename'],
 					]),

apps/files/lib/Search/FilesSearchProvider.php

Indentation +94 added lines, -94 removed lines

@@ -42,98 +42,98 @@
 
 class FilesSearchProvider implements IProvider {
 
-	/** @var File */
-	private $fileSearch;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	public function __construct(File $fileSearch,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								IMimeTypeDetector $mimeTypeDetector,
-								IRootFolder $rootFolder) {
-		$this->l10n = $l10n;
-		$this->fileSearch = $fileSearch;
-		$this->urlGenerator = $urlGenerator;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'files';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Files');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'files.View.index') {
-			// Before comments
-			return -5;
-		}
-		return 5;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-
-		// Make sure we setup the users filesystem
-		$this->rootFolder->getUserFolder($user->getUID());
-
-		return SearchResult::complete(
-			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
-				// Generate thumbnail url
-				$thumbnailUrl = $result->has_preview
-					? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
-					: '';
-
-				return new SearchResultEntry(
-					$thumbnailUrl,
-					$result->name,
-					$this->formatSubline($result),
-					$this->urlGenerator->getAbsoluteURL($result->link),
-					$result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type)
-				);
-			}, $this->fileSearch->search($query->getTerm()))
-		);
-	}
-
-	/**
-	 * Format subline for files
-	 *
-	 * @param FileResult $result
-	 * @return string
-	 */
-	private function formatSubline($result): string {
-		// Do not show the location if the file is in root
-		if ($result->path === '/' . $result->name) {
-			return '';
-		}
-
-		$path = ltrim(dirname($result->path), '/');
-		return $this->l10n->t('in %s', [$path]);
-	}
+    /** @var File */
+    private $fileSearch;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    public function __construct(File $fileSearch,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IRootFolder $rootFolder) {
+        $this->l10n = $l10n;
+        $this->fileSearch = $fileSearch;
+        $this->urlGenerator = $urlGenerator;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->rootFolder = $rootFolder;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'files';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Files');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'files.View.index') {
+            // Before comments
+            return -5;
+        }
+        return 5;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+
+        // Make sure we setup the users filesystem
+        $this->rootFolder->getUserFolder($user->getUID());
+
+        return SearchResult::complete(
+            $this->l10n->t('Files'),
+            array_map(function (FileResult $result) {
+                // Generate thumbnail url
+                $thumbnailUrl = $result->has_preview
+                    ? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
+                    : '';
+
+                return new SearchResultEntry(
+                    $thumbnailUrl,
+                    $result->name,
+                    $this->formatSubline($result),
+                    $this->urlGenerator->getAbsoluteURL($result->link),
+                    $result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type)
+                );
+            }, $this->fileSearch->search($query->getTerm()))
+        );
+    }
+
+    /**
+     * Format subline for files
+     *
+     * @param FileResult $result
+     * @return string
+     */
+    private function formatSubline($result): string {
+        // Do not show the location if the file is in root
+        if ($result->path === '/' . $result->name) {
+            return '';
+        }
+
+        $path = ltrim(dirname($result->path), '/');
+        return $this->l10n->t('in %s', [$path]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
 
 		return SearchResult::complete(
 			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
+			array_map(function(FileResult $result) {
 				// Generate thumbnail url
 				$thumbnailUrl = $result->has_preview
 					? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
@@ -129,7 +129,7 @@ 
 	 */
 	private function formatSubline($result): string {
 		// Do not show the location if the file is in root
-		if ($result->path === '/' . $result->name) {
+		if ($result->path === '/'.$result->name) {
 			return '';
 		}