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

Show root package version in error output for circular dependencies for added clarity

pull/12205/head
Jordi Boggiano 2024-11-14 11:26:58 +01:00
parent f1163bdbd4
commit a7a14ea860
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/DependencyResolver/Problem.php
View File

@ -598,7 +598,7 @@ class Problem
if ($topPackage instanceof RootPackageInterface) { if ($topPackage instanceof RootPackageInterface) {
return [ return [
"- Root composer.json requires $packageName".self::constraintToText($constraint).', it is ', "- Root composer.json requires $packageName".self::constraintToText($constraint).', it is ',
'satisfiable by '.self::getPackageList($nextRepoPackages, $isVerbose, $pool, $constraint).' from '.$nextRepo->getRepoName().' but '.$topPackage->getPrettyName().' is the root package and cannot be modified. See https://getcomposer.org/dep-on-root for details and assistance.', 'satisfiable by '.self::getPackageList($nextRepoPackages, $isVerbose, $pool, $constraint).' from '.$nextRepo->getRepoName().' but '.$topPackage->getPrettyName().' '.$topPackage->getPrettyVersion().' is the root package and cannot be modified. See https://getcomposer.org/dep-on-root for details and assistance.',
]; ];
} }
} }

2
tests/Composer/Test/Fixtures/installer/circular-dependency-errors.test
View File

@ -49,7 +49,7 @@ Your requirements could not be resolved to an installable set of packages.
Problem 1 Problem 1
- Root composer.json requires requires/root 1.0.0 -> satisfiable by requires/root[1.0.0]. - Root composer.json requires requires/root 1.0.0 -> satisfiable by requires/root[1.0.0].
- requires/root 1.0.0 requires root/pkg ^1.0 -> satisfiable by root/pkg[1.0.0] from package repo (defining 3 packages) but root/pkg is the root package and cannot be modified. See https://getcomposer.org/dep-on-root for details and assistance. - requires/root 1.0.0 requires root/pkg ^1.0 -> satisfiable by root/pkg[1.0.0] from package repo (defining 3 packages) but root/pkg dev-master is the root package and cannot be modified. See https://getcomposer.org/dep-on-root for details and assistance.
Problem 2 Problem 2
- Root composer.json requires requires/root2 1.0.0 -> satisfiable by requires/root2[1.0.0]. - Root composer.json requires requires/root2 1.0.0 -> satisfiable by requires/root2[1.0.0].
- requires/root2 1.0.0 requires root/pkg ^2.0 -> found root/pkg[dev-master] but it does not match the constraint. See https://getcomposer.org/dep-on-root for details and assistance. - requires/root2 1.0.0 requires root/pkg ^2.0 -> found root/pkg[dev-master] but it does not match the constraint. See https://getcomposer.org/dep-on-root for details and assistance.