Skip to content
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

Jump to bottom

fix: improve char encoding #43

Merged
merged 1 commit into from
Mar 14, 2024
Merged

fix: improve char encoding #43

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/Document.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

namespace YetiForcePDF;

use Exception;
use YetiForcePDF\Html\Parser;
use YetiForcePDF\Layout\FooterBox;
use YetiForcePDF\Layout\HeaderBox;
use YetiForcePDF\Layout\WatermarkBox;
Expand Down Expand Up @@ -95,7 +97,7 @@ class Document
protected $objects = [];

/**
* @var \YetiForcePDF\Html\Parser
* @var Parser
*/
protected $htmlParser;

Expand Down Expand Up @@ -786,14 +788,19 @@ public function removeObject(PdfObject $object): self
* Load html string.
*
* @param string $html
* @param string $inputEncoding
* @param string $fromEncoding
*
* @return $this
* @throws Exception
*/
public function loadHtml(string $html, string $inputEncoding = 'UTF-8')
public function loadHtml(string $html, string $fromEncoding = 'UTF-8'): self
{
$this->htmlParser = (new \YetiForcePDF\Html\Parser())->setDocument($this)->init();
$this->htmlParser->loadHtml($html, $inputEncoding);
if ($fromEncoding === '') {
throw new Exception('Encoding can not be empty');
}

$this->htmlParser = (new Parser())->setDocument($this)->init();
$this->htmlParser->loadHtml($html, $fromEncoding);

return $this;
}
Expand Down
16 changes: 11 additions & 5 deletions lib/Html/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@

namespace YetiForcePDF\Html;

use YetiForcePDF\Base;
use YetiForcePDF\Layout\PageGroupBox;

/**
* Class Parser.
*/
class Parser extends \YetiForcePDF\Base
class Parser extends Base
{
/**
* @var \DOMDocument
Expand Down Expand Up @@ -61,13 +62,18 @@ protected function cleanUpHtml(string $html)
* @param string $html
* @param string $fromEncoding
*
* @return \YetiForcePDF\Html\Parser
* @return Parser
*/
public function loadHtml(string $html, string $fromEncoding = ''): self
public function loadHtml(string $html, string $fromEncoding): self
{
$html = htmlspecialchars_decode($html, ENT_HTML5);
$this->html = htmlspecialchars_decode($html, ENT_HTML5);
$this->html = $this->cleanUpHtml($html);
$this->html = html_entity_decode($this->html, ENT_COMPAT, $fromEncoding);

// 0x80 - start of unicode range
// 0x10FFFF - end of unicode range
// 0 - do not ommit any unicode char
// ~0 - negated 0 - convert negation of nothing (so convert all)
$this->html = mb_encode_numericentity($this->html, [0x80, 0x10FFFF, 0, ~0], $fromEncoding);

return $this;
}
Expand Down