6 files changed, 897 insertions, 897 deletions
diff --git a/tests/profilefields/type_bool_test.php b/tests/profilefields/type_bool_test.php
index 91852f210b..87c9d7c96f 100644
--- a/tests/profilefields/type_bool_test.php
+++ b/tests/profilefields/type_bool_test.php
@@ -13,135 +13,135 @@
 
 class phpbb_profilefield_type_bool_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options = array();
-    protected $options = array();
-
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return void
-     */
-    public function setUp()
-    {
-        $user = $this->getMock('\phpbb\user');
-        $user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
-
-        $lang = $this->getMock('\phpbb\profilefields\lang_helper', array(), array(null, null));
-
-        $lang->expects($this->any())
-            ->method('get_options_lang');
-
-        $lang->expects($this->any())
-            ->method('is_set')
-            ->will($this->returnCallback(array($this, 'is_set_callback')));
-
-        $lang->expects($this->any())
-            ->method('get')
-            ->will($this->returnCallback(array($this, 'get')));
-
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
-
-        $this->cp = new \phpbb\profilefields\type\type_bool(
-            $lang,
-            $request,
-            $template,
-            $user
-        );
-
-        $this->field_options = array(
-            'field_type'       => '\phpbb\profilefields\type\type_bool',
-            'field_name' 	   => 'field',
-            'field_id'	 	   => 1,
-            'lang_id'	 	   => 1,
-            'lang_name'        => 'field',
-            'field_required'   => false,
-            'field_default_value' => 1,
-            'field_length' => 1,
-        );
-
-        $this->options = array(
-            0 => 'Yes',
-            1 => 'No',
-        );
-    }
-
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                    false,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should not accept empty values for required fields',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->validate_profile_field($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function profile_value_data()
-    {
-        return array(
-            array(
-                    false,
-                    array('field_show_novalue' => true),
-                    'No',
-                    'Field should output the default value',
-            ),
-            array(
-                    false,
-                    array('field_show_novalue' => false, 'field_length' => 2),
-                    null,
-                    'Field should not show anything for empty value',
-            ),
-            array(
-                    0,
-                    array(),
-                    'Yes',
-                    'Field should show the set value',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider profile_value_data
-     */
-    public function test_get_profile_value($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->get_profile_value($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function is_set_callback($field_id, $lang_id, $field_value)
-    {
-        return isset($this->options[$field_value]);
-    }
-
-    public function get($field_id, $lang_id, $field_value)
-    {
-        return $this->options[$field_value];
-    }
-
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
+	protected $cp;
+	protected $field_options = array();
+	protected $options = array();
+
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function setUp()
+	{
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$lang = $this->getMock('\phpbb\profilefields\lang_helper', array(), array(null, null));
+
+		$lang->expects($this->any())
+			->method('get_options_lang');
+
+		$lang->expects($this->any())
+			->method('is_set')
+			->will($this->returnCallback(array($this, 'is_set_callback')));
+
+		$lang->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(array($this, 'get')));
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$this->cp = new \phpbb\profilefields\type\type_bool(
+			$lang,
+			$request,
+			$template,
+			$user
+		);
+
+		$this->field_options = array(
+			'field_type'       => '\phpbb\profilefields\type\type_bool',
+			'field_name' 	   => 'field',
+			'field_id'	 	   => 1,
+			'lang_id'	 	   => 1,
+			'lang_name'        => 'field',
+			'field_required'   => false,
+			'field_default_value' => 1,
+			'field_length' => 1,
+		);
+
+		$this->options = array(
+			0 => 'Yes',
+			1 => 'No',
+		);
+	}
+
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+					false,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should not accept empty values for required fields',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->validate_profile_field($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function profile_value_data()
+	{
+		return array(
+			array(
+					false,
+					array('field_show_novalue' => true),
+					'No',
+					'Field should output the default value',
+			),
+			array(
+					false,
+					array('field_show_novalue' => false, 'field_length' => 2),
+					null,
+					'Field should not show anything for empty value',
+			),
+			array(
+					0,
+					array(),
+					'Yes',
+					'Field should show the set value',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider profile_value_data
+	 */
+	public function test_get_profile_value($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->get_profile_value($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function is_set_callback($field_id, $lang_id, $field_value)
+	{
+		return isset($this->options[$field_value]);
+	}
+
+	public function get($field_id, $lang_id, $field_value)
+	{
+		return $this->options[$field_value];
+	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }
diff --git a/tests/profilefields/type_date_test.php b/tests/profilefields/type_date_test.php
index 05bf72d0b9..f356e7727c 100644
--- a/tests/profilefields/type_date_test.php
+++ b/tests/profilefields/type_date_test.php
@@ -13,180 +13,180 @@
 
 class phpbb_profilefield_type_date_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options;
-    protected $user;
-
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return null
-     */
-    public function setUp()
-    {
-        $this->user = $this->getMock('\phpbb\user');
-        $this->user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
-
-        $this->user->expects($this->any())
-            ->method('create_datetime')
-            ->will($this->returnCallback(array($this, 'create_datetime_callback')));
-
-        $this->user->timezone = new DateTimeZone('UTC');
-        $this->user->lang = array(
-            'datetime' => array(),
-            'DATE_FORMAT' => 'm/d/Y',
-        );
-
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
-
-        $this->cp = new \phpbb\profilefields\type\type_date(
-            $request,
-            $template,
-            $this->user
-        );
-
-        $this->field_options = array(
-            'field_type'     => '\phpbb\profilefields\type\type_date',
-            'field_name' 	 => 'field',
-            'field_id'	 	 => 1,
-            'lang_id'	 	 => 1,
-            'lang_name'      => 'field',
-            'field_required' => false,
-        );
-    }
-
-    public function profile_value_data()
-    {
-        return array(
-            array(
-                    '01-01-2009',
-                    array('field_show_novalue' => true),
-                    '01/01/2009',
-                    'Field should output the correctly formatted date',
-            ),
-            array(
-                    null,
-                    array('field_show_novalue' => false),
-                    null,
-                    'Field should leave empty value as is',
-            ),
-            array(
-                    'None',
-                    array('field_show_novalue' => true),
-                    'None',
-                    'Field should leave invalid value as is',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider profile_value_data
-     */
-    public function test_get_profile_value($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->get_profile_value($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                    '',
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being empty',
-            ),
-            array(
-                    '0125',
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    '01-01-2012',
-                    array(),
-                    false,
-                    'Field should accept a valid value',
-            ),
-            array(
-                    '40-05-2009',
-                    array(),
-                    'FIELD_INVALID_DATE-field',
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    '12-30-2012',
-                    array(),
-                    'FIELD_INVALID_DATE-field',
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    'string',
-                    array(),
-                    false,
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    'string',
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    100,
-                    array(),
-                    false,
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    100,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being invalid',
-            ),
-            array(
-                    null,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being empty',
-            ),
-            array(
-                    true,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should reject value for being empty',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->validate_profile_field($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
-
-    public function create_datetime_callback($time = 'now', \DateTimeZone $timezone = null)
-    {
-        $timezone = $timezone ?: $this->user->timezone;
-        return new \phpbb\datetime($this->user, $time, $timezone);
-    }
+	protected $cp;
+	protected $field_options;
+	protected $user;
+
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return null
+	 */
+	public function setUp()
+	{
+		$this->user = $this->getMock('\phpbb\user');
+		$this->user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$this->user->expects($this->any())
+			->method('create_datetime')
+			->will($this->returnCallback(array($this, 'create_datetime_callback')));
+
+		$this->user->timezone = new DateTimeZone('UTC');
+		$this->user->lang = array(
+			'datetime' => array(),
+			'DATE_FORMAT' => 'm/d/Y',
+		);
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$this->cp = new \phpbb\profilefields\type\type_date(
+			$request,
+			$template,
+			$this->user
+		);
+
+		$this->field_options = array(
+			'field_type'     => '\phpbb\profilefields\type\type_date',
+			'field_name' 	 => 'field',
+			'field_id'	 	 => 1,
+			'lang_id'	 	 => 1,
+			'lang_name'      => 'field',
+			'field_required' => false,
+		);
+	}
+
+	public function profile_value_data()
+	{
+		return array(
+			array(
+					'01-01-2009',
+					array('field_show_novalue' => true),
+					'01/01/2009',
+					'Field should output the correctly formatted date',
+			),
+			array(
+					null,
+					array('field_show_novalue' => false),
+					null,
+					'Field should leave empty value as is',
+			),
+			array(
+					'None',
+					array('field_show_novalue' => true),
+					'None',
+					'Field should leave invalid value as is',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider profile_value_data
+	 */
+	public function test_get_profile_value($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->get_profile_value($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+					'',
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being empty',
+			),
+			array(
+					'0125',
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being invalid',
+			),
+			array(
+					'01-01-2012',
+					array(),
+					false,
+					'Field should accept a valid value',
+			),
+			array(
+					'40-05-2009',
+					array(),
+					'FIELD_INVALID_DATE-field',
+					'Field should reject value for being invalid',
+			),
+			array(
+					'12-30-2012',
+					array(),
+					'FIELD_INVALID_DATE-field',
+					'Field should reject value for being invalid',
+			),
+			array(
+					'string',
+					array(),
+					false,
+					'Field should reject value for being invalid',
+			),
+			array(
+					'string',
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being invalid',
+			),
+			array(
+					100,
+					array(),
+					false,
+					'Field should reject value for being invalid',
+			),
+			array(
+					100,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being invalid',
+			),
+			array(
+					null,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being empty',
+			),
+			array(
+					true,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should reject value for being empty',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->validate_profile_field($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
+
+	public function create_datetime_callback($time = 'now', \DateTimeZone $timezone = null)
+	{
+		$timezone = $timezone ?: $this->user->timezone;
+		return new \phpbb\datetime($this->user, $time, $timezone);
+	}
 }
diff --git a/tests/profilefields/type_dropdown_test.php b/tests/profilefields/type_dropdown_test.php
index ec68f0e77e..559ec254a7 100644
--- a/tests/profilefields/type_dropdown_test.php
+++ b/tests/profilefields/type_dropdown_test.php
@@ -13,175 +13,175 @@
 
 class phpbb_profilefield_type_dropdown_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options = array();
-    protected $dropdown_options = array();
-
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return null
-     */
-    public function setUp()
-    {
-        $user = $this->getMock('\phpbb\user');
-        $user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
-
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
-
-        $lang = $this->getMock('\phpbb\profilefields\lang_helper', array(), array(null, null));
-
-        $lang->expects($this->any())
-             ->method('get_options_lang');
-
-        $lang->expects($this->any())
-             ->method('is_set')
-             ->will($this->returnCallback(array($this, 'is_set_callback')));
-
-        $lang->expects($this->any())
-             ->method('get')
-             ->will($this->returnCallback(array($this, 'get')));
-
-        $this->cp = new \phpbb\profilefields\type\type_dropdown(
-            $lang,
-            $request,
-            $template,
-            $user
-        );
-
-        $this->field_options = array(
-            'field_type'       => '\phpbb\profilefields\type\type_dropdown',
-            'field_name' 	   => 'field',
-            'field_id'	 	   => 1,
-            'lang_id'	 	   => 1,
-            'lang_name'        => 'field',
-            'field_required'   => false,
-            'field_validation' => '.*',
-            'field_novalue'    => 0,
-        );
-
-        $this->dropdown_options = array(
-            0 => '<No Value>',
-            1 => 'Option 1',
-            2 => 'Option 2',
-            3 => 'Option 3',
-            4 => 'Option 4',
-        );
-    }
-
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                    7,
-                    array(),
-                    'FIELD_INVALID_VALUE-field',
-                    'Invalid value should throw error',
-            ),
-            array(
-                    true,
-                    array('field_required' => true),
-                    false,
-                    'Boolean would evaluate to 1 and hence correct value',
-            ),
-            array(
-                    'string',
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'String should be rejected for value',
-            ),
-            array(
-                    2,
-                    array(),
-                    false,
-                    'Valid value should not throw error'
-            ),
-            array(
-                    0,
-                    array(),
-                    false,
-                    'Empty value should be acceptible',
-            ),
-            array(
-                    0,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Required field should not accept empty value',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->validate_profile_field($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function profile_value_data()
-    {
-        return array(
-            array(
-                    1,
-                    array('field_show_novalue' => true),
-                    'Option 1',
-                    'Field should output the given value',
-            ),
-            array(
-                    4,
-                    array('field_show_novalue' => false),
-                    'Option 4',
-                    'Field should output the given value',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => true),
-                    '<No Value>',
-                    'Field should output nothing for empty value',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => false),
-                    null,
-                    'Field should simply output null for empty value',
-            ),
-        );
-    }
-
-
-    /**
-     * @dataProvider profile_value_data
-     */
-    public function test_get_profile_value($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->get_profile_value($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function is_set_callback($field_id, $lang_id, $field_value)
-    {
-        return isset($this->dropdown_options[$field_value]);
-    }
-
-    public function get($field_id, $lang_id, $field_value)
-    {
-        return $this->dropdown_options[$field_value];
-    }
-
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
+	protected $cp;
+	protected $field_options = array();
+	protected $dropdown_options = array();
+
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return null
+	 */
+	public function setUp()
+	{
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$lang = $this->getMock('\phpbb\profilefields\lang_helper', array(), array(null, null));
+
+		$lang->expects($this->any())
+			 ->method('get_options_lang');
+
+		$lang->expects($this->any())
+			 ->method('is_set')
+			 ->will($this->returnCallback(array($this, 'is_set_callback')));
+
+		$lang->expects($this->any())
+			 ->method('get')
+			 ->will($this->returnCallback(array($this, 'get')));
+
+		$this->cp = new \phpbb\profilefields\type\type_dropdown(
+			$lang,
+			$request,
+			$template,
+			$user
+		);
+
+		$this->field_options = array(
+			'field_type'       => '\phpbb\profilefields\type\type_dropdown',
+			'field_name' 	   => 'field',
+			'field_id'	 	   => 1,
+			'lang_id'	 	   => 1,
+			'lang_name'        => 'field',
+			'field_required'   => false,
+			'field_validation' => '.*',
+			'field_novalue'    => 0,
+		);
+
+		$this->dropdown_options = array(
+			0 => '<No Value>',
+			1 => 'Option 1',
+			2 => 'Option 2',
+			3 => 'Option 3',
+			4 => 'Option 4',
+		);
+	}
+
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+					7,
+					array(),
+					'FIELD_INVALID_VALUE-field',
+					'Invalid value should throw error',
+			),
+			array(
+					true,
+					array('field_required' => true),
+					false,
+					'Boolean would evaluate to 1 and hence correct value',
+			),
+			array(
+					'string',
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'String should be rejected for value',
+			),
+			array(
+					2,
+					array(),
+					false,
+					'Valid value should not throw error'
+			),
+			array(
+					0,
+					array(),
+					false,
+					'Empty value should be acceptible',
+			),
+			array(
+					0,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Required field should not accept empty value',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->validate_profile_field($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function profile_value_data()
+	{
+		return array(
+			array(
+					1,
+					array('field_show_novalue' => true),
+					'Option 1',
+					'Field should output the given value',
+			),
+			array(
+					4,
+					array('field_show_novalue' => false),
+					'Option 4',
+					'Field should output the given value',
+			),
+			array(
+					'',
+					array('field_show_novalue' => true),
+					'<No Value>',
+					'Field should output nothing for empty value',
+			),
+			array(
+					'',
+					array('field_show_novalue' => false),
+					null,
+					'Field should simply output null for empty value',
+			),
+		);
+	}
+
+
+	/**
+	 * @dataProvider profile_value_data
+	 */
+	public function test_get_profile_value($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->get_profile_value($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function is_set_callback($field_id, $lang_id, $field_value)
+	{
+		return isset($this->dropdown_options[$field_value]);
+	}
+
+	public function get($field_id, $lang_id, $field_value)
+	{
+		return $this->dropdown_options[$field_value];
+	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }
diff --git a/tests/profilefields/type_int_test.php b/tests/profilefields/type_int_test.php
index 11278e8f52..9b0adcb78c 100644
--- a/tests/profilefields/type_int_test.php
+++ b/tests/profilefields/type_int_test.php
@@ -13,164 +13,164 @@
 
 class phpbb_profilefield_type_int_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options;
+	protected $cp;
+	protected $field_options;
 
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return null
-     */
-    public function setUp()
-    {
-        $user = $this->getMock('\phpbb\user');
-        $user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return null
+	 */
+	public function setUp()
+	{
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
 
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
 
-        $this->cp = new \phpbb\profilefields\type\type_int(
-            $request,
-            $template,
-            $user
-        );
+		$this->cp = new \phpbb\profilefields\type\type_int(
+			$request,
+			$template,
+			$user
+		);
 
-        $this->field_options = array(
-            'field_type'     => '\phpbb\profilefields\type\type_int',
-            'field_name' 	 => 'field',
-            'field_id'	 	 => 1,
-            'lang_id'	 	 => 1,
-            'lang_name'      => 'field',
-            'field_required' => false,
-        );
-    }
+		$this->field_options = array(
+			'field_type'     => '\phpbb\profilefields\type\type_int',
+			'field_name' 	 => 'field',
+			'field_id'	 	 => 1,
+			'lang_id'	 	 => 1,
+			'lang_name'      => 'field',
+			'field_required' => false,
+		);
+	}
 
-    public function profile_value_data()
-    {
-        return array(
-            array(
-                    '10',
-                    array('field_show_novalue' => true),
-                    10,
-                    'Field should output integer value of given input',
-            ),
-            array(
-                    '0',
-                    array('field_show_novalue' => true),
-                    0,
-                    'Field should output integer value of given input',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => true),
-                    0,
-                    'Field should translate empty value to 0 as integer',
-                    false,
-            ),
-            array(
-                    null,
-                    array('field_show_novalue' => true),
-                    0,
-                    'Field should translate null value to 0 as integer',
-            ),
-            array(
-                    '10',
-                    array('field_show_novalue' => false),
-                    10,
-                    'Field should output integer value of given input',
-            ),
-            array(
-                    '0',
-                    array('field_show_novalue' => false),
-                    0,
-                    'Field should output integer value of given input',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => false),
-                    null,
-                    'Field should leave empty value as is',
-            ),
-            array(
-                    null,
-                    array('field_show_novalue' => false),
-                    null,
-                    'Field should leave empty value as is',
-            ),
-        );
-    }
+	public function profile_value_data()
+	{
+		return array(
+			array(
+					'10',
+					array('field_show_novalue' => true),
+					10,
+					'Field should output integer value of given input',
+			),
+			array(
+					'0',
+					array('field_show_novalue' => true),
+					0,
+					'Field should output integer value of given input',
+			),
+			array(
+					'',
+					array('field_show_novalue' => true),
+					0,
+					'Field should translate empty value to 0 as integer',
+					false,
+			),
+			array(
+					null,
+					array('field_show_novalue' => true),
+					0,
+					'Field should translate null value to 0 as integer',
+			),
+			array(
+					'10',
+					array('field_show_novalue' => false),
+					10,
+					'Field should output integer value of given input',
+			),
+			array(
+					'0',
+					array('field_show_novalue' => false),
+					0,
+					'Field should output integer value of given input',
+			),
+			array(
+					'',
+					array('field_show_novalue' => false),
+					null,
+					'Field should leave empty value as is',
+			),
+			array(
+					null,
+					array('field_show_novalue' => false),
+					null,
+					'Field should leave empty value as is',
+			),
+		);
+	}
 
-    /**
-     * @dataProvider profile_value_data
-     */
-    public function test_get_profile_value($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
+	/**
+	 * @dataProvider profile_value_data
+	 */
+	public function test_get_profile_value($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
 
-        $result = $this->cp->get_profile_value($value, $field_options);
+		$result = $this->cp->get_profile_value($value, $field_options);
 
-        $this->assertSame($expected, $result, $description);
-    }
+		$this->assertSame($expected, $result, $description);
+	}
 
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                    '15',
-                    array('field_minlen' => 10, 'field_maxlen' => 20, 'field_required' => true),
-                    false,
-                    'Field should accept input of correct boundaries',
-            ),
-            array(
-                    '556476',
-                    array('field_maxlen' => 50000, 'field_required' => true),
-                    'FIELD_TOO_LARGE-50000-field',
-                    'Field should reject value of greater value than max',
-            ),
-            array(
-                    '9',
-                    array('field_minlen' => 10, 'field_required' => true),
-                    'FIELD_TOO_SMALL-10-field',
-                    'Field should reject value which is less than defined minimum',
-            ),
-            array(
-                    true,
-                    array('field_maxlen' => 20),
-                    false,
-                    'Field should accept correct boolean value',
-            ),
-            array(
-                    'string',
-                    array('field_maxlen' => 10, 'field_required' => true),
-                    false,
-                    'Field should accept correct string value',
-            ),
-            array(
-                    null,
-                    array('field_minlen' => 1, 'field_maxlen' => 10, 'field_required' => true),
-                    'FIELD_TOO_SMALL-1-field',
-                    'Field should not accept an empty value',
-            ),
-        );
-    }
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+					'15',
+					array('field_minlen' => 10, 'field_maxlen' => 20, 'field_required' => true),
+					false,
+					'Field should accept input of correct boundaries',
+			),
+			array(
+					'556476',
+					array('field_maxlen' => 50000, 'field_required' => true),
+					'FIELD_TOO_LARGE-50000-field',
+					'Field should reject value of greater value than max',
+			),
+			array(
+					'9',
+					array('field_minlen' => 10, 'field_required' => true),
+					'FIELD_TOO_SMALL-10-field',
+					'Field should reject value which is less than defined minimum',
+			),
+			array(
+					true,
+					array('field_maxlen' => 20),
+					false,
+					'Field should accept correct boolean value',
+			),
+			array(
+					'string',
+					array('field_maxlen' => 10, 'field_required' => true),
+					false,
+					'Field should accept correct string value',
+			),
+			array(
+					null,
+					array('field_minlen' => 1, 'field_maxlen' => 10, 'field_required' => true),
+					'FIELD_TOO_SMALL-1-field',
+					'Field should not accept an empty value',
+			),
+		);
+	}
 
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
 
-        $result = $this->cp->validate_profile_field($value, $field_options);
+		$result = $this->cp->validate_profile_field($value, $field_options);
 
-        $this->assertSame($expected, $result, $description);
-    }
+		$this->assertSame($expected, $result, $description);
+	}
 
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }
diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php
index 8e24b7a3f0..5c376eea3a 100644
--- a/tests/profilefields/type_string_test.php
+++ b/tests/profilefields/type_string_test.php
@@ -17,192 +17,192 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_profilefield_type_string_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options;
-
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return null
-     */
-    public function setUp()
-    {
-        global $request, $user, $cache;
-
-        $user = $this->getMock('\phpbb\user');
-        $cache = new phpbb_mock_cache;
-        $user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
-
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
-
-        $this->cp = new \phpbb\profilefields\type\type_string(
-            $request,
-            $template,
-            $user
-        );
-
-        $this->field_options = array(
-            'field_type'       => '\phpbb\profilefields\type\type_string',
-            'field_name' 	   => 'field',
-            'field_id'	 	   => 1,
-            'lang_id'	 	   => 1,
-            'lang_name'        => 'field',
-            'field_required'   => false,
-            'field_validation' => '.*',
-        );
-    }
-
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                    '',
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should not accept empty values for required fields',
-            ),
-            array(
-                    null,
-                    array('field_required' => true),
-                    'FIELD_REQUIRED-field',
-                    'Field should not accept empty values for required field',
-            ),
-            array(
-                    0,
-                    array('field_required' => true),
-                    false,
-                    'Field should accept a non-empty input',
-            ),
-            array(
-                    'false',
-                    array('field_required' => true),
-                    false,
-                    'Field should accept a non-empty input',
-            ),
-            array(
-                    10,
-                    array('field_required' => true),
-                    false,
-                    'Field should accept a non-empty input',
-            ),
-            array(
-                    'tas',
-                    array('field_minlen' => 2, 'field_maxlen' => 5),
-                    false,
-                    'Field should accept value of correct length',
-            ),
-            array(
-                    't',
-                    array('field_minlen' => 2, 'field_maxlen' => 5),
-                    'FIELD_TOO_SHORT-2-field',
-                    'Field should reject value of incorrect length',
-            ),
-            array(
-                    'this is a long string',
-                    array('field_minlen' => 2, 'field_maxlen' => 5),
-                    'FIELD_TOO_LONG-5-field',
-                    'Field should reject value of incorrect length',
-            ),
-            array(
-                    'H3110',
-                    array('field_validation' => '[0-9]+'),
-                    'FIELD_INVALID_CHARS_NUMBERS_ONLY-field',
-                    'Required field should reject characters in a numbers-only field',
-            ),
-            array(
-                    '&lt;&gt;&quot;&amp;%&amp;&gt;&lt;&gt;',
-                    array('field_maxlen' => 10, 'field_minlen' => 2),
-                    false,
-                    'Optional field should accept html entities',
-            ),
-            array(
-                    'ö ä ü ß',
-                    array(),
-                    false,
-                    'Required field should accept UTF-8 string',
-            ),
-            array(
-                    'This ö ä string has to b',
-                    array('field_maxlen' => 10),
-                    'FIELD_TOO_LONG-10-field',
-                    'Required field should reject an UTF-8 string which is too long',
-            ),
-            array(
-                    'ö äö äö ä',
-                    array('field_validation' => '[\w]+'),
-                    'FIELD_INVALID_CHARS_ALPHA_ONLY-field',
-                    'Required field should reject UTF-8 in alpha only field',
-            ),
-            array(
-                    'Hello',
-                    array('field_validation' => '[\w]+'),
-                    false,
-                    'Required field should accept a characters only field',
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->validate_profile_field($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function profile_value_data()
-    {
-        return array(
-            array(
-                    'test',
-                    array('field_show_novalue' => true),
-                    'test',
-                    'Field should output the given value',
-            ),
-            array(
-                    'test',
-                    array('field_show_novalue' => false),
-                    'test',
-                    'Field should output the given value',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => true),
-                    '',
-                    'Field should output nothing for empty value',
-            ),
-            array(
-                    '',
-                    array('field_show_novalue' => false),
-                    null,
-                    'Field should simply output null for empty vlaue',
-            ),
-        );
-    }
-
-
-    /**
-     * @dataProvider profile_value_data
-     */
-    public function test_get_profile_value($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
-
-        $result = $this->cp->get_profile_value($value, $field_options);
-
-        $this->assertSame($expected, $result, $description);
-    }
-
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
+	protected $cp;
+	protected $field_options;
+
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return null
+	 */
+	public function setUp()
+	{
+		global $request, $user, $cache;
+
+		$user = $this->getMock('\phpbb\user');
+		$cache = new phpbb_mock_cache;
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
+
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
+
+		$this->cp = new \phpbb\profilefields\type\type_string(
+			$request,
+			$template,
+			$user
+		);
+
+		$this->field_options = array(
+			'field_type'       => '\phpbb\profilefields\type\type_string',
+			'field_name' 	   => 'field',
+			'field_id'	 	   => 1,
+			'lang_id'	 	   => 1,
+			'lang_name'        => 'field',
+			'field_required'   => false,
+			'field_validation' => '.*',
+		);
+	}
+
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+					'',
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should not accept empty values for required fields',
+			),
+			array(
+					null,
+					array('field_required' => true),
+					'FIELD_REQUIRED-field',
+					'Field should not accept empty values for required field',
+			),
+			array(
+					0,
+					array('field_required' => true),
+					false,
+					'Field should accept a non-empty input',
+			),
+			array(
+					'false',
+					array('field_required' => true),
+					false,
+					'Field should accept a non-empty input',
+			),
+			array(
+					10,
+					array('field_required' => true),
+					false,
+					'Field should accept a non-empty input',
+			),
+			array(
+					'tas',
+					array('field_minlen' => 2, 'field_maxlen' => 5),
+					false,
+					'Field should accept value of correct length',
+			),
+			array(
+					't',
+					array('field_minlen' => 2, 'field_maxlen' => 5),
+					'FIELD_TOO_SHORT-2-field',
+					'Field should reject value of incorrect length',
+			),
+			array(
+					'this is a long string',
+					array('field_minlen' => 2, 'field_maxlen' => 5),
+					'FIELD_TOO_LONG-5-field',
+					'Field should reject value of incorrect length',
+			),
+			array(
+					'H3110',
+					array('field_validation' => '[0-9]+'),
+					'FIELD_INVALID_CHARS_NUMBERS_ONLY-field',
+					'Required field should reject characters in a numbers-only field',
+			),
+			array(
+					'&lt;&gt;&quot;&amp;%&amp;&gt;&lt;&gt;',
+					array('field_maxlen' => 10, 'field_minlen' => 2),
+					false,
+					'Optional field should accept html entities',
+			),
+			array(
+					'ö ä ü ß',
+					array(),
+					false,
+					'Required field should accept UTF-8 string',
+			),
+			array(
+					'This ö ä string has to b',
+					array('field_maxlen' => 10),
+					'FIELD_TOO_LONG-10-field',
+					'Required field should reject an UTF-8 string which is too long',
+			),
+			array(
+					'ö äö äö ä',
+					array('field_validation' => '[\w]+'),
+					'FIELD_INVALID_CHARS_ALPHA_ONLY-field',
+					'Required field should reject UTF-8 in alpha only field',
+			),
+			array(
+					'Hello',
+					array('field_validation' => '[\w]+'),
+					false,
+					'Required field should accept a characters only field',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->validate_profile_field($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function profile_value_data()
+	{
+		return array(
+			array(
+					'test',
+					array('field_show_novalue' => true),
+					'test',
+					'Field should output the given value',
+			),
+			array(
+					'test',
+					array('field_show_novalue' => false),
+					'test',
+					'Field should output the given value',
+			),
+			array(
+					'',
+					array('field_show_novalue' => true),
+					'',
+					'Field should output nothing for empty value',
+			),
+			array(
+					'',
+					array('field_show_novalue' => false),
+					null,
+					'Field should simply output null for empty vlaue',
+			),
+		);
+	}
+
+
+	/**
+	 * @dataProvider profile_value_data
+	 */
+	public function test_get_profile_value($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
+
+		$result = $this->cp->get_profile_value($value, $field_options);
+
+		$this->assertSame($expected, $result, $description);
+	}
+
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }
diff --git a/tests/profilefields/type_url_test.php b/tests/profilefields/type_url_test.php
index 68ae0f6b7d..3dd32401a0 100644
--- a/tests/profilefields/type_url_test.php
+++ b/tests/profilefields/type_url_test.php
@@ -15,97 +15,97 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_profilefield_type_url_test extends phpbb_test_case
 {
-    protected $cp;
-    protected $field_options;
+	protected $cp;
+	protected $field_options;
 
-    /**
-     * Sets up basic test objects
-     *
-     * @access public
-     * @return null
-     */
-    public function setUp()
-    {
-        $user = $this->getMock('\phpbb\user');
-        $user->expects($this->any())
-            ->method('lang')
-            ->will($this->returnCallback(array($this, 'return_callback_implode')));
+	/**
+	 * Sets up basic test objects
+	 *
+	 * @access public
+	 * @return null
+	 */
+	public function setUp()
+	{
+		$user = $this->getMock('\phpbb\user');
+		$user->expects($this->any())
+			->method('lang')
+			->will($this->returnCallback(array($this, 'return_callback_implode')));
 
-        $request = $this->getMock('\phpbb\request\request');
-        $template = $this->getMock('\phpbb\template\template');
+		$request = $this->getMock('\phpbb\request\request');
+		$template = $this->getMock('\phpbb\template\template');
 
-        $this->cp = new \phpbb\profilefields\type\type_url(
-            $request,
-            $template,
-            $user
-        );
+		$this->cp = new \phpbb\profilefields\type\type_url(
+			$request,
+			$template,
+			$user
+		);
 
-        $this->field_options = array(
-            'field_type'     => '\phpbb\profilefields\type\type_url',
-            'field_name' 	 => 'field',
-            'field_id'	 	 => 1,
-            'lang_id'	 	 => 1,
-            'lang_name'      => 'field',
-            'field_required' => false,
-        );
-    }
+		$this->field_options = array(
+			'field_type'     => '\phpbb\profilefields\type\type_url',
+			'field_name' 	 => 'field',
+			'field_id'	 	 => 1,
+			'lang_id'	 	 => 1,
+			'lang_name'      => 'field',
+			'field_required' => false,
+		);
+	}
 
-    public function validate_profile_field_data()
-    {
-        return array(
-            array(
-                '',
-                    array('field_required' => true),
-                    'FIELD_INVALID_URL-field',
-                    'Field should reject empty field that is required',
-            ),
-            array(
-                    'invalidURL',
-                    array(),
-                    'FIELD_INVALID_URL-field',
-                    'Field should reject invalid input',
-            ),
-            array(
-                    'http://onetwothree.example.io',
-                    array(),
-                    false,
-                    'Field should accept valid URL',
-            ),
-            array(
-                    'http://example.com/index.html?param1=test&param2=awesome',
-                    array(),
-                    false,
-                    'Field should accept valid URL',
-            ),
-            array(
-                    'http://example.com/index.html/test/path?document=get',
-                    array(),
-                    false,
-                    'Field should accept valid URL',
-            ),
-            array(
-                    'http://example.com/index.html/test/path?document[]=DocType%20test&document[]=AnotherDoc',
-                    array(),
-                    'FIELD_INVALID_URL-field',
-                    'Field should reject invalid URL having multi value parameters',
-            ),
-        );
-    }
+	public function validate_profile_field_data()
+	{
+		return array(
+			array(
+				'',
+					array('field_required' => true),
+					'FIELD_INVALID_URL-field',
+					'Field should reject empty field that is required',
+			),
+			array(
+					'invalidURL',
+					array(),
+					'FIELD_INVALID_URL-field',
+					'Field should reject invalid input',
+			),
+			array(
+					'http://onetwothree.example.io',
+					array(),
+					false,
+					'Field should accept valid URL',
+			),
+			array(
+					'http://example.com/index.html?param1=test&param2=awesome',
+					array(),
+					false,
+					'Field should accept valid URL',
+			),
+			array(
+					'http://example.com/index.html/test/path?document=get',
+					array(),
+					false,
+					'Field should accept valid URL',
+			),
+			array(
+					'http://example.com/index.html/test/path?document[]=DocType%20test&document[]=AnotherDoc',
+					array(),
+					'FIELD_INVALID_URL-field',
+					'Field should reject invalid URL having multi value parameters',
+			),
+		);
+	}
 
-    /**
-     * @dataProvider validate_profile_field_data
-     */
-    public function test_validate_profile_field($value, $field_options, $expected, $description)
-    {
-        $field_options = array_merge($this->field_options, $field_options);
+	/**
+	 * @dataProvider validate_profile_field_data
+	 */
+	public function test_validate_profile_field($value, $field_options, $expected, $description)
+	{
+		$field_options = array_merge($this->field_options, $field_options);
 
-        $result = $this->cp->validate_profile_field($value, $field_options);
+		$result = $this->cp->validate_profile_field($value, $field_options);
 
-        $this->assertSame($expected, $result, $description);
-    }
+		$this->assertSame($expected, $result, $description);
+	}
 
-    public function return_callback_implode()
-    {
-        return implode('-', func_get_args());
-    }
+	public function return_callback_implode()
+	{
+		return implode('-', func_get_args());
+	}
 }