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

Merge branch '1.10'

pull/10150/head
Jordi Boggiano 2021-10-01 10:34:36 +02:00
parent ffee8ca329 1a994e41d4
commit f85e2136fd
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.2.10", "version": "1.2.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "9fdb22c2e97a614657716178093cd1da90a64aa8" "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/9fdb22c2e97a614657716178093cd1da90a64aa8", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0b072d51c5a9c6f3412f7ea3ab043d6603cb2582",
"reference": "9fdb22c2e97a614657716178093cd1da90a64aa8", "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -29,7 +29,7 @@
"phpstan/phpstan": "^0.12.55", "phpstan/phpstan": "^0.12.55",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/phpunit-bridge": "^4.2 || ^5", "symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -64,7 +64,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues", "issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.2.10" "source": "https://github.com/composer/ca-bundle/tree/1.2.11"
}, },
"funding": [ "funding": [
{ {
@ -80,7 +80,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-06-07T13:58:28+00:00" "time": "2021-09-25T20:32:43+00:00"
}, },
{ {
"name": "composer/metadata-minifier", "name": "composer/metadata-minifier",

1
tests/Composer/Test/Fixtures/installer/broken-deps-do-not-replace.test
View File

@ -31,6 +31,7 @@ Your requirements could not be resolved to an installable set of packages.
- Root composer.json requires b/b 1.* -> satisfiable by b/b[1.0.0]. - Root composer.json requires b/b 1.* -> satisfiable by b/b[1.0.0].
Potential causes: Potential causes:
- This package is not installable via Composer 1.x, see <https://blog.packagist.com/deprecating-composer-1-support/>
- A typo in the package name - A typo in the package name
- The package is not available in a stable-enough version according to your minimum-stability setting - The package is not available in a stable-enough version according to your minimum-stability setting
see <https://getcomposer.org/doc/04-schema.md#minimum-stability> for more details. see <https://getcomposer.org/doc/04-schema.md#minimum-stability> for more details.

1
tests/Composer/Test/Fixtures/installer/solver-problems.test
View File

@ -153,6 +153,7 @@ Your requirements could not be resolved to an installable set of packages.
- Root composer.json requires package/found5 2.* -> satisfiable by package/found5[2.0.0]. - Root composer.json requires package/found5 2.* -> satisfiable by package/found5[2.0.0].
Potential causes: Potential causes:
- This package is not installable via Composer 1.x, see <https://blog.packagist.com/deprecating-composer-1-support/>
- A typo in the package name - A typo in the package name
- The package is not available in a stable-enough version according to your minimum-stability setting - The package is not available in a stable-enough version according to your minimum-stability setting
see <https://getcomposer.org/doc/04-schema.md#minimum-stability> for more details. see <https://getcomposer.org/doc/04-schema.md#minimum-stability> for more details.