makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 11:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17525] Correctly handle Doctrine DB tools exceptions, enrich error info

Browse source 
PHPBB-17525
This commit is contained in:
rxu 2025-06-15 13:03:55 +07:00
parent e34e1759c7
commit 8d1f8af7c6
No known key found for this signature in database
GPG key ID: 955F0567380E586A
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/acp/acp_extensions.php
View file

@ -276,6 +276,12 @@ class acp_extensions
{
$this->template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($this->user));
}
catch (\Exception $e)
{
$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
$message = $e->getMessage();
$this->template->assign_var('MIGRATOR_ERROR', '<b>' . $message . '</b><br><br>' . $stack_trace);
}
$this->tpl_name = 'acp_ext_enable';

2
phpBB/includes/functions.php
View file

@ -2716,7 +2716,7 @@ function get_backtrace()
// Only show function arguments for include etc.
// Other parameters may contain sensible information
$argument = '';
if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once', 'try_apply')))
{
$argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0]), ENT_COMPAT);
}

2
phpBB/install/startup.php
View file

@ -107,7 +107,7 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline): bool
{
/** @var \phpbb\install\helper\iohandler\iohandler_interface $iohandler */
$iohandler = $phpbb_installer_container->get('installer.helper.iohandler');
$iohandler->add_error_message($msg);
$iohandler->add_error_message($msg, get_backtrace());
$iohandler->send_response(true);
exit();
}

8
phpBB/phpbb/db/tools/doctrine.php
View file

@ -457,8 +457,6 @@ class doctrine implements tools_interface
* @return bool|string[]
*/
protected function alter_schema(callable $callback)
{
try
{
$current_schema = $this->get_schema();
$new_schema = clone $current_schema;
@ -481,12 +479,6 @@ class doctrine implements tools_interface
return true;
}
catch (Exception $e)
{
// @todo: check if it makes sense to properly handle the exception
return [$e->getMessage()];
}
}
/**
* Alter table.

4
phpBB/phpbb/install/installer.php
View file

@ -280,7 +280,9 @@ class installer
}
catch (\Exception $e)
{
$this->iohandler->add_error_message($e->getMessage());
$stack_trace = phpbb_filter_root_path(str_replace("\n", '<br>', $e->getTraceAsString()));
$message = $e->getMessage();
$this->iohandler->add_error_message($message, $stack_trace);
$this->iohandler->send_response(true);
$fail_cleanup = true;
}