nextcloud / server

core/Controller/UnifiedSearchController.php

Indentation +109 added lines, -109 removed lines

@@ -38,113 +38,113 @@
 
 class UnifiedSearchController extends Controller {
 
-	/** @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 JSONResponse
-	 */
-	public function getProviders(string $from = ''): JSONResponse {
-		[$route, $parameters] = $this->getRouteInformation($from);
-
-		return new JSONResponse(
-			$this->composer->getProviders($route, $parameters)
-		);
-	}
-
-	/**
-	 * @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 JSONResponse
-	 */
-	public function search(string $providerId,
-						   string $term = '',
-						   ?int $sortOrder = null,
-						   ?int $limit = null,
-						   $cursor = null,
-						   string $from = ''): JSONResponse {
-		if (empty(trim($term))) {
-			return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
-		}
-		[$route, $routeParameters] = $this->getRouteInformation($from);
-
-		return new JSONResponse(
-			$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 JSONResponse
+     */
+    public function getProviders(string $from = ''): JSONResponse {
+        [$route, $parameters] = $this->getRouteInformation($from);
+
+        return new JSONResponse(
+            $this->composer->getProviders($route, $parameters)
+        );
+    }
+
+    /**
+     * @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 JSONResponse
+     */
+    public function search(string $providerId,
+                            string $term = '',
+                           ?int $sortOrder = null,
+                           ?int $limit = null,
+                            $cursor = null,
+                            string $from = ''): JSONResponse {
+        if (empty(trim($term))) {
+            return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
+        }
+        [$route, $routeParameters] = $this->getRouteInformation($from);
+
+        return new JSONResponse(
+            $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/files/lib/Search/FilesSearchProvider.php

Indentation +85 added lines, -85 removed lines

@@ -38,89 +38,89 @@
 
 class FilesSearchProvider implements IProvider {
 
-	/** @var File */
-	private $fileSearch;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
-
-	public function __construct(File $fileSearch,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								IMimeTypeDetector $mimeTypeDetector) {
-		$this->l10n = $l10n;
-		$this->fileSearch = $fileSearch;
-		$this->urlGenerator = $urlGenerator;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-	}
-
-	/**
-	 * @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 {
-		return SearchResult::complete(
-			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
-				// Generate thumbnail url
-				$thumbnailUrl = $result->has_preview
-					? $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
-					: '';
-
-				return new SearchResultEntry(
-					$thumbnailUrl,
-					$result->name,
-					$this->formatSubline($result),
-					$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;
+
+    public function __construct(File $fileSearch,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                IMimeTypeDetector $mimeTypeDetector) {
+        $this->l10n = $l10n;
+        $this->fileSearch = $fileSearch;
+        $this->urlGenerator = $urlGenerator;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+    }
+
+    /**
+     * @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 {
+        return SearchResult::complete(
+            $this->l10n->t('Files'),
+            array_map(function (FileResult $result) {
+                // Generate thumbnail url
+                $thumbnailUrl = $result->has_preview
+                    ? $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
+                    : '';
+
+                return new SearchResultEntry(
+                    $thumbnailUrl,
+                    $result->name,
+                    $this->formatSubline($result),
+                    $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]);
+    }
 }

apps/dav/lib/Search/EventsSearchProvider.php

Indentation +199 added lines, -199 removed lines

@@ -40,203 +40,203 @@
  */
 class EventsSearchProvider extends ACalendarSearchProvider {
 
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'SUMMARY',
-		'LOCATION',
-		'DESCRIPTION',
-		'ATTENDEE',
-		'ORGANIZER',
-		'CATEGORIES',
-	];
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchParameters = [
-		'ATTENDEE' => ['CN'],
-		'ORGANIZER' => ['CN'],
-	];
-
-	/**
-	 * @var string
-	 */
-	private static $componentType = 'VEVENT';
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'calendar-dav';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Events');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'calendar.View.index') {
-			return -1;
-		}
-		return 10;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user,
-						   ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('calendar', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$calendarsById = $this->getSortedCalendars($principalUri);
-		$subscriptionsById = $this->getSortedSubscriptions($principalUri);
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			[self::$componentType],
-			self::$searchProperties,
-			self::$searchParameters,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
-			$component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
-			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
-			$subline = $this->generateSubline($component);
-
-			if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
-				$calendar = $calendarsById[$eventRow['calendarid']];
-			} else {
-				$calendar = $subscriptionsById[$eventRow['calendarid']];
-			}
-			$resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
-
-			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param string $calendarObjectUri
-	 * @return string
-	 */
-	protected function getDeepLinkToCalendarApp(string $principalUri,
-												string $calendarUri,
-												string $calendarObjectUri): string {
-		$davUrl = $this->getDavUrlForCalendarObject($principalUri, $calendarUri, $calendarObjectUri);
-		// This route will automatically figure out what recurrence-id to open
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('calendar.view.index')
-			. 'edit/'
-			. base64_encode($davUrl)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param string $calendarObjectUri
-	 * @return string
-	 */
-	protected function getDavUrlForCalendarObject(string $principalUri,
-												  string $calendarUri,
-												  string $calendarObjectUri): string {
-		[,, $principalId] = explode('/', $principalUri, 3);
-
-		return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
-			. $principalId . '/'
-			. $calendarUri . '/'
-			. $calendarObjectUri;
-	}
-
-	/**
-	 * @param Component $eventComponent
-	 * @return string
-	 */
-	protected function generateSubline(Component $eventComponent): string {
-		$dtStart = $eventComponent->DTSTART;
-		$dtEnd = $this->getDTEndForEvent($eventComponent);
-		$isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
-		$startDateTime = new \DateTime($dtStart->getDateTime()->format(\DateTime::ATOM));
-		$endDateTime = new \DateTime($dtEnd->getDateTime()->format(\DateTime::ATOM));
-
-		if ($isAllDayEvent) {
-			$endDateTime->modify('-1 day');
-			if ($this->isDayEqual($startDateTime, $endDateTime)) {
-				return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			}
-
-			$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-			return "$formattedStart - $formattedEnd";
-		}
-
-		$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-		$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-		$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
-		$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
-
-		if ($this->isDayEqual($startDateTime, $endDateTime)) {
-			return "$formattedStartDate $formattedStartTime - $formattedEndTime";
-		}
-
-		return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
-	}
-
-	/**
-	 * @param Component $eventComponent
-	 * @return Property
-	 */
-	protected function getDTEndForEvent(Component $eventComponent):Property {
-		if (isset($eventComponent->DTEND)) {
-			$end = $eventComponent->DTEND;
-		} elseif (isset($eventComponent->DURATION)) {
-			$isFloating = $eventComponent->DTSTART->isFloating();
-			$end = clone $eventComponent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($eventComponent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-		} elseif (!$eventComponent->DTSTART->hasTime()) {
-			$isFloating = $eventComponent->DTSTART->isFloating();
-			$end = clone $eventComponent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-		} else {
-			$end = clone $eventComponent->DTSTART;
-		}
-
-		return $end;
-	}
-
-	/**
-	 * @param \DateTime $dtStart
-	 * @param \DateTime $dtEnd
-	 * @return bool
-	 */
-	protected function isDayEqual(\DateTime $dtStart,
-								  \DateTime $dtEnd) {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'SUMMARY',
+        'LOCATION',
+        'DESCRIPTION',
+        'ATTENDEE',
+        'ORGANIZER',
+        'CATEGORIES',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private static $searchParameters = [
+        'ATTENDEE' => ['CN'],
+        'ORGANIZER' => ['CN'],
+    ];
+
+    /**
+     * @var string
+     */
+    private static $componentType = 'VEVENT';
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'calendar-dav';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Events');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'calendar.View.index') {
+            return -1;
+        }
+        return 10;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user,
+                            ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('calendar', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $calendarsById = $this->getSortedCalendars($principalUri);
+        $subscriptionsById = $this->getSortedSubscriptions($principalUri);
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            [self::$componentType],
+            self::$searchProperties,
+            self::$searchParameters,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
+            $component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
+            $title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
+            $subline = $this->generateSubline($component);
+
+            if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
+                $calendar = $calendarsById[$eventRow['calendarid']];
+            } else {
+                $calendar = $subscriptionsById[$eventRow['calendarid']];
+            }
+            $resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
+
+            return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param string $calendarObjectUri
+     * @return string
+     */
+    protected function getDeepLinkToCalendarApp(string $principalUri,
+                                                string $calendarUri,
+                                                string $calendarObjectUri): string {
+        $davUrl = $this->getDavUrlForCalendarObject($principalUri, $calendarUri, $calendarObjectUri);
+        // This route will automatically figure out what recurrence-id to open
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('calendar.view.index')
+            . 'edit/'
+            . base64_encode($davUrl)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param string $calendarObjectUri
+     * @return string
+     */
+    protected function getDavUrlForCalendarObject(string $principalUri,
+                                                    string $calendarUri,
+                                                    string $calendarObjectUri): string {
+        [,, $principalId] = explode('/', $principalUri, 3);
+
+        return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
+            . $principalId . '/'
+            . $calendarUri . '/'
+            . $calendarObjectUri;
+    }
+
+    /**
+     * @param Component $eventComponent
+     * @return string
+     */
+    protected function generateSubline(Component $eventComponent): string {
+        $dtStart = $eventComponent->DTSTART;
+        $dtEnd = $this->getDTEndForEvent($eventComponent);
+        $isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
+        $startDateTime = new \DateTime($dtStart->getDateTime()->format(\DateTime::ATOM));
+        $endDateTime = new \DateTime($dtEnd->getDateTime()->format(\DateTime::ATOM));
+
+        if ($isAllDayEvent) {
+            $endDateTime->modify('-1 day');
+            if ($this->isDayEqual($startDateTime, $endDateTime)) {
+                return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+            }
+
+            $formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+            $formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+            return "$formattedStart - $formattedEnd";
+        }
+
+        $formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+        $formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+        $formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
+        $formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
+
+        if ($this->isDayEqual($startDateTime, $endDateTime)) {
+            return "$formattedStartDate $formattedStartTime - $formattedEndTime";
+        }
+
+        return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
+    }
+
+    /**
+     * @param Component $eventComponent
+     * @return Property
+     */
+    protected function getDTEndForEvent(Component $eventComponent):Property {
+        if (isset($eventComponent->DTEND)) {
+            $end = $eventComponent->DTEND;
+        } elseif (isset($eventComponent->DURATION)) {
+            $isFloating = $eventComponent->DTSTART->isFloating();
+            $end = clone $eventComponent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($eventComponent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+        } elseif (!$eventComponent->DTSTART->hasTime()) {
+            $isFloating = $eventComponent->DTSTART->isFloating();
+            $end = clone $eventComponent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+        } else {
+            $end = clone $eventComponent->DTSTART;
+        }
+
+        return $end;
+    }
+
+    /**
+     * @param \DateTime $dtStart
+     * @param \DateTime $dtEnd
+     * @return bool
+     */
+    protected function isDayEqual(\DateTime $dtStart,
+                                    \DateTime $dtEnd) {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
 }

apps/dav/lib/Search/TasksSearchProvider.php

Indentation +130 added lines, -130 removed lines

@@ -38,134 +38,134 @@
  */
 class TasksSearchProvider extends ACalendarSearchProvider {
 
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'SUMMARY',
-		'DESCRIPTION',
-		'CATEGORIES',
-	];
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchParameters = [];
-
-	/**
-	 * @var string
-	 */
-	private static $componentType = 'VTODO';
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'tasks-dav';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Tasks');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'tasks.Page.index') {
-			return -1;
-		}
-		return 10;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user,
-						   ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('tasks', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$calendarsById = $this->getSortedCalendars($principalUri);
-		$subscriptionsById = $this->getSortedSubscriptions($principalUri);
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			[self::$componentType],
-			self::$searchProperties,
-			self::$searchParameters,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
-			$component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
-			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
-			$subline = $this->generateSubline($component);
-
-			if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
-				$calendar = $calendarsById[$taskRow['calendarid']];
-			} else {
-				$calendar = $subscriptionsById[$taskRow['calendarid']];
-			}
-			$resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);
-
-			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $calendarUri
-	 * @param string $taskUri
-	 * @return string
-	 */
-	protected function getDeepLinkToTasksApp(string $calendarUri,
-											 string $taskUri): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('tasks.page.index')
-			. '#/calendars/'
-			. $calendarUri
-			. '/tasks/'
-			. $taskUri
-		);
-	}
-
-	/**
-	 * @param Component $taskComponent
-	 * @return string
-	 */
-	protected function generateSubline(Component $taskComponent): string {
-		if ($taskComponent->COMPLETED) {
-			$completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTime::ATOM));
-			$formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
-			return $this->l10n->t('Completed on %s', [$formattedDate]);
-		}
-
-		if ($taskComponent->DUE) {
-			$dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTime::ATOM));
-			$formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);
-
-			if ($taskComponent->DUE->hasTime()) {
-				$formattedTime =  $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
-				return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
-			}
-
-			return $this->l10n->t('Due on %s', [$formattedDate]);
-		}
-
-		return '';
-	}
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'SUMMARY',
+        'DESCRIPTION',
+        'CATEGORIES',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private static $searchParameters = [];
+
+    /**
+     * @var string
+     */
+    private static $componentType = 'VTODO';
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'tasks-dav';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Tasks');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'tasks.Page.index') {
+            return -1;
+        }
+        return 10;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user,
+                            ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('tasks', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $calendarsById = $this->getSortedCalendars($principalUri);
+        $subscriptionsById = $this->getSortedSubscriptions($principalUri);
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            [self::$componentType],
+            self::$searchProperties,
+            self::$searchParameters,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
+            $component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
+            $title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
+            $subline = $this->generateSubline($component);
+
+            if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
+                $calendar = $calendarsById[$taskRow['calendarid']];
+            } else {
+                $calendar = $subscriptionsById[$taskRow['calendarid']];
+            }
+            $resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);
+
+            return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $calendarUri
+     * @param string $taskUri
+     * @return string
+     */
+    protected function getDeepLinkToTasksApp(string $calendarUri,
+                                                string $taskUri): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('tasks.page.index')
+            . '#/calendars/'
+            . $calendarUri
+            . '/tasks/'
+            . $taskUri
+        );
+    }
+
+    /**
+     * @param Component $taskComponent
+     * @return string
+     */
+    protected function generateSubline(Component $taskComponent): string {
+        if ($taskComponent->COMPLETED) {
+            $completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTime::ATOM));
+            $formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
+            return $this->l10n->t('Completed on %s', [$formattedDate]);
+        }
+
+        if ($taskComponent->DUE) {
+            $dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTime::ATOM));
+            $formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);
+
+            if ($taskComponent->DUE->hasTime()) {
+                $formattedTime =  $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
+                return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
+            }
+
+            return $this->l10n->t('Due on %s', [$formattedDate]);
+        }
+
+        return '';
+    }
 }

apps/dav/lib/Search/ContactsSearchProvider.php

Indentation +159 added lines, -159 removed lines

@@ -38,163 +38,163 @@
 
 class ContactsSearchProvider implements IProvider {
 
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var CardDavBackend */
-	private $backend;
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'N',
-		'FN',
-		'NICKNAME',
-		'EMAIL',
-		'ADR',
-	];
-
-	/**
-	 * ContactsSearchProvider constructor.
-	 *
-	 * @param IAppManager $appManager
-	 * @param IL10N $l10n
-	 * @param IURLGenerator $urlGenerator
-	 * @param CardDavBackend $backend
-	 */
-	public function __construct(IAppManager $appManager,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								CardDavBackend $backend) {
-		$this->appManager = $appManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'contacts-dav';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Contacts');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'contacts.Page.index') {
-			return -1;
-		}
-		return 20;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('contacts', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$addressBooks = $this->backend->getAddressBooksForUser($principalUri);
-		$addressBooksById = [];
-		foreach ($addressBooks as $addressBook) {
-			$addressBooksById[(int) $addressBook['id']] = $addressBook;
-		}
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			self::$searchProperties,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
-			$addressBook = $addressBooksById[$contactRow['addressbookid']];
-
-			/** @var VCard $vCard */
-			$vCard = Reader::read($contactRow['carddata']);
-			$thumbnailUrl = '';
-			if ($vCard->PHOTO) {
-				$thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
-			}
-
-			$title = (string)$vCard->FN;
-			$subline = $this->generateSubline($vCard);
-			$resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
-
-			return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $addressBookUri
-	 * @param string $contactsUri
-	 * @return string
-	 */
-	protected function getDavUrlForContact(string $principalUri,
-										   string $addressBookUri,
-										   string $contactsUri): string {
-		[, $principalType, $principalId] = explode('/', $principalUri, 3);
-
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
-				. $principalType . '/'
-				. $principalId . '/'
-				. $addressBookUri . '/'
-				. $contactsUri
-		);
-	}
-
-	/**
-	 * @param string $addressBookUri
-	 * @param string $contactUid
-	 * @return string
-	 */
-	protected function getDeepLinkToContactsApp(string $addressBookUri,
-												string $contactUid): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('contacts.contacts.direct', [
-				'contact' => $contactUid . '~' . $addressBookUri
-			])
-		);
-	}
-
-	/**
-	 * @param VCard $vCard
-	 * @return string
-	 */
-	protected function generateSubline(VCard $vCard): string {
-		$emailAddresses = $vCard->select('EMAIL');
-		if (!is_array($emailAddresses) || empty($emailAddresses)) {
-			return '';
-		}
-
-		return (string)$emailAddresses[0];
-	}
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var CardDavBackend */
+    private $backend;
+
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'N',
+        'FN',
+        'NICKNAME',
+        'EMAIL',
+        'ADR',
+    ];
+
+    /**
+     * ContactsSearchProvider constructor.
+     *
+     * @param IAppManager $appManager
+     * @param IL10N $l10n
+     * @param IURLGenerator $urlGenerator
+     * @param CardDavBackend $backend
+     */
+    public function __construct(IAppManager $appManager,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                CardDavBackend $backend) {
+        $this->appManager = $appManager;
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->backend = $backend;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'contacts-dav';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Contacts');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'contacts.Page.index') {
+            return -1;
+        }
+        return 20;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('contacts', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $addressBooks = $this->backend->getAddressBooksForUser($principalUri);
+        $addressBooksById = [];
+        foreach ($addressBooks as $addressBook) {
+            $addressBooksById[(int) $addressBook['id']] = $addressBook;
+        }
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            self::$searchProperties,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
+            $addressBook = $addressBooksById[$contactRow['addressbookid']];
+
+            /** @var VCard $vCard */
+            $vCard = Reader::read($contactRow['carddata']);
+            $thumbnailUrl = '';
+            if ($vCard->PHOTO) {
+                $thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
+            }
+
+            $title = (string)$vCard->FN;
+            $subline = $this->generateSubline($vCard);
+            $resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
+
+            return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $addressBookUri
+     * @param string $contactsUri
+     * @return string
+     */
+    protected function getDavUrlForContact(string $principalUri,
+                                            string $addressBookUri,
+                                            string $contactsUri): string {
+        [, $principalType, $principalId] = explode('/', $principalUri, 3);
+
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
+                . $principalType . '/'
+                . $principalId . '/'
+                . $addressBookUri . '/'
+                . $contactsUri
+        );
+    }
+
+    /**
+     * @param string $addressBookUri
+     * @param string $contactUid
+     * @return string
+     */
+    protected function getDeepLinkToContactsApp(string $addressBookUri,
+                                                string $contactUid): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('contacts.contacts.direct', [
+                'contact' => $contactUid . '~' . $addressBookUri
+            ])
+        );
+    }
+
+    /**
+     * @param VCard $vCard
+     * @return string
+     */
+    protected function generateSubline(VCard $vCard): string {
+        $emailAddresses = $vCard->select('EMAIL');
+        if (!is_array($emailAddresses) || empty($emailAddresses)) {
+            return '';
+        }
+
+        return (string)$emailAddresses[0];
+    }
 }

apps/comments/lib/Search/CommentsSearchProvider.php

Indentation +66 added lines, -66 removed lines

@@ -38,78 +38,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->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
-					: $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
-				return new SearchResultEntry(
-					$avatarUrl,
-					$result->name,
-					$path,
-					$this->urlGenerator->linkToRoute('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->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
+                    : $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
+                return new SearchResultEntry(
+                    $avatarUrl,
+                    $result->name,
+                    $path,
+                    $this->urlGenerator->linkToRoute('files.view.index',[
+                        'dir' => $pathInfo['dirname'],
+                        'scrollto' => $pathInfo['basename'],
+                    ]),
+                    '',
+                    true
+                );
+            }, $this->legacyProvider->search($query->getTerm()))
+        );
+    }
 }

apps/settings/lib/Search/SectionSearch.php

Indentation +112 added lines, -112 removed lines

@@ -36,116 +36,116 @@
 
 class SectionSearch implements IProvider {
 
-	/** @var IManager */
-	protected $settingsManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IManager $settingsManager,
-								IGroupManager $groupManager,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->settingsManager = $settingsManager;
-		$this->groupManager = $groupManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'settings_sections';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l->t('Settings');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
-			return -1;
-		}
-		return 20;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-
-		$result = $this->searchSections(
-			$query,
-			$this->settingsManager->getPersonalSections(),
-			$isAdmin ? $this->l->t('Personal') : '',
-			'settings.PersonalSettings.index'
-		);
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			$result = array_merge($result, $this->searchSections(
-				$query,
-				$this->settingsManager->getAdminSections(),
-				$this->l->t('Administration'),
-				'settings.AdminSettings.index'
-			));
-		}
-
-		return SearchResult::complete(
-			$this->l->t('Settings'),
-			$result
-		);
-	}
-
-	/**
-	 * @param ISearchQuery $query
-	 * @param ISection[][] $sections
-	 * @param string $subline
-	 * @param string $routeName
-	 * @return array
-	 */
-	public function searchSections(ISearchQuery $query, array $sections, string $subline, string $routeName): array {
-		$result = [];
-		foreach ($sections as $priority => $sectionsByPriority) {
-			foreach ($sectionsByPriority as $section) {
-				if (
-					stripos($section->getName(), $query->getTerm()) === false &&
-					stripos($section->getID(), $query->getTerm()) === false
-				) {
-					continue;
-				}
-
-				/**
-				 * We can't use the icon URL at the moment as they don't invert correctly for dark theme
-				 * $iconUrl = '';
-				 * if ($section instanceof IIconSection) {
-				 * $iconUrl = $section->getIcon();
-				 * }
-				 */
-
-				$result[] = new SearchResultEntry(
-					'',
-					$section->getName(),
-					$subline,
-					$this->urlGenerator->linkToRouteAbsolute($routeName, ['section' => $section->getID()]),
-					'icon-settings'
-				);
-			}
-		}
-
-		return $result;
-	}
+    /** @var IManager */
+    protected $settingsManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(IManager $settingsManager,
+                                IGroupManager $groupManager,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l) {
+        $this->settingsManager = $settingsManager;
+        $this->groupManager = $groupManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'settings_sections';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l->t('Settings');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
+            return -1;
+        }
+        return 20;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+
+        $result = $this->searchSections(
+            $query,
+            $this->settingsManager->getPersonalSections(),
+            $isAdmin ? $this->l->t('Personal') : '',
+            'settings.PersonalSettings.index'
+        );
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            $result = array_merge($result, $this->searchSections(
+                $query,
+                $this->settingsManager->getAdminSections(),
+                $this->l->t('Administration'),
+                'settings.AdminSettings.index'
+            ));
+        }
+
+        return SearchResult::complete(
+            $this->l->t('Settings'),
+            $result
+        );
+    }
+
+    /**
+     * @param ISearchQuery $query
+     * @param ISection[][] $sections
+     * @param string $subline
+     * @param string $routeName
+     * @return array
+     */
+    public function searchSections(ISearchQuery $query, array $sections, string $subline, string $routeName): array {
+        $result = [];
+        foreach ($sections as $priority => $sectionsByPriority) {
+            foreach ($sectionsByPriority as $section) {
+                if (
+                    stripos($section->getName(), $query->getTerm()) === false &&
+                    stripos($section->getID(), $query->getTerm()) === false
+                ) {
+                    continue;
+                }
+
+                /**
+                 * We can't use the icon URL at the moment as they don't invert correctly for dark theme
+                 * $iconUrl = '';
+                 * if ($section instanceof IIconSection) {
+                 * $iconUrl = $section->getIcon();
+                 * }
+                 */
+
+                $result[] = new SearchResultEntry(
+                    '',
+                    $section->getName(),
+                    $subline,
+                    $this->urlGenerator->linkToRouteAbsolute($routeName, ['section' => $section->getID()]),
+                    'icon-settings'
+                );
+            }
+        }
+
+        return $result;
+    }
 }

lib/private/Search/SearchQuery.php

Indentation +83 added lines, -83 removed lines

@@ -28,87 +28,87 @@
 use OCP\Search\ISearchQuery;
 
 class SearchQuery implements ISearchQuery {
-	public const LIMIT_DEFAULT = 5;
-
-	/** @var string */
-	private $term;
-
-	/** @var int */
-	private $sortOrder;
-
-	/** @var int */
-	private $limit;
-
-	/** @var int|string|null */
-	private $cursor;
-
-	/** @var string */
-	private $route;
-
-	/** @var array */
-	private $routeParameters;
-
-	/**
-	 * @param string $term
-	 * @param int $sortOrder
-	 * @param int $limit
-	 * @param int|string|null $cursor
-	 * @param string $route
-	 * @param array $routeParameters
-	 */
-	public function __construct(string $term,
-								int $sortOrder = ISearchQuery::SORT_DATE_DESC,
-								int $limit = self::LIMIT_DEFAULT,
-								$cursor = null,
-								string $route = '',
-								array $routeParameters = []) {
-		$this->term = $term;
-		$this->sortOrder = $sortOrder;
-		$this->limit = $limit;
-		$this->cursor = $cursor;
-		$this->route = $route;
-		$this->routeParameters = $routeParameters;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getTerm(): string {
-		return $this->term;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getSortOrder(): int {
-		return $this->sortOrder;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getLimit(): int {
-		return $this->limit;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getCursor() {
-		return $this->cursor;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getRoute(): string {
-		return $this->route;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getRouteParameters(): array {
-		return $this->routeParameters;
-	}
+    public const LIMIT_DEFAULT = 5;
+
+    /** @var string */
+    private $term;
+
+    /** @var int */
+    private $sortOrder;
+
+    /** @var int */
+    private $limit;
+
+    /** @var int|string|null */
+    private $cursor;
+
+    /** @var string */
+    private $route;
+
+    /** @var array */
+    private $routeParameters;
+
+    /**
+     * @param string $term
+     * @param int $sortOrder
+     * @param int $limit
+     * @param int|string|null $cursor
+     * @param string $route
+     * @param array $routeParameters
+     */
+    public function __construct(string $term,
+                                int $sortOrder = ISearchQuery::SORT_DATE_DESC,
+                                int $limit = self::LIMIT_DEFAULT,
+                                $cursor = null,
+                                string $route = '',
+                                array $routeParameters = []) {
+        $this->term = $term;
+        $this->sortOrder = $sortOrder;
+        $this->limit = $limit;
+        $this->cursor = $cursor;
+        $this->route = $route;
+        $this->routeParameters = $routeParameters;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTerm(): string {
+        return $this->term;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSortOrder(): int {
+        return $this->sortOrder;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLimit(): int {
+        return $this->limit;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCursor() {
+        return $this->cursor;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRoute(): string {
+        return $this->route;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRouteParameters(): array {
+        return $this->routeParameters;
+    }
 }

lib/private/Search/SearchComposer.php

Indentation +101 added lines, -101 removed lines

@@ -57,105 +57,105 @@
  */
 class SearchComposer {
 
-	/** @var IProvider[] */
-	private $providers = [];
-
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
-
-	/** @var IServerContainer */
-	private $container;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(Coordinator $bootstrapCoordinator,
-								IServerContainer $container,
-								ILogger $logger) {
-		$this->container = $container;
-		$this->logger = $logger;
-		$this->bootstrapCoordinator = $bootstrapCoordinator;
-	}
-
-	/**
-	 * Load all providers dynamically that were registered through `registerProvider`
-	 *
-	 * If a provider can't be loaded we log it but the operation continues nevertheless
-	 */
-	private function loadLazyProviders(): void {
-		$context = $this->bootstrapCoordinator->getRegistrationContext();
-		if ($context === null) {
-			// Too early, nothing registered yet
-			return;
-		}
-
-		$registrations = $context->getSearchProviders();
-		foreach ($registrations as $registration) {
-			try {
-				/** @var IProvider $provider */
-				$provider = $this->container->query($registration['class']);
-				$this->providers[$provider->getId()] = $provider;
-			} catch (QueryException $e) {
-				// Log an continue. We can be fault tolerant here.
-				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * Get a list of all provider IDs & Names for the consecutive calls to `search`
-	 * Sort the list by the order property
-	 *
-	 * @param string $route the route the user is currently at
-	 * @param array $routeParameters the parameters of the route the user is currently at
-	 *
-	 * @return array
-	 */
-	public function getProviders(string $route, array $routeParameters): array {
-		$this->loadLazyProviders();
-
-		$providers = array_values(
-			array_map(function (IProvider $provider) use ($route, $routeParameters) {
-				return [
-					'id' => $provider->getId(),
-					'name' => $provider->getName(),
-					'order' => $provider->getOrder($route, $routeParameters),
-				];
-			}, $this->providers)
-		);
-
-		usort($providers, function ($provider1, $provider2) {
-			return $provider1['order'] <=> $provider2['order'];
-		});
-
-		/**
-		 * Return an array with the IDs, but strip the associative keys
-		 */
-		return $providers;
-	}
-
-	/**
-	 * Query an individual search provider for results
-	 *
-	 * @param IUser $user
-	 * @param string $providerId one of the IDs received by `getProviders`
-	 * @param ISearchQuery $query
-	 *
-	 * @return SearchResult
-	 * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
-	 */
-	public function search(IUser $user,
-						   string $providerId,
-						   ISearchQuery $query): SearchResult {
-		$this->loadLazyProviders();
-
-		$provider = $this->providers[$providerId] ?? null;
-		if ($provider === null) {
-			throw new InvalidArgumentException("Provider $providerId is unknown");
-		}
-		return $provider->search($user, $query);
-	}
+    /** @var IProvider[] */
+    private $providers = [];
+
+    /** @var Coordinator */
+    private $bootstrapCoordinator;
+
+    /** @var IServerContainer */
+    private $container;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(Coordinator $bootstrapCoordinator,
+                                IServerContainer $container,
+                                ILogger $logger) {
+        $this->container = $container;
+        $this->logger = $logger;
+        $this->bootstrapCoordinator = $bootstrapCoordinator;
+    }
+
+    /**
+     * Load all providers dynamically that were registered through `registerProvider`
+     *
+     * If a provider can't be loaded we log it but the operation continues nevertheless
+     */
+    private function loadLazyProviders(): void {
+        $context = $this->bootstrapCoordinator->getRegistrationContext();
+        if ($context === null) {
+            // Too early, nothing registered yet
+            return;
+        }
+
+        $registrations = $context->getSearchProviders();
+        foreach ($registrations as $registration) {
+            try {
+                /** @var IProvider $provider */
+                $provider = $this->container->query($registration['class']);
+                $this->providers[$provider->getId()] = $provider;
+            } catch (QueryException $e) {
+                // Log an continue. We can be fault tolerant here.
+                $this->logger->logException($e, [
+                    'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * Get a list of all provider IDs & Names for the consecutive calls to `search`
+     * Sort the list by the order property
+     *
+     * @param string $route the route the user is currently at
+     * @param array $routeParameters the parameters of the route the user is currently at
+     *
+     * @return array
+     */
+    public function getProviders(string $route, array $routeParameters): array {
+        $this->loadLazyProviders();
+
+        $providers = array_values(
+            array_map(function (IProvider $provider) use ($route, $routeParameters) {
+                return [
+                    'id' => $provider->getId(),
+                    'name' => $provider->getName(),
+                    'order' => $provider->getOrder($route, $routeParameters),
+                ];
+            }, $this->providers)
+        );
+
+        usort($providers, function ($provider1, $provider2) {
+            return $provider1['order'] <=> $provider2['order'];
+        });
+
+        /**
+         * Return an array with the IDs, but strip the associative keys
+         */
+        return $providers;
+    }
+
+    /**
+     * Query an individual search provider for results
+     *
+     * @param IUser $user
+     * @param string $providerId one of the IDs received by `getProviders`
+     * @param ISearchQuery $query
+     *
+     * @return SearchResult
+     * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
+     */
+    public function search(IUser $user,
+                            string $providerId,
+                            ISearchQuery $query): SearchResult {
+        $this->loadLazyProviders();
+
+        $provider = $this->providers[$providerId] ?? null;
+        if ($provider === null) {
+            throw new InvalidArgumentException("Provider $providerId is unknown");
+        }
+        return $provider->search($user, $query);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+					'message' => 'Could not load search provider dynamically: '.$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -118,7 +118,7 @@ 
 		$this->loadLazyProviders();
 
 		$providers = array_values(
-			array_map(function (IProvider $provider) use ($route, $routeParameters) {
+			array_map(function(IProvider $provider) use ($route, $routeParameters) {
 				return [
 					'id' => $provider->getId(),
 					'name' => $provider->getName(),
@@ -127,7 +127,7 @@ 
 			}, $this->providers)
 		);
 
-		usort($providers, function ($provider1, $provider2) {
+		usort($providers, function($provider1, $provider2) {
 			return $provider1['order'] <=> $provider2['order'];
 		});