[ticket/217] Silence errors in tests, not code.

p · rxu · commit 2d1e426ba745 · 2011-06-06T21:14:10.000+08:00
Use a mock user object for testing bbcode.

PHPBB3-217
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
@@ -975,7 +975,7 @@ function validate_url($var1, $var2)
 			}
 
 			// Is this a link to somewhere inside this board? If so then remove the session id from the url
-			if (strpos($url, @generate_board_url()) !== false && strpos($url, 'sid=') !== false)
+			if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)
 			{
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}&amp;/', '\1', $url);
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}$/', '', $url);
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
@@ -11,6 +11,7 @@
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
+require_once dirname(__FILE__) . '/../mock_user.php';
 
 class phpbb_url_bbcode_test extends phpbb_test_case
 {
@@ -30,6 +31,9 @@ public function url_bbcode_test_data()
 	*/
 	public function test_url($message)
 	{
+		global $user;
+		$user = new phpbb_mock_user;
+
 		$bbcode = new bbcode_firstpass();
 		$bbcode->message = $message;
 		$bbcode->bbcode_init(false);
diff --git a/tests/mock_user.php b/tests/mock_user.php
@@ -0,0 +1,20 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* Mock user class.
+* This class is used when tests invoke phpBB code expecting to have a global
+* user object, to avoid instantiating the actual user object.
+* It has a minimum amount of functionality, just to make tests work.
+*/
+class phpbb_mock_user
+{
+	public $host = "testhost";
+	public $page = array('root_script_path' => '/');
+}

Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ function validate_url($var1, $var2)`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`// Is this a link to somewhere inside this board? If so then remove the session id from the url`
`978`		`- if (strpos($url, @generate_board_url()) !== false && strpos($url, 'sid=') !== false)`
	`978`	`+ if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)`
`979`	`979`	`{`
`980`	`980`	`$url = preg_replace('/(&\|\?)sid=[0-9a-f]{32}&/', '\1', $url);`
`981`	`981`	`$url = preg_replace('/(&\|\?)sid=[0-9a-f]{32}$/', '', $url);`