nextcloud / fulltextsearch_elasticsearch

lib/Vendor/Http/Discovery/Psr17Factory.php

Indentation +259 added lines, -259 removed lines

@@ -41,263 +41,263 @@
  */
 class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
 {
-    private $requestFactory;
-    private $responseFactory;
-    private $serverRequestFactory;
-    private $streamFactory;
-    private $uploadedFileFactory;
-    private $uriFactory;
-
-    public function __construct(
-        ?RequestFactoryInterface $requestFactory = null,
-        ?ResponseFactoryInterface $responseFactory = null,
-        ?ServerRequestFactoryInterface $serverRequestFactory = null,
-        ?StreamFactoryInterface $streamFactory = null,
-        ?UploadedFileFactoryInterface $uploadedFileFactory = null,
-        ?UriFactoryInterface $uriFactory = null
-    ) {
-        $this->requestFactory = $requestFactory;
-        $this->responseFactory = $responseFactory;
-        $this->serverRequestFactory = $serverRequestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->uploadedFileFactory = $uploadedFileFactory;
-        $this->uriFactory = $uriFactory;
-
-        $this->setFactory($requestFactory);
-        $this->setFactory($responseFactory);
-        $this->setFactory($serverRequestFactory);
-        $this->setFactory($streamFactory);
-        $this->setFactory($uploadedFileFactory);
-        $this->setFactory($uriFactory);
-    }
-
-    /**
-     * @param UriInterface|string $uri
-     */
-    public function createRequest(string $method, $uri): RequestInterface
-    {
-        $factory = $this->requestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findRequestFactory());
-
-        return $factory->createRequest(...\func_get_args());
-    }
-
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
-    {
-        $factory = $this->responseFactory ?? $this->setFactory(Psr17FactoryDiscovery::findResponseFactory());
-
-        return $factory->createResponse(...\func_get_args());
-    }
-
-    /**
-     * @param UriInterface|string $uri
-     */
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
-    {
-        $factory = $this->serverRequestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findServerRequestFactory());
-
-        return $factory->createServerRequest(...\func_get_args());
-    }
-
-    public function createServerRequestFromGlobals(?array $server = null, ?array $get = null, ?array $post = null, ?array $cookie = null, ?array $files = null, ?StreamInterface $body = null): ServerRequestInterface
-    {
-        $server = $server ?? $_SERVER;
-        $request = $this->createServerRequest($server['REQUEST_METHOD'] ?? 'GET', $this->createUriFromGlobals($server), $server);
-
-        return $this->buildServerRequestFromGlobals($request, $server, $files ?? $_FILES)
-            ->withQueryParams($get ?? $_GET)
-            ->withParsedBody($post ?? $_POST)
-            ->withCookieParams($cookie ?? $_COOKIE)
-            ->withBody($body ?? $this->createStreamFromFile('php://input', 'r+'));
-    }
-
-    public function createStream(string $content = ''): StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-
-        return $factory->createStream($content);
-    }
-
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-
-        return $factory->createStreamFromFile($filename, $mode);
-    }
-
-    /**
-     * @param resource $resource
-     */
-    public function createStreamFromResource($resource): StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-
-        return $factory->createStreamFromResource($resource);
-    }
-
-    public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null): UploadedFileInterface
-    {
-        $factory = $this->uploadedFileFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUploadedFileFactory());
-
-        return $factory->createUploadedFile(...\func_get_args());
-    }
-
-    public function createUri(string $uri = ''): UriInterface
-    {
-        $factory = $this->uriFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUriFactory());
-
-        return $factory->createUri(...\func_get_args());
-    }
-
-    public function createUriFromGlobals(?array $server = null): UriInterface
-    {
-        return $this->buildUriFromGlobals($this->createUri(''), $server ?? $_SERVER);
-    }
-
-    private function setFactory($factory)
-    {
-        if (!$this->requestFactory && $factory instanceof RequestFactoryInterface) {
-            $this->requestFactory = $factory;
-        }
-        if (!$this->responseFactory && $factory instanceof ResponseFactoryInterface) {
-            $this->responseFactory = $factory;
-        }
-        if (!$this->serverRequestFactory && $factory instanceof ServerRequestFactoryInterface) {
-            $this->serverRequestFactory = $factory;
-        }
-        if (!$this->streamFactory && $factory instanceof StreamFactoryInterface) {
-            $this->streamFactory = $factory;
-        }
-        if (!$this->uploadedFileFactory && $factory instanceof UploadedFileFactoryInterface) {
-            $this->uploadedFileFactory = $factory;
-        }
-        if (!$this->uriFactory && $factory instanceof UriFactoryInterface) {
-            $this->uriFactory = $factory;
-        }
-
-        return $factory;
-    }
-
-    private function buildServerRequestFromGlobals(ServerRequestInterface $request, array $server, array $files): ServerRequestInterface
-    {
-        $request = $request
-            ->withProtocolVersion(isset($server['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $server['SERVER_PROTOCOL']) : '1.1')
-            ->withUploadedFiles($this->normalizeFiles($files));
-
-        $headers = [];
-        foreach ($server as $k => $v) {
-            if (0 === strpos($k, 'HTTP_')) {
-                $k = substr($k, 5);
-            } elseif (!\in_array($k, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {
-                continue;
-            }
-            $k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $k))));
-
-            $headers[$k] = $v;
-        }
-
-        if (!isset($headers['Authorization'])) {
-            if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-                $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
-            } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-                $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.($_SERVER['PHP_AUTH_PW'] ?? ''));
-            } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
-                $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
-            }
-        }
-
-        foreach ($headers as $k => $v) {
-            try {
-                $request = $request->withHeader($k, $v);
-            } catch (\InvalidArgumentException $e) {
-                // ignore invalid headers
-            }
-        }
-
-        return $request;
-    }
-
-    private function buildUriFromGlobals(UriInterface $uri, array $server): UriInterface
-    {
-        $uri = $uri->withScheme(!empty($server['HTTPS']) && 'off' !== strtolower($server['HTTPS']) ? 'https' : 'http');
-
-        $hasPort = false;
-        if (isset($server['HTTP_HOST'])) {
-            $parts = parse_url('http://'.$server['HTTP_HOST']);
-
-            $uri = $uri->withHost($parts['host'] ?? 'localhost');
-
-            if ($parts['port'] ?? false) {
-                $hasPort = true;
-                $uri = $uri->withPort($parts['port']);
-            }
-        } else {
-            $uri = $uri->withHost($server['SERVER_NAME'] ?? $server['SERVER_ADDR'] ?? 'localhost');
-        }
-
-        if (!$hasPort && isset($server['SERVER_PORT'])) {
-            $uri = $uri->withPort($server['SERVER_PORT']);
-        }
-
-        $hasQuery = false;
-        if (isset($server['REQUEST_URI'])) {
-            $requestUriParts = explode('?', $server['REQUEST_URI'], 2);
-            $uri = $uri->withPath($requestUriParts[0]);
-            if (isset($requestUriParts[1])) {
-                $hasQuery = true;
-                $uri = $uri->withQuery($requestUriParts[1]);
-            }
-        }
-
-        if (!$hasQuery && isset($server['QUERY_STRING'])) {
-            $uri = $uri->withQuery($server['QUERY_STRING']);
-        }
-
-        return $uri;
-    }
-
-    private function normalizeFiles(array $files): array
-    {
-        foreach ($files as $k => $v) {
-            if ($v instanceof UploadedFileInterface) {
-                continue;
-            }
-            if (!\is_array($v)) {
-                unset($files[$k]);
-            } elseif (!isset($v['tmp_name'])) {
-                $files[$k] = $this->normalizeFiles($v);
-            } else {
-                $files[$k] = $this->createUploadedFileFromSpec($v);
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * @param array $value $_FILES struct
-     *
-     * @return UploadedFileInterface|UploadedFileInterface[]
-     */
-    private function createUploadedFileFromSpec(array $value)
-    {
-        if (!is_array($tmpName = $value['tmp_name'])) {
-            $file = is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();
-
-            return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
-        }
-
-        foreach ($tmpName as $k => $v) {
-            $tmpName[$k] = $this->createUploadedFileFromSpec([
-                'tmp_name' => $v,
-                'size' => $value['size'][$k] ?? null,
-                'error' => $value['error'][$k] ?? null,
-                'name' => $value['name'][$k] ?? null,
-                'type' => $value['type'][$k] ?? null,
-            ]);
-        }
-
-        return $tmpName;
-    }
+	private $requestFactory;
+	private $responseFactory;
+	private $serverRequestFactory;
+	private $streamFactory;
+	private $uploadedFileFactory;
+	private $uriFactory;
+
+	public function __construct(
+		?RequestFactoryInterface $requestFactory = null,
+		?ResponseFactoryInterface $responseFactory = null,
+		?ServerRequestFactoryInterface $serverRequestFactory = null,
+		?StreamFactoryInterface $streamFactory = null,
+		?UploadedFileFactoryInterface $uploadedFileFactory = null,
+		?UriFactoryInterface $uriFactory = null
+	) {
+		$this->requestFactory = $requestFactory;
+		$this->responseFactory = $responseFactory;
+		$this->serverRequestFactory = $serverRequestFactory;
+		$this->streamFactory = $streamFactory;
+		$this->uploadedFileFactory = $uploadedFileFactory;
+		$this->uriFactory = $uriFactory;
+
+		$this->setFactory($requestFactory);
+		$this->setFactory($responseFactory);
+		$this->setFactory($serverRequestFactory);
+		$this->setFactory($streamFactory);
+		$this->setFactory($uploadedFileFactory);
+		$this->setFactory($uriFactory);
+	}
+
+	/**
+	 * @param UriInterface|string $uri
+	 */
+	public function createRequest(string $method, $uri): RequestInterface
+	{
+		$factory = $this->requestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findRequestFactory());
+
+		return $factory->createRequest(...\func_get_args());
+	}
+
+	public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
+	{
+		$factory = $this->responseFactory ?? $this->setFactory(Psr17FactoryDiscovery::findResponseFactory());
+
+		return $factory->createResponse(...\func_get_args());
+	}
+
+	/**
+	 * @param UriInterface|string $uri
+	 */
+	public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
+	{
+		$factory = $this->serverRequestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findServerRequestFactory());
+
+		return $factory->createServerRequest(...\func_get_args());
+	}
+
+	public function createServerRequestFromGlobals(?array $server = null, ?array $get = null, ?array $post = null, ?array $cookie = null, ?array $files = null, ?StreamInterface $body = null): ServerRequestInterface
+	{
+		$server = $server ?? $_SERVER;
+		$request = $this->createServerRequest($server['REQUEST_METHOD'] ?? 'GET', $this->createUriFromGlobals($server), $server);
+
+		return $this->buildServerRequestFromGlobals($request, $server, $files ?? $_FILES)
+			->withQueryParams($get ?? $_GET)
+			->withParsedBody($post ?? $_POST)
+			->withCookieParams($cookie ?? $_COOKIE)
+			->withBody($body ?? $this->createStreamFromFile('php://input', 'r+'));
+	}
+
+	public function createStream(string $content = ''): StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+
+		return $factory->createStream($content);
+	}
+
+	public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+
+		return $factory->createStreamFromFile($filename, $mode);
+	}
+
+	/**
+	 * @param resource $resource
+	 */
+	public function createStreamFromResource($resource): StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+
+		return $factory->createStreamFromResource($resource);
+	}
+
+	public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null): UploadedFileInterface
+	{
+		$factory = $this->uploadedFileFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUploadedFileFactory());
+
+		return $factory->createUploadedFile(...\func_get_args());
+	}
+
+	public function createUri(string $uri = ''): UriInterface
+	{
+		$factory = $this->uriFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUriFactory());
+
+		return $factory->createUri(...\func_get_args());
+	}
+
+	public function createUriFromGlobals(?array $server = null): UriInterface
+	{
+		return $this->buildUriFromGlobals($this->createUri(''), $server ?? $_SERVER);
+	}
+
+	private function setFactory($factory)
+	{
+		if (!$this->requestFactory && $factory instanceof RequestFactoryInterface) {
+			$this->requestFactory = $factory;
+		}
+		if (!$this->responseFactory && $factory instanceof ResponseFactoryInterface) {
+			$this->responseFactory = $factory;
+		}
+		if (!$this->serverRequestFactory && $factory instanceof ServerRequestFactoryInterface) {
+			$this->serverRequestFactory = $factory;
+		}
+		if (!$this->streamFactory && $factory instanceof StreamFactoryInterface) {
+			$this->streamFactory = $factory;
+		}
+		if (!$this->uploadedFileFactory && $factory instanceof UploadedFileFactoryInterface) {
+			$this->uploadedFileFactory = $factory;
+		}
+		if (!$this->uriFactory && $factory instanceof UriFactoryInterface) {
+			$this->uriFactory = $factory;
+		}
+
+		return $factory;
+	}
+
+	private function buildServerRequestFromGlobals(ServerRequestInterface $request, array $server, array $files): ServerRequestInterface
+	{
+		$request = $request
+			->withProtocolVersion(isset($server['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $server['SERVER_PROTOCOL']) : '1.1')
+			->withUploadedFiles($this->normalizeFiles($files));
+
+		$headers = [];
+		foreach ($server as $k => $v) {
+			if (0 === strpos($k, 'HTTP_')) {
+				$k = substr($k, 5);
+			} elseif (!\in_array($k, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {
+				continue;
+			}
+			$k = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $k))));
+
+			$headers[$k] = $v;
+		}
+
+		if (!isset($headers['Authorization'])) {
+			if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+				$headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
+			} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
+				$headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.($_SERVER['PHP_AUTH_PW'] ?? ''));
+			} elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
+				$headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
+			}
+		}
+
+		foreach ($headers as $k => $v) {
+			try {
+				$request = $request->withHeader($k, $v);
+			} catch (\InvalidArgumentException $e) {
+				// ignore invalid headers
+			}
+		}
+
+		return $request;
+	}
+
+	private function buildUriFromGlobals(UriInterface $uri, array $server): UriInterface
+	{
+		$uri = $uri->withScheme(!empty($server['HTTPS']) && 'off' !== strtolower($server['HTTPS']) ? 'https' : 'http');
+
+		$hasPort = false;
+		if (isset($server['HTTP_HOST'])) {
+			$parts = parse_url('http://'.$server['HTTP_HOST']);
+
+			$uri = $uri->withHost($parts['host'] ?? 'localhost');
+
+			if ($parts['port'] ?? false) {
+				$hasPort = true;
+				$uri = $uri->withPort($parts['port']);
+			}
+		} else {
+			$uri = $uri->withHost($server['SERVER_NAME'] ?? $server['SERVER_ADDR'] ?? 'localhost');
+		}
+
+		if (!$hasPort && isset($server['SERVER_PORT'])) {
+			$uri = $uri->withPort($server['SERVER_PORT']);
+		}
+
+		$hasQuery = false;
+		if (isset($server['REQUEST_URI'])) {
+			$requestUriParts = explode('?', $server['REQUEST_URI'], 2);
+			$uri = $uri->withPath($requestUriParts[0]);
+			if (isset($requestUriParts[1])) {
+				$hasQuery = true;
+				$uri = $uri->withQuery($requestUriParts[1]);
+			}
+		}
+
+		if (!$hasQuery && isset($server['QUERY_STRING'])) {
+			$uri = $uri->withQuery($server['QUERY_STRING']);
+		}
+
+		return $uri;
+	}
+
+	private function normalizeFiles(array $files): array
+	{
+		foreach ($files as $k => $v) {
+			if ($v instanceof UploadedFileInterface) {
+				continue;
+			}
+			if (!\is_array($v)) {
+				unset($files[$k]);
+			} elseif (!isset($v['tmp_name'])) {
+				$files[$k] = $this->normalizeFiles($v);
+			} else {
+				$files[$k] = $this->createUploadedFileFromSpec($v);
+			}
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Create and return an UploadedFile instance from a $_FILES specification.
+	 *
+	 * @param array $value $_FILES struct
+	 *
+	 * @return UploadedFileInterface|UploadedFileInterface[]
+	 */
+	private function createUploadedFileFromSpec(array $value)
+	{
+		if (!is_array($tmpName = $value['tmp_name'])) {
+			$file = is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();
+
+			return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
+		}
+
+		foreach ($tmpName as $k => $v) {
+			$tmpName[$k] = $this->createUploadedFileFromSpec([
+				'tmp_name' => $v,
+				'size' => $value['size'][$k] ?? null,
+				'error' => $value['error'][$k] ?? null,
+				'name' => $value['name'][$k] ?? null,
+				'type' => $value['type'][$k] ?? null,
+			]);
+		}
+
+		return $tmpName;
+	}
 }

lib/Vendor/Http/Discovery/HttpClientDiscovery.php

Indentation +16 added lines, -16 removed lines

@@ -14,21 +14,21 @@
  */
 final class HttpClientDiscovery extends ClassDiscovery
 {
-    /**
-     * Finds an HTTP Client.
-     *
-     * @return HttpClient
-     *
-     * @throws Exception\NotFoundException
-     */
-    public static function find()
-    {
-        try {
-            $client = static::findOneByType(HttpClient::class);
-        } catch (DiscoveryFailedException $e) {
-            throw new NotFoundException('No HTTPlug clients found. Make sure to install a package providing "php-http/client-implementation". Example: "php-http/guzzle6-adapter".', 0, $e);
-        }
+	/**
+	 * Finds an HTTP Client.
+	 *
+	 * @return HttpClient
+	 *
+	 * @throws Exception\NotFoundException
+	 */
+	public static function find()
+	{
+		try {
+			$client = static::findOneByType(HttpClient::class);
+		} catch (DiscoveryFailedException $e) {
+			throw new NotFoundException('No HTTPlug clients found. Make sure to install a package providing "php-http/client-implementation". Example: "php-http/guzzle6-adapter".', 0, $e);
+		}
 
-        return static::instantiateClass($client);
-    }
+		return static::instantiateClass($client);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
  *
  * @deprecated This will be removed in 2.0. Consider using Psr18ClientDiscovery.
  */
-final class HttpClientDiscovery extends ClassDiscovery
-{
+final class HttpClientDiscovery extends ClassDiscovery {
     /**
      * Finds an HTTP Client.
      *

lib/Vendor/Http/Discovery/Psr18ClientDiscovery.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 final class Psr18ClientDiscovery extends ClassDiscovery
 {
-    /**
-     * Finds a PSR-18 HTTP Client.
-     *
-     * @return ClientInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function find()
-    {
-        try {
-            $client = static::findOneByType(ClientInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw new RealNotFoundException('No PSR-18 clients found. Make sure to install a package providing "psr/http-client-implementation". Example: "php-http/guzzle7-adapter".', 0, $e);
-        }
+	/**
+	 * Finds a PSR-18 HTTP Client.
+	 *
+	 * @return ClientInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function find()
+	{
+		try {
+			$client = static::findOneByType(ClientInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw new RealNotFoundException('No PSR-18 clients found. Make sure to install a package providing "psr/http-client-implementation". Example: "php-http/guzzle7-adapter".', 0, $e);
+		}
 
-        return static::instantiateClass($client);
-    }
+		return static::instantiateClass($client);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class Psr18ClientDiscovery extends ClassDiscovery
-{
+final class Psr18ClientDiscovery extends ClassDiscovery {
     /**
      * Finds a PSR-18 HTTP Client.
      *

lib/Vendor/Http/Discovery/Exception/DiscoveryFailedException.php

Indentation +37 added lines, -37 removed lines

@@ -11,41 +11,41 @@
  */
 final class DiscoveryFailedException extends \Exception implements Exception
 {
-    /**
-     * @var \Exception[]
-     */
-    private $exceptions;
-
-    /**
-     * @param string       $message
-     * @param \Exception[] $exceptions
-     */
-    public function __construct($message, array $exceptions = [])
-    {
-        $this->exceptions = $exceptions;
-
-        parent::__construct($message);
-    }
-
-    /**
-     * @param \Exception[] $exceptions
-     */
-    public static function create($exceptions)
-    {
-        $message = 'Could not find resource using any discovery strategy. Find more information at http://docs.php-http.org/en/latest/discovery.html#common-errors';
-        foreach ($exceptions as $e) {
-            $message .= "\n - ".$e->getMessage();
-        }
-        $message .= "\n\n";
-
-        return new self($message, $exceptions);
-    }
-
-    /**
-     * @return \Exception[]
-     */
-    public function getExceptions()
-    {
-        return $this->exceptions;
-    }
+	/**
+	 * @var \Exception[]
+	 */
+	private $exceptions;
+
+	/**
+	 * @param string       $message
+	 * @param \Exception[] $exceptions
+	 */
+	public function __construct($message, array $exceptions = [])
+	{
+		$this->exceptions = $exceptions;
+
+		parent::__construct($message);
+	}
+
+	/**
+	 * @param \Exception[] $exceptions
+	 */
+	public static function create($exceptions)
+	{
+		$message = 'Could not find resource using any discovery strategy. Find more information at http://docs.php-http.org/en/latest/discovery.html#common-errors';
+		foreach ($exceptions as $e) {
+			$message .= "\n - ".$e->getMessage();
+		}
+		$message .= "\n\n";
+
+		return new self($message, $exceptions);
+	}
+
+	/**
+	 * @return \Exception[]
+	 */
+	public function getExceptions()
+	{
+		return $this->exceptions;
+	}
 }

lib/Vendor/Http/Discovery/Exception/PuliUnavailableException.php

Braces +1 added lines, -2 removed lines

@@ -7,6 +7,5 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class PuliUnavailableException extends StrategyUnavailableException
-{
+final class PuliUnavailableException extends StrategyUnavailableException {
 }

lib/Vendor/Http/Discovery/Exception/NoCandidateFoundException.php

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@
  */
 final class NoCandidateFoundException extends \Exception implements Exception
 {
-    /**
-     * @param string $strategy
-     */
-    public function __construct($strategy, array $candidates)
-    {
-        $classes = array_map(
-            function ($a) {
-                return $a['class'];
-            },
-            $candidates
-        );
-
-        $message = sprintf(
-            'No valid candidate found using strategy "%s". We tested the following candidates: %s.',
-            $strategy,
-            implode(', ', array_map([$this, 'stringify'], $classes))
-        );
-
-        parent::__construct($message);
-    }
-
-    private function stringify($mixed)
-    {
-        if (is_string($mixed)) {
-            return $mixed;
-        }
-
-        if (is_array($mixed) && 2 === count($mixed)) {
-            return sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]);
-        }
-
-        return is_object($mixed) ? get_class($mixed) : gettype($mixed);
-    }
+	/**
+	 * @param string $strategy
+	 */
+	public function __construct($strategy, array $candidates)
+	{
+		$classes = array_map(
+			function ($a) {
+				return $a['class'];
+			},
+			$candidates
+		);
+
+		$message = sprintf(
+			'No valid candidate found using strategy "%s". We tested the following candidates: %s.',
+			$strategy,
+			implode(', ', array_map([$this, 'stringify'], $classes))
+		);
+
+		parent::__construct($message);
+	}
+
+	private function stringify($mixed)
+	{
+		if (is_string($mixed)) {
+			return $mixed;
+		}
+
+		if (is_array($mixed) && 2 === count($mixed)) {
+			return sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]);
+		}
+
+		return is_object($mixed) ? get_class($mixed) : gettype($mixed);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function __construct($strategy, array $candidates)
     {
         $classes = array_map(
-            function ($a) {
+            function($a) {
                 return $a['class'];
             },
             $candidates

lib/Vendor/Http/Discovery/Strategy/CommonClassesStrategy.php

Indentation +122 added lines, -122 removed lines

@@ -48,138 +48,138 @@
  */
 final class CommonClassesStrategy implements DiscoveryStrategy
 {
-    /**
-     * @var array
-     */
-    private static $classes = [
-        MessageFactory::class => [
-            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
-            ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]],
-            ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]],
-            ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]],
-        ],
-        StreamFactory::class => [
-            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
-            ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]],
-            ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]],
-            ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]],
-        ],
-        UriFactory::class => [
-            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
-            ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]],
-            ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]],
-            ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]],
-        ],
-        HttpAsyncClient::class => [
-            ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, [self::class, 'isPsr17FactoryInstalled']]],
-            ['class' => Guzzle7::class, 'condition' => Guzzle7::class],
-            ['class' => Guzzle6::class, 'condition' => Guzzle6::class],
-            ['class' => Curl::class, 'condition' => Curl::class],
-            ['class' => React::class, 'condition' => React::class],
-        ],
-        HttpClient::class => [
-            ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]],
-            ['class' => Guzzle7::class, 'condition' => Guzzle7::class],
-            ['class' => Guzzle6::class, 'condition' => Guzzle6::class],
-            ['class' => Guzzle5::class, 'condition' => Guzzle5::class],
-            ['class' => Curl::class, 'condition' => Curl::class],
-            ['class' => Socket::class, 'condition' => Socket::class],
-            ['class' => Buzz::class, 'condition' => Buzz::class],
-            ['class' => React::class, 'condition' => React::class],
-            ['class' => Cake::class, 'condition' => Cake::class],
-            ['class' => Artax::class, 'condition' => Artax::class],
-            [
-                'class' => [self::class, 'buzzInstantiate'],
-                'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class],
-            ],
-        ],
-        Psr18Client::class => [
-            [
-                'class' => [self::class, 'symfonyPsr18Instantiate'],
-                'condition' => [SymfonyPsr18::class, Psr17RequestFactory::class],
-            ],
-            [
-                'class' => GuzzleHttp::class,
-                'condition' => [self::class, 'isGuzzleImplementingPsr18'],
-            ],
-            [
-                'class' => [self::class, 'buzzInstantiate'],
-                'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class],
-            ],
-        ],
-    ];
+	/**
+	 * @var array
+	 */
+	private static $classes = [
+		MessageFactory::class => [
+			['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
+			['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]],
+			['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]],
+			['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]],
+		],
+		StreamFactory::class => [
+			['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
+			['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]],
+			['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]],
+			['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]],
+		],
+		UriFactory::class => [
+			['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
+			['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]],
+			['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]],
+			['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]],
+		],
+		HttpAsyncClient::class => [
+			['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, [self::class, 'isPsr17FactoryInstalled']]],
+			['class' => Guzzle7::class, 'condition' => Guzzle7::class],
+			['class' => Guzzle6::class, 'condition' => Guzzle6::class],
+			['class' => Curl::class, 'condition' => Curl::class],
+			['class' => React::class, 'condition' => React::class],
+		],
+		HttpClient::class => [
+			['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]],
+			['class' => Guzzle7::class, 'condition' => Guzzle7::class],
+			['class' => Guzzle6::class, 'condition' => Guzzle6::class],
+			['class' => Guzzle5::class, 'condition' => Guzzle5::class],
+			['class' => Curl::class, 'condition' => Curl::class],
+			['class' => Socket::class, 'condition' => Socket::class],
+			['class' => Buzz::class, 'condition' => Buzz::class],
+			['class' => React::class, 'condition' => React::class],
+			['class' => Cake::class, 'condition' => Cake::class],
+			['class' => Artax::class, 'condition' => Artax::class],
+			[
+				'class' => [self::class, 'buzzInstantiate'],
+				'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class],
+			],
+		],
+		Psr18Client::class => [
+			[
+				'class' => [self::class, 'symfonyPsr18Instantiate'],
+				'condition' => [SymfonyPsr18::class, Psr17RequestFactory::class],
+			],
+			[
+				'class' => GuzzleHttp::class,
+				'condition' => [self::class, 'isGuzzleImplementingPsr18'],
+			],
+			[
+				'class' => [self::class, 'buzzInstantiate'],
+				'condition' => [\Buzz\Client\FileGetContents::class, \Buzz\Message\ResponseBuilder::class],
+			],
+		],
+	];
 
-    public static function getCandidates($type)
-    {
-        if (Psr18Client::class === $type) {
-            return self::getPsr18Candidates();
-        }
+	public static function getCandidates($type)
+	{
+		if (Psr18Client::class === $type) {
+			return self::getPsr18Candidates();
+		}
 
-        return self::$classes[$type] ?? [];
-    }
+		return self::$classes[$type] ?? [];
+	}
 
-    /**
-     * @return array The return value is always an array with zero or more elements. Each
-     *               element is an array with two keys ['class' => string, 'condition' => mixed].
-     */
-    private static function getPsr18Candidates()
-    {
-        $candidates = self::$classes[Psr18Client::class];
+	/**
+	 * @return array The return value is always an array with zero or more elements. Each
+	 *               element is an array with two keys ['class' => string, 'condition' => mixed].
+	 */
+	private static function getPsr18Candidates()
+	{
+		$candidates = self::$classes[Psr18Client::class];
 
-        // HTTPlug 2.0 clients implements PSR18Client too.
-        foreach (self::$classes[HttpClient::class] as $c) {
-            if (!is_string($c['class'])) {
-                continue;
-            }
-            try {
-                if (ClassDiscovery::safeClassExists($c['class']) && is_subclass_of($c['class'], Psr18Client::class)) {
-                    $candidates[] = $c;
-                }
-            } catch (\Throwable $e) {
-                trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-18 Client is available', get_class($e), $e->getMessage()), E_USER_WARNING);
-            }
-        }
+		// HTTPlug 2.0 clients implements PSR18Client too.
+		foreach (self::$classes[HttpClient::class] as $c) {
+			if (!is_string($c['class'])) {
+				continue;
+			}
+			try {
+				if (ClassDiscovery::safeClassExists($c['class']) && is_subclass_of($c['class'], Psr18Client::class)) {
+					$candidates[] = $c;
+				}
+			} catch (\Throwable $e) {
+				trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-18 Client is available', get_class($e), $e->getMessage()), E_USER_WARNING);
+			}
+		}
 
-        return $candidates;
-    }
+		return $candidates;
+	}
 
-    public static function buzzInstantiate()
-    {
-        return new \Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory());
-    }
+	public static function buzzInstantiate()
+	{
+		return new \Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory());
+	}
 
-    public static function symfonyPsr18Instantiate()
-    {
-        return new SymfonyPsr18(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory());
-    }
+	public static function symfonyPsr18Instantiate()
+	{
+		return new SymfonyPsr18(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory());
+	}
 
-    public static function isGuzzleImplementingPsr18()
-    {
-        return defined('GuzzleHttp\ClientInterface::MAJOR_VERSION');
-    }
+	public static function isGuzzleImplementingPsr18()
+	{
+		return defined('GuzzleHttp\ClientInterface::MAJOR_VERSION');
+	}
 
-    public static function isSymfonyImplementingHttpClient()
-    {
-        return is_subclass_of(SymfonyHttplug::class, HttpClient::class);
-    }
+	public static function isSymfonyImplementingHttpClient()
+	{
+		return is_subclass_of(SymfonyHttplug::class, HttpClient::class);
+	}
 
-    /**
-     * Can be used as a condition.
-     *
-     * @return bool
-     */
-    public static function isPsr17FactoryInstalled()
-    {
-        try {
-            Psr17FactoryDiscovery::findResponseFactory();
-        } catch (NotFoundException $e) {
-            return false;
-        } catch (\Throwable $e) {
-            trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-17 ResponseFactory is available', get_class($e), $e->getMessage()), E_USER_WARNING);
+	/**
+	 * Can be used as a condition.
+	 *
+	 * @return bool
+	 */
+	public static function isPsr17FactoryInstalled()
+	{
+		try {
+			Psr17FactoryDiscovery::findResponseFactory();
+		} catch (NotFoundException $e) {
+			return false;
+		} catch (\Throwable $e) {
+			trigger_error(sprintf('Got exception "%s (%s)" while checking if a PSR-17 ResponseFactory is available', get_class($e), $e->getMessage()), E_USER_WARNING);
 
-            return false;
-        }
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
  *
  * Don't miss updating src/Composer/Plugin.php when adding a new supported class.
  */
-final class CommonClassesStrategy implements DiscoveryStrategy
-{
+final class CommonClassesStrategy implements DiscoveryStrategy {
     /**
      * @var array
      */

lib/Vendor/Http/Discovery/Strategy/PuliBetaStrategy.php

Indentation +56 added lines, -56 removed lines

@@ -19,72 +19,72 @@
  */
 class PuliBetaStrategy implements DiscoveryStrategy
 {
-    /**
-     * @var GeneratedPuliFactory
-     */
-    protected static $puliFactory;
+	/**
+	 * @var GeneratedPuliFactory
+	 */
+	protected static $puliFactory;
 
-    /**
-     * @var Discovery
-     */
-    protected static $puliDiscovery;
+	/**
+	 * @var Discovery
+	 */
+	protected static $puliDiscovery;
 
-    /**
-     * @return GeneratedPuliFactory
-     *
-     * @throws PuliUnavailableException
-     */
-    private static function getPuliFactory()
-    {
-        if (null === self::$puliFactory) {
-            if (!defined('PULI_FACTORY_CLASS')) {
-                throw new PuliUnavailableException('Puli Factory is not available');
-            }
+	/**
+	 * @return GeneratedPuliFactory
+	 *
+	 * @throws PuliUnavailableException
+	 */
+	private static function getPuliFactory()
+	{
+		if (null === self::$puliFactory) {
+			if (!defined('PULI_FACTORY_CLASS')) {
+				throw new PuliUnavailableException('Puli Factory is not available');
+			}
 
-            $puliFactoryClass = PULI_FACTORY_CLASS;
+			$puliFactoryClass = PULI_FACTORY_CLASS;
 
-            if (!ClassDiscovery::safeClassExists($puliFactoryClass)) {
-                throw new PuliUnavailableException('Puli Factory class does not exist');
-            }
+			if (!ClassDiscovery::safeClassExists($puliFactoryClass)) {
+				throw new PuliUnavailableException('Puli Factory class does not exist');
+			}
 
-            self::$puliFactory = new $puliFactoryClass();
-        }
+			self::$puliFactory = new $puliFactoryClass();
+		}
 
-        return self::$puliFactory;
-    }
+		return self::$puliFactory;
+	}
 
-    /**
-     * Returns the Puli discovery layer.
-     *
-     * @return Discovery
-     *
-     * @throws PuliUnavailableException
-     */
-    private static function getPuliDiscovery()
-    {
-        if (!isset(self::$puliDiscovery)) {
-            $factory = self::getPuliFactory();
-            $repository = $factory->createRepository();
+	/**
+	 * Returns the Puli discovery layer.
+	 *
+	 * @return Discovery
+	 *
+	 * @throws PuliUnavailableException
+	 */
+	private static function getPuliDiscovery()
+	{
+		if (!isset(self::$puliDiscovery)) {
+			$factory = self::getPuliFactory();
+			$repository = $factory->createRepository();
 
-            self::$puliDiscovery = $factory->createDiscovery($repository);
-        }
+			self::$puliDiscovery = $factory->createDiscovery($repository);
+		}
 
-        return self::$puliDiscovery;
-    }
+		return self::$puliDiscovery;
+	}
 
-    public static function getCandidates($type)
-    {
-        $returnData = [];
-        $bindings = self::getPuliDiscovery()->findBindings($type);
+	public static function getCandidates($type)
+	{
+		$returnData = [];
+		$bindings = self::getPuliDiscovery()->findBindings($type);
 
-        foreach ($bindings as $binding) {
-            $condition = true;
-            if ($binding->hasParameterValue('depends')) {
-                $condition = $binding->getParameterValue('depends');
-            }
-            $returnData[] = ['class' => $binding->getClassName(), 'condition' => $condition];
-        }
+		foreach ($bindings as $binding) {
+			$condition = true;
+			if ($binding->hasParameterValue('depends')) {
+				$condition = $binding->getParameterValue('depends');
+			}
+			$returnData[] = ['class' => $binding->getClassName(), 'condition' => $condition];
+		}
 
-        return $returnData;
-    }
+		return $returnData;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  * @author David de Boer <david@ddeboer.nl>
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
  */
-class PuliBetaStrategy implements DiscoveryStrategy
-{
+class PuliBetaStrategy implements DiscoveryStrategy {
     /**
      * @var GeneratedPuliFactory
      */

lib/Vendor/Http/Discovery/Strategy/DiscoveryStrategy.php

Indentation +11 added lines, -11 removed lines

@@ -9,15 +9,15 @@
  */
 interface DiscoveryStrategy
 {
-    /**
-     * Find a resource of a specific type.
-     *
-     * @param string $type
-     *
-     * @return array The return value is always an array with zero or more elements. Each
-     *               element is an array with two keys ['class' => string, 'condition' => mixed].
-     *
-     * @throws StrategyUnavailableException if we cannot use this strategy
-     */
-    public static function getCandidates($type);
+	/**
+	 * Find a resource of a specific type.
+	 *
+	 * @param string $type
+	 *
+	 * @return array The return value is always an array with zero or more elements. Each
+	 *               element is an array with two keys ['class' => string, 'condition' => mixed].
+	 *
+	 * @throws StrategyUnavailableException if we cannot use this strategy
+	 */
+	public static function getCandidates($type);
 }

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-interface DiscoveryStrategy
-{
+interface DiscoveryStrategy {
     /**
      * Find a resource of a specific type.
      *