public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 16:42:57 +00:00
Code Activity

Give a clearer error message explaining how to update a conflicting locked dependency

Browse source
This commit is contained in:
Nils Adermann 2020-04-02 15:32:02 +02:00
parent 1b55b466fb
commit 9858718ef6
5 changed files with 80 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Composer/DependencyResolver/Rule.php
View file

@ -123,6 +123,11 @@ abstract class Rule
abstract public function isAssertion();
public function isCausedByLock()
{
return $this->getReason() === self::RULE_FIXED && $this->reasonData['lockable'];
}
public function getPrettyString(RepositorySet $repositorySet, Request $request, Pool $pool, array $installedMap = array(), array $learnedPool = array())
{
$literals = $this->getLiterals();