Merge branch '2.2' into main

main
Jordi Boggiano 2 years ago
commit 3844e05ac1
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC

@ -17,6 +17,8 @@ use Composer\Repository\RepositorySet;
/**
* @author Nils Adermann <naderman@naderman.de>
*
* @method self::ERROR_DEPENDENCY_RESOLUTION_FAILED getCode()
*/
class SolverProblemsException extends \RuntimeException
{

@ -384,6 +384,7 @@ class Installer
* @param bool $doInstall
*
* @return int
* @phpstan-return self::ERROR_*
*/
protected function doUpdate(InstalledRepositoryInterface $localRepo, $doInstall)
{
@ -645,6 +646,7 @@ class Installer
* @param InstalledRepositoryInterface $localRepo
* @param bool $alreadySolved Whether the function is called as part of an update command or independently
* @return int exit code
* @phpstan-return self::ERROR_*
*/
protected function doInstall(InstalledRepositoryInterface $localRepo, $alreadySolved = false)
{

Loading…
Cancel
Save