Merge pull request #379 from iMattPro/fixes

Fix ncr gaps

Author: iMattPro

entity/rule.php

@@ -273,8 +273,7 @@ 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);
+		$title = $this->encode_unicode_for_storage($title);
 
 		// Limit both the displayed and stored title lengths to the column size.
 		if (truncate_string($title, 200, 200) !== $title)
@@ -288,6 +287,22 @@ public function set_title($title)
 		return $this;
 	}
 
+	/**
+	 * Encode Unicode characters that cannot be stored safely by the DBMS.
+	 *
+	 * @param string $text
+	 * @return string
+	 */
+	protected function encode_unicode_for_storage($text)
+	{
+		if (strpos($this->db->get_sql_layer(), 'mssql') === 0)
+		{
+			return utf8_encode_ncr($text);
+		}
+
+		return utf8_encode_ucr($text);
+	}
+
 	/**
 	* Get message for edit
 	*

migrations/v10x/m7_sample_rule_data.php

@@ -81,8 +81,8 @@ public function insert_sample_rule_data()
 		// Define sample rule data
 		$sample_rule_data = array(
 			array(
-				'rule_title'     => $lang->lang('BOARDRULES_SAMPLE_CATEGORY_TITLE'),
-				'rule_message'   => $lang->lang('BOARDRULES_SAMPLE_CATEGORY_MESSAGE'),
+				'rule_title'     => utf8_encode_ncr($lang->lang('BOARDRULES_SAMPLE_CATEGORY_TITLE')),
+				'rule_message'   => utf8_encode_ncr($lang->lang('BOARDRULES_SAMPLE_CATEGORY_MESSAGE')),
 				'rule_anchor'    => $lang->lang('BOARDRULES_SAMPLE_CATEGORY_ANCHOR'),
 				'rule_left_id'   => 1,
 				'rule_right_id'  => 4,
@@ -91,8 +91,8 @@ public function insert_sample_rule_data()
 				'rule_parents'   => '',
 			),
 			array(
-				'rule_title'     => $lang->lang('BOARDRULES_SAMPLE_RULE_TITLE'),
-				'rule_message'   => $lang->lang('BOARDRULES_SAMPLE_RULE_MESSAGE'),
+				'rule_title'     => utf8_encode_ncr($lang->lang('BOARDRULES_SAMPLE_RULE_TITLE')),
+				'rule_message'   => utf8_encode_ncr($lang->lang('BOARDRULES_SAMPLE_RULE_MESSAGE')),
 				'rule_anchor'    => $lang->lang('BOARDRULES_SAMPLE_RULE_ANCHOR'),
 				'rule_left_id'   => 2,
 				'rule_right_id'  => 3,

tests/entity/rule_entity_save_test.php

@@ -73,12 +73,12 @@ public function test_save($id, $expected)
 		self::assertEquals($expected['rule_title'], $result->get_title());
 	}
 
-	public function test_four_byte_title_characters_are_encoded_for_storage_and_decoded_on_read()
+	public function test_unicode_title_characters_are_encoded_for_storage_and_decoded_on_read()
 	{
 		$entity = $this->get_rule_entity();
 		$entity->load(1)
 			->set_anchor('emoji-title')
-			->set_title('Emoji 😀 title')
+			->set_title('Emoji 😀 中文 Кириллица title')
 			->save();
 
 		$result = $this->db->sql_query('SELECT rule_anchor, rule_title
@@ -88,11 +88,14 @@ public function test_four_byte_title_characters_are_encoded_for_storage_and_deco
 		$this->db->sql_freeresult($result);
 
 		self::assertSame('emoji-title', $row['rule_anchor']);
-		self::assertSame('Emoji 😀 title', $row['rule_title']);
+		$expected_title = strpos($this->db->get_sql_layer(), 'mssql') === 0
+			? 'Emoji 😀 中文 Кириллица title'
+			: 'Emoji 😀 中文 Кириллица title';
+		self::assertSame($expected_title, $row['rule_title']);
 
 		$entity->load(1);
 		self::assertSame('emoji-title', $entity->get_anchor());
-		self::assertSame('Emoji 😀 title', $entity->get_title());
+		self::assertSame('Emoji 😀 中文 Кириллица title', $entity->get_title());
 	}
 
 	/**

tests/functional/admin_controller_test.php

@@ -148,8 +148,9 @@ public function test_acp_create_rule($crawler)
 		self::assertCount(0, $crawler->filter('.successbox'));
 
 		// Submit valid rule data
+		$rule_title = 'Test 😀 中文 Кириллица Rule';
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(array(
-			'rule_title'	=> 'Test Rule',
+			'rule_title'	=> $rule_title,
 			'rule_anchor'	=> 'test-rule',
 			'rule_message'	=> str_repeat('test ', 1000), // 5000 character message
 		));
@@ -158,6 +159,19 @@ public function test_acp_create_rule($crawler)
 		// Assert addition was success
 		self::assertGreaterThan(0, $crawler->filter('.successbox')->count());
 		$this->assertContainsLang('ACP_RULE_ADDED', $crawler->text());
+
+		$this->get_db();
+		$result = $this->db->sql_query("SELECT rule_title
+			FROM phpbb_boardrules
+			WHERE rule_anchor = 'test-rule'");
+		$stored_title = $this->db->sql_fetchfield('rule_title', false, $result);
+		$this->db->sql_freeresult($result);
+
+		$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));
 	}
 
 	/**