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

Merge pull request #4 from j0k3r/php53

Browse Source 
Restore compatibility with PHP 5.3
This commit is contained in:
Jeremy Benoist
2015-06-11 09:39:26 +02:00
parent b69619d386 eecae93161
commit 8667dae74b
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -2
View File
@@ -1,18 +1,20 @@
language: php language: php
php: php:
- 5.3.3
- 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- nightly - nightly
- hhvm-nightly - hhvm
# run build against nightly but allow them to fail # run build against nightly but allow them to fail
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: nightly - php: nightly
- php: hhvm-nightly - php: hhvm
# faster builds on new travis setup not using sudo # faster builds on new travis setup not using sudo
sudo: false sudo: false
composer.json
+1 -1
View File
@@ -24,7 +24,7 @@
"role": "Developer (original JS version)" "role": "Developer (original JS version)"
}], }],
"require": { "require": {
"php": ">=5.4", "php": ">=5.3.3",
"ext-tidy": ">=1.2" "ext-tidy": ">=1.2"
}, },
"autoload": { "autoload": {
phpunit.xml.dist
+1 -1
View File
@@ -27,6 +27,6 @@
</filter> </filter>
<logging> <logging>
<log type="coverage-html" target="coverage" title="FullText" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/> <log type="coverage-html" target="coverage" title="Readability" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
</logging> </logging>
</phpunit> </phpunit>
src/Readability.php
+7 -2
View File
@@ -47,7 +47,6 @@ namespace Readability;
*/ */
class Readability class Readability
{ {
public $version = '1.7.2-without-multi-page';
public $convertLinksToFootnotes = false; public $convertLinksToFootnotes = false;
public $revertForcedParagraphElements = true; public $revertForcedParagraphElements = true;
public $articleTitle; public $articleTitle;
@@ -195,7 +194,13 @@ class Readability
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
$this->dom = new \DOMDocument(); $this->dom = new \DOMDocument();
$this->dom->preserveWhiteSpace = false; $this->dom->preserveWhiteSpace = false;
@$this->dom->loadHTML($html, LIBXML_NOBLANKS | LIBXML_COMPACT | LIBXML_NOERROR);
if (PHP_VERSION_ID >= 50400) {
$this->dom->loadHTML($html, LIBXML_NOBLANKS | LIBXML_COMPACT | LIBXML_NOERROR);
} else {
$this->dom->loadHTML($html);
}
libxml_use_internal_errors(false); libxml_use_internal_errors(false);
} }