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/10369] Always include errfile and errline in format_errors().

Browse source 
We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
This commit is contained in:
Andreas Fischer 2011-09-18 00:55:24 +02:00
parent eb8b1c333f
commit 7b3f6cb219
2 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/error_collector.php
View file

@ -42,6 +42,8 @@ class phpbb_error_collector
function format_errors()
{
$phpbb_root_path = phpbb_realpath(dirname(__FILE__) . '/../');
$text = '';
foreach ($this->errors as $error)
{
@ -49,13 +51,15 @@ class phpbb_error_collector
{
$text .= "<br />\n";
}
list($errno, $msg_text, $errfile, $errline) = $error;
$text .= "Errno $errno: $msg_text";
if (defined('DEBUG_EXTRA') || defined('IN_INSTALL'))
{
$text .= " at $errfile line $errline";
}
// Prevent leakage of local path to phpBB install
$errfile = str_replace(array($phpbb_root_path, '\\'), array('', '/'), $errfile);
$text .= "Errno $errno: $msg_text at $errfile line $errline";
}
return $text;
}
}

35
tests/error_collector_test.php Normal file
View file

@ -0,0 +1,35 @@
<?php
/**
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
class phpbb_error_collector_test extends phpbb_test_case
{
public function test_collection()
{
$collector = new phpbb_error_collector;
$collector->install();
// Cause a warning
1/0; $line = __LINE__;
$collector->uninstall();
list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
$error_contents = $collector->format_errors();
$this->assertEquals($errno, 2);
// Unfortunately $error_contents will contain the full path here,
// because the tests directory is outside of phpbb root path.
$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
$this->assertStringEndsWith(" line $line", $error_contents);
}
}