Merge pull request #57 from j0k3r/fix/html5-parser

Use a new deps for HTML5 parser

.editorconfig

@@ -4,8 +4,6 @@ root = true
 ; Unix-style newlines
 [*]
 end_of_line = LF
-
-[*.php]
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true

.gitattributes

@@ -4,6 +4,6 @@
 /.scrutinizer.yml export-ignore
 /.travis.yml export-ignore
 /.php_cs export-ignore
-/README.md export-ignore
 /phpunit.xml.dist export-ignore
+/phpstan.neon export-ignore
 /tests export-ignore

.gitignore

@@ -2,3 +2,4 @@ vendor/
 coverage/
 composer.lock
 .php_cs.cache
+.phpunit.result.cache

.php_cs

@@ -1,20 +1,30 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
+return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    // use default SYMFONY_LEVEL and extra fixers:
-    ->fixers(array(
-        'concat_with_spaces',
-        'ordered_use',
-        'phpdoc_order',
-        'strict',
-        'strict_param',
-        'long_array_syntax',
-    ))
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'combine_consecutive_unsets' => true,
+        'heredoc_to_nowdoc' => true,
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_strict' => false,
+        'phpdoc_order' => true,
+        // 'psr4' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'concat_space' => ['spacing' => 'one'],
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude(['vendor'])
             ->in(__DIR__)
-            ->exclude(array('vendor'))
     )
 ;

.scrutinizer.yml

@@ -1,2 +1,12 @@
 tools:
     external_code_coverage: false
+
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
+            environment:
+                php:
+                    version: 7.2

.travis.yml

@@ -1,55 +1,54 @@
+dist: xenial
+os: linux
 language: php
 
 php:
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
-    - 7.2
-    - 7.3
-    - nightly
 
-matrix:
+jobs:
     include:
-        - php: 5.3.3
-          dist: precise
-          sudo: required
-        - php: 5.3
-          dist: precise
-          sudo: required
-        - php: 5.4
-          dist: precise
-          sudo: required
-        - php: 7.0
-          env: CS_FIXER=run
+        - php: 7.2
+          env: SYMFONY_PHPUNIT_VERSION=7.5
+        - php: 7.2
+          env: SYMFONY_PHPUNIT_VERSION=7.5 COMPOSER_FLAGS="--prefer-lowest"
+        - php: 7.3
+          env: SYMFONY_PHPUNIT_VERSION=7.5 CS_FIXER=run COVERAGE=run
+        - php: 7.4
+          env: SYMFONY_PHPUNIT_VERSION=7.5
+        - php: nightly
+          env: SYMFONY_PHPUNIT_VERSION=7.5
     fast_finish: true
     allow_failures:
-        - php: 7.3
         - php: nightly
 
-# cache vendor dirs
 cache:
     directories:
-        - vendor
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 before_install:
     - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    # disable TLS for composer because openssl is disabled for PHP 5.3.3 on travis
-    # see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/
-    - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi;
-    - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- secure-http false; fi;
 
 install:
-    - composer self-update
+    # only install phpstan when we need it
+    - if [ "$CS_FIXER" = "run" ]; then composer require phpstan/phpstan phpstan/phpstan-phpunit --dev --no-progress --no-suggest ; fi;
+    - composer update --prefer-dist --no-progress --no-suggest -o $COMPOSER_FLAGS
+    - php vendor/bin/simple-phpunit install
 
 before_script:
-    - composer install -o --prefer-dist --no-interaction
+    - mkdir -p build/logs
+    - if [ "$COVERAGE" = "run" ]; then PHPUNIT_FLAGS="--coverage-clover build/logs/clover.xml"; fi;
 
 script:
-    - mkdir -p build/logs
-    - php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml
+    - php vendor/bin/simple-phpunit -v $PHPUNIT_FLAGS
     - if [ "$CS_FIXER" = "run" ]; then php vendor/bin/php-cs-fixer fix --verbose --dry-run ; fi;
+    - if [ "$CS_FIXER" = "run" ]; then php vendor/bin/phpstan analyse src tests --no-progress --level 1 ; fi;
 
-after_script:
-    - php vendor/bin/coveralls -v
+after_success:
+    - |
+        if [ "$COVERAGE" = "run" ]; then
+            wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.2.0/php-coveralls.phar
+            chmod +x php-coveralls.phar
+            php php-coveralls.phar -v -x build/logs/clover.xml
+        fi

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/j0k3r/php-readability.svg?branch=master)](https://travis-ci.org/j0k3r/php-readability)
 [![Coverage Status](https://coveralls.io/repos/j0k3r/php-readability/badge.svg?branch=master&service=github)](https://coveralls.io/github/j0k3r/php-readability/?branch=master)
+[![Total Downloads](https://poser.pugx.org/j0k3r/php-readability/downloads)](https://packagist.org/packages/j0k3r/php-readability)
+[![License](https://poser.pugx.org/j0k3r/php-readability/license)](https://packagist.org/packages/j0k3r/php-readability)
 
 This is an extract of the Readability class from this [full-text-rss](https://github.com/Dither/full-text-rss) fork. It can be defined as a better version of the original [php-readability](https://bitbucket.org/fivefilters/php-readability/overview).
 

composer.json

@@ -24,21 +24,23 @@
         "role": "Developer (original JS version)"
     }],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.6.0",
         "ext-mbstring": "*",
         "psr/log": "^1.0",
-        "electrolinux/php-html5lib": "^0.1.0"
+        "masterminds/html5": "^2.7"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "~0.6",
-        "friendsofphp/php-cs-fixer": "<2",
-        "monolog/monolog": "^1.13",
-        "symfony/phpunit-bridge": "^3.2"
+        "friendsofphp/php-cs-fixer": "^2.14",
+        "monolog/monolog": "^1.24|^2.1",
+        "symfony/phpunit-bridge": "^4.2.3"
     },
     "suggest": {
         "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure."
     },
     "autoload": {
         "psr-4": { "Readability\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Tests\\Readability\\": "tests/" }
     }
 }

phpstan.neon

@@ -0,0 +1,8 @@
+includes:
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+
+parameters:
+    # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
+    autoload_files:
+        - vendor/bin/.phpunit/phpunit-7.5-0/vendor/autoload.php

phpunit.xml.dist

@@ -7,7 +7,6 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="vendor/autoload.php"
     >
 
@@ -27,6 +26,6 @@
     </filter>
 
     <!-- <logging>
-        <log type="coverage-html" target="coverage" title="Readability" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-html" target="coverage" lowUpperBound="35" highLowerBound="70"/>
     </logging> -->
 </phpunit>

src/JSLikeHTMLElement.php

@@ -45,7 +45,7 @@ class JSLikeHTMLElement extends \DOMElement
      */
     public function __set($name, $value)
     {
-        if ($name !== 'innerHTML') {
+        if ('innerHTML' !== $name) {
             $trace = debug_backtrace();
             trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
 
@@ -109,7 +109,7 @@ class JSLikeHTMLElement extends \DOMElement
      */
     public function __get($name)
     {
-        if ($name === 'innerHTML') {
+        if ('innerHTML' === $name) {
             $inner = '';
 
             foreach ($this->childNodes as $child) {
@@ -121,12 +121,20 @@ class JSLikeHTMLElement extends \DOMElement
 
         $trace = debug_backtrace();
         trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
-
-        return;
     }
 
     public function __toString()
     {
         return '[' . $this->tagName . ']';
     }
+
+    public function getInnerHtml()
+    {
+        return $this->__get('innerHTML');
+    }
+
+    public function setInnerHtml($value)
+    {
+        return $this->__set('innerHTML', $value);
+    }
 }

tests/ReadabilityTest.php

@@ -11,17 +11,6 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
     public $logHandler;
     public $logger;
 
-    private function getReadability($html, $url = null, $parser = 'libxml', $useTidy = true)
-    {
-        $readability = new Readability($html, $url, $parser, $useTidy);
-
-        $this->logHandler = new TestHandler();
-        $this->logger = new Logger('test', array($this->logHandler));
-        $readability->setLogger($this->logger);
-
-        return $readability;
-    }
-
     /**
      * @requires extension tidy
      */
@@ -84,8 +73,8 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('Sorry, Readability was unable to parse this page for content.', $readability->getContent()->innerHTML);
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('Sorry, Readability was unable to parse this page for content.', $readability->getContent()->getInnerHtml());
     }
 
     public function testInitP()
@@ -96,9 +85,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
     }
 
     public function testInitDivP()
@@ -109,9 +98,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
     }
 
     public function testInitDiv()
@@ -123,9 +112,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithFootnotes()
@@ -138,11 +127,11 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertContains('readabilityFootnoteLink', $readability->getContent()->innerHTML);
-        $this->assertContains('readabilityLink-3', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertContains('readabilityFootnoteLink', $readability->getContent()->getInnerHtml());
+        $this->assertContains('readabilityLink-3', $readability->getContent()->getInnerHtml());
     }
 
     public function testStandardClean()
@@ -155,11 +144,11 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertContains('will NOT be removed', $readability->getContent()->innerHTML);
-        $this->assertNotContains('<h2>', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertContains('will NOT be removed', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('<h2>', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithIframe()
@@ -171,10 +160,10 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<div readability=', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertContains('nofollow', $readability->getContent()->innerHTML);
+        $this->assertContains('<div readability=', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertContains('nofollow', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithArticle()
@@ -186,10 +175,10 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('alt="article"', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertContains('nofollow', $readability->getContent()->innerHTML);
+        $this->assertContains('alt="article"', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertContains('nofollow', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithAside()
@@ -201,10 +190,10 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('<aside>', $readability->getContent()->innerHTML);
-        $this->assertContains('<footer readability="4"/>', $readability->getContent()->innerHTML);
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('<aside>', $readability->getContent()->getInnerHtml());
+        $this->assertContains('<footer readability="5"/>', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithClasses()
@@ -216,10 +205,10 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('alt="article"', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text should be removed', $readability->getContent()->innerHTML);
+        $this->assertContains('alt="article"', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text should be removed', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithClassesWithoutLightClean()
@@ -232,10 +221,10 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('alt="article"', $readability->getContent()->innerHTML);
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text should be removed', $readability->getContent()->innerHTML);
+        $this->assertContains('alt="article"', $readability->getContent()->getInnerHtml());
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text should be removed', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithTd()
@@ -247,8 +236,8 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithSameClasses()
@@ -260,9 +249,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     public function testWithScript()
@@ -274,9 +263,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEmpty($readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEmpty($readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     public function testTitle()
@@ -288,9 +277,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEquals('this is my title', $readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEquals('this is my title', $readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     public function testTitleWithDash()
@@ -302,9 +291,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEquals('title2 - title3', $readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEquals('title2 - title3', $readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     public function testTitleWithDoubleDot()
@@ -316,9 +305,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEquals('title2 : title3', $readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEquals('title2 : title3', $readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     public function testTitleTooShortUseH1()
@@ -330,9 +319,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertEquals('this is my h1 title !', $readability->getTitle()->innerHTML);
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->innerHTML);
-        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->innerHTML);
+        $this->assertEquals('this is my h1 title !', $readability->getTitle()->getInnerHtml());
+        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertNotContains('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
     }
 
     // dummy function to be used to the next test
@@ -345,7 +334,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
     {
         error_reporting(E_ALL | E_STRICT);
         ini_set('display_errors', true);
-        set_error_handler(array($this, 'error2Exception'), E_ALL | E_STRICT);
+        set_error_handler([$this, 'error2Exception'], E_ALL | E_STRICT);
 
         $data = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" lang="ru-RU" prefix="og: http://ogp.me/ns#">
@@ -380,8 +369,8 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($res);
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
         $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
-        $this->assertContains('<iframe src="https://www.youtube.com/embed/PUep6xNeKjA" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"> </iframe>', $readability->getContent()->innerHTML);
-        $this->assertContains('3D Touch', $readability->getTitle()->innerHTML);
+        $this->assertContains('<iframe src="https://www.youtube.com/embed/PUep6xNeKjA" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"> </iframe>', $readability->getContent()->getInnerHtml());
+        $this->assertContains('3D Touch', $readability->getTitle()->getInnerHtml());
     }
 
     /**
@@ -445,13 +434,13 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
 
     public function testPostFilters()
     {
-        $readability = $this->getReadability('<div>' . str_repeat('<p>This <b>is</b> the awesome content :)</p>', 10) . '</div>', 'http://0.0.0.0');
+        $readability = $this->getReadability('<div>' . str_repeat('<p>This <strong>is</strong> the awesome content :)</p>', 10) . '</div>', 'http://0.0.0.0');
         $readability->addPostFilter('!<strong[^>]*>(.*?)</strong>!is', '');
 
         $res = $readability->init();
 
         $this->assertTrue($res);
-        $this->assertContains('This  the awesome content :)', $readability->getContent()->innerHTML);
+        $this->assertContains('This  the awesome content :)', $readability->getContent()->getInnerHtml());
     }
 
     public function testPreFilters()
@@ -464,7 +453,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $res = $readability->init();
 
         $this->assertTrue($res);
-        $this->assertContains('This the awesome and WONDERFUL content :)', $readability->getContent()->innerHTML);
+        $this->assertContains('This the awesome and WONDERFUL content :)', $readability->getContent()->getInnerHtml());
     }
 
     public function testChildNodeGoneNull()
@@ -490,7 +479,18 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
         $res = $readability->init();
 
         $this->assertTrue($res);
-        $this->assertContains('<sup id="fnref1:fnfeed_2"><a href="#fn:fnfeed_2" class="footnote-ref">2</a></sup>', $readability->getContent()->innerHTML);
-        $this->assertContains('<a href="#fnref1:fnfeed_2" rev="footnote"', $readability->getContent()->innerHTML);
+        $this->assertContains('<sup id="fnref1:fnfeed_2"><a href="#fn:fnfeed_2" class="footnote-ref">2</a></sup>', $readability->getContent()->getInnerHtml());
+        $this->assertContains('<a href="#fnref1:fnfeed_2" rev="footnote"', $readability->getContent()->getInnerHtml());
+    }
+
+    private function getReadability($html, $url = null, $parser = 'libxml', $useTidy = true)
+    {
+        $readability = new Readability($html, $url, $parser, $useTidy);
+
+        $this->logHandler = new TestHandler();
+        $this->logger = new Logger('test', [$this->logHandler]);
+        $readability->setLogger($this->logger);
+
+        return $readability;
     }
 }