From fad379813f1c44887c59d9bcd90b77b96a37b640 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 22 Dec 2015 16:45:30 +0100 Subject: [PATCH] [ticket/11150] Always display an error message PHPBB3-11150 --- phpBB/phpbb/composer/installer.php | 2 +- .../phpbb/composer/io/translate_composer_trait.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 3e140e9a5f..6197b59bd5 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -99,7 +99,7 @@ class installer $this->root_path = $root_path; - putenv('COMPOSER_HOME=' . $filesystem->realpath($root_path) . 'store/composer'); + putenv('COMPOSER_HOME=' . $filesystem->realpath($root_path) . '/store/composer'); } /** diff --git a/phpBB/phpbb/composer/io/translate_composer_trait.php b/phpBB/phpbb/composer/io/translate_composer_trait.php index 56a996d91c..9a0f63ceb5 100644 --- a/phpBB/phpbb/composer/io/translate_composer_trait.php +++ b/phpBB/phpbb/composer/io/translate_composer_trait.php @@ -121,9 +121,14 @@ trait translate_composer_trait $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) { @@ -145,11 +150,6 @@ trait translate_composer_trait $lang_key = 'COMPOSER_LOADING_REPOSITORIES'; $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) { $end_repo = strpos($message, 'could not be fully loaded, package information was loaded from the local cache and may be out of date');