makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Always display an error message

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-12-22 16:45:30 +01:00 • committed by Tristan Darricau
parent f6eb17048a
commit fad379813f
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/composer/installer.php
View file

@ -99,7 +99,7 @@ class installer
$this->root_path = $root_path; $this->root_path = $root_path;
putenv('COMPOSER_HOME=' . $filesystem->realpath($root_path) . 'store/composer'); putenv('COMPOSER_HOME=' . $filesystem->realpath($root_path) . '/store/composer');
} }
/** /**

14
phpBB/phpbb/composer/io/translate_composer_trait.php
View file

@ -121,9 +121,14 @@ trait translate_composer_trait
$message = trim($this->strip_format($lang_key), "\n\r"); $message = trim($this->strip_format($lang_key), "\n\r");
if ($this->output->getVerbosity() === OutputInterface::VERBOSITY_DEBUG) if ($message === 'Your requirements could not be resolved to an installable set of packages.')
{ {
// Do nothing $this->composer_error[] = ['COMPOSER_ERROR_CONFLICT', []];
if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_DEBUG)
{
continue;
}
} }
else if (strpos($message, ' Problem ') === 0) else if (strpos($message, ' Problem ') === 0)
{ {
@ -145,11 +150,6 @@ trait translate_composer_trait
$lang_key = 'COMPOSER_LOADING_REPOSITORIES'; $lang_key = 'COMPOSER_LOADING_REPOSITORIES';
$level = 1; $level = 1;
} }
else if ($message === 'Your requirements could not be resolved to an installable set of packages.')
{
$this->composer_error[] = ['COMPOSER_ERROR_CONFLICT', []];
continue;
}
else if (strpos($message, 'could not be fully loaded, package information was loaded from the local cache and may be out of date') !== false) else if (strpos($message, 'could not be fully loaded, package information was loaded from the local cache and may be out of date') !== false)
{ {
$end_repo = strpos($message, 'could not be fully loaded, package information was loaded from the local cache and may be out of date'); $end_repo = strpos($message, 'could not be fully loaded, package information was loaded from the local cache and may be out of date');