nextcloud / server

lib/private/Authentication/Events/ARemoteWipeEvent.php

Indentation +9 added lines, -9 removed lines

@@ -31,16 +31,16 @@
 
 abstract class ARemoteWipeEvent extends Event {
 
-	/** @var IToken */
-	private $token;
+    /** @var IToken */
+    private $token;
 
-	public function __construct(IToken $token) {
-		parent::__construct();
-		$this->token = $token;
-	}
+    public function __construct(IToken $token) {
+        parent::__construct();
+        $this->token = $token;
+    }
 
-	public function getToken(): IToken {
-		return $this->token;
-	}
+    public function getToken(): IToken {
+        return $this->token;
+    }
 
 }

lib/public/Security/IContentSecurityPolicyManager.php

Indentation +19 added lines, -19 removed lines

@@ -31,23 +31,23 @@
  * @deprecated 17.0.0 listen to the AddContentSecurityPolicyEvent to add a policy
  */
 interface IContentSecurityPolicyManager {
-	/**
-	 * Allows to inject something into the default content policy. This is for
-	 * example useful when you're injecting Javascript code into a view belonging
-	 * to another controller and cannot modify its Content-Security-Policy itself.
-	 * Note that the adjustment is only applied to applications that use AppFramework
-	 * controllers.
-	 *
-	 * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
-	 * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
-	 *
-	 * WARNING: Using this API incorrectly may make the instance more insecure.
-	 * Do think twice before adding whitelisting resources. Please do also note
-	 * that it is not possible to use the `disallowXYZ` functions.
-	 *
-	 * @param EmptyContentSecurityPolicy $policy
-	 * @since 9.0.0
-	 * @deprecated 17.0.0 listen to the AddContentSecurityPolicyEvent to add a policy
-	 */
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
+    /**
+     * Allows to inject something into the default content policy. This is for
+     * example useful when you're injecting Javascript code into a view belonging
+     * to another controller and cannot modify its Content-Security-Policy itself.
+     * Note that the adjustment is only applied to applications that use AppFramework
+     * controllers.
+     *
+     * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
+     * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
+     *
+     * WARNING: Using this API incorrectly may make the instance more insecure.
+     * Do think twice before adding whitelisting resources. Please do also note
+     * that it is not possible to use the `disallowXYZ` functions.
+     *
+     * @param EmptyContentSecurityPolicy $policy
+     * @since 9.0.0
+     * @deprecated 17.0.0 listen to the AddContentSecurityPolicyEvent to add a policy
+     */
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
 }

lib/public/Preview/IVersionedPreviewFile.php

Indentation +5 added lines, -5 removed lines

@@ -31,9 +31,9 @@
  * @since 17.0.0
  */
 interface IVersionedPreviewFile {
-	/**
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getPreviewVersion(): string;
+    /**
+     * @return string
+     * @since 17.0.0
+     */
+    public function getPreviewVersion(): string;
 }

lib/private/Authentication/Token/IWipeableToken.php

Indentation +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@
 
 interface IWipeableToken extends IToken {
 
-	/**
-	 * Mark the token for remote wipe
-	 */
-	public function wipe(): void;
+    /**
+     * Mark the token for remote wipe
+     */
+    public function wipe(): void;
 
 }

apps/provisioning_api/lib/Controller/AppConfigController.php

Indentation +128 added lines, -128 removed lines

@@ -34,132 +34,132 @@
 
 class AppConfigController extends OCSController {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IAppConfig $appConfig) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->appConfig = $appConfig;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function getApps(): DataResponse {
-		return new DataResponse([
-			'data' => $this->appConfig->getApps(),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function getKeys(string $app): DataResponse {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppKeys($app),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @param string $defaultValue
-	 * @return DataResponse
-	 */
-	public function getValue(string $app, string $key, string $defaultValue = ''): DataResponse {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppValue($app, $key, $defaultValue),
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setValue(string $app, string $key, string $value): DataResponse {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key, $value);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue($app, $key, $value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @return DataResponse
-	 */
-	public function deleteKey(string $app, string $key): DataResponse {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key, '');
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->deleteAppValue($app, $key);
-		return new DataResponse();
-	}
-
-	/**
-	 * @param string $app
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyAppId(string $app) {
-		if (\OC_App::cleanAppId($app) !== $app) {
-			throw new \InvalidArgumentException('Invalid app id given');
-		}
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyConfigKey(string $app, string $key, string $value) {
-		if (in_array($key, ['installed_version', 'enabled', 'types'])) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-
-		if ($app === 'core' && $key === 'encryption_enabled' && $value !== 'yes') {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-
-		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IAppConfig $appConfig
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IAppConfig $appConfig) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->appConfig = $appConfig;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function getApps(): DataResponse {
+        return new DataResponse([
+            'data' => $this->appConfig->getApps(),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @return DataResponse
+     */
+    public function getKeys(string $app): DataResponse {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppKeys($app),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @param string $defaultValue
+     * @return DataResponse
+     */
+    public function getValue(string $app, string $key, string $defaultValue = ''): DataResponse {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppValue($app, $key, $defaultValue),
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setValue(string $app, string $key, string $value): DataResponse {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key, $value);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue($app, $key, $value);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @return DataResponse
+     */
+    public function deleteKey(string $app, string $key): DataResponse {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key, '');
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->deleteAppValue($app, $key);
+        return new DataResponse();
+    }
+
+    /**
+     * @param string $app
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyAppId(string $app) {
+        if (\OC_App::cleanAppId($app) !== $app) {
+            throw new \InvalidArgumentException('Invalid app id given');
+        }
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyConfigKey(string $app, string $key, string $value) {
+        if (in_array($key, ['installed_version', 'enabled', 'types'])) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+
+        if ($app === 'core' && $key === 'encryption_enabled' && $value !== 'yes') {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+
+        if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+    }
 }

lib/public/FullTextSearch/Model/ISearchRequest.php

Indentation +311 added lines, -311 removed lines

@@ -52,317 +52,317 @@
 interface ISearchRequest {
 
 
-	/**
-	 * Get the maximum number of results to be returns by the Search Platform.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return int
-	 */
-	public function getSize(): int;
-
-
-	/**
-	 * Get the current page.
-	 * Used by pagination.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return int
-	 */
-	public function getPage(): int;
-
-
-	/**
-	 * Get the author of the request.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getAuthor(): string;
-
-	/**
-	 * Get the searched string.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getSearch(): string;
-
-	/**
-	 * Set the searched string.
-	 *
-	 * @param string $search
-	 *
-	 * @since 17.0.0
-	 *
-	 * @return ISearchRequest
-	 */
-	public function setSearch(string $search): ISearchRequest;
-
-	/**
-	 * Extends the searched string.
-	 *
-	 * @since 17.0.0
-	 *
-	 * @param string $search
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addSearch(string $search): ISearchRequest;
-
-
-	/**
-	 * Get the value of an option (as string).
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $option
-	 * @param string $default
-	 *
-	 * @return string
-	 */
-	public function getOption(string $option, string $default = ''): string;
-
-	/**
-	 * Get the value of an option (as array).
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $option
-	 * @param array $default
-	 *
-	 * @return array
-	 */
-	public function getOptionArray(string $option, array $default = []): array;
-
-
-	/**
-	 * Limit the search to a part of the document.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $part
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addPart(string $part): ISearchRequest;
-
-	/**
-	 * Limit the search to an array of parts of the document.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $parts
-	 *
-	 * @return ISearchRequest
-	 */
-	public function setParts(array $parts): ISearchRequest;
-
-	/**
-	 * Get the parts the search is limited to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getParts(): array;
-
-
-	/**
-	 * Limit the search to a specific meta tag.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $tag
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addMetaTag(string $tag): ISearchRequest;
-
-	/**
-	 * Get the meta tags the search is limited to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getMetaTags(): array;
-
-	/**
-	 * Limit the search to an array of meta tags.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $tags
-	 *
-	 * @return ISearchRequest
-	 */
-	public function setMetaTags(array $tags): IsearchRequest;
-
-
-	/**
-	 * Limit the search to a specific sub tag.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $source
-	 * @param string $tag
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addSubTag(string $source, string $tag): ISearchRequest;
-
-	/**
-	 * Get the sub tags the search is limited to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param bool $formatted
-	 *
-	 * @return array
-	 */
-	public function getSubTags(bool $formatted): array;
-
-	/**
-	 * Limit the search to an array of sub tags.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $tags
-	 *
-	 * @return ISearchRequest
-	 */
-	public function setSubTags(array $tags): ISearchRequest;
-
-
-	/**
-	 * Limit the search to a specific field of the mapping, using a full string.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $field
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addLimitField(string $field): ISearchRequest;
-
-	/**
-	 * Get the fields the search is limited to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getLimitFields(): array;
-
-
-	/**
-	 * Limit the search to a specific field of the mapping, using a wildcard on
-	 * the search string.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $field
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addWildcardField(string $field): ISearchRequest;
-
-	/**
-	 * Get the limit to field of the mapping.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getWildcardFields(): array;
-
-
-	/**
-	 * Filter the results, based on a group of field, using regex
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $filters
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addRegexFilters(array $filters): ISearchRequest;
-
-	/**
-	 * Get the regex filters the search is limit to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getRegexFilters(): array;
-
-
-	/**
-	 * Filter the results, based on a group of field, using wildcard
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param array $filter
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addWildcardFilter(array $filter): ISearchRequest;
-
-	/**
-	 * Get the wildcard filters the search is limit to.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getWildcardFilters(): array;
-
-
-	/**
-	 * Add an extra field to the search.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $field
-	 *
-	 * @return ISearchRequest
-	 */
-	public function addField(string $field): ISearchRequest;
-
-	/**
-	 * Get the list of extra field to search into.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return array
-	 */
-	public function getFields(): array;
-
-
-
-	/**
-	 * Add a MUST search on an extra field
-	 *
-	 * @param ISearchRequestSimpleQuery $query
-	 *
-	 * @return ISearchRequest
-	 * @since 17.0.0
-	 */
-	public function addSimpleQuery(ISearchRequestSimpleQuery $query): ISearchRequest;
-
-
-	/**
-	 * Get the list of queries on extra field.
-	 *
-	 * @return ISearchRequestSimpleQuery[]
-	 * @since 17.0.0
-	 */
-	public function getSimpleQueries(): array;
+    /**
+     * Get the maximum number of results to be returns by the Search Platform.
+     *
+     * @since 15.0.0
+     *
+     * @return int
+     */
+    public function getSize(): int;
+
+
+    /**
+     * Get the current page.
+     * Used by pagination.
+     *
+     * @since 15.0.0
+     *
+     * @return int
+     */
+    public function getPage(): int;
+
+
+    /**
+     * Get the author of the request.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getAuthor(): string;
+
+    /**
+     * Get the searched string.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getSearch(): string;
+
+    /**
+     * Set the searched string.
+     *
+     * @param string $search
+     *
+     * @since 17.0.0
+     *
+     * @return ISearchRequest
+     */
+    public function setSearch(string $search): ISearchRequest;
+
+    /**
+     * Extends the searched string.
+     *
+     * @since 17.0.0
+     *
+     * @param string $search
+     *
+     * @return ISearchRequest
+     */
+    public function addSearch(string $search): ISearchRequest;
+
+
+    /**
+     * Get the value of an option (as string).
+     *
+     * @since 15.0.0
+     *
+     * @param string $option
+     * @param string $default
+     *
+     * @return string
+     */
+    public function getOption(string $option, string $default = ''): string;
+
+    /**
+     * Get the value of an option (as array).
+     *
+     * @since 15.0.0
+     *
+     * @param string $option
+     * @param array $default
+     *
+     * @return array
+     */
+    public function getOptionArray(string $option, array $default = []): array;
+
+
+    /**
+     * Limit the search to a part of the document.
+     *
+     * @since 15.0.0
+     *
+     * @param string $part
+     *
+     * @return ISearchRequest
+     */
+    public function addPart(string $part): ISearchRequest;
+
+    /**
+     * Limit the search to an array of parts of the document.
+     *
+     * @since 15.0.0
+     *
+     * @param array $parts
+     *
+     * @return ISearchRequest
+     */
+    public function setParts(array $parts): ISearchRequest;
+
+    /**
+     * Get the parts the search is limited to.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getParts(): array;
+
+
+    /**
+     * Limit the search to a specific meta tag.
+     *
+     * @since 15.0.0
+     *
+     * @param string $tag
+     *
+     * @return ISearchRequest
+     */
+    public function addMetaTag(string $tag): ISearchRequest;
+
+    /**
+     * Get the meta tags the search is limited to.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getMetaTags(): array;
+
+    /**
+     * Limit the search to an array of meta tags.
+     *
+     * @since 15.0.0
+     *
+     * @param array $tags
+     *
+     * @return ISearchRequest
+     */
+    public function setMetaTags(array $tags): IsearchRequest;
+
+
+    /**
+     * Limit the search to a specific sub tag.
+     *
+     * @since 15.0.0
+     *
+     * @param string $source
+     * @param string $tag
+     *
+     * @return ISearchRequest
+     */
+    public function addSubTag(string $source, string $tag): ISearchRequest;
+
+    /**
+     * Get the sub tags the search is limited to.
+     *
+     * @since 15.0.0
+     *
+     * @param bool $formatted
+     *
+     * @return array
+     */
+    public function getSubTags(bool $formatted): array;
+
+    /**
+     * Limit the search to an array of sub tags.
+     *
+     * @since 15.0.0
+     *
+     * @param array $tags
+     *
+     * @return ISearchRequest
+     */
+    public function setSubTags(array $tags): ISearchRequest;
+
+
+    /**
+     * Limit the search to a specific field of the mapping, using a full string.
+     *
+     * @since 15.0.0
+     *
+     * @param string $field
+     *
+     * @return ISearchRequest
+     */
+    public function addLimitField(string $field): ISearchRequest;
+
+    /**
+     * Get the fields the search is limited to.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getLimitFields(): array;
+
+
+    /**
+     * Limit the search to a specific field of the mapping, using a wildcard on
+     * the search string.
+     *
+     * @since 15.0.0
+     *
+     * @param string $field
+     *
+     * @return ISearchRequest
+     */
+    public function addWildcardField(string $field): ISearchRequest;
+
+    /**
+     * Get the limit to field of the mapping.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getWildcardFields(): array;
+
+
+    /**
+     * Filter the results, based on a group of field, using regex
+     *
+     * @since 15.0.0
+     *
+     * @param array $filters
+     *
+     * @return ISearchRequest
+     */
+    public function addRegexFilters(array $filters): ISearchRequest;
+
+    /**
+     * Get the regex filters the search is limit to.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getRegexFilters(): array;
+
+
+    /**
+     * Filter the results, based on a group of field, using wildcard
+     *
+     * @since 15.0.0
+     *
+     * @param array $filter
+     *
+     * @return ISearchRequest
+     */
+    public function addWildcardFilter(array $filter): ISearchRequest;
+
+    /**
+     * Get the wildcard filters the search is limit to.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getWildcardFilters(): array;
+
+
+    /**
+     * Add an extra field to the search.
+     *
+     * @since 15.0.0
+     *
+     * @param string $field
+     *
+     * @return ISearchRequest
+     */
+    public function addField(string $field): ISearchRequest;
+
+    /**
+     * Get the list of extra field to search into.
+     *
+     * @since 15.0.0
+     *
+     * @return array
+     */
+    public function getFields(): array;
+
+
+
+    /**
+     * Add a MUST search on an extra field
+     *
+     * @param ISearchRequestSimpleQuery $query
+     *
+     * @return ISearchRequest
+     * @since 17.0.0
+     */
+    public function addSimpleQuery(ISearchRequestSimpleQuery $query): ISearchRequest;
+
+
+    /**
+     * Get the list of queries on extra field.
+     *
+     * @return ISearchRequestSimpleQuery[]
+     * @since 17.0.0
+     */
+    public function getSimpleQueries(): array;
 
 }
 

apps/updatenotification/lib/Notification/Notifier.php

Indentation +157 added lines, -157 removed lines

@@ -39,161 +39,161 @@
 
 class Notifier implements INotifier {
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IFactory */
-	protected $l10NFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $appVersions;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IURLGenerator $url
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IFactory $l10NFactory
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
-		$this->url = $url;
-		$this->notificationManager = $notificationManager;
-		$this->config = $config;
-		$this->l10NFactory = $l10NFactory;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appVersions = $this->getAppVersions();
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'updatenotification';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10NFactory->get('updatenotification')->t('Update notifications');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'updatenotification') {
-			throw new \InvalidArgumentException('Unknown app id');
-		}
-
-		$l = $this->l10NFactory->get('updatenotification', $languageCode);
-		if ($notification->getSubject() === 'connection_error') {
-			$errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			if ($errors === 0) {
-				$this->notificationManager->markProcessed($notification);
-				throw new \InvalidArgumentException('Update checked worked again');
-			}
-
-			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
-		} elseif ($notification->getObjectType() === 'core') {
-			$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
-
-			$parameters = $notification->getSubjectParameters();
-			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
-			}
-		} else {
-			$appInfo = $this->getAppInfo($notification->getObjectType());
-			$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
-
-			if (isset($this->appVersions[$notification->getObjectType()])) {
-				$this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
-			}
-
-			$notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
-				->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
-					'app' => [
-						'type' => 'app',
-						'id' => $notification->getObjectType(),
-						'name' => $appName,
-					]
-				]);
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
-			}
-		}
-
-		$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
-
-		return $notification;
-	}
-
-	/**
-	 * Remove the notification and prevent rendering, when the update is installed
-	 *
-	 * @param INotification $notification
-	 * @param string $installedVersion
-	 * @throws AlreadyProcessedException When the update is already installed
-	 */
-	protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
-		if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
-			throw new AlreadyProcessedException();
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isAdmin(): bool {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions(): string {
-		return implode('.', Util::getVersion());
-	}
-
-	protected function getAppVersions(): array {
-		return \OC_App::getAppVersions();
-	}
-
-	protected function getAppInfo($appId) {
-		return \OC_App::getAppInfo($appId);
-	}
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IFactory */
+    protected $l10NFactory;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $appVersions;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IURLGenerator $url
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IFactory $l10NFactory
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
+        $this->url = $url;
+        $this->notificationManager = $notificationManager;
+        $this->config = $config;
+        $this->l10NFactory = $l10NFactory;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->appVersions = $this->getAppVersions();
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'updatenotification';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10NFactory->get('updatenotification')->t('Update notifications');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'updatenotification') {
+            throw new \InvalidArgumentException('Unknown app id');
+        }
+
+        $l = $this->l10NFactory->get('updatenotification', $languageCode);
+        if ($notification->getSubject() === 'connection_error') {
+            $errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            if ($errors === 0) {
+                $this->notificationManager->markProcessed($notification);
+                throw new \InvalidArgumentException('Update checked worked again');
+            }
+
+            $notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
+                ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
+        } elseif ($notification->getObjectType() === 'core') {
+            $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+
+            $parameters = $notification->getSubjectParameters();
+            $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+            }
+        } else {
+            $appInfo = $this->getAppInfo($notification->getObjectType());
+            $appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
+
+            if (isset($this->appVersions[$notification->getObjectType()])) {
+                $this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
+            }
+
+            $notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
+                ->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
+                    'app' => [
+                        'type' => 'app',
+                        'id' => $notification->getObjectType(),
+                        'name' => $appName,
+                    ]
+                ]);
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+            }
+        }
+
+        $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
+
+        return $notification;
+    }
+
+    /**
+     * Remove the notification and prevent rendering, when the update is installed
+     *
+     * @param INotification $notification
+     * @param string $installedVersion
+     * @throws AlreadyProcessedException When the update is already installed
+     */
+    protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
+        if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
+            throw new AlreadyProcessedException();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdmin(): bool {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions(): string {
+        return implode('.', Util::getVersion());
+    }
+
+    protected function getAppVersions(): array {
+        return \OC_App::getAppVersions();
+    }
+
+    protected function getAppInfo($appId) {
+        return \OC_App::getAppInfo($appId);
+    }
 }

lib/private/Authentication/Notifications/Notifier.php

Indentation +53 added lines, -53 removed lines

@@ -32,65 +32,65 @@
 
 class Notifier implements INotifier {
 
-	/** @var IL10nFactory */
-	private $factory;
+    /** @var IL10nFactory */
+    private $factory;
 
-	public function __construct(IL10nFactory $l10nFactory) {
-		$this->factory = $l10nFactory;
-	}
+    public function __construct(IL10nFactory $l10nFactory) {
+        $this->factory = $l10nFactory;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'auth') {
-			// Not my app => throw
-			throw new InvalidArgumentException();
-		}
+    /**
+     * @inheritDoc
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'auth') {
+            // Not my app => throw
+            throw new InvalidArgumentException();
+        }
 
-		// Read the language from the notification
-		$l = $this->factory->get('lib', $languageCode);
+        // Read the language from the notification
+        $l = $this->factory->get('lib', $languageCode);
 
-		switch ($notification->getSubject()) {
-			case 'remote_wipe_start':
-				$notification->setParsedSubject(
-					$l->t('Remote wipe started')
-				)->setParsedMessage(
-					$l->t('A remote wipe was started on device %s', $notification->getSubjectParameters())
-				);
+        switch ($notification->getSubject()) {
+            case 'remote_wipe_start':
+                $notification->setParsedSubject(
+                    $l->t('Remote wipe started')
+                )->setParsedMessage(
+                    $l->t('A remote wipe was started on device %s', $notification->getSubjectParameters())
+                );
 
-				return $notification;
-			case 'remote_wipe_finish':
-				$notification->setParsedSubject(
-					$l->t('Remote wipe finished')
-				)->setParsedMessage(
-					$l->t('The remote wipe on %s has finished', $notification->getSubjectParameters())
-				);
+                return $notification;
+            case 'remote_wipe_finish':
+                $notification->setParsedSubject(
+                    $l->t('Remote wipe finished')
+                )->setParsedMessage(
+                    $l->t('The remote wipe on %s has finished', $notification->getSubjectParameters())
+                );
 
-				return $notification;
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new InvalidArgumentException();
-		}
-	}
+                return $notification;
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new InvalidArgumentException();
+        }
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'auth';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'auth';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->factory->get('lib')->t('Authentication');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->factory->get('lib')->t('Authentication');
+    }
 }

lib/private/Notification/Action.php

Indentation +142 added lines, -142 removed lines

@@ -28,146 +28,146 @@
 
 class Action implements IAction {
 
-	/** @var string */
-	protected $label;
-
-	/** @var string */
-	protected $labelParsed;
-
-	/** @var string */
-	protected $link;
-
-	/** @var string */
-	protected $requestType;
-
-	/** @var string */
-	protected $icon;
-
-	/** @var bool */
-	protected $primary;
-
-	public function __construct() {
-		$this->label = '';
-		$this->labelParsed = '';
-		$this->link = '';
-		$this->requestType = '';
-		$this->primary = false;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setLabel(string $label): IAction {
-		if ($label === '' || isset($label[32])) {
-			throw new \InvalidArgumentException('The given label is invalid');
-		}
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLabel(): string {
-		return $this->label;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedLabel(string $label): IAction {
-		if ($label === '') {
-			throw new \InvalidArgumentException('The given parsed label is invalid');
-		}
-		$this->labelParsed = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedLabel(): string {
-		return $this->labelParsed;
-	}
-
-	/**
-	 * @param $primary bool
-	 * @return $this
-	 * @since 9.0.0
-	 */
-	public function setPrimary(bool $primary): IAction {
-		$this->primary = $primary;
-		return $this;
-	}
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isPrimary(): bool {
-		return $this->primary;
-	}
-
-	/**
-	 * @param string $link
-	 * @param string $requestType
-	 * @return $this
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink(string $link, string $requestType): IAction {
-		if ($link === '' || isset($link[256])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		if (!in_array($requestType, [
-			self::TYPE_GET,
-			self::TYPE_POST,
-			self::TYPE_PUT,
-			self::TYPE_DELETE,
-			self::TYPE_WEB,
-		], true)) {
-			throw new \InvalidArgumentException('The given request type is invalid');
-		}
-		$this->link = $link;
-		$this->requestType = $requestType;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink(): string {
-		return $this->link;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getRequestType(): string {
-		return $this->requestType;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValid(): bool {
-		return $this->label !== '' && $this->link !== '';
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValidParsed(): bool {
-		return $this->labelParsed !== '' && $this->link !== '';
-	}
+    /** @var string */
+    protected $label;
+
+    /** @var string */
+    protected $labelParsed;
+
+    /** @var string */
+    protected $link;
+
+    /** @var string */
+    protected $requestType;
+
+    /** @var string */
+    protected $icon;
+
+    /** @var bool */
+    protected $primary;
+
+    public function __construct() {
+        $this->label = '';
+        $this->labelParsed = '';
+        $this->link = '';
+        $this->requestType = '';
+        $this->primary = false;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setLabel(string $label): IAction {
+        if ($label === '' || isset($label[32])) {
+            throw new \InvalidArgumentException('The given label is invalid');
+        }
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLabel(): string {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setParsedLabel(string $label): IAction {
+        if ($label === '') {
+            throw new \InvalidArgumentException('The given parsed label is invalid');
+        }
+        $this->labelParsed = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedLabel(): string {
+        return $this->labelParsed;
+    }
+
+    /**
+     * @param $primary bool
+     * @return $this
+     * @since 9.0.0
+     */
+    public function setPrimary(bool $primary): IAction {
+        $this->primary = $primary;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isPrimary(): bool {
+        return $this->primary;
+    }
+
+    /**
+     * @param string $link
+     * @param string $requestType
+     * @return $this
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink(string $link, string $requestType): IAction {
+        if ($link === '' || isset($link[256])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        if (!in_array($requestType, [
+            self::TYPE_GET,
+            self::TYPE_POST,
+            self::TYPE_PUT,
+            self::TYPE_DELETE,
+            self::TYPE_WEB,
+        ], true)) {
+            throw new \InvalidArgumentException('The given request type is invalid');
+        }
+        $this->link = $link;
+        $this->requestType = $requestType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink(): string {
+        return $this->link;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getRequestType(): string {
+        return $this->requestType;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid(): bool {
+        return $this->label !== '' && $this->link !== '';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValidParsed(): bool {
+        return $this->labelParsed !== '' && $this->link !== '';
+    }
 }