From 7b3f6cb219cac448ba470f016ed5068bdc7ffc56 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 00:55:24 +0200
Subject: [ticket/10369] Always include errfile and errline in format_errors().

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

PHPBB3-10369
---
 tests/error_collector_test.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 tests/error_collector_test.php

(limited to 'tests')

diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
new file mode 100644
index 0000000000..e1ac32f5ac
--- /dev/null
+++ b/tests/error_collector_test.php
@@ -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);
+	}
+}
-- 
cgit v1.2.1