From 0f4124127306408b3560aace31d55864b0043697 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 4 Dec 2013 13:36:23 +0100
Subject: [ticket/12056] validate_config_vars: Fix "Creating ... from empty
 value".

PHPBB3-12056
---
 tests/functions_acp/validate_config_vars_test.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'tests/functions_acp/validate_config_vars_test.php')

diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 7cd7fa3892..5ccd73fe8d 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -11,6 +11,16 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 {
+	protected function setUp()
+	{
+		parent::setUp();
+
+		global $user;
+
+		$user = new phpbb_mock_user();
+		$user->lang = new phpbb_mock_lang();
+	}
+
 	/**
 	* Data sets that don't throw an error.
 	*/
@@ -60,10 +70,6 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 	*/
 	public function test_validate_config_vars_fit($test_data, $cfg_array)
 	{
-		global $user;
-
-		$user->lang = new phpbb_mock_lang();
-
 		$phpbb_error = array();
 		validate_config_vars($test_data, $cfg_array, $phpbb_error);
 
@@ -146,10 +152,6 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 	*/
 	public function test_validate_config_vars_error($test_data, $cfg_array, $expected)
 	{
-		global $user;
-
-		$user->lang = new phpbb_mock_lang();
-
 		$phpbb_error = array();
 		validate_config_vars($test_data, $cfg_array, $phpbb_error);
 
-- 
cgit v1.2.1


From 7e160e4fc0a7b3e02d15b892d8b8c202cb0639f6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 4 Dec 2013 13:37:56 +0100
Subject: [ticket/12056] validate_config_vars: Fix ".. undefined function
 utf8_strlen()"

PHPBB3-12056
---
 tests/functions_acp/validate_config_vars_test.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/functions_acp/validate_config_vars_test.php')

diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 5ccd73fe8d..acc98fbf0d 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -8,6 +8,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 {
-- 
cgit v1.2.1