Merge pull request #98 from jtojnar/backports

[1.x] Backport fixes
phpstan: Use standard config path
2026-09-27 14:36:23 +00:00 · 2025-02-24 09:51:12 +01:00 · 2025-02-24 09:47:42 +01:00 · 2025-02-24 09:47:42 +01:00 · 2025-02-23 02:32:57 +01:00 · 2025-02-23 02:32:57 +01:00
11 changed files with 283 additions and 298 deletions
@@ -4,9 +4,11 @@ on:
  pull_request:
    branches:
      - master
+      - 1.x
  push:
    branches:
      - master
+      - 1.x

 env:
  SYMFONY_PHPUNIT_VERSION: 7.5
@@ -14,7 +16,7 @@ env:
 jobs:
  coding-standards:
    name: "CS Fixer & PHPStan"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"

    strategy:
      matrix:
@@ -23,7 +25,7 @@ jobs:

    steps:
      - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"

      - name: "Install PHP"
        uses: "shivammathur/setup-php@v2"
@@ -39,7 +41,7 @@ jobs:
        run: "composer require phpstan/phpstan phpstan/phpstan-phpunit --dev --no-progress --no-suggest"

      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v3"
        with:
          composer-options: "--optimize-autoloader --prefer-dist"

@@ -4,9 +4,11 @@ on:
  pull_request:
    branches:
      - "master"
+      - "1.x"
  push:
    branches:
      - "master"
+      - "1.x"

 env:
  fail-fast: true
@@ -14,7 +16,7 @@ env:
 jobs:
  phpunit:
    name: "PHPUnit (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"

    strategy:
      matrix:
@@ -25,152 +27,15 @@ jobs:
          - "7.2"
          - "7.3"
          - "7.4"
+          - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"

    steps:
      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: "none"
-          tools: composer:v1
-          extensions: tidy
-          ini-values: "date.timezone=Europe/Paris"
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Force PHPUnit version"
-        if: matrix.php >= '7.2'
-        run: "echo $SYMFONY_PHPUNIT_VERSION"
-        env:
-          SYMFONY_PHPUNIT_VERSION: 7.5
-
-      - name: "Remove useless deps"
-        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit"
-        run: "php vendor/bin/simple-phpunit -v"
-
-  phpunit-coverage:
-    name: "PHPUnit coverage (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-18.04"
-
-    strategy:
-      matrix:
-        php:
-          - "7.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP with Xdebug"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: "xdebug"
-          tools: composer:v1
-          extensions: tidy
-          ini-values: "date.timezone=Europe/Paris"
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Remove useless deps"
-        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit (with coverage)"
-        run: "php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml"
-        env:
-          SYMFONY_PHPUNIT_VERSION: 7.5
-
-      - name: "Retrieve Coveralls phar"
-        run: "wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.2/php-coveralls.phar"
-
-      - name: "Enable Coveralls phar"
-        run: "chmod +x php-coveralls.phar"
-
-      - name: "Upload to Coveralls"
-        run: "php php-coveralls.phar -v -x build/logs/clover.xml"
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  phpunit-lowest:
-    name: "PHPUnit lowest deps (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-18.04"
-
-    strategy:
-      matrix:
-        php:
-          - "7.2"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: "none"
-          tools: composer:v1
-          extensions: tidy
-          ini-values: "date.timezone=Europe/Paris"
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Remove useless deps"
-        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-          dependency-versions: "lowest"
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit"
-        run: "php vendor/bin/simple-phpunit -v"
-        env:
-          SYMFONY_PHPUNIT_VERSION: 7.5
-
-  phpunit-composerv2:
-    name: "PHPUnit with Composer v2 (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-18.04"
-
-    strategy:
-      matrix:
-        php:
-          - "7.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
        with:
          fetch-depth: 2

@@ -188,6 +53,138 @@ jobs:
      - name: "Remove useless deps"
        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"

+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Setup logs"
+        run: "mkdir -p build/logs"
+
+      - name: "Run PHPUnit"
+        run: "php vendor/bin/simple-phpunit -v"
+
+  phpunit-coverage:
+    name: "PHPUnit coverage (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-22.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP with Xdebug"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: "xdebug"
+          tools: composer:v2
+          extensions: tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Remove useless deps"
+        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Setup logs"
+        run: "mkdir -p build/logs"
+
+      - name: "Run PHPUnit (with coverage)"
+        run: "php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml"
+
+      - name: "Retrieve Coveralls phar"
+        run: "wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.2/php-coveralls.phar"
+
+      - name: "Enable Coveralls phar"
+        run: "chmod +x php-coveralls.phar"
+
+      - name: "Upload to Coveralls"
+        run: "php php-coveralls.phar -v -x build/logs/clover.xml"
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  phpunit-lowest:
+    name: "PHPUnit lowest deps (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-22.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.2"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: "none"
+          tools: composer:v2
+          extensions: tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Remove useless deps"
+        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+          dependency-versions: "lowest"
+
+      - name: "Setup logs"
+        run: "mkdir -p build/logs"
+
+      - name: "Run PHPUnit"
+        run: "php vendor/bin/simple-phpunit -v"
+
+  phpunit-composerv2:
+    name: "PHPUnit with Composer v1 (PHP ${{ matrix.php }})"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: "none"
+          tools: composer:v1
+          extensions: tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Remove useless deps"
+        run: "composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update"
+
      - name: "Install dependencies with Composer"
        uses: "ramsey/composer-install@v1"
        with:
@@ -198,5 +195,3 @@ jobs:

      - name: "Run PHPUnit"
        run: "php vendor/bin/simple-phpunit -v"
-        env:
-          SYMFONY_PHPUNIT_VERSION: 7.5
@@ -3,3 +3,4 @@ coverage/
 composer.lock
 .php_cs.cache
 .phpunit.result.cache
+phpstan.neon
@@ -26,6 +26,10 @@ return (new PhpCsFixer\Config())
        'strict_comparison' => true,
        'strict_param' => true,
        'concat_space' => ['spacing' => 'one'],
+        // Pulled in by @Symfony, we cannot add property types until we bump PHP to ≥ 7.4
+        'no_null_property_initialization' => false,
+        // Pulled in by @Symfony with `const` but const visibility requires PHP ≥ 7.1
+        'visibility_required' => ['elements' => ['method', 'property']],
    ])
    ->setFinder($finder)
 ;
@@ -1,34 +0,0 @@
-dist: xenial
-os: linux
-language: php
-
-# avoid double Travis build when the PR is created on upstream
-if: |
-    type = pull_request OR \
-    branch = master
-
-jobs:
-    include:
-        - php: 8.0
-          env: SYMFONY_PHPUNIT_VERSION=7.5
-    fast_finish: true
-    allow_failures:
-        - php: 8.0
-
-cache:
-    directories:
-        - $HOME/.composer/cache/files
-
-before_install:
-    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-
-install:
-    - if [ "$CS_FIXER" != "run" ]; then composer remove friendsofphp/php-cs-fixer --dev --no-progress --no-update ; fi;
-    - composer update --prefer-dist --no-progress -o
-    - php vendor/bin/simple-phpunit install
-
-before_script:
-    - mkdir -p build/logs
-
-script:
-    - php vendor/bin/simple-phpunit -v
@@ -1,7 +1,6 @@
 # Readability

 ![CI](https://github.com/j0k3r/php-readability/workflows/CI/badge.svg)
-[![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)
@@ -32,7 +32,7 @@
    "require-dev": {
        "friendsofphp/php-cs-fixer": "^2.14",
        "monolog/monolog": "^1.24|^2.1",
-        "symfony/phpunit-bridge": "^4.4|^5.3"
+        "symfony/phpunit-bridge": "^4.4|^5.3|^6.0|^7.0"
    },
    "suggest": {
        "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure."
@@ -42,5 +42,10 @@
    },
    "autoload-dev": {
        "psr-4": { "Tests\\Readability\\": "tests/" }
+    },
+    "scripts": {
+        "fix": "php-cs-fixer fix --verbose --diff",
+        "phpstan": "phpstan analyze --memory-limit 512M",
+        "test": "simple-phpunit -v"
    }
 }
@@ -6,7 +6,7 @@ parameters:

    # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
    bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit-7.5-0/vendor/autoload.php
+        - vendor/bin/.phpunit/phpunit/vendor/autoload.php

 includes:
    - vendor/phpstan/phpstan-phpunit/extension.neon
@@ -39,9 +39,9 @@ class JSLikeHTMLElement extends \DOMElement
    /**
     * Used for setting innerHTML like it's done in JavaScript:.
     *
-     * @code
+     * ```php
     * $div->innerHTML = '<h2>Chapter 2</h2><p>The story begins...</p>';
-     * @endcode
+     * ```
     */
    public function __set($name, $value)
    {
@@ -79,14 +79,13 @@ class JSLikeHTMLElement extends \DOMElement
        } else {
            // $value is probably ill-formed
            $f = new \DOMDocument();
-            $value = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8');

            // Using <htmlfragment> will generate a warning, but so will bad HTML
            // (and by this point, bad HTML is what we've got).
            // 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.
            // Note: despite the warning, if loadHTML succeeds it will return true.
-            $result = $f->loadHTML('<htmlfragment>' . $value . '</htmlfragment>');
+            $result = $f->loadHTML('<meta charset="utf-8"><htmlfragment>' . $value . '</htmlfragment>');

            if ($result) {
                $import = $f->getElementsByTagName('htmlfragment')->item(0);
@@ -105,9 +104,9 @@ class JSLikeHTMLElement extends \DOMElement
    /**
     * Used for getting innerHTML like it's done in JavaScript:.
     *
-     * @code
+     * ```php
     * $string = $div->innerHTML;
-     * @endcode
+     * ```
     */
    public function __get($name)
    {
@@ -137,10 +137,6 @@ class Readability implements LoggerAwareInterface
    protected $useTidy;
    // raw HTML filters
    protected $pre_filters = [
-        // remove obvious scripts
-        '!<script[^>]*>(.*?)</script>!is' => '',
-        // remove obvious styles
-        '!<style[^>]*>(.*?)</style>!is' => '',
        // remove spans as we redefine styles and they're probably special-styled
        '!</?span[^>]*>!is' => '',
        // HACK: firewall-filtered content
@@ -148,7 +144,7 @@ class Readability implements LoggerAwareInterface
        // HACK: replace linebreaks plus br's with p's
        '!(<br[^>]*>[ \r\n\s]*){2,}!i' => '</p><p>',
        // replace noscripts
-        //'!</?noscript>!is' => '',
+        // '!</?noscript>!is' => '',
        // replace fonts to spans
        '!<(/?)font[^>]*>!is' => '<\\1span>',
    ];
@@ -159,8 +155,8 @@ class Readability implements LoggerAwareInterface
        // replace empty tags that break layouts
        '!<(?:a|div|p|figure)[^>]+/>!is' => '',
        // remove all attributes on text tags
-        //'!<(\s*/?\s*(?:blockquote|br|hr|code|div|article|span|footer|aside|p|pre|dl|li|ul|ol)) [^>]+>!is' => "<\\1>",
-        //single newlines cleanup
+        // '!<(\s*/?\s*(?:blockquote|br|hr|code|div|article|span|footer|aside|p|pre|dl|li|ul|ol)) [^>]+>!is' => "<\\1>",
+        // single newlines cleanup
        "/\n+/" => "\n",
        // modern web...
        '!<pre[^>]*>\s*<code!is' => '<pre',
@@ -187,6 +183,9 @@ class Readability implements LoggerAwareInterface
        $this->loadHtml();
    }

+    /**
+     * @return void
+     */
    public function setLogger(LoggerInterface $logger)
    {
        $this->logger = $logger;
@@ -367,7 +366,7 @@ class Readability implements LoggerAwareInterface
            $articleLink->setAttribute('style', 'color: inherit; text-decoration: none;');
            $articleLink->setAttribute('name', 'readabilityLink-' . $linkCount);
            $footnote->setInnerHtml('<small><sup><a href="#readabilityLink-' . $linkCount . '" title="Jump to Link in Article">^</a></sup></small> ');
-            $footnoteLink->setInnerHtml(('' !== $footnoteLink->getAttribute('title') ? $footnoteLink->getAttribute('title') : $linkText));
+            $footnoteLink->setInnerHtml('' !== $footnoteLink->getAttribute('title') ? $footnoteLink->getAttribute('title') : $linkText);
            $footnoteLink->setAttribute('name', 'readabilityFootnoteLink-' . $linkCount);
            $footnote->appendChild($footnoteLink);

@@ -394,6 +393,9 @@ class Readability implements LoggerAwareInterface

        $this->logger->debug($this->lightClean ? 'Light clean enabled.' : 'Standard clean enabled.');

+        $this->clean($articleContent, 'style');
+        $this->clean($articleContent, 'script');
+
        $this->cleanStyles($articleContent);
        $this->killBreaks($articleContent);

@@ -794,7 +796,7 @@ class Readability implements LoggerAwareInterface
     */
    public function addFlag($flag)
    {
-        $this->flags = $this->flags | $flag;
+        $this->flags |= $flag;
    }

    /**
@@ -804,13 +806,14 @@ class Readability implements LoggerAwareInterface
     */
    public function removeFlag($flag)
    {
-        $this->flags = $this->flags & ~$flag;
+        $this->flags &= ~$flag;
    }

    /**
     * Debug.
     *
     * @deprecated use $this->logger->debug() instead
+     *
     * @codeCoverageIgnore
     */
    protected function dbg($msg)
@@ -822,6 +825,7 @@ class Readability implements LoggerAwareInterface
     * Dump debug info.
     *
     * @deprecated since Monolog gather log, we don't need it
+     *
     * @codeCoverageIgnore
     */
    protected function dump_dbg()
@@ -971,11 +975,11 @@ class Readability implements LoggerAwareInterface
     * Using a variety of metrics (content score, classname, element types), find the content that is
     * most likely to be the stuff a user wants to read. Then return it wrapped up in a div.
     *
-     * @param \DOMElement $page
+     * @param ?\DOMElement $page
     *
     * @return \DOMElement|false
     */
-    protected function grabArticle(\DOMElement $page = null)
+    protected function grabArticle($page = null)
    {
        if (!$page) {
            $page = $this->dom;
@@ -990,7 +994,7 @@ class Readability implements LoggerAwareInterface

        $allElements = $page->getElementsByTagName('*');

-        for ($nodeIndex = 0; ($node = $allElements->item($nodeIndex)); ++$nodeIndex) {
+        for ($nodeIndex = 0; $node = $allElements->item($nodeIndex); ++$nodeIndex) {
            $tagName = $node->tagName;

            $nodeContent = $node->getInnerHTML();
@@ -1134,9 +1138,9 @@ class Readability implements LoggerAwareInterface
                // Remove unlikely candidates
                $unlikelyMatchString = $node->getAttribute('class') . ' ' . $node->getAttribute('id') . ' ' . $node->getAttribute('style');

-                if (mb_strlen($unlikelyMatchString) > 3 && // don't process "empty" strings
-                    preg_match($this->regexps['unlikelyCandidates'], $unlikelyMatchString) &&
-                    !preg_match($this->regexps['okMaybeItsACandidate'], $unlikelyMatchString)
+                if (mb_strlen($unlikelyMatchString) > 3 // don't process "empty" strings
+                    && preg_match($this->regexps['unlikelyCandidates'], $unlikelyMatchString)
+                    && !preg_match($this->regexps['okMaybeItsACandidate'], $unlikelyMatchString)
                ) {
                    $this->logger->debug('Removing unlikely candidate (using conf) ' . $node->getNodePath() . ' by "' . $unlikelyMatchString . '" with readability ' . ($node->hasAttribute('readability') ? (int) $node->getAttributeNode('readability')->value : 0));
                    $node->parentNode->removeChild($node);
@@ -1287,8 +1291,8 @@ class Readability implements LoggerAwareInterface

                // To ensure a node does not interfere with readability styles, remove its classnames & ids.
                // Now done via RegExp post_filter.
-                //$nodeToAppend->removeAttribute('class');
-                //$nodeToAppend->removeAttribute('id');
+                // $nodeToAppend->removeAttribute('class');
+                // $nodeToAppend->removeAttribute('id');
                // Append sibling and subtract from our list as appending removes a node.
                $articleContent->appendChild($nodeToAppend);
            }
@@ -1428,7 +1432,7 @@ class Readability implements LoggerAwareInterface
            unset($tidy);
        }

-        $this->html = mb_convert_encoding($this->html, 'HTML-ENTITIES', 'UTF-8');
+        $this->html = '<meta charset="utf-8">' . (string) $this->html;

        if ('html5lib' === $this->parser || 'html5' === $this->parser) {
            $this->dom = (new HTML5())->loadHTML($this->html);
@@ -26,9 +26,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
    {
        $readability = $this->getReadability('<html/>', 'http://0.0.0.0', 'html5lib');

-        $this->assertEquals('http://0.0.0.0', $readability->url);
+        $this->assertSame('http://0.0.0.0', $readability->url);
        $this->assertInstanceOf('DomDocument', $readability->dom);
-        $this->assertEquals('<html/>', $readability->original_html);
+        $this->assertSame('<html/>', $readability->original_html);
    }

    /**
@@ -38,9 +38,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
    {
        $readability = $this->getReadability('<html/>', 'http://0.0.0.0');

-        $this->assertEquals('http://0.0.0.0', $readability->url);
+        $this->assertSame('http://0.0.0.0', $readability->url);
        $this->assertInstanceOf('DomDocument', $readability->dom);
-        $this->assertEquals('<html/>', $readability->original_html);
+        $this->assertSame('<html/>', $readability->original_html);
        $this->assertTrue($readability->tidied);
    }

@@ -49,7 +49,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $readability = $this->getReadability('', null, 'libxml', false);

        $this->assertNull($readability->url);
-        $this->assertEquals('', $readability->original_html);
+        $this->assertSame('', $readability->original_html);
        $this->assertFalse($readability->tidied);

        $this->assertInstanceOf('DomDocument', $readability->dom);
@@ -59,9 +59,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
    {
        $readability = $this->getReadability('<html/>', 'http://0.0.0.0', 'libxml', false);

-        $this->assertEquals('http://0.0.0.0', $readability->url);
+        $this->assertSame('http://0.0.0.0', $readability->url);
        $this->assertInstanceOf('DomDocument', $readability->dom);
-        $this->assertEquals('<html/>', $readability->original_html);
+        $this->assertSame('<html/>', $readability->original_html);
        $this->assertFalse($readability->tidied);
    }

@@ -74,7 +74,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
        $this->assertEmpty($readability->getTitle()->getInnerHtml());
-        $this->assertContains('Sorry, Readability was unable to parse this page for content.', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('Sorry, Readability was unable to parse this page for content.', $readability->getContent()->getInnerHtml());
    }

    public function testInitP()
@@ -85,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()->getInnerHtml());
+        $this->assertStringContainsString('<div readability=', $readability->getContent()->getInnerHtml());
        $this->assertEmpty($readability->getTitle()->getInnerHtml());
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This is the awesome content :)', $readability->getContent()->getInnerHtml());
    }

    public function testInitDivP()
@@ -98,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()->getInnerHtml());
+        $this->assertStringContainsString('<div readability=', $readability->getContent()->getInnerHtml());
        $this->assertEmpty($readability->getTitle()->getInnerHtml());
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This is the awesome content :)', $readability->getContent()->getInnerHtml());
    }

    public function testInitDiv()
@@ -112,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()->getInnerHtml());
+        $this->assertStringContainsString('<div readability=', $readability->getContent()->getInnerHtml());
        $this->assertEmpty($readability->getTitle()->getInnerHtml());
-        $this->assertContains('This is the awesome content :)', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This is the awesome content :)', $readability->getContent()->getInnerHtml());
    }

    public function testWithFootnotes()
@@ -127,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()->getInnerHtml());
+        $this->assertStringContainsString('<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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('readabilityFootnoteLink', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('readabilityLink-3', $readability->getContent()->getInnerHtml());
    }

    public function testStandardClean()
@@ -144,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()->getInnerHtml());
+        $this->assertStringContainsString('<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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('will NOT be removed', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('<h2>', $readability->getContent()->getInnerHtml());
    }

    public function testWithIframe()
@@ -160,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()->getInnerHtml());
+        $this->assertStringContainsString('<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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('nofollow', $readability->getContent()->getInnerHtml());
    }

    public function testWithArticle()
@@ -175,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()->getInnerHtml());
+        $this->assertStringContainsString('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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('nofollow', $readability->getContent()->getInnerHtml());
    }

    public function testWithAside()
@@ -191,9 +191,9 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
        $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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('<aside>', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('<footer readability="5"/>', $readability->getContent()->getInnerHtml());
    }

    public function testWithClasses()
@@ -205,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()->getInnerHtml());
+        $this->assertStringContainsString('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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text should be removed', $readability->getContent()->getInnerHtml());
    }

    public function testWithClassesWithoutLightClean()
@@ -221,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()->getInnerHtml());
+        $this->assertStringContainsString('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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text should be removed', $readability->getContent()->getInnerHtml());
    }

    public function testWithTd()
@@ -237,7 +237,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
        $this->assertEmpty($readability->getTitle()->getInnerHtml());
-        $this->assertContains('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
    }

    public function testWithSameClasses()
@@ -250,8 +250,8 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
        $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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    public function testWithScript()
@@ -264,8 +264,8 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
        $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
        $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());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    public function testTitle()
@@ -277,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()->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());
+        $this->assertSame('this is my title', $readability->getTitle()->getInnerHtml());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    public function testTitleWithDash()
@@ -291,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()->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());
+        $this->assertSame('title2 - title3', $readability->getTitle()->getInnerHtml());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    public function testTitleWithDoubleDot()
@@ -305,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()->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());
+        $this->assertSame('title2 : title3', $readability->getTitle()->getInnerHtml());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    public function testTitleTooShortUseH1()
@@ -319,41 +319,44 @@ 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()->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());
+        $this->assertSame('this is my h1 title !', $readability->getTitle()->getInnerHtml());
+        $this->assertStringContainsString('This is an awesome text with some links, here there are', $readability->getContent()->getInnerHtml());
+        $this->assertStringNotContainsString('This text is also an awesome text and you should know that', $readability->getContent()->getInnerHtml());
    }

    // dummy function to be used to the next test
-    public function error2Exception($code, $string, $file, $line, $context)
+    public function error2Exception($code, $string, $file, $line)
    {
        throw new \Exception($string, $code);
    }

    public function testAutoClosingIframeNotThrowingException()
    {
-        error_reporting(\E_ALL | \E_STRICT);
-        ini_set('display_errors', true);
-        set_error_handler([$this, 'error2Exception'], \E_ALL | \E_STRICT);
+        $oldErrorReporting = error_reporting(\E_ALL);
+        $oldDisplayErrors = ini_set('display_errors', true);
+        set_error_handler([$this, 'error2Exception']);

-        $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#">
+        try {
+            $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#">

-            <head profile="http://gmpg.org/xfn/11">
-            <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <head profile="http://gmpg.org/xfn/11">
+                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />

-            </head>
-            <body class="single single-post postid-22030 single-format-standard">
-              <div id="wrapper">
-                <div id="content">
-                  <div class="post-22030 post type-post status-publish format-standard has-post-thumbnail hentry category-video category-reviews tag-193" id="post-22030">
-                    <h1>3D Touch &#8212; будущее мобильных игр</h1>
-                    <div class="postdate">Автор:  <strong>Сергей Пак</strong> | Просмотров: 1363 | Опубликовано:  14 сентября 2015 </div>
-                    <div class="entry">
-                      <p>Компания Apple представила новую технологию 3D Touch, которая является прямым потомком более ранней версии Force Touch &#8212; последняя, напомним, используется сейчас в трекпадах Macbook Pro и Macbook 2015. Теперь управлять устройством стало в разы проще, и Force Touch открывает перед пользователями новые возможности, но при этом 3D Touch &#8212; это про другое. Дело в том, что теперь и на мобильных устройствах интерфейс будет постепенно меняться, кардинальные перемены ждут мобильный гейминг, потому что здесь разработчики действительно могут разгуляться.<span id="more-22030"></span></p>
-                      <p><iframe src="https://www.youtube.com/embed/PUep6xNeKjA" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p>
-                      <p>Итак, просто представьте себе, что iPhone 6S &#8212; это, по большому счету, отличная игровая приставка, которую вы носите с собой, а еще она может выдавать невероятной красоты картинку. Но проблема заключается, пожалуй, в том, что управлять персонажем в играх довольно трудно &#8212; он неповоротлив, обладает заторможенной реакцией, а игровой клиент зачастую требует перегруза интерфейса для того, чтобы обеспечить максимально большое количество возможностей. Благодаря трехуровневому нажатию можно избавиться от лишних кнопок и обеспечить более качественный обзор местности, и при этом пользователь будет закрывать пальцами минимальное пространство.</p>
+                </head>
+                <body class="single single-post postid-22030 single-format-standard">
+                  <div id="wrapper">
+                    <div id="content">
+                      <div class="post-22030 post type-post status-publish format-standard has-post-thumbnail hentry category-video category-reviews tag-193" id="post-22030">
+                        <h1>3D Touch &#8212; будущее мобильных игр</h1>
+                        <div class="postdate">Автор:  <strong>Сергей Пак</strong> | Просмотров: 1363 | Опубликовано:  14 сентября 2015 </div>
+                        <div class="entry">
+                          <p>Компания Apple представила новую технологию 3D Touch, которая является прямым потомком более ранней версии Force Touch &#8212; последняя, напомним, используется сейчас в трекпадах Macbook Pro и Macbook 2015. Теперь управлять устройством стало в разы проще, и Force Touch открывает перед пользователями новые возможности, но при этом 3D Touch &#8212; это про другое. Дело в том, что теперь и на мобильных устройствах интерфейс будет постепенно меняться, кардинальные перемены ждут мобильный гейминг, потому что здесь разработчики действительно могут разгуляться.<span id="more-22030"></span></p>
+                          <p><iframe src="https://www.youtube.com/embed/PUep6xNeKjA" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"></iframe></p>
+                          <p>Итак, просто представьте себе, что iPhone 6S &#8212; это, по большому счету, отличная игровая приставка, которую вы носите с собой, а еще она может выдавать невероятной красоты картинку. Но проблема заключается, пожалуй, в том, что управлять персонажем в играх довольно трудно &#8212; он неповоротлив, обладает заторможенной реакцией, а игровой клиент зачастую требует перегруза интерфейса для того, чтобы обеспечить максимально большое количество возможностей. Благодаря трехуровневому нажатию можно избавиться от лишних кнопок и обеспечить более качественный обзор местности, и при этом пользователь будет закрывать пальцами минимальное пространство.</p>
+                        </div>
+                      </div>
                    </div>
                  </div>
                </div>
@@ -361,16 +364,23 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
            </body>
            </html>';

-        $readability = $this->getReadability($data, 'http://iosgames.ru/?p=22030');
-        $readability->debug = true;
+            $readability = $this->getReadability($data, 'http://iosgames.ru/?p=22030');
+            $readability->debug = true;

-        $res = $readability->init();
+            $res = $readability->init();

-        $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()->getInnerHtml());
-        $this->assertContains('3D Touch', $readability->getTitle()->getInnerHtml());
+            $this->assertTrue($res);
+            $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getContent());
+            $this->assertInstanceOf('Readability\JSLikeHTMLElement', $readability->getTitle());
+            $this->assertStringContainsString('<iframe src="https://www.youtube.com/embed/PUep6xNeKjA" width="560" height="315" frameborder="0" allowfullscreen="allowfullscreen"> </iframe>', $readability->getContent()->getInnerHtml());
+            $this->assertStringContainsString('3D Touch', $readability->getTitle()->getInnerHtml());
+        } finally {
+            restore_error_handler();
+            if (false !== $oldDisplayErrors) {
+                ini_set('display_errors', $oldDisplayErrors);
+            }
+            error_reporting($oldErrorReporting);
+        }
    }

    /**
@@ -440,7 +450,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $res = $readability->init();

        $this->assertTrue($res);
-        $this->assertContains('This  the awesome content :)', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This  the awesome content :)', $readability->getContent()->getInnerHtml());
    }

    public function testPreFilters()
@@ -453,7 +463,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $res = $readability->init();

        $this->assertTrue($res);
-        $this->assertContains('This the awesome and WONDERFUL content :)', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('This the awesome and WONDERFUL content :)', $readability->getContent()->getInnerHtml());
    }

    public function testChildNodeGoneNull()
@@ -479,8 +489,8 @@ 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()->getInnerHtml());
-        $this->assertContains('<a href="#fnref1:fnfeed_2" rev="footnote"', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('<sup id="fnref1:fnfeed_2"><a href="#fn:fnfeed_2" class="footnote-ref">2</a></sup>', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('<a href="#fnref1:fnfeed_2" rev="footnote"', $readability->getContent()->getInnerHtml());
    }

    public function testWithWipedBody()
@@ -493,7 +503,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
        $res = $readability->init();

        $this->assertTrue($res);
-        $this->assertContains('<a href="alice-I.html">Down the Rabbit-Hole</a>', $readability->getContent()->getInnerHtml());
+        $this->assertStringContainsString('<a href="alice-I.html">Down the Rabbit-Hole</a>', $readability->getContent()->getInnerHtml());
    }

    private function getReadability($html, $url = null, $parser = 'libxml', $useTidy = true)
Author	SHA1	Message	Date
Jérémy BenoistandGitHub	487ce3a517	Merge pull request #98 from jtojnar/backports [1.x] Backport fixes	2025-02-24 09:51:12 +01:00
Jan Tojnar	0bae41248f	phpstan: Use standard config path This allows developer to create their own own config file, e.g. for setting `editorUrl`: https://phpstan.org/user-guide/output-format#opening-file-in-an-editor (cherry picked from commit `1d7cdf3a12`)	2025-02-24 09:47:42 +01:00
Jan Tojnar	ae0c20ab18	composer: Allow phpunit-bridge 6.0 and 7.0 This is required for PHP 8.4 support. On master this was done in `66215a6c80` and `1ac761d708`.	2025-02-24 09:47:42 +01:00
Jan Tojnar	84220bff99	ci: Add PHP 8.1 through 8.4 - 8.1 was introduced in `66215a6c80` - 8.2 and 8.3 was introduced in `9bdd3b6b2e` - 8.4 cherry picked from commit `5b9551d1e3`	2025-02-23 02:32:57 +01:00
Jan Tojnar	2ae758555a	Remove extra set_error_handler callback argument It is unused and would cause an error on PHP ≥ 8.0: https://www.php.net/manual/en/function.set-error-handler.php#refsect1-function.set-error-handler-parameters Not sure if the handler is even necessary – it was introduced in `175196d6c2` but I did not manage to reproduce the original error (Entity 'nbsp' not defined). It was probably fixed by `f2a43b476c`. (based on commit `da755013aa`)	2025-02-23 02:32:57 +01:00
Jan Tojnar	f5e25f3c9c	Avoid E_STRICT constant It will be deprecated in PHP 8.4 and it is meaningless nowadays anyway: https://wiki.php.net/rfc/deprecations_php_8_4#remove_e_strict_error_level_and_deprecate_e_strict_constant The use of the constant was introduced in `175196d6c2`. (cherry picked from commit `c7b10dcc45`)	2025-02-23 02:32:57 +01:00
Jan Tojnar	a209429e8b	tests: Fix “THE ERROR HANDLER HAS CHANGED!” (cherry picked from commit `23f824a1ce`)	2025-02-23 02:32:57 +01:00
Jan Tojnar	8421ed5962	Update coding style for upcoming PHP-CS-Fixer changes Once we bump minimum PHP version, we will get newer PHP-CS-Fixer, which will try to apply this cleanups. (partially cherry picked from commit `648d8c605b`) Though avoid disabling `modernize_strpos` since it was only introduced in PHP-CS-Fixer 3.2.0: https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/commit/2ca22a27c4ffb8cc46f20e7110b1dfcbb0c8c47c Also had to disable `visibility_required` for constants since those require PHP ≥ 7.1: https://cs.symfony.com/doc/rules/class_notation/visibility_required.html And remove type hint from `grabArticle` since implicitly nullable types were deprecated in PHP 8.4: https://wiki.php.net/rfc/deprecate-implicitly-nullable-types But we cannot use explicitly nullable types, which require PHP ≥ 7.1: https://wiki.php.net/rfc/nullable_types Also switch code blocks to Markdown syntax to work around `phpdoc_separation`, ApiGen uses Markdown these days anyway. (partially cherry picked from commit `9ed89bde92`)	2025-02-23 02:32:57 +01:00
Jan Tojnar	66864279fd	composer: Add scripts for development (cherry picked from commit `c5407ec07c`, except for rector)	2025-02-23 02:16:17 +01:00
Jan Tojnar	ae87c8ca8c	ci: Do not force PHPUnit version It should no longer be necessary and PHPUnit 7.5 is not compatible with PHP 8.4. master did that in `66215a6c80`.	2025-02-23 02:16:17 +01:00
Jan Tojnar	4adb0a96aa	PHPStan: Use stable PHPUnit path phpunit-bridge will create a symlink. (cherry picked from commit `2c6c6d5987`)	2025-02-23 02:16:17 +01:00
Jan Tojnar	baa0a78ab6	ci: Switch to composer v2 Composer v1 is not compatible with PHP 8.4. master switched in `66215a6c80`.	2025-02-23 01:34:11 +01:00
Jan Tojnar	2112dd95d1	ci: Update actions Mostly just of nodejs bump: - https://github.com/actions/checkout/releases/tag/v4.0.0 - https://github.com/ramsey/composer-install/releases/tag/3.0.0 (cherry picked from commit `7f4c6cfcbd`, resolving conflicts with previous bump in `82083c872b`)	2025-02-23 01:34:09 +01:00
Jan Tojnar	f4550ccc46	ci: Enable on 1.x branch	2025-02-23 01:34:05 +01:00
Jan Tojnar	6f4404030b	Do not use `mb_convert_encoding` with `HTML-ENTITIES` as target encoding This is deprecated since PHP 8.2: Deprecated: mb_convert_encoding(): Handling HTML entities via mbstring is deprecated; use htmlspecialchars, htmlentities, or mb_encode_numericentity/mb_decode_numericentity instead It was used because `DOMDocument`, which uses libxml2 internally, will parse the HTML as ISO-8859-1, unless the document contains an XML encoding declaration or HTML meta tag setting character set. Since first such element wins, putting the `meta[charset]` up front will ensure the parser uses the correct encoding, even if the document contains incorrect meta tag (e.g. when the document is converted to UTF-8 without also updating the metadata by the software passing it to Readability). https://stackoverflow.com/a/39148511/160386 (cherry picked from commit `f14428e4c0`)	2025-02-23 01:34:02 +01:00
Jérémy BenoistandGitHub	5638357306	Merge pull request #74 from Kdecherf/fix/pre-filters-failure	2022-06-13 06:15:24 +02:00
Kevin Decherf	651e8a6bb0	Strip script and style tags through ::clean() method instead of preg_replace Huge tags can lead to a failure of preg_replace, thus erasing the whole fetched content. Fixes https://github.com/wallabag/wallabag/issues/5847 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2022-06-11 00:11:36 +02:00
Jérémy BenoistandGitHub	b1a20a9575	Merge pull request #68 from open-source-contributions/master Using assertSame to make assertion equal strict	2021-12-17 12:17:44 +01:00
peter279k	97c02e8ad4	Using assertSame to make assertion equal strict	2021-12-17 19:09:36 +08:00
Jérémy BenoistandGitHub	c506b7ebd7	Merge pull request #67 from j0k3r/fix/psr-log-void Fix deprecated message	2021-11-29 21:06:47 +01:00
Jeremy Benoist	d0af21814a	Ditch `assertContains` & `assertNotContains`	2021-11-29 21:04:56 +01:00
Jeremy Benoist	5b1eba79bd	Test on PHP 8 & drop Travis	2021-11-29 21:00:36 +01:00
Jérémy BenoistandGitHub	fabf096ce6	Fix deprecated message > Method "Psr\Log\LoggerAwareInterface::setLogger()" might add "void" as a native return type declaration in the future. Do the same in implementation "Readability\Readability" now to avoid errors or add an explicit @return annotation to suppress this message.	2021-11-29 20:50:10 +01:00