diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c61cc77..94efa9e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### [2.2.5] 2022-01-21 + + * Disabled `composer/package-versions-deprecated` by default as it can function using `Composer\InstalledVersions` at runtime (#10458) + * Fixed artifact repositories crashing if a phar file was present in the directory (#10406) + * Fixed binary proxy issue on PHP <8 when fseek is used on the proxied binary path (#10468) + * Fixed handling of non-string versions in package repositories metadata (#10470) + ### [2.2.4] 2022-01-08 * Fixed handling of process timeout when running async processes during installation @@ -1367,6 +1374,7 @@ * Initial release +[2.2.5]: https://github.com/composer/composer/compare/2.2.4...2.2.5 [2.2.4]: https://github.com/composer/composer/compare/2.2.3...2.2.4 [2.2.3]: https://github.com/composer/composer/compare/2.2.2...2.2.3 [2.2.2]: https://github.com/composer/composer/compare/2.2.1...2.2.2 diff --git a/composer.lock b/composer.lock index eacfa742a..68b5d6ad7 100644 --- a/composer.lock +++ b/composer.lock @@ -1798,16 +1798,16 @@ "packages-dev": [ { "name": "phpstan/phpstan", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "5bd02c86beb4c024dd4662b6443f5d5332a0ae12" + "reference": "1dd8f3e40bf7aa30031a75c65cece99220a161b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5bd02c86beb4c024dd4662b6443f5d5332a0ae12", - "reference": "5bd02c86beb4c024dd4662b6443f5d5332a0ae12", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1dd8f3e40bf7aa30031a75c65cece99220a161b8", + "reference": "1dd8f3e40bf7aa30031a75c65cece99220a161b8", "shasum": "" }, "require": { @@ -1838,7 +1838,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.4.1" + "source": "https://github.com/phpstan/phpstan/tree/1.4.2" }, "funding": [ { @@ -1858,7 +1858,7 @@ "type": "tidelift" } ], - "time": "2022-01-17T16:35:17+00:00" + "time": "2022-01-18T16:09:11+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -2112,5 +2112,5 @@ "platform-overrides": { "php": "7.2.5" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/src/Composer/Util/Http/CurlDownloader.php b/src/Composer/Util/Http/CurlDownloader.php index 4a2a0d0c3..96f0dfe8e 100644 --- a/src/Composer/Util/Http/CurlDownloader.php +++ b/src/Composer/Util/Http/CurlDownloader.php @@ -356,7 +356,7 @@ class CurlDownloader if ( (!isset($job['options']['http']['method']) || $job['options']['http']['method'] === 'GET') && ( - in_array($errno, array(7 /* CURLE_COULDNT_CONNECT */, 16 /* CURLE_HTTP2 */), true) + in_array($errno, array(7 /* CURLE_COULDNT_CONNECT */, 16 /* CURLE_HTTP2 */, 92 /* CURLE_HTTP2_STREAM */), true) || ($errno === 35 /* CURLE_SSL_CONNECT_ERROR */ && false !== strpos($error, 'Connection reset by peer')) ) && $job['attributes']['retries'] < $this->maxRetries ) {