mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/12610] Use exception_interface

Browse Source 
PHPBB3-12610
This commit is contained in:
Tristan Darricau
2015-08-24 12:33:32 +02:00
committed by Tristan Darricau
parent 376042d845
commit 8481bd4e18
9 changed files with 46 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/console/command/update/check.php
View File

@@ -13,6 +13,7 @@
namespace phpbb\console\command\update;
use phpbb\exception\exception_interface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
@@ -116,18 +117,9 @@ class check extends \phpbb\console\command\command
*/
protected function check_ext(InputInterface $input, OutputInterface $output, $stability, $recheck, $ext_name)
{
try
{
$ext_manager = $this->phpbb_container->get('ext.manager');
$md_manager = $ext_manager->create_extension_metadata_manager($ext_name, null);
$updates_available = $ext_manager->version_check($md_manager, $recheck, false, $stability);
}
catch (\RuntimeException $e)
{
$output->writeln('<error>' . $e->getMessage() . '</error>');
return 2;
}
$ext_manager = $this->phpbb_container->get('ext.manager');
$md_manager = $ext_manager->create_extension_metadata_manager($ext_name, null);
$updates_available = $ext_manager->version_check($md_manager, $recheck, false, $stability);
$metadata = $md_manager->get_metadata('all');
if ($input->getOption('verbose'))
@@ -178,16 +170,7 @@ class check extends \phpbb\console\command\command
$version_helper = $this->phpbb_container->get('version_helper');
$version_helper->force_stability($stability);
try
{
$updates_available = $version_helper->get_suggested_updates($recheck);
}
catch (\RuntimeException $e)
{
$output->writeln('<error>' . $this->user->lang('VERSIONCHECK_FAIL') . '</error>');
return 2;
}
$updates_available = $version_helper->get_suggested_updates($recheck);
if ($input->getOption('verbose'))
{
@@ -258,6 +241,11 @@ class check extends \phpbb\console\command\command
$message .= ' | ';
}
}
catch (exception_interface $e)
{
$exception_message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
$message .= ('<error>' . $exception_message . '</error>');
}
catch (\RuntimeException $e)
{
$message .= ('<error>' . $e->getMessage() . '</error>');