public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-10 17:12:51 +00:00
Code Activity

Fix detection of fixed package problems to include more cases, fixes #8910

Browse source
This commit is contained in:
Jordi Boggiano 2020-05-19 12:17:25 +02:00
parent 106289e5dc
commit 98e5f81a5f
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
9 changed files with 58 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Composer/DependencyResolver/SolverProblemsException.php
View file

@ -45,7 +45,7 @@ class SolverProblemsException extends \RuntimeException
$hasExtensionProblems = true;
}
$isCausedByLock |= $problem->isCausedByLock();
$isCausedByLock |= $problem->isCausedByLock($repositorySet, $request, $pool);
}
$i = 1;
@ -63,7 +63,7 @@ class SolverProblemsException extends \RuntimeException
}
if ($isCausedByLock && !$isDevExtraction) {
$text .= "\nUse the option --with-all-dependencies to allow updates and removals for packages currently locked to specific versions.";
$text .= "\nUse the option --with-all-dependencies to allow upgrades, downgrades and removals for packages currently locked to specific versions.";
}
if (strpos($text, 'found composer-plugin-api[2.0.0] but it does not match') && strpos($text, '- ocramius/package-versions')) {