Merge pull request #2621 from Dragooon/ticket/12732

[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php
index 97d024fbaa..cee8a1d863 100644
--- a/tests/profilefields/type_string_test.php
+++ b/tests/profilefields/type_string_test.php
@@ -155,6 +155,18 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
 				'FIELD_INVALID_CHARS_ALPHA_DOTS-field',
 				'Required field should reject field with comma',
 			),
+			array(
+				'skype.test.name,_this',
+				array('field_validation' => '[a-zA-Z][\w\.,\-_]+'),
+				false,
+				'Required field should accept alphanumeric field with punctuations',
+			),
+			array(
+				'1skype.this.should.faila',
+				array('field_validation' => '[a-zA-Z][\w\.,\-_]+'),
+				'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION-field',
+				'Required field should reject field having invalid input for the given validation',
+			),
 		);
 	}