public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Bump dependencies, fixes #12015

pull/11956/merge
Jordi Boggiano 2024-09-01 22:17:42 +02:00
parent d832d8c6c5
commit 4a34725682
No known key found for this signature in database
4 changed files with 67 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
composer.lock generated
View File

@ -226,16 +226,16 @@
}, },
{ {
"name": "composer/pcre", "name": "composer/pcre",
"version": "2.3.0", "version": "2.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/pcre.git", "url": "https://github.com/composer/pcre.git",
"reference": "06d0e49d6e136e4521c6bad18598bf0f6062ae37" "reference": "26859a860a7f140fc08422c3cc14ad9c2a287d79"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/pcre/zipball/06d0e49d6e136e4521c6bad18598bf0f6062ae37", "url": "https://api.github.com/repos/composer/pcre/zipball/26859a860a7f140fc08422c3cc14ad9c2a287d79",
"reference": "06d0e49d6e136e4521c6bad18598bf0f6062ae37", "reference": "26859a860a7f140fc08422c3cc14ad9c2a287d79",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -285,7 +285,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/composer/pcre/issues", "issues": "https://github.com/composer/pcre/issues",
"source": "https://github.com/composer/pcre/tree/2.3.0" "source": "https://github.com/composer/pcre/tree/2.3.1"
}, },
"funding": [ "funding": [
{ {
@ -301,7 +301,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-08-19T19:14:31+00:00" "time": "2024-08-27T12:02:26+00:00"
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
@ -941,16 +941,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.42", "version": "v5.4.43",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f" "reference": "e86f8554de667c16dde8aeb89a3990cfde924df9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/cef62396a0477e94fc52e87a17c6e5c32e226b7f", "url": "https://api.github.com/repos/symfony/console/zipball/e86f8554de667c16dde8aeb89a3990cfde924df9",
"reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f", "reference": "e86f8554de667c16dde8aeb89a3990cfde924df9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1020,7 +1020,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.42" "source": "https://github.com/symfony/console/tree/v5.4.43"
}, },
"funding": [ "funding": [
{ {
@ -1036,7 +1036,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-26T12:21:55+00:00" "time": "2024-08-13T16:31:56+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -1174,16 +1174,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v5.4.42", "version": "v5.4.43",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "0724c51fa067b198e36506d2864e09a52180998a" "reference": "ae25a9145a900764158d439653d5630191155ca0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/0724c51fa067b198e36506d2864e09a52180998a", "url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0",
"reference": "0724c51fa067b198e36506d2864e09a52180998a", "reference": "ae25a9145a900764158d439653d5630191155ca0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1217,7 +1217,7 @@
"description": "Finds files and directories via an intuitive fluent interface", "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v5.4.42" "source": "https://github.com/symfony/finder/tree/v5.4.43"
}, },
"funding": [ "funding": [
{ {
@ -1233,7 +1233,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-22T08:53:29+00:00" "time": "2024-08-13T14:03:51+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -1932,16 +1932,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.4.42", "version": "v5.4.43",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "909cec913edea162a3b2836788228ad45fcab337" "reference": "8be1d484951ff5ca995eaf8edcbcb8b9a5888450"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/909cec913edea162a3b2836788228ad45fcab337", "url": "https://api.github.com/repos/symfony/string/zipball/8be1d484951ff5ca995eaf8edcbcb8b9a5888450",
"reference": "909cec913edea162a3b2836788228ad45fcab337", "reference": "8be1d484951ff5ca995eaf8edcbcb8b9a5888450",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1998,7 +1998,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.4.42" "source": "https://github.com/symfony/string/tree/v5.4.43"
}, },
"funding": [ "funding": [
{ {
@ -2014,22 +2014,22 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-20T18:38:32+00:00" "time": "2024-08-01T10:24:28+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.11.11", "version": "1.12.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3" "reference": "384af967d35b2162f69526c7276acadce534d0e1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
"reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3", "reference": "384af967d35b2162f69526c7276acadce534d0e1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2074,7 +2074,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-08-19T14:37:29+00:00" "time": "2024-08-27T09:18:05+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@ -2298,16 +2298,16 @@
}, },
{ {
"name": "symfony/phpunit-bridge", "name": "symfony/phpunit-bridge",
"version": "v7.1.3", "version": "v7.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git", "url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "e823122d31935eb711e2767c31f3d71cb0b87fb1" "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e823122d31935eb711e2767c31f3d71cb0b87fb1", "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e876eb90e32a8fc4c4911d458e09f88d65877d1c",
"reference": "e823122d31935eb711e2767c31f3d71cb0b87fb1", "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2360,7 +2360,7 @@
"description": "Provides utilities for PHPUnit, especially user deprecation notices management", "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.3" "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.4"
}, },
"funding": [ "funding": [
{ {
@ -2376,7 +2376,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-26T12:41:01+00:00" "time": "2024-08-13T14:28:19+00:00"
} }
], ],
"aliases": [], "aliases": [],

35
phpstan/baseline-8.3.neon
View File

@ -185,46 +185,11 @@ parameters:
count: 8 count: 8
path: ../src/Composer/Util/Git.php path: ../src/Composer/Util/Git.php
-
message: "#^Parameter \\#1 \\$multi_handle of function curl_multi_add_handle expects CurlMultiHandle, resource\\|null given\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Parameter \\#1 \\$multi_handle of function curl_multi_exec expects CurlMultiHandle, resource\\|null given\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Parameter \\#1 \\$multi_handle of function curl_multi_info_read expects CurlMultiHandle, resource\\|null given\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Parameter \\#1 \\$multi_handle of function curl_multi_remove_handle expects CurlMultiHandle, resource\\|null given\\.$#"
count: 2
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Parameter \\#1 \\$multi_handle of function curl_multi_select expects CurlMultiHandle, resource\\|null given\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$string of function rtrim expects string, string\\|false given\\.$#" message: "#^Parameter \\#1 \\$string of function rtrim expects string, string\\|false given\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$multiHandle \\(resource\\|null\\) does not accept CurlMultiHandle\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$shareHandle \\(resource\\|null\\) does not accept CurlShareHandle\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\<0, max\\>\\|false given\\.$#" message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\<0, max\\>\\|false given\\.$#"
count: 1 count: 1

35
phpstan/baseline.neon
View File

@ -3819,27 +3819,27 @@ parameters:
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$mh of function curl_multi_add_handle expects resource, resource\\|null given\\.$#" message: "#^Parameter \\#1 \\$mh of function curl_multi_add_handle expects resource, CurlMultiHandle given\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$mh of function curl_multi_exec expects resource, resource\\|null given\\.$#" message: "#^Parameter \\#1 \\$mh of function curl_multi_exec expects resource, CurlMultiHandle given\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$mh of function curl_multi_info_read expects resource, resource\\|null given\\.$#" message: "#^Parameter \\#1 \\$mh of function curl_multi_info_read expects resource, CurlMultiHandle given\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$mh of function curl_multi_remove_handle expects resource, resource\\|null given\\.$#" message: "#^Parameter \\#1 \\$mh of function curl_multi_remove_handle expects resource, CurlMultiHandle given\\.$#"
count: 2 count: 2
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Parameter \\#1 \\$mh of function curl_multi_select expects resource, resource\\|null given\\.$#" message: "#^Parameter \\#1 \\$mh of function curl_multi_select expects resource, CurlMultiHandle given\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
@ -3923,11 +3923,36 @@ parameters:
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$multiHandle \\(CurlMultiHandle\\) does not accept resource\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$multiHandle has unknown class CurlMultiHandle as its type\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$shareHandle \\(CurlShareHandle\\) does not accept resource\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Property Composer\\\\Util\\\\Http\\\\CurlDownloader\\:\\:\\$shareHandle has unknown class CurlShareHandle as its type\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#" message: "#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#"
count: 1 count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php path: ../src/Composer/Util/Http/CurlDownloader.php
-
message: "#^Type alias Job contains unknown class CurlHandle\\.$#"
count: 1
path: ../src/Composer/Util/Http/CurlDownloader.php
- -
message: "#^Constant CURLOPT_PROXY_CAINFO not found\\.$#" message: "#^Constant CURLOPT_PROXY_CAINFO not found\\.$#"
count: 1 count: 1

4
src/Composer/Util/Http/CurlDownloader.php
View File

@ -34,9 +34,9 @@ use Symfony\Component\HttpFoundation\IpUtils;
*/ */
class CurlDownloader class CurlDownloader
{ {
/** @var ?resource */ /** @var \CurlMultiHandle */
private $multiHandle; private $multiHandle;
/** @var ?resource */ /** @var \CurlShareHandle */
private $shareHandle; private $shareHandle;
/** @var Job[] */ /** @var Job[] */
private $jobs = []; private $jobs = [];