nextcloud / fulltextsearch_elasticsearch

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

Indentation +10 added lines, -10 removed lines

@@ -7,14 +7,14 @@
 
 interface ClientInterface
 {
-    /**
-     * Sends a PSR-7 request and returns a PSR-7 response.
-     *
-     * @param RequestInterface $request
-     *
-     * @return ResponseInterface
-     *
-     * @throws \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Client\ClientExceptionInterface If an error happens while processing the request.
-     */
-    public function sendRequest(RequestInterface $request): ResponseInterface;
+	/**
+	 * Sends a PSR-7 request and returns a PSR-7 response.
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @throws \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Client\ClientExceptionInterface If an error happens while processing the request.
+	 */
+	public function sendRequest(RequestInterface $request): ResponseInterface;
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface;
 
-interface ClientInterface
-{
+interface ClientInterface {
     /**
      * Sends a PSR-7 request and returns a PSR-7 response.
      *

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

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,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;
 }

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

lib/Vendor/Http/Discovery/UriFactoryDiscovery.php

Indentation +16 added lines, -16 removed lines

@@ -14,21 +14,21 @@
  */
 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);
-        }
+	/**
+	 * 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);
-    }
+		return static::instantiateClass($uriFactory);
+	}
 }

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

lib/Vendor/Http/Discovery/HttpAsyncClientDiscovery.php

Indentation +16 added lines, -16 removed lines

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

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

lib/Vendor/Http/Discovery/Composer/Plugin.php

Indentation +408 added lines, -408 removed lines

@@ -38,370 +38,370 @@ 
  */
 class Plugin implements PluginInterface, EventSubscriberInterface
 {
-    /**
-     * Describes, for every supported virtual implementation, which packages
-     * provide said implementation and which extra dependencies each package
-     * requires to provide the implementation.
-     */
-    private const PROVIDE_RULES = [
-        'php-http/async-client-implementation' => [
-            'symfony/http-client:>=6.3' => ['guzzlehttp/promises', 'psr/http-factory-implementation', 'php-http/httplug'],
-            'symfony/http-client' => ['guzzlehttp/promises', 'php-http/message-factory', 'psr/http-factory-implementation', 'php-http/httplug'],
-            'php-http/guzzle7-adapter' => [],
-            'php-http/guzzle6-adapter' => [],
-            'php-http/curl-client' => [],
-            'php-http/react-adapter' => [],
-        ],
-        'php-http/client-implementation' => [
-            'symfony/http-client:>=6.3' => ['psr/http-factory-implementation', 'php-http/httplug'],
-            'symfony/http-client' => ['php-http/message-factory', 'psr/http-factory-implementation', 'php-http/httplug'],
-            'php-http/guzzle7-adapter' => [],
-            'php-http/guzzle6-adapter' => [],
-            'php-http/cakephp-adapter' => [],
-            'php-http/curl-client' => [],
-            'php-http/react-adapter' => [],
-            'php-http/buzz-adapter' => [],
-            'php-http/artax-adapter' => [],
-            'kriswallsmith/buzz:^1' => [],
-        ],
-        'psr/http-client-implementation' => [
-            'symfony/http-client' => ['psr/http-factory-implementation', 'psr/http-client'],
-            'guzzlehttp/guzzle' => [],
-            'kriswallsmith/buzz:^1' => [],
-        ],
-        'psr/http-message-implementation' => [
-            'php-http/discovery' => ['psr/http-factory-implementation'],
-        ],
-        'psr/http-factory-implementation' => [
-            'nyholm/psr7' => [],
-            'guzzlehttp/psr7:>=2' => [],
-            'slim/psr7' => [],
-            'laminas/laminas-diactoros' => [],
-            'phalcon/cphalcon:^4' => [],
-            'http-interop/http-factory-guzzle' => [],
-            'http-interop/http-factory-diactoros' => [],
-            'http-interop/http-factory-slim' => [],
-            'httpsoft/http-message' => [],
-        ],
-    ];
-
-    /**
-     * Describes which package should be preferred on the left side
-     * depending on which one is already installed on the right side.
-     */
-    private const STICKYNESS_RULES = [
-        'symfony/http-client' => 'symfony/framework-bundle',
-        'php-http/guzzle7-adapter' => 'guzzlehttp/guzzle:^7',
-        'php-http/guzzle6-adapter' => 'guzzlehttp/guzzle:^6',
-        'php-http/guzzle5-adapter' => 'guzzlehttp/guzzle:^5',
-        'php-http/cakephp-adapter' => 'cakephp/cakephp',
-        'php-http/react-adapter' => 'react/event-loop',
-        'php-http/buzz-adapter' => 'kriswallsmith/buzz:^0.15.1',
-        'php-http/artax-adapter' => 'amphp/artax:^3',
-        'http-interop/http-factory-guzzle' => 'guzzlehttp/psr7:^1',
-        'http-interop/http-factory-slim' => 'slim/slim:^3',
-    ];
-
-    private const INTERFACE_MAP = [
-        'php-http/async-client-implementation' => [
-            'Http\Client\HttpAsyncClient',
-        ],
-        'php-http/client-implementation' => [
-            'Http\Client\HttpClient',
-        ],
-        'psr/http-client-implementation' => [
-            'Psr\Http\Client\ClientInterface',
-        ],
-        'psr/http-factory-implementation' => [
-            'Psr\Http\Message\RequestFactoryInterface',
-            'Psr\Http\Message\ResponseFactoryInterface',
-            'Psr\Http\Message\ServerRequestFactoryInterface',
-            'Psr\Http\Message\StreamFactoryInterface',
-            'Psr\Http\Message\UploadedFileFactoryInterface',
-            'Psr\Http\Message\UriFactoryInterface',
-        ],
-    ];
-
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            ScriptEvents::PRE_AUTOLOAD_DUMP => 'preAutoloadDump',
-            ScriptEvents::POST_UPDATE_CMD => 'postUpdate',
-        ];
-    }
-
-    public function activate(Composer $composer, IOInterface $io): void
-    {
-    }
-
-    public function deactivate(Composer $composer, IOInterface $io)
-    {
-    }
-
-    public function uninstall(Composer $composer, IOInterface $io)
-    {
-    }
-
-    public function postUpdate(Event $event)
-    {
-        $composer = $event->getComposer();
-        $repo = $composer->getRepositoryManager()->getLocalRepository();
-        $requires = [
-            $composer->getPackage()->getRequires(),
-            $composer->getPackage()->getDevRequires(),
-        ];
-        $pinnedAbstractions = [];
-        $pinned = $composer->getPackage()->getExtra()['discovery'] ?? [];
-        foreach (self::INTERFACE_MAP as $abstraction => $interfaces) {
-            foreach (isset($pinned[$abstraction]) ? [] : $interfaces as $interface) {
-                if (!isset($pinned[$interface])) {
-                    continue 2;
-                }
-            }
-            $pinnedAbstractions[$abstraction] = true;
-        }
-
-        $missingRequires = $this->getMissingRequires($repo, $requires, 'project' === $composer->getPackage()->getType(), $pinnedAbstractions);
-        $missingRequires = [
-            'require' => array_fill_keys(array_merge([], ...array_values($missingRequires[0])), '*'),
-            'require-dev' => array_fill_keys(array_merge([], ...array_values($missingRequires[1])), '*'),
-            'remove' => array_fill_keys(array_merge([], ...array_values($missingRequires[2])), '*'),
-        ];
-
-        if (!$missingRequires = array_filter($missingRequires)) {
-            return;
-        }
-
-        $composerJsonContents = file_get_contents(Factory::getComposerFile());
-        $this->updateComposerJson($missingRequires, $composer->getConfig()->get('sort-packages'));
-
-        $installer = null;
-        // Find the composer installer, hack borrowed from symfony/flex
-        foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT) as $trace) {
-            if (isset($trace['object']) && $trace['object'] instanceof Installer) {
-                $installer = $trace['object'];
-                break;
-            }
-        }
-
-        if (!$installer) {
-            return;
-        }
-
-        $event->stopPropagation();
-
-        $dispatcher = $composer->getEventDispatcher();
-        $disableScripts = !method_exists($dispatcher, 'setRunScripts') || !((array) $dispatcher)["\0*\0runScripts"];
-        $composer = Factory::create($event->getIO(), null, false, $disableScripts);
-
-        /** @var Installer $installer */
-        $installer = clone $installer;
-        if (method_exists($installer, 'setAudit')) {
-            $trace['object']->setAudit(false);
-        }
-        // we need a clone of the installer to preserve its configuration state but with our own service objects
-        $installer->__construct(
-            $event->getIO(),
-            $composer->getConfig(),
-            $composer->getPackage(),
-            $composer->getDownloadManager(),
-            $composer->getRepositoryManager(),
-            $composer->getLocker(),
-            $composer->getInstallationManager(),
-            $composer->getEventDispatcher(),
-            $composer->getAutoloadGenerator()
-        );
-        if (method_exists($installer, 'setPlatformRequirementFilter')) {
-            $installer->setPlatformRequirementFilter(((array) $trace['object'])["\0*\0platformRequirementFilter"]);
-        }
-
-        if (0 !== $installer->run()) {
-            file_put_contents(Factory::getComposerFile(), $composerJsonContents);
-
-            return;
-        }
-
-        $versionSelector = new VersionSelector(ClassDiscovery::safeClassExists(RepositorySet::class) ? new RepositorySet() : new Pool());
-        $updateComposerJson = false;
-
-        foreach ($composer->getRepositoryManager()->getLocalRepository()->getPackages() as $package) {
-            foreach (['require', 'require-dev'] as $key) {
-                if (!isset($missingRequires[$key][$package->getName()])) {
-                    continue;
-                }
-                $updateComposerJson = true;
-                $missingRequires[$key][$package->getName()] = $versionSelector->findRecommendedRequireVersion($package);
-            }
-        }
-
-        if ($updateComposerJson) {
-            $this->updateComposerJson($missingRequires, $composer->getConfig()->get('sort-packages'));
-            $this->updateComposerLock($composer, $event->getIO());
-        }
-    }
-
-    public function getMissingRequires(InstalledRepositoryInterface $repo, array $requires, bool $isProject, array $pinnedAbstractions): array
-    {
-        $allPackages = [];
-        $devPackages = method_exists($repo, 'getDevPackageNames') ? array_fill_keys($repo->getDevPackageNames(), true) : [];
-
-        // One must require "php-http/discovery"
-        // to opt-in for auto-installation of virtual package implementations
-        if (!isset($requires[0]['php-http/discovery'])) {
-            $requires = [[], []];
-        }
-
-        foreach ($repo->getPackages() as $package) {
-            $allPackages[$package->getName()] = true;
-
-            if (1 < \count($names = $package->getNames(false))) {
-                $allPackages += array_fill_keys($names, false);
-
-                if (isset($devPackages[$package->getName()])) {
-                    $devPackages += $names;
-                }
-            }
-
-            if (isset($package->getRequires()['php-http/discovery'])) {
-                $requires[(int) isset($devPackages[$package->getName()])] += $package->getRequires();
-            }
-        }
-
-        $missingRequires = [[], [], []];
-        $versionParser = new VersionParser();
-
-        if (ClassDiscovery::safeClassExists(\Phalcon\Http\Message\RequestFactory::class, false)) {
-            $missingRequires[0]['psr/http-factory-implementation'] = [];
-            $missingRequires[1]['psr/http-factory-implementation'] = [];
-        }
-
-        foreach ($requires as $dev => $rules) {
-            $abstractions = [];
-            $rules = array_intersect_key(self::PROVIDE_RULES, $rules);
-
-            while ($rules) {
-                $abstraction = key($rules);
-
-                if (isset($pinnedAbstractions[$abstraction])) {
-                    unset($rules[$abstraction]);
-                    continue;
-                }
-
-                $abstractions[] = $abstraction;
-
-                foreach (array_shift($rules) as $candidate => $deps) {
-                    [$candidate, $version] = explode(':', $candidate, 2) + [1 => null];
-
-                    if (!isset($allPackages[$candidate])) {
-                        continue;
-                    }
-                    if (null !== $version && !$repo->findPackage($candidate, $versionParser->parseConstraints($version))) {
-                        continue;
-                    }
-                    if ($isProject && !$dev && isset($devPackages[$candidate])) {
-                        $missingRequires[0][$abstraction] = [$candidate];
-                        $missingRequires[2][$abstraction] = [$candidate];
-                    } else {
-                        $missingRequires[$dev][$abstraction] = [];
-                    }
-
-                    foreach ($deps as $dep) {
-                        if (isset(self::PROVIDE_RULES[$dep])) {
-                            $rules[$dep] = self::PROVIDE_RULES[$dep];
-                        } elseif (!isset($allPackages[$dep])) {
-                            $missingRequires[$dev][$abstraction][] = $dep;
-                        } elseif ($isProject && !$dev && isset($devPackages[$dep])) {
-                            $missingRequires[0][$abstraction][] = $dep;
-                            $missingRequires[2][$abstraction][] = $dep;
-                        }
-                    }
-                    break;
-                }
-            }
-
-            while ($abstractions) {
-                $abstraction = array_shift($abstractions);
-
-                if (isset($missingRequires[$dev][$abstraction])) {
-                    continue;
-                }
-                $candidates = self::PROVIDE_RULES[$abstraction];
-
-                foreach ($candidates as $candidate => $deps) {
-                    [$candidate, $version] = explode(':', $candidate, 2) + [1 => null];
-
-                    if (null !== $version && !$repo->findPackage($candidate, $versionParser->parseConstraints($version))) {
-                        continue;
-                    }
-                    if (isset($allPackages[$candidate]) && (!$isProject || $dev || !isset($devPackages[$candidate]))) {
-                        continue 2;
-                    }
-                }
-
-                foreach (array_intersect_key(self::STICKYNESS_RULES, $candidates) as $candidate => $stickyRule) {
-                    [$stickyName, $stickyVersion] = explode(':', $stickyRule, 2) + [1 => null];
-                    if (!isset($allPackages[$stickyName]) || ($isProject && !$dev && isset($devPackages[$stickyName]))) {
-                        continue;
-                    }
-                    if (null !== $stickyVersion && !$repo->findPackage($stickyName, $versionParser->parseConstraints($stickyVersion))) {
-                        continue;
-                    }
-
-                    $candidates = [$candidate => $candidates[$candidate]];
-                    break;
-                }
-
-                $dep = key($candidates);
-                [$dep] = explode(':', $dep, 2);
-                $missingRequires[$dev][$abstraction] = [$dep];
-
-                if ($isProject && !$dev && isset($devPackages[$dep])) {
-                    $missingRequires[2][$abstraction][] = $dep;
-                }
-            }
-        }
-
-        $missingRequires[1] = array_diff_key($missingRequires[1], $missingRequires[0]);
-
-        return $missingRequires;
-    }
-
-    public function preAutoloadDump(Event $event)
-    {
-        $filesystem = new Filesystem();
-        // Double realpath() on purpose, see https://bugs.php.net/72738
-        $vendorDir = $filesystem->normalizePath(realpath(realpath($event->getComposer()->getConfig()->get('vendor-dir'))));
-        $filesystem->ensureDirectoryExists($vendorDir.'/composer');
-        $pinned = $event->getComposer()->getPackage()->getExtra()['discovery'] ?? [];
-        $candidates = [];
-
-        $allInterfaces = array_merge(...array_values(self::INTERFACE_MAP));
-        foreach ($pinned as $abstraction => $class) {
-            if (isset(self::INTERFACE_MAP[$abstraction])) {
-                $interfaces = self::INTERFACE_MAP[$abstraction];
-            } elseif (false !== $k = array_search($abstraction, $allInterfaces, true)) {
-                $interfaces = [$allInterfaces[$k]];
-            } else {
-                throw new \UnexpectedValueException(sprintf('Invalid "extra.discovery" pinned in composer.json: "%s" is not one of ["%s"].', $abstraction, implode('", "', array_keys(self::INTERFACE_MAP))));
-            }
-
-            foreach ($interfaces as $interface) {
-                $candidates[] = sprintf("case %s: return [['class' => %s]];\n", var_export($interface, true), var_export($class, true));
-            }
-        }
-
-        $file = $vendorDir.'/composer/GeneratedDiscoveryStrategy.php';
-
-        if (!$candidates) {
-            if (file_exists($file)) {
-                unlink($file);
-            }
-
-            return;
-        }
-
-        $candidates = implode('            ', $candidates);
-        $code = <<<EOPHP
+	/**
+	 * Describes, for every supported virtual implementation, which packages
+	 * provide said implementation and which extra dependencies each package
+	 * requires to provide the implementation.
+	 */
+	private const PROVIDE_RULES = [
+		'php-http/async-client-implementation' => [
+			'symfony/http-client:>=6.3' => ['guzzlehttp/promises', 'psr/http-factory-implementation', 'php-http/httplug'],
+			'symfony/http-client' => ['guzzlehttp/promises', 'php-http/message-factory', 'psr/http-factory-implementation', 'php-http/httplug'],
+			'php-http/guzzle7-adapter' => [],
+			'php-http/guzzle6-adapter' => [],
+			'php-http/curl-client' => [],
+			'php-http/react-adapter' => [],
+		],
+		'php-http/client-implementation' => [
+			'symfony/http-client:>=6.3' => ['psr/http-factory-implementation', 'php-http/httplug'],
+			'symfony/http-client' => ['php-http/message-factory', 'psr/http-factory-implementation', 'php-http/httplug'],
+			'php-http/guzzle7-adapter' => [],
+			'php-http/guzzle6-adapter' => [],
+			'php-http/cakephp-adapter' => [],
+			'php-http/curl-client' => [],
+			'php-http/react-adapter' => [],
+			'php-http/buzz-adapter' => [],
+			'php-http/artax-adapter' => [],
+			'kriswallsmith/buzz:^1' => [],
+		],
+		'psr/http-client-implementation' => [
+			'symfony/http-client' => ['psr/http-factory-implementation', 'psr/http-client'],
+			'guzzlehttp/guzzle' => [],
+			'kriswallsmith/buzz:^1' => [],
+		],
+		'psr/http-message-implementation' => [
+			'php-http/discovery' => ['psr/http-factory-implementation'],
+		],
+		'psr/http-factory-implementation' => [
+			'nyholm/psr7' => [],
+			'guzzlehttp/psr7:>=2' => [],
+			'slim/psr7' => [],
+			'laminas/laminas-diactoros' => [],
+			'phalcon/cphalcon:^4' => [],
+			'http-interop/http-factory-guzzle' => [],
+			'http-interop/http-factory-diactoros' => [],
+			'http-interop/http-factory-slim' => [],
+			'httpsoft/http-message' => [],
+		],
+	];
+
+	/**
+	 * Describes which package should be preferred on the left side
+	 * depending on which one is already installed on the right side.
+	 */
+	private const STICKYNESS_RULES = [
+		'symfony/http-client' => 'symfony/framework-bundle',
+		'php-http/guzzle7-adapter' => 'guzzlehttp/guzzle:^7',
+		'php-http/guzzle6-adapter' => 'guzzlehttp/guzzle:^6',
+		'php-http/guzzle5-adapter' => 'guzzlehttp/guzzle:^5',
+		'php-http/cakephp-adapter' => 'cakephp/cakephp',
+		'php-http/react-adapter' => 'react/event-loop',
+		'php-http/buzz-adapter' => 'kriswallsmith/buzz:^0.15.1',
+		'php-http/artax-adapter' => 'amphp/artax:^3',
+		'http-interop/http-factory-guzzle' => 'guzzlehttp/psr7:^1',
+		'http-interop/http-factory-slim' => 'slim/slim:^3',
+	];
+
+	private const INTERFACE_MAP = [
+		'php-http/async-client-implementation' => [
+			'Http\Client\HttpAsyncClient',
+		],
+		'php-http/client-implementation' => [
+			'Http\Client\HttpClient',
+		],
+		'psr/http-client-implementation' => [
+			'Psr\Http\Client\ClientInterface',
+		],
+		'psr/http-factory-implementation' => [
+			'Psr\Http\Message\RequestFactoryInterface',
+			'Psr\Http\Message\ResponseFactoryInterface',
+			'Psr\Http\Message\ServerRequestFactoryInterface',
+			'Psr\Http\Message\StreamFactoryInterface',
+			'Psr\Http\Message\UploadedFileFactoryInterface',
+			'Psr\Http\Message\UriFactoryInterface',
+		],
+	];
+
+	public static function getSubscribedEvents(): array
+	{
+		return [
+			ScriptEvents::PRE_AUTOLOAD_DUMP => 'preAutoloadDump',
+			ScriptEvents::POST_UPDATE_CMD => 'postUpdate',
+		];
+	}
+
+	public function activate(Composer $composer, IOInterface $io): void
+	{
+	}
+
+	public function deactivate(Composer $composer, IOInterface $io)
+	{
+	}
+
+	public function uninstall(Composer $composer, IOInterface $io)
+	{
+	}
+
+	public function postUpdate(Event $event)
+	{
+		$composer = $event->getComposer();
+		$repo = $composer->getRepositoryManager()->getLocalRepository();
+		$requires = [
+			$composer->getPackage()->getRequires(),
+			$composer->getPackage()->getDevRequires(),
+		];
+		$pinnedAbstractions = [];
+		$pinned = $composer->getPackage()->getExtra()['discovery'] ?? [];
+		foreach (self::INTERFACE_MAP as $abstraction => $interfaces) {
+			foreach (isset($pinned[$abstraction]) ? [] : $interfaces as $interface) {
+				if (!isset($pinned[$interface])) {
+					continue 2;
+				}
+			}
+			$pinnedAbstractions[$abstraction] = true;
+		}
+
+		$missingRequires = $this->getMissingRequires($repo, $requires, 'project' === $composer->getPackage()->getType(), $pinnedAbstractions);
+		$missingRequires = [
+			'require' => array_fill_keys(array_merge([], ...array_values($missingRequires[0])), '*'),
+			'require-dev' => array_fill_keys(array_merge([], ...array_values($missingRequires[1])), '*'),
+			'remove' => array_fill_keys(array_merge([], ...array_values($missingRequires[2])), '*'),
+		];
+
+		if (!$missingRequires = array_filter($missingRequires)) {
+			return;
+		}
+
+		$composerJsonContents = file_get_contents(Factory::getComposerFile());
+		$this->updateComposerJson($missingRequires, $composer->getConfig()->get('sort-packages'));
+
+		$installer = null;
+		// Find the composer installer, hack borrowed from symfony/flex
+		foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT) as $trace) {
+			if (isset($trace['object']) && $trace['object'] instanceof Installer) {
+				$installer = $trace['object'];
+				break;
+			}
+		}
+
+		if (!$installer) {
+			return;
+		}
+
+		$event->stopPropagation();
+
+		$dispatcher = $composer->getEventDispatcher();
+		$disableScripts = !method_exists($dispatcher, 'setRunScripts') || !((array) $dispatcher)["\0*\0runScripts"];
+		$composer = Factory::create($event->getIO(), null, false, $disableScripts);
+
+		/** @var Installer $installer */
+		$installer = clone $installer;
+		if (method_exists($installer, 'setAudit')) {
+			$trace['object']->setAudit(false);
+		}
+		// we need a clone of the installer to preserve its configuration state but with our own service objects
+		$installer->__construct(
+			$event->getIO(),
+			$composer->getConfig(),
+			$composer->getPackage(),
+			$composer->getDownloadManager(),
+			$composer->getRepositoryManager(),
+			$composer->getLocker(),
+			$composer->getInstallationManager(),
+			$composer->getEventDispatcher(),
+			$composer->getAutoloadGenerator()
+		);
+		if (method_exists($installer, 'setPlatformRequirementFilter')) {
+			$installer->setPlatformRequirementFilter(((array) $trace['object'])["\0*\0platformRequirementFilter"]);
+		}
+
+		if (0 !== $installer->run()) {
+			file_put_contents(Factory::getComposerFile(), $composerJsonContents);
+
+			return;
+		}
+
+		$versionSelector = new VersionSelector(ClassDiscovery::safeClassExists(RepositorySet::class) ? new RepositorySet() : new Pool());
+		$updateComposerJson = false;
+
+		foreach ($composer->getRepositoryManager()->getLocalRepository()->getPackages() as $package) {
+			foreach (['require', 'require-dev'] as $key) {
+				if (!isset($missingRequires[$key][$package->getName()])) {
+					continue;
+				}
+				$updateComposerJson = true;
+				$missingRequires[$key][$package->getName()] = $versionSelector->findRecommendedRequireVersion($package);
+			}
+		}
+
+		if ($updateComposerJson) {
+			$this->updateComposerJson($missingRequires, $composer->getConfig()->get('sort-packages'));
+			$this->updateComposerLock($composer, $event->getIO());
+		}
+	}
+
+	public function getMissingRequires(InstalledRepositoryInterface $repo, array $requires, bool $isProject, array $pinnedAbstractions): array
+	{
+		$allPackages = [];
+		$devPackages = method_exists($repo, 'getDevPackageNames') ? array_fill_keys($repo->getDevPackageNames(), true) : [];
+
+		// One must require "php-http/discovery"
+		// to opt-in for auto-installation of virtual package implementations
+		if (!isset($requires[0]['php-http/discovery'])) {
+			$requires = [[], []];
+		}
+
+		foreach ($repo->getPackages() as $package) {
+			$allPackages[$package->getName()] = true;
+
+			if (1 < \count($names = $package->getNames(false))) {
+				$allPackages += array_fill_keys($names, false);
+
+				if (isset($devPackages[$package->getName()])) {
+					$devPackages += $names;
+				}
+			}
+
+			if (isset($package->getRequires()['php-http/discovery'])) {
+				$requires[(int) isset($devPackages[$package->getName()])] += $package->getRequires();
+			}
+		}
+
+		$missingRequires = [[], [], []];
+		$versionParser = new VersionParser();
+
+		if (ClassDiscovery::safeClassExists(\Phalcon\Http\Message\RequestFactory::class, false)) {
+			$missingRequires[0]['psr/http-factory-implementation'] = [];
+			$missingRequires[1]['psr/http-factory-implementation'] = [];
+		}
+
+		foreach ($requires as $dev => $rules) {
+			$abstractions = [];
+			$rules = array_intersect_key(self::PROVIDE_RULES, $rules);
+
+			while ($rules) {
+				$abstraction = key($rules);
+
+				if (isset($pinnedAbstractions[$abstraction])) {
+					unset($rules[$abstraction]);
+					continue;
+				}
+
+				$abstractions[] = $abstraction;
+
+				foreach (array_shift($rules) as $candidate => $deps) {
+					[$candidate, $version] = explode(':', $candidate, 2) + [1 => null];
+
+					if (!isset($allPackages[$candidate])) {
+						continue;
+					}
+					if (null !== $version && !$repo->findPackage($candidate, $versionParser->parseConstraints($version))) {
+						continue;
+					}
+					if ($isProject && !$dev && isset($devPackages[$candidate])) {
+						$missingRequires[0][$abstraction] = [$candidate];
+						$missingRequires[2][$abstraction] = [$candidate];
+					} else {
+						$missingRequires[$dev][$abstraction] = [];
+					}
+
+					foreach ($deps as $dep) {
+						if (isset(self::PROVIDE_RULES[$dep])) {
+							$rules[$dep] = self::PROVIDE_RULES[$dep];
+						} elseif (!isset($allPackages[$dep])) {
+							$missingRequires[$dev][$abstraction][] = $dep;
+						} elseif ($isProject && !$dev && isset($devPackages[$dep])) {
+							$missingRequires[0][$abstraction][] = $dep;
+							$missingRequires[2][$abstraction][] = $dep;
+						}
+					}
+					break;
+				}
+			}
+
+			while ($abstractions) {
+				$abstraction = array_shift($abstractions);
+
+				if (isset($missingRequires[$dev][$abstraction])) {
+					continue;
+				}
+				$candidates = self::PROVIDE_RULES[$abstraction];
+
+				foreach ($candidates as $candidate => $deps) {
+					[$candidate, $version] = explode(':', $candidate, 2) + [1 => null];
+
+					if (null !== $version && !$repo->findPackage($candidate, $versionParser->parseConstraints($version))) {
+						continue;
+					}
+					if (isset($allPackages[$candidate]) && (!$isProject || $dev || !isset($devPackages[$candidate]))) {
+						continue 2;
+					}
+				}
+
+				foreach (array_intersect_key(self::STICKYNESS_RULES, $candidates) as $candidate => $stickyRule) {
+					[$stickyName, $stickyVersion] = explode(':', $stickyRule, 2) + [1 => null];
+					if (!isset($allPackages[$stickyName]) || ($isProject && !$dev && isset($devPackages[$stickyName]))) {
+						continue;
+					}
+					if (null !== $stickyVersion && !$repo->findPackage($stickyName, $versionParser->parseConstraints($stickyVersion))) {
+						continue;
+					}
+
+					$candidates = [$candidate => $candidates[$candidate]];
+					break;
+				}
+
+				$dep = key($candidates);
+				[$dep] = explode(':', $dep, 2);
+				$missingRequires[$dev][$abstraction] = [$dep];
+
+				if ($isProject && !$dev && isset($devPackages[$dep])) {
+					$missingRequires[2][$abstraction][] = $dep;
+				}
+			}
+		}
+
+		$missingRequires[1] = array_diff_key($missingRequires[1], $missingRequires[0]);
+
+		return $missingRequires;
+	}
+
+	public function preAutoloadDump(Event $event)
+	{
+		$filesystem = new Filesystem();
+		// Double realpath() on purpose, see https://bugs.php.net/72738
+		$vendorDir = $filesystem->normalizePath(realpath(realpath($event->getComposer()->getConfig()->get('vendor-dir'))));
+		$filesystem->ensureDirectoryExists($vendorDir.'/composer');
+		$pinned = $event->getComposer()->getPackage()->getExtra()['discovery'] ?? [];
+		$candidates = [];
+
+		$allInterfaces = array_merge(...array_values(self::INTERFACE_MAP));
+		foreach ($pinned as $abstraction => $class) {
+			if (isset(self::INTERFACE_MAP[$abstraction])) {
+				$interfaces = self::INTERFACE_MAP[$abstraction];
+			} elseif (false !== $k = array_search($abstraction, $allInterfaces, true)) {
+				$interfaces = [$allInterfaces[$k]];
+			} else {
+				throw new \UnexpectedValueException(sprintf('Invalid "extra.discovery" pinned in composer.json: "%s" is not one of ["%s"].', $abstraction, implode('", "', array_keys(self::INTERFACE_MAP))));
+			}
+
+			foreach ($interfaces as $interface) {
+				$candidates[] = sprintf("case %s: return [['class' => %s]];\n", var_export($interface, true), var_export($class, true));
+			}
+		}
+
+		$file = $vendorDir.'/composer/GeneratedDiscoveryStrategy.php';
+
+		if (!$candidates) {
+			if (file_exists($file)) {
+				unlink($file);
+			}
+
+			return;
+		}
+
+		$candidates = implode('            ', $candidates);
+		$code = <<<EOPHP
 <?php
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Http\Discovery\Strategy;
@@ -418,48 +418,48 @@ 
 }
 
 EOPHP
-        ;
-
-        if (!file_exists($file) || $code !== file_get_contents($file)) {
-            file_put_contents($file, $code);
-        }
-
-        $rootPackage = $event->getComposer()->getPackage();
-        $autoload = $rootPackage->getAutoload();
-        $autoload['classmap'][] = $vendorDir.'/composer/GeneratedDiscoveryStrategy.php';
-        $rootPackage->setAutoload($autoload);
-    }
-
-    private function updateComposerJson(array $missingRequires, bool $sortPackages)
-    {
-        $file = Factory::getComposerFile();
-        $contents = file_get_contents($file);
-
-        $manipulator = new JsonManipulator($contents);
-
-        foreach ($missingRequires as $key => $packages) {
-            foreach ($packages as $package => $constraint) {
-                if ('remove' === $key) {
-                    $manipulator->removeSubNode('require-dev', $package);
-                } else {
-                    $manipulator->addLink($key, $package, $constraint, $sortPackages);
-                }
-            }
-        }
-
-        file_put_contents($file, $manipulator->getContents());
-    }
-
-    private function updateComposerLock(Composer $composer, IOInterface $io)
-    {
-        $lock = substr(Factory::getComposerFile(), 0, -4).'lock';
-        $composerJson = file_get_contents(Factory::getComposerFile());
-        $lockFile = new JsonFile($lock, null, $io);
-        $locker = ClassDiscovery::safeClassExists(RepositorySet::class)
-            ? new Locker($io, $lockFile, $composer->getInstallationManager(), $composerJson)
-            : new Locker($io, $lockFile, $composer->getRepositoryManager(), $composer->getInstallationManager(), $composerJson);
-        $lockData = $locker->getLockData();
-        $lockData['content-hash'] = Locker::getContentHash($composerJson);
-        $lockFile->write($lockData);
-    }
+		;
+
+		if (!file_exists($file) || $code !== file_get_contents($file)) {
+			file_put_contents($file, $code);
+		}
+
+		$rootPackage = $event->getComposer()->getPackage();
+		$autoload = $rootPackage->getAutoload();
+		$autoload['classmap'][] = $vendorDir.'/composer/GeneratedDiscoveryStrategy.php';
+		$rootPackage->setAutoload($autoload);
+	}
+
+	private function updateComposerJson(array $missingRequires, bool $sortPackages)
+	{
+		$file = Factory::getComposerFile();
+		$contents = file_get_contents($file);
+
+		$manipulator = new JsonManipulator($contents);
+
+		foreach ($missingRequires as $key => $packages) {
+			foreach ($packages as $package => $constraint) {
+				if ('remove' === $key) {
+					$manipulator->removeSubNode('require-dev', $package);
+				} else {
+					$manipulator->addLink($key, $package, $constraint, $sortPackages);
+				}
+			}
+		}
+
+		file_put_contents($file, $manipulator->getContents());
+	}
+
+	private function updateComposerLock(Composer $composer, IOInterface $io)
+	{
+		$lock = substr(Factory::getComposerFile(), 0, -4).'lock';
+		$composerJson = file_get_contents(Factory::getComposerFile());
+		$lockFile = new JsonFile($lock, null, $io);
+		$locker = ClassDiscovery::safeClassExists(RepositorySet::class)
+			? new Locker($io, $lockFile, $composer->getInstallationManager(), $composerJson)
+			: new Locker($io, $lockFile, $composer->getRepositoryManager(), $composer->getInstallationManager(), $composerJson);
+		$lockData = $locker->getLockData();
+		$lockData['content-hash'] = Locker::getContentHash($composerJson);
+		$lockFile->write($lockData);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -191,7 +191,7 @@ 
         $event->stopPropagation();
 
         $dispatcher = $composer->getEventDispatcher();
-        $disableScripts = !method_exists($dispatcher, 'setRunScripts') || !((array) $dispatcher)["\0*\0runScripts"];
+        $disableScripts = !method_exists($dispatcher, 'setRunScripts') || !((array)$dispatcher)["\0*\0runScripts"];
         $composer = Factory::create($event->getIO(), null, false, $disableScripts);
 
         /** @var Installer $installer */
@@ -212,7 +212,7 @@ 
             $composer->getAutoloadGenerator()
         );
         if (method_exists($installer, 'setPlatformRequirementFilter')) {
-            $installer->setPlatformRequirementFilter(((array) $trace['object'])["\0*\0platformRequirementFilter"]);
+            $installer->setPlatformRequirementFilter(((array)$trace['object'])["\0*\0platformRequirementFilter"]);
         }
 
         if (0 !== $installer->run()) {
@@ -263,7 +263,7 @@ 
             }
 
             if (isset($package->getRequires()['php-http/discovery'])) {
-                $requires[(int) isset($devPackages[$package->getName()])] += $package->getRequires();
+                $requires[(int)isset($devPackages[$package->getName()])] += $package->getRequires();
             }
         }
 

lib/Vendor/Http/Discovery/ClassDiscovery.php

Indentation +235 added lines, -235 removed lines

@@ -17,239 +17,239 @@
  */
 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

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

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

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