Redo over-zealous ncr encoding and check char limts better

Author: iMattPro

entity/rule.php

@@ -274,10 +274,10 @@ public function set_title($title)
 		// Enforce a string
 		$title = (string) $title;
 
-		// Replace four-byte UTF-8 characters before storing in utf8mb3 columns.
-		$title = utf8_encode_ucr($title);
+		// MSSQL string literals cannot safely preserve every BMP character.
+		$title = strpos($this->db->get_sql_layer(), 'mssql') === 0 ? utf8_encode_ncr($title) : utf8_encode_ucr($title);
 
-		// Limit both the displayed and stored title lengths to the column size.
+		// Enforce the database column length after storage encoding.
 		if (truncate_string($title, 200, 200) !== $title)
 		{
 			throw new \phpbb\boardrules\exception\unexpected_value(array('title', 'TOO_LONG'));

tests/entity/rule_entity_save_test.php

@@ -88,7 +88,12 @@ public function test_four_byte_title_characters_are_encoded_and_other_unicode_is
 		$this->db->sql_freeresult($result);
 
 		self::assertSame('emoji-title', $row['rule_anchor']);
-		self::assertSame('Emoji 😀 中文 Кириллица title', $row['rule_title']);
+		self::assertSame(
+			strpos($this->db->get_sql_layer(), 'mssql') === 0
+				? 'Emoji 😀 中文 Кириллица title'
+				: 'Emoji 😀 中文 Кириллица title',
+			$row['rule_title']
+		);
 
 		$entity->load(1);
 		self::assertSame('emoji-title', $entity->get_anchor());

tests/entity/rule_entity_title_test.php

@@ -35,8 +35,8 @@ public function title_test_data()
 				str_repeat('a', 200),
 			),
 			array(
-				str_repeat('К', 200),
-				str_repeat('К', 200),
+				str_repeat('😀', 22),
+				str_repeat('😀', 22),
 			),
 		);
 	}
@@ -76,10 +76,13 @@ public function title_fails_test_data()
 				str_repeat('a', 201),
 			),
 
-			// Escaped request value exceeds the stored column length.
+			// Encoded request value exceeds the stored column length.
 			array(
 				str_repeat('a', 194) . '&&',
 			),
+			array(
+				str_repeat('😀', 23),
+			),
 		);
 	}
 

tests/functional/admin_controller_test.php

@@ -167,7 +167,9 @@ public function test_acp_create_rule($crawler)
 		$stored_title = $this->db->sql_fetchfield('rule_title', false, $result);
 		$this->db->sql_freeresult($result);
 
-		$expected_title = 'Test 😀 中文 Кириллица Rule';
+		$expected_title = strpos($this->db->get_sql_layer(), 'mssql') === 0
+			? 'Test 😀 中文 Кириллица Rule'
+			: 'Test 😀 中文 Кириллица Rule';
 		self::assertSame($expected_title, $stored_title);
 		self::assertSame($rule_title, utf8_decode_ncr($stored_title));
 	}