infong/php-readability
1
0
Fork 0
mirror of https://github.com/j0k3r/php-readability.git synced 2026-09-27 06:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: infong/php-readability:1.1.7
Branches Tags
infong/php-readability:master infong/php-readability:1.x
infong/php-readability:2.0.9 infong/php-readability:1.3.1 infong/php-readability:2.0.8 infong/php-readability:1.3.0 infong/php-readability:1.2.13 infong/php-readability:2.0.7 infong/php-readability:1.2.12 infong/php-readability:2.0.6 infong/php-readability:1.2.11 infong/php-readability:2.0.5 infong/php-readability:2.0.4 infong/php-readability:2.0.3 infong/php-readability:2.0.2 infong/php-readability:2.0.1 infong/php-readability:1.2.10 infong/php-readability:2.0.0 infong/php-readability:1.2.9 infong/php-readability:1.2.8 infong/php-readability:1.2.7 infong/php-readability:v1.2.6 infong/php-readability:1.2.5 infong/php-readability:1.2.4 infong/php-readability:1.2.3 infong/php-readability:1.2.2 infong/php-readability:1.2.1 infong/php-readability:1.2.0 infong/php-readability:1.1.11 infong/php-readability:1.1.10 infong/php-readability:1.1.9 infong/php-readability:1.1.8 infong/php-readability:1.1.7 infong/php-readability:1.1.6 infong/php-readability:1.1.5 infong/php-readability:1.1.4 infong/php-readability:1.1.3 infong/php-readability:1.1.2 infong/php-readability:1.1.1 infong/php-readability:1.1.0 infong/php-readability:v1.0.9 infong/php-readability:v1.0.8 infong/php-readability:v1.0.7 infong/php-readability:v1.0.6 infong/php-readability:v1.0.5 infong/php-readability:v1.0.4 infong/php-readability:v1.0.3 infong/php-readability:v1.0.2 infong/php-readability:v1.0.1 infong/php-readability:v1.0
..
compare: infong/php-readability:1.1.8
Branches Tags
infong/php-readability:master infong/php-readability:1.x
infong/php-readability:2.0.9 infong/php-readability:1.3.1 infong/php-readability:2.0.8 infong/php-readability:1.3.0 infong/php-readability:1.2.13 infong/php-readability:2.0.7 infong/php-readability:1.2.12 infong/php-readability:2.0.6 infong/php-readability:1.2.11 infong/php-readability:2.0.5 infong/php-readability:2.0.4 infong/php-readability:2.0.3 infong/php-readability:2.0.2 infong/php-readability:2.0.1 infong/php-readability:1.2.10 infong/php-readability:2.0.0 infong/php-readability:1.2.9 infong/php-readability:1.2.8 infong/php-readability:1.2.7 infong/php-readability:v1.2.6 infong/php-readability:1.2.5 infong/php-readability:1.2.4 infong/php-readability:1.2.3 infong/php-readability:1.2.2 infong/php-readability:1.2.1 infong/php-readability:1.2.0 infong/php-readability:1.1.11 infong/php-readability:1.1.10 infong/php-readability:1.1.9 infong/php-readability:1.1.8 infong/php-readability:1.1.7 infong/php-readability:1.1.6 infong/php-readability:1.1.5 infong/php-readability:1.1.4 infong/php-readability:1.1.3 infong/php-readability:1.1.2 infong/php-readability:1.1.1 infong/php-readability:1.1.0 infong/php-readability:v1.0.9 infong/php-readability:v1.0.8 infong/php-readability:v1.0.7 infong/php-readability:v1.0.6 infong/php-readability:v1.0.5 infong/php-readability:v1.0.4 infong/php-readability:v1.0.3 infong/php-readability:v1.0.2 infong/php-readability:v1.0.1 infong/php-readability:v1.0
3 Commits
1.1.7 .. 1.1.8
Author SHA1 Message Date
Jérémy BenoistandGitHub 5ac82f3c87 Merge pull request #30 from j0k3r/avoid-php-warning 
Avoid php warning
 2017-05-19 16:16:20 +02:00
Jeremy Benoist 85fb92a042 Fix tests 2017-05-19 16:02:36 +02:00
Jeremy Benoist f2a43b476c Avoid PHP Warning 
This isn't the best solution but the previous one using `@` wasn't really better.
Appending a string into a fragment might generate some warning if the string contains bad entity.
For example `+`.
 2017-05-19 15:37:46 +02:00
2 changed files with 51 additions and 44 deletions
Expand all files Collapse all files
src/JSLikeHTMLElement.php
+20 -13
View File
@@ -45,19 +45,31 @@ class JSLikeHTMLElement extends \DOMElement
*/ */
public function __set($name, $value) public function __set($name, $value)
{ {
if ($name === 'innerHTML') { if ($name !== 'innerHTML') {
$trace = debug_backtrace();
trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
return;
}
// first, empty the element // first, empty the element
for ($x = $this->childNodes->length - 1; $x >= 0; --$x) { for ($x = $this->childNodes->length - 1; $x >= 0; --$x) {
$this->removeChild($this->childNodes->item($x)); $this->removeChild($this->childNodes->item($x));
} }
// $value holds our new inner HTML // $value holds our new inner HTML
if ($value !== '') { $value = trim($value);
if (empty($value)) {
return;
}
// ensure bad entity won't generate warning
$previousError = libxml_use_internal_errors(true);
$f = $this->ownerDocument->createDocumentFragment(); $f = $this->ownerDocument->createDocumentFragment();
// appendXML() expects well-formed markup (XHTML) // appendXML() expects well-formed markup (XHTML)
// @ to suppress PHP warnings $result = $f->appendXML($value);
$result = @$f->appendXML($value);
if ($result) { if ($result) {
if ($f->hasChildNodes()) { if ($f->hasChildNodes()) {
$this->appendChild($f); $this->appendChild($f);
@@ -72,7 +84,7 @@ class JSLikeHTMLElement extends \DOMElement
// We use it (and suppress the warning) because an HTML fragment will // We use it (and suppress the warning) because an HTML fragment will
// be wrapped around <html><body> tags which we don't really want to keep. // be wrapped around <html><body> tags which we don't really want to keep.
// Note: despite the warning, if loadHTML succeeds it will return true. // Note: despite the warning, if loadHTML succeeds it will return true.
$result = @$f->loadHTML('<htmlfragment>' . $value . '</htmlfragment>'); $result = $f->loadHTML('<htmlfragment>' . $value . '</htmlfragment>');
if ($result) { if ($result) {
$import = $f->getElementsByTagName('htmlfragment')->item(0); $import = $f->getElementsByTagName('htmlfragment')->item(0);
@@ -81,16 +93,11 @@ class JSLikeHTMLElement extends \DOMElement
$importedNode = $this->ownerDocument->importNode($child, true); $importedNode = $this->ownerDocument->importNode($child, true);
$this->appendChild($importedNode); $this->appendChild($importedNode);
} }
} else {
// oh well, we tried, we really did. :(
// this element is now empty
} }
} }
}
} else { libxml_clear_errors();
$trace = debug_backtrace(); libxml_use_internal_errors($previousError);
trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
}
} }
/** /**
tests/ReadabilityTest.php
+1 -1
View File
@@ -443,7 +443,7 @@ class ReadabilityTest extends \PHPUnit_Framework_TestCase
public function testPostFilters() public function testPostFilters()
{ {
$readability = $this->getReadability('<div>' . str_repeat('<p>This <b>is</b> the awesome content :)</p>', 7) . '</div>', 'http://0.0.0.0'); $readability = $this->getReadability('<div>' . str_repeat('<p>This <b>is</b> the awesome content :)</p>', 10) . '</div>', 'http://0.0.0.0');
$readability->addPostFilter('!<strong[^>]*>(.*?)</strong>!is', ''); $readability->addPostFilter('!<strong[^>]*>(.*?)</strong>!is', '');
$res = $readability->init(); $res = $readability->init();