nextcloud / fulltextsearch_elasticsearch

lib/Vendor/Psr/Http/Client/NetworkExceptionInterface.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * Example: the target host name can not be resolved or the connection failed.
  */
-interface NetworkExceptionInterface extends ClientExceptionInterface
-{
+interface NetworkExceptionInterface extends ClientExceptionInterface {
     /**
      * Returns the request.
      *

Indentation +8 added lines, -8 removed lines

@@ -12,12 +12,12 @@
  */
 interface NetworkExceptionInterface extends ClientExceptionInterface
 {
-    /**
-     * Returns the request.
-     *
-     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
-     *
-     * @return RequestInterface
-     */
-    public function getRequest() : RequestInterface;
+	/**
+	 * Returns the request.
+	 *
+	 * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+	 *
+	 * @return RequestInterface
+	 */
+	public function getRequest() : RequestInterface;
 }

lib/Vendor/Http/Discovery/UriFactoryDiscovery.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
  *
  * @deprecated This will be removed in 2.0. Consider using Psr17FactoryDiscovery.
  */
-final class UriFactoryDiscovery extends ClassDiscovery
-{
+final class UriFactoryDiscovery extends ClassDiscovery {
     /**
      * Finds a URI Factory.
      *

Indentation +16 added lines, -16 removed lines

@@ -13,20 +13,20 @@
  */
 final class UriFactoryDiscovery extends ClassDiscovery
 {
-    /**
-     * Finds a URI Factory.
-     *
-     * @return UriFactory
-     *
-     * @throws Exception\NotFoundException
-     */
-    public static function find()
-    {
-        try {
-            $uriFactory = static::findOneByType(UriFactory::class);
-        } catch (DiscoveryFailedException $e) {
-            throw new NotFoundException('No uri factories found. To use Guzzle, Diactoros or Slim Framework factories install php-http/message and the chosen message implementation.', 0, $e);
-        }
-        return static::instantiateClass($uriFactory);
-    }
+	/**
+	 * Finds a URI Factory.
+	 *
+	 * @return UriFactory
+	 *
+	 * @throws Exception\NotFoundException
+	 */
+	public static function find()
+	{
+		try {
+			$uriFactory = static::findOneByType(UriFactory::class);
+		} catch (DiscoveryFailedException $e) {
+			throw new NotFoundException('No uri factories found. To use Guzzle, Diactoros or Slim Framework factories install php-http/message and the chosen message implementation.', 0, $e);
+		}
+		return static::instantiateClass($uriFactory);
+	}
 }

lib/Vendor/Http/Discovery/HttpAsyncClientDiscovery.php

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
  *
  * @author Joel Wurtz <joel.wurtz@gmail.com>
  */
-final class HttpAsyncClientDiscovery extends ClassDiscovery
-{
+final class HttpAsyncClientDiscovery extends ClassDiscovery {
     /**
      * Finds an HTTP Async Client.
      *

Indentation +16 added lines, -16 removed lines

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

lib/Vendor/Http/Discovery/ClassDiscovery.php

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-abstract class ClassDiscovery
-{
+abstract class ClassDiscovery {
     /**
      * A list of strategies to find classes.
      *

Indentation +200 added lines, -200 removed lines

@@ -16,204 +16,204 @@
  */
 abstract class ClassDiscovery
 {
-    /**
-     * A list of strategies to find classes.
-     *
-     * @var DiscoveryStrategy[]
-     */
-    private static $strategies = [Strategy\GeneratedDiscoveryStrategy::class, Strategy\CommonClassesStrategy::class, Strategy\CommonPsr17ClassesStrategy::class, Strategy\PuliBetaStrategy::class];
-    private static $deprecatedStrategies = [Strategy\PuliBetaStrategy::class => \true];
-    /**
-     * Discovery cache to make the second time we use discovery faster.
-     *
-     * @var array
-     */
-    private static $cache = [];
-    /**
-     * Finds a class.
-     *
-     * @param string $type
-     *
-     * @return string|\Closure
-     *
-     * @throws DiscoveryFailedException
-     */
-    protected static function findOneByType($type)
-    {
-        // Look in the cache
-        if (null !== ($class = self::getFromCache($type))) {
-            return $class;
-        }
-        static $skipStrategy;
-        $skipStrategy ?? ($skipStrategy = self::safeClassExists(Strategy\GeneratedDiscoveryStrategy::class) ? \false : Strategy\GeneratedDiscoveryStrategy::class);
-        $exceptions = [];
-        foreach (self::$strategies as $strategy) {
-            if ($skipStrategy === $strategy) {
-                continue;
-            }
-            try {
-                $candidates = $strategy::getCandidates($type);
-            } catch (StrategyUnavailableException $e) {
-                if (!isset(self::$deprecatedStrategies[$strategy])) {
-                    $exceptions[] = $e;
-                }
-                continue;
-            }
-            foreach ($candidates as $candidate) {
-                if (isset($candidate['condition'])) {
-                    if (!self::evaluateCondition($candidate['condition'])) {
-                        continue;
-                    }
-                }
-                // save the result for later use
-                self::storeInCache($type, $candidate);
-                return $candidate['class'];
-            }
-            $exceptions[] = new NoCandidateFoundException($strategy, $candidates);
-        }
-        throw DiscoveryFailedException::create($exceptions);
-    }
-    /**
-     * Get a value from cache.
-     *
-     * @param string $type
-     *
-     * @return string|null
-     */
-    private static function getFromCache($type)
-    {
-        if (!isset(self::$cache[$type])) {
-            return;
-        }
-        $candidate = self::$cache[$type];
-        if (isset($candidate['condition'])) {
-            if (!self::evaluateCondition($candidate['condition'])) {
-                return;
-            }
-        }
-        return $candidate['class'];
-    }
-    /**
-     * Store a value in cache.
-     *
-     * @param string $type
-     * @param string $class
-     */
-    private static function storeInCache($type, $class)
-    {
-        self::$cache[$type] = $class;
-    }
-    /**
-     * Set new strategies and clear the cache.
-     *
-     * @param string[] $strategies list of fully qualified class names that implement DiscoveryStrategy
-     */
-    public static function setStrategies(array $strategies)
-    {
-        self::$strategies = $strategies;
-        self::clearCache();
-    }
-    /**
-     * Returns the currently configured discovery strategies as fully qualified class names.
-     *
-     * @return string[]
-     */
-    public static function getStrategies() : iterable
-    {
-        return self::$strategies;
-    }
-    /**
-     * Append a strategy at the end of the strategy queue.
-     *
-     * @param string $strategy Fully qualified class name of a DiscoveryStrategy
-     */
-    public static function appendStrategy($strategy)
-    {
-        self::$strategies[] = $strategy;
-        self::clearCache();
-    }
-    /**
-     * Prepend a strategy at the beginning of the strategy queue.
-     *
-     * @param string $strategy Fully qualified class name to a DiscoveryStrategy
-     */
-    public static function prependStrategy($strategy)
-    {
-        \array_unshift(self::$strategies, $strategy);
-        self::clearCache();
-    }
-    public static function clearCache()
-    {
-        self::$cache = [];
-    }
-    /**
-     * Evaluates conditions to boolean.
-     *
-     * @return bool
-     */
-    protected static function evaluateCondition($condition)
-    {
-        if (\is_string($condition)) {
-            // Should be extended for functions, extensions???
-            return self::safeClassExists($condition);
-        }
-        if (\is_callable($condition)) {
-            return (bool) $condition();
-        }
-        if (\is_bool($condition)) {
-            return $condition;
-        }
-        if (\is_array($condition)) {
-            foreach ($condition as $c) {
-                if (\false === static::evaluateCondition($c)) {
-                    // Immediately stop execution if the condition is false
-                    return \false;
-                }
-            }
-            return \true;
-        }
-        return \false;
-    }
-    /**
-     * Get an instance of the $class.
-     *
-     * @param string|\Closure $class a FQCN of a class or a closure that instantiate the class
-     *
-     * @return object
-     *
-     * @throws ClassInstantiationFailedException
-     */
-    protected static function instantiateClass($class)
-    {
-        try {
-            if (\is_string($class)) {
-                return new $class();
-            }
-            if (\is_callable($class)) {
-                return $class();
-            }
-        } catch (\Exception $e) {
-            throw new ClassInstantiationFailedException('Unexpected exception when instantiating class.', 0, $e);
-        }
-        throw new ClassInstantiationFailedException('Could not instantiate class because parameter is neither a callable nor a string');
-    }
-    /**
-     * We need a "safe" version of PHP's "class_exists" because Magento has a bug
-     * (or they call it a "feature"). Magento is throwing an exception if you do class_exists()
-     * on a class that ends with "Factory" and if that file does not exits.
-     *
-     * This function catches all potential exceptions and makes sure to always return a boolean.
-     *
-     * @param string $class
-     *
-     * @return bool
-     */
-    public static function safeClassExists($class)
-    {
-        try {
-            return \class_exists($class) || \interface_exists($class);
-        } catch (\Exception $e) {
-            return \false;
-        }
-    }
+	/**
+	 * A list of strategies to find classes.
+	 *
+	 * @var DiscoveryStrategy[]
+	 */
+	private static $strategies = [Strategy\GeneratedDiscoveryStrategy::class, Strategy\CommonClassesStrategy::class, Strategy\CommonPsr17ClassesStrategy::class, Strategy\PuliBetaStrategy::class];
+	private static $deprecatedStrategies = [Strategy\PuliBetaStrategy::class => \true];
+	/**
+	 * Discovery cache to make the second time we use discovery faster.
+	 *
+	 * @var array
+	 */
+	private static $cache = [];
+	/**
+	 * Finds a class.
+	 *
+	 * @param string $type
+	 *
+	 * @return string|\Closure
+	 *
+	 * @throws DiscoveryFailedException
+	 */
+	protected static function findOneByType($type)
+	{
+		// Look in the cache
+		if (null !== ($class = self::getFromCache($type))) {
+			return $class;
+		}
+		static $skipStrategy;
+		$skipStrategy ?? ($skipStrategy = self::safeClassExists(Strategy\GeneratedDiscoveryStrategy::class) ? \false : Strategy\GeneratedDiscoveryStrategy::class);
+		$exceptions = [];
+		foreach (self::$strategies as $strategy) {
+			if ($skipStrategy === $strategy) {
+				continue;
+			}
+			try {
+				$candidates = $strategy::getCandidates($type);
+			} catch (StrategyUnavailableException $e) {
+				if (!isset(self::$deprecatedStrategies[$strategy])) {
+					$exceptions[] = $e;
+				}
+				continue;
+			}
+			foreach ($candidates as $candidate) {
+				if (isset($candidate['condition'])) {
+					if (!self::evaluateCondition($candidate['condition'])) {
+						continue;
+					}
+				}
+				// save the result for later use
+				self::storeInCache($type, $candidate);
+				return $candidate['class'];
+			}
+			$exceptions[] = new NoCandidateFoundException($strategy, $candidates);
+		}
+		throw DiscoveryFailedException::create($exceptions);
+	}
+	/**
+	 * Get a value from cache.
+	 *
+	 * @param string $type
+	 *
+	 * @return string|null
+	 */
+	private static function getFromCache($type)
+	{
+		if (!isset(self::$cache[$type])) {
+			return;
+		}
+		$candidate = self::$cache[$type];
+		if (isset($candidate['condition'])) {
+			if (!self::evaluateCondition($candidate['condition'])) {
+				return;
+			}
+		}
+		return $candidate['class'];
+	}
+	/**
+	 * Store a value in cache.
+	 *
+	 * @param string $type
+	 * @param string $class
+	 */
+	private static function storeInCache($type, $class)
+	{
+		self::$cache[$type] = $class;
+	}
+	/**
+	 * Set new strategies and clear the cache.
+	 *
+	 * @param string[] $strategies list of fully qualified class names that implement DiscoveryStrategy
+	 */
+	public static function setStrategies(array $strategies)
+	{
+		self::$strategies = $strategies;
+		self::clearCache();
+	}
+	/**
+	 * Returns the currently configured discovery strategies as fully qualified class names.
+	 *
+	 * @return string[]
+	 */
+	public static function getStrategies() : iterable
+	{
+		return self::$strategies;
+	}
+	/**
+	 * Append a strategy at the end of the strategy queue.
+	 *
+	 * @param string $strategy Fully qualified class name of a DiscoveryStrategy
+	 */
+	public static function appendStrategy($strategy)
+	{
+		self::$strategies[] = $strategy;
+		self::clearCache();
+	}
+	/**
+	 * Prepend a strategy at the beginning of the strategy queue.
+	 *
+	 * @param string $strategy Fully qualified class name to a DiscoveryStrategy
+	 */
+	public static function prependStrategy($strategy)
+	{
+		\array_unshift(self::$strategies, $strategy);
+		self::clearCache();
+	}
+	public static function clearCache()
+	{
+		self::$cache = [];
+	}
+	/**
+	 * Evaluates conditions to boolean.
+	 *
+	 * @return bool
+	 */
+	protected static function evaluateCondition($condition)
+	{
+		if (\is_string($condition)) {
+			// Should be extended for functions, extensions???
+			return self::safeClassExists($condition);
+		}
+		if (\is_callable($condition)) {
+			return (bool) $condition();
+		}
+		if (\is_bool($condition)) {
+			return $condition;
+		}
+		if (\is_array($condition)) {
+			foreach ($condition as $c) {
+				if (\false === static::evaluateCondition($c)) {
+					// Immediately stop execution if the condition is false
+					return \false;
+				}
+			}
+			return \true;
+		}
+		return \false;
+	}
+	/**
+	 * Get an instance of the $class.
+	 *
+	 * @param string|\Closure $class a FQCN of a class or a closure that instantiate the class
+	 *
+	 * @return object
+	 *
+	 * @throws ClassInstantiationFailedException
+	 */
+	protected static function instantiateClass($class)
+	{
+		try {
+			if (\is_string($class)) {
+				return new $class();
+			}
+			if (\is_callable($class)) {
+				return $class();
+			}
+		} catch (\Exception $e) {
+			throw new ClassInstantiationFailedException('Unexpected exception when instantiating class.', 0, $e);
+		}
+		throw new ClassInstantiationFailedException('Could not instantiate class because parameter is neither a callable nor a string');
+	}
+	/**
+	 * We need a "safe" version of PHP's "class_exists" because Magento has a bug
+	 * (or they call it a "feature"). Magento is throwing an exception if you do class_exists()
+	 * on a class that ends with "Factory" and if that file does not exits.
+	 *
+	 * This function catches all potential exceptions and makes sure to always return a boolean.
+	 *
+	 * @param string $class
+	 *
+	 * @return bool
+	 */
+	public static function safeClassExists($class)
+	{
+		try {
+			return \class_exists($class) || \interface_exists($class);
+		} catch (\Exception $e) {
+			return \false;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
             return self::safeClassExists($condition);
         }
         if (\is_callable($condition)) {
-            return (bool) $condition();
+            return (bool)$condition();
         }
         if (\is_bool($condition)) {
             return $condition;

lib/Vendor/Http/Discovery/HttpClientDiscovery.php

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.
      *

Indentation +16 added lines, -16 removed lines

@@ -13,20 +13,20 @@
  */
 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);
-        }
-        return static::instantiateClass($client);
-    }
+	/**
+	 * 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);
+	}
 }

lib/Vendor/Http/Discovery/Psr18ClientDiscovery.php

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.
      *

Indentation +16 added lines, -16 removed lines

@@ -12,20 +12,20 @@
  */
 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);
-        }
-        return static::instantiateClass($client);
-    }
+	/**
+	 * 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);
+	}
 }

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/Strategy/CommonClassesStrategy.php

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
      */

Indentation +66 added lines, -66 removed lines

@@ -47,70 +47,70 @@
  */
 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' => [\OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents::class, \OCA\FullTextSearch_Elasticsearch\Vendor\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' => [\OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents::class, \OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Message\ResponseBuilder::class]]]];
-    public static function getCandidates($type)
-    {
-        if (Psr18Client::class === $type) {
-            return self::getPsr18Candidates();
-        }
-        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];
-        // 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;
-    }
-    public static function buzzInstantiate()
-    {
-        return new \OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory());
-    }
-    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 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);
-            return \false;
-        }
-        return \true;
-    }
+	/**
+	 * @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' => [\OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents::class, \OCA\FullTextSearch_Elasticsearch\Vendor\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' => [\OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents::class, \OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Message\ResponseBuilder::class]]]];
+	public static function getCandidates($type)
+	{
+		if (Psr18Client::class === $type) {
+			return self::getPsr18Candidates();
+		}
+		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];
+		// 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;
+	}
+	public static function buzzInstantiate()
+	{
+		return new \OCA\FullTextSearch_Elasticsearch\Vendor\Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory());
+	}
+	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 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);
+			return \false;
+		}
+		return \true;
+	}
 }

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

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
      */

Indentation +56 added lines, -56 removed lines

@@ -18,60 +18,60 @@
  */
 class PuliBetaStrategy implements DiscoveryStrategy
 {
-    /**
-     * @var GeneratedPuliFactory
-     */
-    protected static $puliFactory;
-    /**
-     * @var Discovery
-     */
-    protected static $puliDiscovery;
-    /**
-     * @return GeneratedPuliFactory
-     *
-     * @throws PuliUnavailableException
-     */
-    private static function getPuliFactory()
-    {
-        if (null === self::$puliFactory) {
-            if (!\defined('OCA\\FullTextSearch_Elasticsearch\\Vendor\\PULI_FACTORY_CLASS')) {
-                throw new PuliUnavailableException('Puli Factory is not available');
-            }
-            $puliFactoryClass = PULI_FACTORY_CLASS;
-            if (!ClassDiscovery::safeClassExists($puliFactoryClass)) {
-                throw new PuliUnavailableException('Puli Factory class does not exist');
-            }
-            self::$puliFactory = new $puliFactoryClass();
-        }
-        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();
-            self::$puliDiscovery = $factory->createDiscovery($repository);
-        }
-        return self::$puliDiscovery;
-    }
-    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];
-        }
-        return $returnData;
-    }
+	/**
+	 * @var GeneratedPuliFactory
+	 */
+	protected static $puliFactory;
+	/**
+	 * @var Discovery
+	 */
+	protected static $puliDiscovery;
+	/**
+	 * @return GeneratedPuliFactory
+	 *
+	 * @throws PuliUnavailableException
+	 */
+	private static function getPuliFactory()
+	{
+		if (null === self::$puliFactory) {
+			if (!\defined('OCA\\FullTextSearch_Elasticsearch\\Vendor\\PULI_FACTORY_CLASS')) {
+				throw new PuliUnavailableException('Puli Factory is not available');
+			}
+			$puliFactoryClass = PULI_FACTORY_CLASS;
+			if (!ClassDiscovery::safeClassExists($puliFactoryClass)) {
+				throw new PuliUnavailableException('Puli Factory class does not exist');
+			}
+			self::$puliFactory = new $puliFactoryClass();
+		}
+		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();
+			self::$puliDiscovery = $factory->createDiscovery($repository);
+		}
+		return self::$puliDiscovery;
+	}
+	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];
+		}
+		return $returnData;
+	}
 }