Skip to content

Fix Unicode handling in table diff by encoding non-ASCII chars as numeric entities #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Unicode handling in table diff by encoding non-ASCII chars as numeric entities #137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/Caxy/HtmlDiff/Table/TableDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,18 @@ protected function buildTableDoms()
*/
protected function createDocumentWithHtml($text)
{
// As DOMDocument::loadHTML() does not support UTF-8 properly without specifying the encoding in the HTML,
// we convert all non-ASCII characters to numeric entities.
$convmap = [
0x80, // Leave ASCII range intact
0x10FFFF, // Convert the rest of the Unicode range
0,
0xFFFFFF,
];
Comment on lines +631 to +636
Copy link

Copilot AI Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The convmap array uses magic numbers without clear documentation. Consider defining named constants for these Unicode range boundaries (0x80 for ASCII_END, 0x10FFFF for UNICODE_MAX) to improve code readability and maintainability.

Copilot uses AI. Check for mistakes.

$text = mb_encode_numericentity($text, $convmap, 'UTF-8');

$dom = new \DOMDocument();
$dom->loadHTML(htmlspecialchars_decode(iconv('UTF-8', 'ISO-8859-1//IGNORE', htmlentities($text, ENT_COMPAT, 'UTF-8')), ENT_QUOTES));
$dom->loadHTML($text);

return $dom;
}
Expand Down