nextcloud / fulltextsearch_elasticsearch

lib/Platform/ElasticSearchPlatform.php

Spacing +3 added lines, -3 removed lines

@@ -126,12 +126,12 @@
 		$hosts = $this->configService->getElasticHost();
 		foreach ($hosts as $host) {
 			$parsedHost = parse_url($host);
-			$safeHost = $parsedHost['scheme'] . '://';
+			$safeHost = $parsedHost['scheme'].'://';
 			if (array_key_exists('user', $parsedHost)) {
-				$safeHost .= $parsedHost['user'] . ':' . '********' . '@';
+				$safeHost .= $parsedHost['user'].':'.'********'.'@';
 			}
 			$safeHost .= $parsedHost['host'];
-			$safeHost .= ':' . $parsedHost['port'];
+			$safeHost .= ':'.$parsedHost['port'];
 
 			$sanitizedHosts[] = $safeHost;
 		}

lib/Tools/Traits/TArrayTools.php

Spacing +2 added lines, -2 removed lines

@@ -404,7 +404,7 @@ 
 		foreach ($keys as $key) {
 			if (!array_key_exists($key, $arr)) {
 				throw new MalformedArrayException(
-					'source: ' . json_encode($arr) . ' - missing key: ' . $key
+					'source: '.json_encode($arr).' - missing key: '.$key
 				);
 			}
 		}
@@ -417,7 +417,7 @@ 
 	protected function cleanArray(array &$arr) {
 		$arr = array_filter(
 			$arr,
-			function ($v) {
+			function($v) {
 				if (is_string($v)) {
 					return ($v !== '');
 				}

lib/Service/IndexMappingService.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id' => $document->getProviderId() . ':' . $document->getId(),
+					'id' => $document->getProviderId().':'.$document->getId(),
 					'body' => $this->generateIndexBody($document)
 				]
 		];
@@ -95,7 +95,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id' => $document->getProviderId() . ':' . $document->getId(),
+					'id' => $document->getProviderId().':'.$document->getId(),
 					'body' => ['doc' => $this->generateIndexBody($document)]
 				]
 		];
@@ -125,7 +125,7 @@ 
 			'index' =>
 				[
 					'index' => $this->configService->getElasticIndex(),
-					'id' => $providerId . ':' . $documentId,
+					'id' => $providerId.':'.$documentId,
 				]
 		];
 

lib/Service/SearchMappingService.php

Spacing +5 added lines, -6 removed lines

@@ -48,8 +48,7 @@ 
  */
 class SearchMappingService {
 
-	public function __construct
-	(
+	public function __construct(
 		private ConfigService $configService
 	) {
 	}
@@ -275,7 +274,7 @@ 
 
 		foreach ($request->getWildcardFields() as $field) {
 			if (!$this->fieldIsOutLimit($request, $field)) {
-				$queryFields[] = ['wildcard' => [$field => '*' . $content->getWord() . '*']];
+				$queryFields[] = ['wildcard' => [$field => '*'.$content->getWord().'*']];
 			}
 		}
 
@@ -439,7 +438,7 @@ 
 	public function getDocumentQuery(string $providerId, string $documentId): array {
 		return [
 			'index' => $this->configService->getElasticIndex(),
-			'id' => $providerId . ':' . $documentId
+			'id' => $providerId.':'.$documentId
 		];
 	}
 
@@ -451,8 +450,8 @@ 
 	 */
 	private function getPartsFields(ISearchRequest $request): array {
 		return array_map(
-			function (string $value): string {
-				return 'parts.' . $value;
+			function(string $value): string {
+				return 'parts.'.$value;
 			}, $request->getParts()
 		);
 	}

lib/Service/ConfigService.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 		}
 
 		return $this->config->getSystemValueString(
-			Application::APP_NAME . '.' . $key,
+			Application::APP_NAME.'.'.$key,
 			(string)$this->config->getAppValue(Application::APP_NAME, $key, $defaultValue)
 		);
 	}

lib/Vendor/Psr/Http/Message/UriInterface.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
  */
-interface UriInterface
-{
+interface UriInterface {
     /**
      * Retrieve the scheme component of the URI.
      *

Indentation +282 added lines, -282 removed lines

@@ -24,286 +24,286 @@
  */
 interface UriInterface
 {
-    /**
-     * Retrieve the scheme component of the URI.
-     *
-     * If no scheme is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.1.
-     *
-     * The trailing ":" character is not part of the scheme and MUST NOT be
-     * added.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.1
-     * @return string The URI scheme.
-     */
-    public function getScheme() : string;
-    /**
-     * Retrieve the authority component of the URI.
-     *
-     * If no authority information is present, this method MUST return an empty
-     * string.
-     *
-     * The authority syntax of the URI is:
-     *
-     * <pre>
-     * [user-info@]host[:port]
-     * </pre>
-     *
-     * If the port component is not set or is the standard port for the current
-     * scheme, it SHOULD NOT be included.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.2
-     * @return string The URI authority, in "[user-info@]host[:port]" format.
-     */
-    public function getAuthority() : string;
-    /**
-     * Retrieve the user information component of the URI.
-     *
-     * If no user information is present, this method MUST return an empty
-     * string.
-     *
-     * If a user is present in the URI, this will return that value;
-     * additionally, if the password is also present, it will be appended to the
-     * user value, with a colon (":") separating the values.
-     *
-     * The trailing "@" character is not part of the user information and MUST
-     * NOT be added.
-     *
-     * @return string The URI user information, in "username[:password]" format.
-     */
-    public function getUserInfo() : string;
-    /**
-     * Retrieve the host component of the URI.
-     *
-     * If no host is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.2.2.
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-     * @return string The URI host.
-     */
-    public function getHost() : string;
-    /**
-     * Retrieve the port component of the URI.
-     *
-     * If a port is present, and it is non-standard for the current scheme,
-     * this method MUST return it as an integer. If the port is the standard port
-     * used with the current scheme, this method SHOULD return null.
-     *
-     * If no port is present, and no scheme is present, this method MUST return
-     * a null value.
-     *
-     * If no port is present, but a scheme is present, this method MAY return
-     * the standard port for that scheme, but SHOULD return null.
-     *
-     * @return null|int The URI port.
-     */
-    public function getPort() : ?int;
-    /**
-     * Retrieve the path component of the URI.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * Normally, the empty path "" and absolute path "/" are considered equal as
-     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-     * do this normalization because in contexts with a trimmed base path, e.g.
-     * the front controller, this difference becomes significant. It's the task
-     * of the user to handle both "" and "/".
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.3.
-     *
-     * As an example, if the value should include a slash ("/") not intended as
-     * delimiter between path segments, that value MUST be passed in encoded
-     * form (e.g., "%2F") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.3
-     * @return string The URI path.
-     */
-    public function getPath() : string;
-    /**
-     * Retrieve the query string of the URI.
-     *
-     * If no query string is present, this method MUST return an empty string.
-     *
-     * The leading "?" character is not part of the query and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.4.
-     *
-     * As an example, if a value in a key/value pair of the query string should
-     * include an ampersand ("&") not intended as a delimiter between values,
-     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.4
-     * @return string The URI query string.
-     */
-    public function getQuery() : string;
-    /**
-     * Retrieve the fragment component of the URI.
-     *
-     * If no fragment is present, this method MUST return an empty string.
-     *
-     * The leading "#" character is not part of the fragment and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.5.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.5
-     * @return string The URI fragment.
-     */
-    public function getFragment() : string;
-    /**
-     * Return an instance with the specified scheme.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified scheme.
-     *
-     * Implementations MUST support the schemes "http" and "https" case
-     * insensitively, and MAY accommodate other schemes if required.
-     *
-     * An empty scheme is equivalent to removing the scheme.
-     *
-     * @param string $scheme The scheme to use with the new instance.
-     * @return static A new instance with the specified scheme.
-     * @throws \InvalidArgumentException for invalid or unsupported schemes.
-     */
-    public function withScheme(string $scheme) : UriInterface;
-    /**
-     * Return an instance with the specified user information.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified user information.
-     *
-     * Password is optional, but the user information MUST include the
-     * user; an empty string for the user is equivalent to removing user
-     * information.
-     *
-     * @param string $user The user name to use for authority.
-     * @param null|string $password The password associated with $user.
-     * @return static A new instance with the specified user information.
-     */
-    public function withUserInfo(string $user, ?string $password = null) : UriInterface;
-    /**
-     * Return an instance with the specified host.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified host.
-     *
-     * An empty host value is equivalent to removing the host.
-     *
-     * @param string $host The hostname to use with the new instance.
-     * @return static A new instance with the specified host.
-     * @throws \InvalidArgumentException for invalid hostnames.
-     */
-    public function withHost(string $host) : UriInterface;
-    /**
-     * Return an instance with the specified port.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified port.
-     *
-     * Implementations MUST raise an exception for ports outside the
-     * established TCP and UDP port ranges.
-     *
-     * A null value provided for the port is equivalent to removing the port
-     * information.
-     *
-     * @param null|int $port The port to use with the new instance; a null value
-     *     removes the port information.
-     * @return static A new instance with the specified port.
-     * @throws \InvalidArgumentException for invalid ports.
-     */
-    public function withPort(?int $port) : UriInterface;
-    /**
-     * Return an instance with the specified path.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified path.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * If the path is intended to be domain-relative rather than path relative then
-     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-     * are assumed to be relative to some base path known to the application or
-     * consumer.
-     *
-     * Users can provide both encoded and decoded path characters.
-     * Implementations ensure the correct encoding as outlined in getPath().
-     *
-     * @param string $path The path to use with the new instance.
-     * @return static A new instance with the specified path.
-     * @throws \InvalidArgumentException for invalid paths.
-     */
-    public function withPath(string $path) : UriInterface;
-    /**
-     * Return an instance with the specified query string.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified query string.
-     *
-     * Users can provide both encoded and decoded query characters.
-     * Implementations ensure the correct encoding as outlined in getQuery().
-     *
-     * An empty query string value is equivalent to removing the query string.
-     *
-     * @param string $query The query string to use with the new instance.
-     * @return static A new instance with the specified query string.
-     * @throws \InvalidArgumentException for invalid query strings.
-     */
-    public function withQuery(string $query) : UriInterface;
-    /**
-     * Return an instance with the specified URI fragment.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified URI fragment.
-     *
-     * Users can provide both encoded and decoded fragment characters.
-     * Implementations ensure the correct encoding as outlined in getFragment().
-     *
-     * An empty fragment value is equivalent to removing the fragment.
-     *
-     * @param string $fragment The fragment to use with the new instance.
-     * @return static A new instance with the specified fragment.
-     */
-    public function withFragment(string $fragment) : UriInterface;
-    /**
-     * Return the string representation as a URI reference.
-     *
-     * Depending on which components of the URI are present, the resulting
-     * string is either a full URI or relative reference according to RFC 3986,
-     * Section 4.1. The method concatenates the various components of the URI,
-     * using the appropriate delimiters:
-     *
-     * - If a scheme is present, it MUST be suffixed by ":".
-     * - If an authority is present, it MUST be prefixed by "//".
-     * - The path can be concatenated without delimiters. But there are two
-     *   cases where the path has to be adjusted to make the URI reference
-     *   valid as PHP does not allow to throw an exception in __toString():
-     *     - If the path is rootless and an authority is present, the path MUST
-     *       be prefixed by "/".
-     *     - If the path is starting with more than one "/" and no authority is
-     *       present, the starting slashes MUST be reduced to one.
-     * - If a query is present, it MUST be prefixed by "?".
-     * - If a fragment is present, it MUST be prefixed by "#".
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-4.1
-     * @return string
-     */
-    public function __toString() : string;
+	/**
+	 * Retrieve the scheme component of the URI.
+	 *
+	 * If no scheme is present, this method MUST return an empty string.
+	 *
+	 * The value returned MUST be normalized to lowercase, per RFC 3986
+	 * Section 3.1.
+	 *
+	 * The trailing ":" character is not part of the scheme and MUST NOT be
+	 * added.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.1
+	 * @return string The URI scheme.
+	 */
+	public function getScheme() : string;
+	/**
+	 * Retrieve the authority component of the URI.
+	 *
+	 * If no authority information is present, this method MUST return an empty
+	 * string.
+	 *
+	 * The authority syntax of the URI is:
+	 *
+	 * <pre>
+	 * [user-info@]host[:port]
+	 * </pre>
+	 *
+	 * If the port component is not set or is the standard port for the current
+	 * scheme, it SHOULD NOT be included.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.2
+	 * @return string The URI authority, in "[user-info@]host[:port]" format.
+	 */
+	public function getAuthority() : string;
+	/**
+	 * Retrieve the user information component of the URI.
+	 *
+	 * If no user information is present, this method MUST return an empty
+	 * string.
+	 *
+	 * If a user is present in the URI, this will return that value;
+	 * additionally, if the password is also present, it will be appended to the
+	 * user value, with a colon (":") separating the values.
+	 *
+	 * The trailing "@" character is not part of the user information and MUST
+	 * NOT be added.
+	 *
+	 * @return string The URI user information, in "username[:password]" format.
+	 */
+	public function getUserInfo() : string;
+	/**
+	 * Retrieve the host component of the URI.
+	 *
+	 * If no host is present, this method MUST return an empty string.
+	 *
+	 * The value returned MUST be normalized to lowercase, per RFC 3986
+	 * Section 3.2.2.
+	 *
+	 * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
+	 * @return string The URI host.
+	 */
+	public function getHost() : string;
+	/**
+	 * Retrieve the port component of the URI.
+	 *
+	 * If a port is present, and it is non-standard for the current scheme,
+	 * this method MUST return it as an integer. If the port is the standard port
+	 * used with the current scheme, this method SHOULD return null.
+	 *
+	 * If no port is present, and no scheme is present, this method MUST return
+	 * a null value.
+	 *
+	 * If no port is present, but a scheme is present, this method MAY return
+	 * the standard port for that scheme, but SHOULD return null.
+	 *
+	 * @return null|int The URI port.
+	 */
+	public function getPort() : ?int;
+	/**
+	 * Retrieve the path component of the URI.
+	 *
+	 * The path can either be empty or absolute (starting with a slash) or
+	 * rootless (not starting with a slash). Implementations MUST support all
+	 * three syntaxes.
+	 *
+	 * Normally, the empty path "" and absolute path "/" are considered equal as
+	 * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+	 * do this normalization because in contexts with a trimmed base path, e.g.
+	 * the front controller, this difference becomes significant. It's the task
+	 * of the user to handle both "" and "/".
+	 *
+	 * The value returned MUST be percent-encoded, but MUST NOT double-encode
+	 * any characters. To determine what characters to encode, please refer to
+	 * RFC 3986, Sections 2 and 3.3.
+	 *
+	 * As an example, if the value should include a slash ("/") not intended as
+	 * delimiter between path segments, that value MUST be passed in encoded
+	 * form (e.g., "%2F") to the instance.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-2
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.3
+	 * @return string The URI path.
+	 */
+	public function getPath() : string;
+	/**
+	 * Retrieve the query string of the URI.
+	 *
+	 * If no query string is present, this method MUST return an empty string.
+	 *
+	 * The leading "?" character is not part of the query and MUST NOT be
+	 * added.
+	 *
+	 * The value returned MUST be percent-encoded, but MUST NOT double-encode
+	 * any characters. To determine what characters to encode, please refer to
+	 * RFC 3986, Sections 2 and 3.4.
+	 *
+	 * As an example, if a value in a key/value pair of the query string should
+	 * include an ampersand ("&") not intended as a delimiter between values,
+	 * that value MUST be passed in encoded form (e.g., "%26") to the instance.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-2
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.4
+	 * @return string The URI query string.
+	 */
+	public function getQuery() : string;
+	/**
+	 * Retrieve the fragment component of the URI.
+	 *
+	 * If no fragment is present, this method MUST return an empty string.
+	 *
+	 * The leading "#" character is not part of the fragment and MUST NOT be
+	 * added.
+	 *
+	 * The value returned MUST be percent-encoded, but MUST NOT double-encode
+	 * any characters. To determine what characters to encode, please refer to
+	 * RFC 3986, Sections 2 and 3.5.
+	 *
+	 * @see https://tools.ietf.org/html/rfc3986#section-2
+	 * @see https://tools.ietf.org/html/rfc3986#section-3.5
+	 * @return string The URI fragment.
+	 */
+	public function getFragment() : string;
+	/**
+	 * Return an instance with the specified scheme.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified scheme.
+	 *
+	 * Implementations MUST support the schemes "http" and "https" case
+	 * insensitively, and MAY accommodate other schemes if required.
+	 *
+	 * An empty scheme is equivalent to removing the scheme.
+	 *
+	 * @param string $scheme The scheme to use with the new instance.
+	 * @return static A new instance with the specified scheme.
+	 * @throws \InvalidArgumentException for invalid or unsupported schemes.
+	 */
+	public function withScheme(string $scheme) : UriInterface;
+	/**
+	 * Return an instance with the specified user information.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified user information.
+	 *
+	 * Password is optional, but the user information MUST include the
+	 * user; an empty string for the user is equivalent to removing user
+	 * information.
+	 *
+	 * @param string $user The user name to use for authority.
+	 * @param null|string $password The password associated with $user.
+	 * @return static A new instance with the specified user information.
+	 */
+	public function withUserInfo(string $user, ?string $password = null) : UriInterface;
+	/**
+	 * Return an instance with the specified host.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified host.
+	 *
+	 * An empty host value is equivalent to removing the host.
+	 *
+	 * @param string $host The hostname to use with the new instance.
+	 * @return static A new instance with the specified host.
+	 * @throws \InvalidArgumentException for invalid hostnames.
+	 */
+	public function withHost(string $host) : UriInterface;
+	/**
+	 * Return an instance with the specified port.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified port.
+	 *
+	 * Implementations MUST raise an exception for ports outside the
+	 * established TCP and UDP port ranges.
+	 *
+	 * A null value provided for the port is equivalent to removing the port
+	 * information.
+	 *
+	 * @param null|int $port The port to use with the new instance; a null value
+	 *     removes the port information.
+	 * @return static A new instance with the specified port.
+	 * @throws \InvalidArgumentException for invalid ports.
+	 */
+	public function withPort(?int $port) : UriInterface;
+	/**
+	 * Return an instance with the specified path.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified path.
+	 *
+	 * The path can either be empty or absolute (starting with a slash) or
+	 * rootless (not starting with a slash). Implementations MUST support all
+	 * three syntaxes.
+	 *
+	 * If the path is intended to be domain-relative rather than path relative then
+	 * it must begin with a slash ("/"). Paths not starting with a slash ("/")
+	 * are assumed to be relative to some base path known to the application or
+	 * consumer.
+	 *
+	 * Users can provide both encoded and decoded path characters.
+	 * Implementations ensure the correct encoding as outlined in getPath().
+	 *
+	 * @param string $path The path to use with the new instance.
+	 * @return static A new instance with the specified path.
+	 * @throws \InvalidArgumentException for invalid paths.
+	 */
+	public function withPath(string $path) : UriInterface;
+	/**
+	 * Return an instance with the specified query string.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified query string.
+	 *
+	 * Users can provide both encoded and decoded query characters.
+	 * Implementations ensure the correct encoding as outlined in getQuery().
+	 *
+	 * An empty query string value is equivalent to removing the query string.
+	 *
+	 * @param string $query The query string to use with the new instance.
+	 * @return static A new instance with the specified query string.
+	 * @throws \InvalidArgumentException for invalid query strings.
+	 */
+	public function withQuery(string $query) : UriInterface;
+	/**
+	 * Return an instance with the specified URI fragment.
+	 *
+	 * This method MUST retain the state of the current instance, and return
+	 * an instance that contains the specified URI fragment.
+	 *
+	 * Users can provide both encoded and decoded fragment characters.
+	 * Implementations ensure the correct encoding as outlined in getFragment().
+	 *
+	 * An empty fragment value is equivalent to removing the fragment.
+	 *
+	 * @param string $fragment The fragment to use with the new instance.
+	 * @return static A new instance with the specified fragment.
+	 */
+	public function withFragment(string $fragment) : UriInterface;
+	/**
+	 * Return the string representation as a URI reference.
+	 *
+	 * Depending on which components of the URI are present, the resulting
+	 * string is either a full URI or relative reference according to RFC 3986,
+	 * Section 4.1. The method concatenates the various components of the URI,
+	 * using the appropriate delimiters:
+	 *
+	 * - If a scheme is present, it MUST be suffixed by ":".
+	 * - If an authority is present, it MUST be prefixed by "//".
+	 * - The path can be concatenated without delimiters. But there are two
+	 *   cases where the path has to be adjusted to make the URI reference
+	 *   valid as PHP does not allow to throw an exception in __toString():
+	 *     - If the path is rootless and an authority is present, the path MUST
+	 *       be prefixed by "/".
+	 *     - If the path is starting with more than one "/" and no authority is
+	 *       present, the starting slashes MUST be reduced to one.
+	 * - If a query is present, it MUST be prefixed by "?".
+	 * - If a fragment is present, it MUST be prefixed by "#".
+	 *
+	 * @see http://tools.ietf.org/html/rfc3986#section-4.1
+	 * @return string
+	 */
+	public function __toString() : string;
 }

lib/Vendor/Psr/Http/Message/StreamFactoryInterface.php

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message;
 
-interface StreamFactoryInterface
-{
+interface StreamFactoryInterface {
     /**
      * Create a new stream from a string.
      *

Indentation +36 added lines, -36 removed lines

@@ -4,40 +4,40 @@
 
 interface StreamFactoryInterface
 {
-    /**
-     * Create a new stream from a string.
-     *
-     * The stream SHOULD be created with a temporary resource.
-     *
-     * @param string $content String content with which to populate the stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStream(string $content = '') : StreamInterface;
-    /**
-     * Create a stream from an existing file.
-     *
-     * The file MUST be opened using the given mode, which may be any mode
-     * supported by the `fopen` function.
-     *
-     * The `$filename` MAY be any string supported by `fopen()`.
-     *
-     * @param string $filename Filename or stream URI to use as basis of stream.
-     * @param string $mode Mode with which to open the underlying filename/stream.
-     *
-     * @return StreamInterface
-     * @throws \RuntimeException If the file cannot be opened.
-     * @throws \InvalidArgumentException If the mode is invalid.
-     */
-    public function createStreamFromFile(string $filename, string $mode = 'r') : StreamInterface;
-    /**
-     * Create a new stream from an existing resource.
-     *
-     * The stream MUST be readable and may be writable.
-     *
-     * @param resource $resource PHP resource to use as basis of stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStreamFromResource($resource) : StreamInterface;
+	/**
+	 * Create a new stream from a string.
+	 *
+	 * The stream SHOULD be created with a temporary resource.
+	 *
+	 * @param string $content String content with which to populate the stream.
+	 *
+	 * @return StreamInterface
+	 */
+	public function createStream(string $content = '') : StreamInterface;
+	/**
+	 * Create a stream from an existing file.
+	 *
+	 * The file MUST be opened using the given mode, which may be any mode
+	 * supported by the `fopen` function.
+	 *
+	 * The `$filename` MAY be any string supported by `fopen()`.
+	 *
+	 * @param string $filename Filename or stream URI to use as basis of stream.
+	 * @param string $mode Mode with which to open the underlying filename/stream.
+	 *
+	 * @return StreamInterface
+	 * @throws \RuntimeException If the file cannot be opened.
+	 * @throws \InvalidArgumentException If the mode is invalid.
+	 */
+	public function createStreamFromFile(string $filename, string $mode = 'r') : StreamInterface;
+	/**
+	 * Create a new stream from an existing resource.
+	 *
+	 * The stream MUST be readable and may be writable.
+	 *
+	 * @param resource $resource PHP resource to use as basis of stream.
+	 *
+	 * @return StreamInterface
+	 */
+	public function createStreamFromResource($resource) : StreamInterface;
 }

lib/Vendor/Psr/Http/Message/UploadedFileFactoryInterface.php

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message;
 
-interface UploadedFileFactoryInterface
-{
+interface UploadedFileFactoryInterface {
     /**
      * Create a new uploaded file.
      *

Indentation +21 added lines, -21 removed lines

@@ -4,25 +4,25 @@
 
 interface UploadedFileFactoryInterface
 {
-    /**
-     * Create a new uploaded file.
-     *
-     * If a size is not provided it will be determined by checking the size of
-     * the file.
-     *
-     * @see http://php.net/manual/features.file-upload.post-method.php
-     * @see http://php.net/manual/features.file-upload.errors.php
-     *
-     * @param StreamInterface $stream Underlying stream representing the
-     *     uploaded file content.
-     * @param int|null $size in bytes
-     * @param int $error PHP file upload error
-     * @param string|null $clientFilename Filename as provided by the client, if any.
-     * @param string|null $clientMediaType Media type as provided by the client, if any.
-     *
-     * @return UploadedFileInterface
-     *
-     * @throws \InvalidArgumentException If the file resource is not readable.
-     */
-    public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface;
+	/**
+	 * Create a new uploaded file.
+	 *
+	 * If a size is not provided it will be determined by checking the size of
+	 * the file.
+	 *
+	 * @see http://php.net/manual/features.file-upload.post-method.php
+	 * @see http://php.net/manual/features.file-upload.errors.php
+	 *
+	 * @param StreamInterface $stream Underlying stream representing the
+	 *     uploaded file content.
+	 * @param int|null $size in bytes
+	 * @param int $error PHP file upload error
+	 * @param string|null $clientFilename Filename as provided by the client, if any.
+	 * @param string|null $clientMediaType Media type as provided by the client, if any.
+	 *
+	 * @return UploadedFileInterface
+	 *
+	 * @throws \InvalidArgumentException If the file resource is not readable.
+	 */
+	public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface;
 }

lib/Vendor/Psr/Http/Message/MessageInterface.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * @link http://www.ietf.org/rfc/rfc7230.txt
  * @link http://www.ietf.org/rfc/rfc7231.txt
  */
-interface MessageInterface
-{
+interface MessageInterface {
     /**
      * Retrieves the HTTP protocol version as a string.
      *

Indentation +158 added lines, -158 removed lines

@@ -16,162 +16,162 @@
  */
 interface MessageInterface
 {
-    /**
-     * Retrieves the HTTP protocol version as a string.
-     *
-     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-     *
-     * @return string HTTP protocol version.
-     */
-    public function getProtocolVersion() : string;
-    /**
-     * Return an instance with the specified HTTP protocol version.
-     *
-     * The version string MUST contain only the HTTP version number (e.g.,
-     * "1.1", "1.0").
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new protocol version.
-     *
-     * @param string $version HTTP protocol version
-     * @return static
-     */
-    public function withProtocolVersion(string $version) : MessageInterface;
-    /**
-     * Retrieves all message header values.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return string[][] Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getHeaders() : array;
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader(string $name) : bool;
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader(string $name) : array;
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine(string $name) : string;
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader(string $name, $value) : MessageInterface;
-    /**
-     * Return an instance with the specified header appended with the given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader(string $name, $value) : MessageInterface;
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $name Case-insensitive header field name to remove.
-     * @return static
-     */
-    public function withoutHeader(string $name) : MessageInterface;
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody() : StreamInterface;
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return static
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body) : MessageInterface;
+	/**
+	 * Retrieves the HTTP protocol version as a string.
+	 *
+	 * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+	 *
+	 * @return string HTTP protocol version.
+	 */
+	public function getProtocolVersion() : string;
+	/**
+	 * Return an instance with the specified HTTP protocol version.
+	 *
+	 * The version string MUST contain only the HTTP version number (e.g.,
+	 * "1.1", "1.0").
+	 *
+	 * This method MUST be implemented in such a way as to retain the
+	 * immutability of the message, and MUST return an instance that has the
+	 * new protocol version.
+	 *
+	 * @param string $version HTTP protocol version
+	 * @return static
+	 */
+	public function withProtocolVersion(string $version) : MessageInterface;
+	/**
+	 * Retrieves all message header values.
+	 *
+	 * The keys represent the header name as it will be sent over the wire, and
+	 * each value is an array of strings associated with the header.
+	 *
+	 *     // Represent the headers as a string
+	 *     foreach ($message->getHeaders() as $name => $values) {
+	 *         echo $name . ": " . implode(", ", $values);
+	 *     }
+	 *
+	 *     // Emit headers iteratively:
+	 *     foreach ($message->getHeaders() as $name => $values) {
+	 *         foreach ($values as $value) {
+	 *             header(sprintf('%s: %s', $name, $value), false);
+	 *         }
+	 *     }
+	 *
+	 * While header names are not case-sensitive, getHeaders() will preserve the
+	 * exact case in which headers were originally specified.
+	 *
+	 * @return string[][] Returns an associative array of the message's headers. Each
+	 *     key MUST be a header name, and each value MUST be an array of strings
+	 *     for that header.
+	 */
+	public function getHeaders() : array;
+	/**
+	 * Checks if a header exists by the given case-insensitive name.
+	 *
+	 * @param string $name Case-insensitive header field name.
+	 * @return bool Returns true if any header names match the given header
+	 *     name using a case-insensitive string comparison. Returns false if
+	 *     no matching header name is found in the message.
+	 */
+	public function hasHeader(string $name) : bool;
+	/**
+	 * Retrieves a message header value by the given case-insensitive name.
+	 *
+	 * This method returns an array of all the header values of the given
+	 * case-insensitive header name.
+	 *
+	 * If the header does not appear in the message, this method MUST return an
+	 * empty array.
+	 *
+	 * @param string $name Case-insensitive header field name.
+	 * @return string[] An array of string values as provided for the given
+	 *    header. If the header does not appear in the message, this method MUST
+	 *    return an empty array.
+	 */
+	public function getHeader(string $name) : array;
+	/**
+	 * Retrieves a comma-separated string of the values for a single header.
+	 *
+	 * This method returns all of the header values of the given
+	 * case-insensitive header name as a string concatenated together using
+	 * a comma.
+	 *
+	 * NOTE: Not all header values may be appropriately represented using
+	 * comma concatenation. For such headers, use getHeader() instead
+	 * and supply your own delimiter when concatenating.
+	 *
+	 * If the header does not appear in the message, this method MUST return
+	 * an empty string.
+	 *
+	 * @param string $name Case-insensitive header field name.
+	 * @return string A string of values as provided for the given header
+	 *    concatenated together using a comma. If the header does not appear in
+	 *    the message, this method MUST return an empty string.
+	 */
+	public function getHeaderLine(string $name) : string;
+	/**
+	 * Return an instance with the provided value replacing the specified header.
+	 *
+	 * While header names are case-insensitive, the casing of the header will
+	 * be preserved by this function, and returned from getHeaders().
+	 *
+	 * This method MUST be implemented in such a way as to retain the
+	 * immutability of the message, and MUST return an instance that has the
+	 * new and/or updated header and value.
+	 *
+	 * @param string $name Case-insensitive header field name.
+	 * @param string|string[] $value Header value(s).
+	 * @return static
+	 * @throws \InvalidArgumentException for invalid header names or values.
+	 */
+	public function withHeader(string $name, $value) : MessageInterface;
+	/**
+	 * Return an instance with the specified header appended with the given value.
+	 *
+	 * Existing values for the specified header will be maintained. The new
+	 * value(s) will be appended to the existing list. If the header did not
+	 * exist previously, it will be added.
+	 *
+	 * This method MUST be implemented in such a way as to retain the
+	 * immutability of the message, and MUST return an instance that has the
+	 * new header and/or value.
+	 *
+	 * @param string $name Case-insensitive header field name to add.
+	 * @param string|string[] $value Header value(s).
+	 * @return static
+	 * @throws \InvalidArgumentException for invalid header names or values.
+	 */
+	public function withAddedHeader(string $name, $value) : MessageInterface;
+	/**
+	 * Return an instance without the specified header.
+	 *
+	 * Header resolution MUST be done without case-sensitivity.
+	 *
+	 * This method MUST be implemented in such a way as to retain the
+	 * immutability of the message, and MUST return an instance that removes
+	 * the named header.
+	 *
+	 * @param string $name Case-insensitive header field name to remove.
+	 * @return static
+	 */
+	public function withoutHeader(string $name) : MessageInterface;
+	/**
+	 * Gets the body of the message.
+	 *
+	 * @return StreamInterface Returns the body as a stream.
+	 */
+	public function getBody() : StreamInterface;
+	/**
+	 * Return an instance with the specified message body.
+	 *
+	 * The body MUST be a StreamInterface object.
+	 *
+	 * This method MUST be implemented in such a way as to retain the
+	 * immutability of the message, and MUST return a new instance that has the
+	 * new body stream.
+	 *
+	 * @param StreamInterface $body Body.
+	 * @return static
+	 * @throws \InvalidArgumentException When the body is not valid.
+	 */
+	public function withBody(StreamInterface $body) : MessageInterface;
 }