From 4c89e92d8ee33fcba5365896032d026c7a47833c Mon Sep 17 00:00:00 2001 From: Thomas Skerbis Date: Mon, 11 Sep 2023 16:21:28 +0200 Subject: [PATCH] vendor update (#198) * vendor update - Upgrading php-http/discovery (1.18.1 => 1.19.1) - Upgrading symfony/http-client (v6.3.0 => v6.3.2) Writing lock file Installing dependencies from lock file (including require-dev) Package operations: 0 installs, 2 updates, 0 removals - Downloading php-http/discovery (1.19.1) - Downloading symfony/http-client (v6.3.2) - Upgrading php-http/discovery (1.18.1 => 1.19.1): Extracting archive - Upgrading symfony/http-client (v6.3.0 => v6.3.2): Extracting archive * 4.0.5 --- composer.lock | 24 ++--- package.yml | 2 +- vendor/composer/ClassLoader.php | 96 +++++++++---------- vendor/composer/installed.json | 28 +++--- vendor/composer/installed.php | 16 ++-- vendor/php-http/discovery/CHANGELOG.md | 9 ++ vendor/php-http/discovery/README.md | 6 +- .../php-http/discovery/src/ClassDiscovery.php | 2 - .../discovery/src/Composer/Plugin.php | 11 ++- .../discovery/src/HttpClientDiscovery.php | 2 +- .../src/Strategy/CommonClassesStrategy.php | 6 +- .../Strategy/CommonPsr17ClassesStrategy.php | 9 +- .../src/Strategy/MockClientStrategy.php | 3 - .../src/Strategy/PuliBetaStrategy.php | 3 - vendor/symfony/http-client/CurlHttpClient.php | 1 + .../symfony/http-client/HttpClientTrait.php | 6 +- .../http-client/Response/AsyncResponse.php | 2 +- .../Retry/GenericRetryStrategy.php | 2 +- 18 files changed, 110 insertions(+), 118 deletions(-) diff --git a/composer.lock b/composer.lock index 56b56e8b..48aaccc5 100644 --- a/composer.lock +++ b/composer.lock @@ -212,16 +212,16 @@ }, { "name": "php-http/discovery", - "version": "1.18.1", + "version": "1.19.1", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237" + "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/f258b3a1d16acb7b21f3b42d7a2494a733365237", - "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237", + "url": "https://api.github.com/repos/php-http/discovery/zipball/57f3de01d32085fea20865f9b16fb0e69347c39e", + "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e", "shasum": "" }, "require": { @@ -284,9 +284,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.18.1" + "source": "https://github.com/php-http/discovery/tree/1.19.1" }, - "time": "2023-05-17T08:53:10+00:00" + "time": "2023-07-11T07:02:26+00:00" }, { "name": "php-http/httplug", @@ -578,16 +578,16 @@ }, { "name": "symfony/http-client", - "version": "v6.3.0", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424" + "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b2f892c91e4e02a939edddeb7ef452522d10a424", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424", + "url": "https://api.github.com/repos/symfony/http-client/zipball/15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", + "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", "shasum": "" }, "require": { @@ -650,7 +650,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.0" + "source": "https://github.com/symfony/http-client/tree/v6.3.2" }, "funding": [ { @@ -666,7 +666,7 @@ "type": "tidelift" } ], - "time": "2023-05-12T08:49:48+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/http-client-contracts", diff --git a/package.yml b/package.yml index 5a311b6c..068980eb 100644 --- a/package.yml +++ b/package.yml @@ -1,5 +1,5 @@ package: feeds -version: '4.0.4' +version: '4.0.5' author: Friends Of REDAXO supportpage: https://github.com/FriendsOfREDAXO/feeds diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index a72151c7..7824d8f7 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -45,35 +45,34 @@ class ClassLoader /** @var \Closure(string):void */ private static $includeFile; - /** @var ?string */ + /** @var string|null */ private $vendorDir; // PSR-4 /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixLengthsPsr4 = array(); /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixDirsPsr4 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * @var array[] - * @psalm-var array> + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> */ private $prefixesPsr0 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr0 = array(); @@ -81,8 +80,7 @@ class ClassLoader private $useIncludePath = false; /** - * @var string[] - * @psalm-var array + * @var array */ private $classMap = array(); @@ -90,21 +88,20 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var bool[] - * @psalm-var array + * @var array */ private $missingClasses = array(); - /** @var ?string */ + /** @var string|null */ private $apcuPrefix; /** - * @var self[] + * @var array */ private static $registeredLoaders = array(); /** - * @param ?string $vendorDir + * @param string|null $vendorDir */ public function __construct($vendorDir = null) { @@ -113,7 +110,7 @@ public function __construct($vendorDir = null) } /** - * @return string[] + * @return array> */ public function getPrefixes() { @@ -125,8 +122,7 @@ public function getPrefixes() } /** - * @return array[] - * @psalm-return array> + * @return array> */ public function getPrefixesPsr4() { @@ -134,8 +130,7 @@ public function getPrefixesPsr4() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirs() { @@ -143,8 +138,7 @@ public function getFallbackDirs() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirsPsr4() { @@ -152,8 +146,7 @@ public function getFallbackDirsPsr4() } /** - * @return string[] Array of classname => path - * @psalm-return array + * @return array Array of classname => path */ public function getClassMap() { @@ -161,8 +154,7 @@ public function getClassMap() } /** - * @param string[] $classMap Class to filename map - * @psalm-param array $classMap + * @param array $classMap Class to filename map * * @return void */ @@ -179,24 +171,25 @@ public function addClassMap(array $classMap) * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - (array) $paths + $paths ); } @@ -205,19 +198,19 @@ public function add($prefix, $paths, $prepend = false) $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; + $this->prefixesPsr0[$first][$prefix] = $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - (array) $paths + $paths ); } } @@ -226,9 +219,9 @@ public function add($prefix, $paths, $prepend = false) * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -236,17 +229,18 @@ public function add($prefix, $paths, $prepend = false) */ public function addPsr4($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - (array) $paths + $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -256,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false) throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; + $this->prefixDirsPsr4[$prefix] = $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - (array) $paths + $paths ); } } @@ -276,8 +270,8 @@ public function addPsr4($prefix, $paths, $prepend = false) * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories * * @return void */ @@ -294,8 +288,8 @@ public function set($prefix, $paths) * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -481,9 +475,9 @@ public function findFile($class) } /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. + * Returns the currently registered loaders keyed by their corresponding vendor directories. * - * @return self[] + * @return array */ public static function getRegisteredLoaders() { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f7be270d..b8022657 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -215,17 +215,17 @@ }, { "name": "php-http/discovery", - "version": "1.18.1", - "version_normalized": "1.18.1.0", + "version": "1.19.1", + "version_normalized": "1.19.1.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237" + "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/f258b3a1d16acb7b21f3b42d7a2494a733365237", - "reference": "f258b3a1d16acb7b21f3b42d7a2494a733365237", + "url": "https://api.github.com/repos/php-http/discovery/zipball/57f3de01d32085fea20865f9b16fb0e69347c39e", + "reference": "57f3de01d32085fea20865f9b16fb0e69347c39e", "shasum": "" }, "require": { @@ -251,7 +251,7 @@ "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", "symfony/phpunit-bridge": "^6.2" }, - "time": "2023-05-17T08:53:10+00:00", + "time": "2023-07-11T07:02:26+00:00", "type": "composer-plugin", "extra": { "class": "Http\\Discovery\\Composer\\Plugin", @@ -290,7 +290,7 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.18.1" + "source": "https://github.com/php-http/discovery/tree/1.19.1" }, "install-path": "../php-http/discovery" }, @@ -599,17 +599,17 @@ }, { "name": "symfony/http-client", - "version": "v6.3.0", - "version_normalized": "6.3.0.0", + "version": "v6.3.2", + "version_normalized": "6.3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424" + "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b2f892c91e4e02a939edddeb7ef452522d10a424", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424", + "url": "https://api.github.com/repos/symfony/http-client/zipball/15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", + "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", "shasum": "" }, "require": { @@ -643,7 +643,7 @@ "symfony/process": "^5.4|^6.0", "symfony/stopwatch": "^5.4|^6.0" }, - "time": "2023-05-12T08:49:48+00:00", + "time": "2023-07-05T08:41:27+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -674,7 +674,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.0" + "source": "https://github.com/symfony/http-client/tree/v6.3.2" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 3876681e..d48adbe4 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'ae6cfcdceca2c646eb5a3f482aa89ca568599c06', + 'reference' => 'ab20f658ec73c64f6da86be44ea5ece71a8b6477', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'ae6cfcdceca2c646eb5a3f482aa89ca568599c06', + 'reference' => 'ab20f658ec73c64f6da86be44ea5ece71a8b6477', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -65,9 +65,9 @@ ), ), 'php-http/discovery' => array( - 'pretty_version' => '1.18.1', - 'version' => '1.18.1.0', - 'reference' => 'f258b3a1d16acb7b21f3b42d7a2494a733365237', + 'pretty_version' => '1.19.1', + 'version' => '1.19.1.0', + 'reference' => '57f3de01d32085fea20865f9b16fb0e69347c39e', 'type' => 'composer-plugin', 'install_path' => __DIR__ . '/../php-http/discovery', 'aliases' => array(), @@ -164,9 +164,9 @@ 'dev_requirement' => false, ), 'symfony/http-client' => array( - 'pretty_version' => 'v6.3.0', - 'version' => '6.3.0.0', - 'reference' => 'b2f892c91e4e02a939edddeb7ef452522d10a424', + 'pretty_version' => 'v6.3.2', + 'version' => '6.3.2.0', + 'reference' => '15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/http-client', 'aliases' => array(), diff --git a/vendor/php-http/discovery/CHANGELOG.md b/vendor/php-http/discovery/CHANGELOG.md index 50ac7895..169f7f40 100644 --- a/vendor/php-http/discovery/CHANGELOG.md +++ b/vendor/php-http/discovery/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## 1.19.1 - 2023-07-11 + +- [#250](https://github.com/php-http/discovery/pull/250) - Fix: Buzz client instantiation using deprecated Message Factory Discovery, use PSR-17 factory discovery instead. + +## 1.19.0 - 2023-06-19 + +- [#249](https://github.com/php-http/discovery/pull/249) - Have composer plugin correctly install Symfony http client when nothing explicitly requires psr 18 resp. httplug. +- [#241](https://github.com/php-http/discovery/pull/241) - Support discovering PSR-17 factories of `httpsoft/http-message` package + ## 1.18.1 - 2023-05-17 - [#242](https://github.com/php-http/discovery/pull/242) - Better exception message when no legacy php-http message factories can be built. Also needs php-http/message-factory package and they are deprecated in favor of PSR-17 anyways. diff --git a/vendor/php-http/discovery/README.md b/vendor/php-http/discovery/README.md index 1d9fd99b..ef7e4991 100644 --- a/vendor/php-http/discovery/README.md +++ b/vendor/php-http/discovery/README.md @@ -45,9 +45,9 @@ Finally, you need to require `php-http/discovery` and the generic implementation that your library is going to need: ```bash -composer require php-http/discovery:^1.17 -composer require psr/http-client-implementation:* -composer require psr/http-factory-implementation:* +composer require 'php-http/discovery:^1.17' +composer require 'psr/http-client-implementation:*' +composer require 'psr/http-factory-implementation:*' ``` Now, you're ready to make an HTTP request: diff --git a/vendor/php-http/discovery/src/ClassDiscovery.php b/vendor/php-http/discovery/src/ClassDiscovery.php index f1e0c82e..5ea46979 100644 --- a/vendor/php-http/discovery/src/ClassDiscovery.php +++ b/vendor/php-http/discovery/src/ClassDiscovery.php @@ -179,8 +179,6 @@ public static function clearCache() /** * Evaluates conditions to boolean. * - * @param mixed $condition - * * @return bool */ protected static function evaluateCondition($condition) diff --git a/vendor/php-http/discovery/src/Composer/Plugin.php b/vendor/php-http/discovery/src/Composer/Plugin.php index bba2e2b6..32ef401e 100644 --- a/vendor/php-http/discovery/src/Composer/Plugin.php +++ b/vendor/php-http/discovery/src/Composer/Plugin.php @@ -45,16 +45,16 @@ class Plugin implements PluginInterface, EventSubscriberInterface */ private const PROVIDE_RULES = [ 'php-http/async-client-implementation' => [ - 'symfony/http-client:>=6.3' => ['guzzlehttp/promises', 'psr/http-factory-implementation'], - 'symfony/http-client' => ['guzzlehttp/promises', 'php-http/message-factory', 'psr/http-factory-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'], - 'symfony/http-client' => ['php-http/message-factory', 'psr/http-factory-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' => [], @@ -65,7 +65,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface 'kriswallsmith/buzz:^1' => [], ], 'psr/http-client-implementation' => [ - 'symfony/http-client' => ['psr/http-factory-implementation'], + 'symfony/http-client' => ['psr/http-factory-implementation', 'psr/http-client'], 'guzzlehttp/guzzle' => [], 'kriswallsmith/buzz:^1' => [], ], @@ -81,6 +81,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface 'http-interop/http-factory-guzzle' => [], 'http-interop/http-factory-diactoros' => [], 'http-interop/http-factory-slim' => [], + 'httpsoft/http-message' => [], ], ]; diff --git a/vendor/php-http/discovery/src/HttpClientDiscovery.php b/vendor/php-http/discovery/src/HttpClientDiscovery.php index bd3da03a..2501e5bb 100644 --- a/vendor/php-http/discovery/src/HttpClientDiscovery.php +++ b/vendor/php-http/discovery/src/HttpClientDiscovery.php @@ -10,7 +10,7 @@ * * @author Márk Sági-Kazár * - * @deprecated This will be removed in 2.0. Consider using Psr18FactoryDiscovery. + * @deprecated This will be removed in 2.0. Consider using Psr18ClientDiscovery. */ final class HttpClientDiscovery extends ClassDiscovery { diff --git a/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php b/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php index af63f88d..ae0b0d84 100644 --- a/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php +++ b/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php @@ -18,7 +18,6 @@ use Http\Client\Socket\Client as Socket; use Http\Discovery\ClassDiscovery; use Http\Discovery\Exception\NotFoundException; -use Http\Discovery\MessageFactoryDiscovery; use Http\Discovery\Psr17FactoryDiscovery; use Http\Message\MessageFactory; use Http\Message\MessageFactory\DiactorosMessageFactory; @@ -110,9 +109,6 @@ final class CommonClassesStrategy implements DiscoveryStrategy ], ]; - /** - * {@inheritdoc} - */ public static function getCandidates($type) { if (Psr18Client::class === $type) { @@ -149,7 +145,7 @@ private static function getPsr18Candidates() public static function buzzInstantiate() { - return new \Buzz\Client\FileGetContents(MessageFactoryDiscovery::find()); + return new \Buzz\Client\FileGetContents(Psr17FactoryDiscovery::findResponseFactory()); } public static function symfonyPsr18Instantiate() diff --git a/vendor/php-http/discovery/src/Strategy/CommonPsr17ClassesStrategy.php b/vendor/php-http/discovery/src/Strategy/CommonPsr17ClassesStrategy.php index 3e1c29b5..04cf4baf 100644 --- a/vendor/php-http/discovery/src/Strategy/CommonPsr17ClassesStrategy.php +++ b/vendor/php-http/discovery/src/Strategy/CommonPsr17ClassesStrategy.php @@ -31,6 +31,7 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\RequestFactory', 'Laminas\Diactoros\RequestFactory', 'Slim\Psr7\Factory\RequestFactory', + 'HttpSoft\Message\RequestFactory', ], ResponseFactoryInterface::class => [ 'Phalcon\Http\Message\ResponseFactory', @@ -41,6 +42,7 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\ResponseFactory', 'Laminas\Diactoros\ResponseFactory', 'Slim\Psr7\Factory\ResponseFactory', + 'HttpSoft\Message\ResponseFactory', ], ServerRequestFactoryInterface::class => [ 'Phalcon\Http\Message\ServerRequestFactory', @@ -51,6 +53,7 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\ServerRequestFactory', 'Laminas\Diactoros\ServerRequestFactory', 'Slim\Psr7\Factory\ServerRequestFactory', + 'HttpSoft\Message\ServerRequestFactory', ], StreamFactoryInterface::class => [ 'Phalcon\Http\Message\StreamFactory', @@ -61,6 +64,7 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\StreamFactory', 'Laminas\Diactoros\StreamFactory', 'Slim\Psr7\Factory\StreamFactory', + 'HttpSoft\Message\StreamFactory', ], UploadedFileFactoryInterface::class => [ 'Phalcon\Http\Message\UploadedFileFactory', @@ -71,6 +75,7 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\UploadedFileFactory', 'Laminas\Diactoros\UploadedFileFactory', 'Slim\Psr7\Factory\UploadedFileFactory', + 'HttpSoft\Message\UploadedFileFactory', ], UriFactoryInterface::class => [ 'Phalcon\Http\Message\UriFactory', @@ -81,12 +86,10 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy 'Http\Factory\Slim\UriFactory', 'Laminas\Diactoros\UriFactory', 'Slim\Psr7\Factory\UriFactory', + 'HttpSoft\Message\UriFactory', ], ]; - /** - * {@inheritdoc} - */ public static function getCandidates($type) { $candidates = []; diff --git a/vendor/php-http/discovery/src/Strategy/MockClientStrategy.php b/vendor/php-http/discovery/src/Strategy/MockClientStrategy.php index 0cee3f7e..77b9d276 100644 --- a/vendor/php-http/discovery/src/Strategy/MockClientStrategy.php +++ b/vendor/php-http/discovery/src/Strategy/MockClientStrategy.php @@ -13,9 +13,6 @@ */ final class MockClientStrategy implements DiscoveryStrategy { - /** - * {@inheritdoc} - */ public static function getCandidates($type) { if (is_a(HttpClient::class, $type, true) || is_a(HttpAsyncClient::class, $type, true)) { diff --git a/vendor/php-http/discovery/src/Strategy/PuliBetaStrategy.php b/vendor/php-http/discovery/src/Strategy/PuliBetaStrategy.php index 6b3a862d..74b78b83 100644 --- a/vendor/php-http/discovery/src/Strategy/PuliBetaStrategy.php +++ b/vendor/php-http/discovery/src/Strategy/PuliBetaStrategy.php @@ -72,9 +72,6 @@ private static function getPuliDiscovery() return self::$puliDiscovery; } - /** - * {@inheritdoc} - */ public static function getCandidates($type) { $returnData = []; diff --git a/vendor/symfony/http-client/CurlHttpClient.php b/vendor/symfony/http-client/CurlHttpClient.php index ccb2a570..bbaa4de2 100644 --- a/vendor/symfony/http-client/CurlHttpClient.php +++ b/vendor/symfony/http-client/CurlHttpClient.php @@ -462,6 +462,7 @@ private function validateExtraCurlOptions(array $options): void \CURLOPT_TIMEOUT_MS => 'max_duration', \CURLOPT_TIMEOUT => 'max_duration', \CURLOPT_MAXREDIRS => 'max_redirects', + \CURLOPT_POSTREDIR => 'max_redirects', \CURLOPT_PROXY => 'proxy', \CURLOPT_NOPROXY => 'no_proxy', \CURLOPT_SSL_VERIFYPEER => 'verify_peer', diff --git a/vendor/symfony/http-client/HttpClientTrait.php b/vendor/symfony/http-client/HttpClientTrait.php index 48782153..3364d32a 100644 --- a/vendor/symfony/http-client/HttpClientTrait.php +++ b/vendor/symfony/http-client/HttpClientTrait.php @@ -659,7 +659,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS } // https://tools.ietf.org/html/rfc3986#section-3.3 - $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()[\]*+,;=:@\\\\^`{|}%]++#", fn ($m) => rawurlencode($m[0]), $parts[$part]); + $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()[\]*+,;=:@{}%]++#", fn ($m) => rawurlencode($m[0]), $parts[$part]); } return [ @@ -748,11 +748,7 @@ private static function mergeQueryString(?string $queryString, array $queryArray '%3B' => ';', '%40' => '@', '%5B' => '[', - '%5C' => '\\', '%5D' => ']', - '%5E' => '^', - '%60' => '`', - '%7C' => '|', ]); } diff --git a/vendor/symfony/http-client/Response/AsyncResponse.php b/vendor/symfony/http-client/Response/AsyncResponse.php index 66152e3d..e37278f7 100644 --- a/vendor/symfony/http-client/Response/AsyncResponse.php +++ b/vendor/symfony/http-client/Response/AsyncResponse.php @@ -27,7 +27,7 @@ * * @author Nicolas Grekas */ -final class AsyncResponse implements ResponseInterface, StreamableInterface +class AsyncResponse implements ResponseInterface, StreamableInterface { use CommonResponseTrait; diff --git a/vendor/symfony/http-client/Retry/GenericRetryStrategy.php b/vendor/symfony/http-client/Retry/GenericRetryStrategy.php index 9d1473c3..edbf2c06 100644 --- a/vendor/symfony/http-client/Retry/GenericRetryStrategy.php +++ b/vendor/symfony/http-client/Retry/GenericRetryStrategy.php @@ -102,7 +102,7 @@ public function getDelay(AsyncContext $context, ?string $responseContent, ?Trans $delay = $this->delayMs * $this->multiplier ** $context->getInfo('retry_count'); if ($this->jitter > 0) { - $randomness = $delay * $this->jitter; + $randomness = (int) ($delay * $this->jitter); $delay = $delay + random_int(-$randomness, +$randomness); }