mirror of
https://github.com/j0k3r/php-readability.git
synced 2026-09-27 14:36:23 +00:00
Compare commits
54
Commits
a8b08d8cb2
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
 Jérémy BenoistandGitHub
|
44c3e02f01 | ||
|
Jérémy BenoistandGitHub
|
a57cc7b25a | ||
|
dependabot[bot]andGitHub
|
67b869b37f | ||
|
dependabot[bot]andGitHub
|
a76eaa555a | ||
|
Jérémy BenoistandGitHub
|
7701717086 | ||
|
Jérémy BenoistandGitHub
|
0dab8c72c4 | ||
|
dependabot[bot]andGitHub
|
4c0b341bff | ||
|
dependabot[bot]andGitHub
|
9736f08a12 | ||
|
Jérémy BenoistandGitHub
|
3e159d4e24 | ||
|
Jérémy BenoistandGitHub
|
3677c91b29 | ||
|
dependabot[bot]andGitHub
|
c88b196ee6 | ||
|
dependabot[bot]andGitHub
|
ad05b00797 | ||
|
Jérémy BenoistandGitHub
|
cbad259ba2 | ||
|
Jérémy BenoistandGitHub
|
a3cc317102 | ||
|
dependabot[bot]andGitHub
|
425a42f239 | ||
|
dependabot[bot]andGitHub
|
9a8d33c6ba | ||
|
Jérémy BenoistandGitHub
|
ced50c9c10 | ||
|
Jérémy BenoistandGitHub
|
f991d80b5a | ||
|
dependabot[bot]andGitHub
|
1697cdbeee | ||
|
Jérémy BenoistandGitHub
|
eb9d8d067c | ||
|
dependabot[bot]andGitHub
|
9052618a31 | ||
|
dependabot[bot]andGitHub
|
3d332b4056 | ||
|
Jérémy BenoistandGitHub
|
6abe0c4054 | ||
|
Jérémy BenoistandGitHub
|
00a4d5f34d | ||
|
dependabot[bot]andGitHub
|
959c0680a8 | ||
|
dependabot[bot]andGitHub
|
74c7b80b32 | ||
|
Jérémy BenoistandGitHub
|
33b69bdb6b | ||
|
Jérémy BenoistandGitHub
|
f8aabce4e0 | ||
|
dependabot[bot]andGitHub
|
2e9d05c239 | ||
|
dependabot[bot]andGitHub
|
85fbb6cbf3 | ||
|
Jérémy BenoistandGitHub
|
67a2b07505 | ||
|
Jérémy BenoistandGitHub
|
b71d73f0e0 | ||
|
dependabot[bot]andGitHub
|
1dc5f6bc78 | ||
|
dependabot[bot]andGitHub
|
f19d7ba19e | ||
|
Kevin DecherfandGitHub
|
a93488d727 | ||
|
Kevin Decherf
|
ac24ef54a4 | ||
|
Kevin Decherf
|
76547fef78 | ||
|
Kevin Decherf
|
228bc7ee1d | ||
|
Jérémy BenoistandGitHub
|
35b87585e7 | ||
|
dependabot[bot]andGitHub
|
4230b2d7ca | ||
|
Jérémy BenoistandGitHub
|
85be584f94 | ||
|
Jérémy BenoistandGitHub
|
03a960daf0 | ||
|
Jérémy BenoistandGitHub
|
6f62bcf662 | ||
|
dependabot[bot]andGitHub
|
3e3114a492 | ||
|
dependabot[bot]andGitHub
|
f98247ed14 | ||
|
dependabot[bot]andGitHub
|
5a6e525ff5 | ||
|
Jérémy BenoistandGitHub
|
0de328760a | ||
|
dependabot[bot]andGitHub
|
5aa9da6843 | ||
|
Jérémy BenoistandGitHub
|
1bb7eec83c | ||
|
Jérémy BenoistandGitHub
|
049bd07074 | ||
|
dependabot[bot]andGitHub
|
ca1b105f40 | ||
|
dependabot[bot]andGitHub
|
5ad159ebb1 | ||
|
Kevin DecherfandGitHub
|
1312ffbced | ||
|
Kevin Decherf
|
266e36c187 |
+4
-4
@@ -30,12 +30,12 @@
|
||||
"masterminds/html5": "^2.7"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "3.95.8",
|
||||
"friendsofphp/php-cs-fixer": "3.95.26",
|
||||
"monolog/monolog": "^1.24|^2.1",
|
||||
"symfony/phpunit-bridge": "^4.4|^5.3|^6.0|^7.0",
|
||||
"phpstan/phpstan": "2.2.2",
|
||||
"phpstan/phpstan-phpunit": "2.0.16",
|
||||
"rector/rector": "2.4.6"
|
||||
"phpstan/phpstan": "2.2.14",
|
||||
"phpstan/phpstan-phpunit": "2.0.18",
|
||||
"rector/rector": "2.6.7"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure."
|
||||
|
||||
+78
-72
@@ -213,7 +213,9 @@ class Readability implements LoggerAwareInterface
|
||||
*/
|
||||
public function init(): bool
|
||||
{
|
||||
$this->loadHtml();
|
||||
if (!isset($this->dom)) {
|
||||
$this->loadHtml();
|
||||
}
|
||||
|
||||
if (!isset($this->dom->documentElement)) {
|
||||
return false;
|
||||
@@ -751,6 +753,76 @@ class Readability implements LoggerAwareInterface
|
||||
$this->flags &= ~$flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load HTML in a DOMDocument.
|
||||
* Apply Pre filters
|
||||
* Cleanup HTML using Tidy (or not).
|
||||
*/
|
||||
public function loadHtml(): void
|
||||
{
|
||||
$this->original_html = $this->html;
|
||||
|
||||
$this->logger->debug('Parsing URL: ' . $this->url);
|
||||
|
||||
if ($this->url) {
|
||||
$host = parse_url($this->url, \PHP_URL_HOST);
|
||||
if (null !== $host) {
|
||||
$this->domainRegExp = '/' . strtr((string) preg_replace('/www\d*\./', '', $host), ['.' => '\.']) . '/';
|
||||
}
|
||||
}
|
||||
|
||||
mb_internal_encoding('UTF-8');
|
||||
mb_http_output('UTF-8');
|
||||
mb_regex_encoding('UTF-8');
|
||||
|
||||
// HACK: dirty cleanup to replace some stuff; shouldn't use regexps with HTML but well...
|
||||
if (!$this->flagIsActive(self::FLAG_DISABLE_PREFILTER)) {
|
||||
foreach ($this->pre_filters as $search => $replace) {
|
||||
$this->html = preg_replace($search, $replace, $this->html);
|
||||
}
|
||||
unset($search, $replace);
|
||||
}
|
||||
|
||||
if ('' === trim($this->html)) {
|
||||
$this->html = '<html></html>';
|
||||
}
|
||||
|
||||
/*
|
||||
* Use tidy (if it exists).
|
||||
* This fixes problems with some sites which would otherwise trouble DOMDocument's HTML parsing.
|
||||
* Although sometimes it makes matters worse, which is why there is an option to disable it.
|
||||
*/
|
||||
if ($this->useTidy) {
|
||||
$this->logger->debug('Tidying document');
|
||||
|
||||
$tidy = tidy_repair_string($this->html, $this->tidy_config, 'UTF8');
|
||||
if (false !== $tidy && $this->html !== $tidy) {
|
||||
$this->tidied = true;
|
||||
$this->html = $tidy;
|
||||
$this->html = preg_replace('/[\r\n]+/is', "\n", $this->html);
|
||||
}
|
||||
unset($tidy);
|
||||
}
|
||||
|
||||
$this->html = self::entitizeNonAscii((string) $this->html);
|
||||
|
||||
if ('html5lib' === $this->parser || 'html5' === $this->parser) {
|
||||
$this->dom = (new HTML5())->loadHTML($this->html);
|
||||
}
|
||||
|
||||
if ('libxml' === $this->parser) {
|
||||
libxml_use_internal_errors(true);
|
||||
|
||||
$this->dom = new \DOMDocument();
|
||||
$this->dom->preserveWhiteSpace = false;
|
||||
$this->dom->loadHTML($this->html, \LIBXML_NOBLANKS | \LIBXML_COMPACT | \LIBXML_NOERROR);
|
||||
|
||||
libxml_use_internal_errors(false);
|
||||
}
|
||||
|
||||
$this->dom->registerNodeClass(\DOMElement::class, JSLikeHTMLElement::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the article title as an H1.
|
||||
*
|
||||
@@ -1003,7 +1075,11 @@ class Readability implements LoggerAwareInterface
|
||||
}
|
||||
|
||||
if ($this->hasSingleTagInsideElement($node, 'p') && $this->getLinkDensity($node) < 0.25) {
|
||||
$newNode = $node->childNodes->item(0);
|
||||
// In some cases when tidy is disabled the first item may not be a DOMElement so we apply a filter
|
||||
$newNode = array_values(array_filter(
|
||||
iterator_to_array($node->childNodes),
|
||||
static fn ($childNode) => $childNode instanceof \DOMElement
|
||||
))[0];
|
||||
$node->parentNode->replaceChild($newNode, $node);
|
||||
$nodesToScore[] = $newNode;
|
||||
}
|
||||
@@ -1371,76 +1447,6 @@ class Readability implements LoggerAwareInterface
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Load HTML in a DOMDocument.
|
||||
* Apply Pre filters
|
||||
* Cleanup HTML using Tidy (or not).
|
||||
*/
|
||||
private function loadHtml(): void
|
||||
{
|
||||
$this->original_html = $this->html;
|
||||
|
||||
$this->logger->debug('Parsing URL: ' . $this->url);
|
||||
|
||||
if ($this->url) {
|
||||
$host = parse_url($this->url, \PHP_URL_HOST);
|
||||
if (null !== $host) {
|
||||
$this->domainRegExp = '/' . strtr((string) preg_replace('/www\d*\./', '', $host), ['.' => '\.']) . '/';
|
||||
}
|
||||
}
|
||||
|
||||
mb_internal_encoding('UTF-8');
|
||||
mb_http_output('UTF-8');
|
||||
mb_regex_encoding('UTF-8');
|
||||
|
||||
// HACK: dirty cleanup to replace some stuff; shouldn't use regexps with HTML but well...
|
||||
if (!$this->flagIsActive(self::FLAG_DISABLE_PREFILTER)) {
|
||||
foreach ($this->pre_filters as $search => $replace) {
|
||||
$this->html = preg_replace($search, $replace, $this->html);
|
||||
}
|
||||
unset($search, $replace);
|
||||
}
|
||||
|
||||
if ('' === trim($this->html)) {
|
||||
$this->html = '<html></html>';
|
||||
}
|
||||
|
||||
/*
|
||||
* Use tidy (if it exists).
|
||||
* This fixes problems with some sites which would otherwise trouble DOMDocument's HTML parsing.
|
||||
* Although sometimes it makes matters worse, which is why there is an option to disable it.
|
||||
*/
|
||||
if ($this->useTidy) {
|
||||
$this->logger->debug('Tidying document');
|
||||
|
||||
$tidy = tidy_repair_string($this->html, $this->tidy_config, 'UTF8');
|
||||
if (false !== $tidy && $this->html !== $tidy) {
|
||||
$this->tidied = true;
|
||||
$this->html = $tidy;
|
||||
$this->html = preg_replace('/[\r\n]+/is', "\n", $this->html);
|
||||
}
|
||||
unset($tidy);
|
||||
}
|
||||
|
||||
$this->html = self::entitizeNonAscii((string) $this->html);
|
||||
|
||||
if ('html5lib' === $this->parser || 'html5' === $this->parser) {
|
||||
$this->dom = (new HTML5())->loadHTML($this->html);
|
||||
}
|
||||
|
||||
if ('libxml' === $this->parser) {
|
||||
libxml_use_internal_errors(true);
|
||||
|
||||
$this->dom = new \DOMDocument();
|
||||
$this->dom->preserveWhiteSpace = false;
|
||||
$this->dom->loadHTML($this->html, \LIBXML_NOBLANKS | \LIBXML_COMPACT | \LIBXML_NOERROR);
|
||||
|
||||
libxml_use_internal_errors(false);
|
||||
}
|
||||
|
||||
$this->dom->registerNodeClass(\DOMElement::class, JSLikeHTMLElement::class);
|
||||
}
|
||||
|
||||
private function getAncestors(\DOMElement $node, int $maxDepth = 0): array
|
||||
{
|
||||
$ancestors = [];
|
||||
|
||||
@@ -507,6 +507,19 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
|
||||
$this->assertSame($expected, $method->invoke($readability, $node, $tag));
|
||||
}
|
||||
|
||||
public function testDivToPElementWithComment(): void
|
||||
{
|
||||
$text = str_repeat('Padded real article text to reach decent length for content scoring threshold here. ', 8);
|
||||
$html = '<div><!-- comment --><code>some code snippet</code> ' . $text . '</div>';
|
||||
|
||||
$readability = $this->getReadability($html, 'http://0.0.0.0', 'libxml', false);
|
||||
$res = $readability->init();
|
||||
|
||||
$this->assertTrue($res);
|
||||
$this->assertStringContainsString('some code snippet', $readability->getContent()->getInnerHtml());
|
||||
$this->assertStringContainsString('Padded real article text', $readability->getContent()->getInnerHtml());
|
||||
}
|
||||
|
||||
public function testKeepFootnotes(): void
|
||||
{
|
||||
// from https://www.schreibdichte.de/blog/feed-aggregator-und-spaeter-lesen-dienst-im-team
|
||||
|
||||
Reference in New Issue
Block a user