Merge pull request #112 from j0k3r/fix/1.x/tidy-php85

Fix bad encoding for `tidy_repair_string`

.github/workflows/continuous-integration.yml

@@ -3,11 +3,9 @@ name: "CI"
 on:
   pull_request:
     branches:
-      - "master"
       - "1.x"
   push:
     branches:
-      - "master"
       - "1.x"
 
 env:
@@ -21,9 +19,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - "5.6"
-          - "7.0"
-          - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
@@ -32,6 +27,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout"
@@ -122,7 +118,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - "7.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"
@@ -155,43 +151,3 @@ jobs:
 
       - name: "Run PHPUnit"
         run: "php vendor/bin/simple-phpunit -v"
-
-  phpunit-composerv2:
-    name: "PHPUnit with Composer v1 (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-latest"
-
-    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:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit"
-        run: "php vendor/bin/simple-phpunit -v"

composer.json

@@ -24,14 +24,14 @@
         "role": "Developer (original JS version)"
     }],
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.2",
         "ext-mbstring": "*",
-        "psr/log": "^1.0",
+        "psr/log": "^1.0.1 || ^2.0 || ^3.0",
         "masterminds/html5": "^2.7"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.14",
-        "monolog/monolog": "^1.24|^2.1",
+        "monolog/monolog": "^1.24|^2.1|^3.0",
         "symfony/phpunit-bridge": "^4.4|^5.3|^6.0|^7.0"
     },
     "suggest": {

src/Readability.php

@@ -118,7 +118,7 @@ class Readability implements LoggerAwareInterface
         'enclose-text' => true,
         'merge-divs' => true,
         // 'merge-spans' => true,
-        'input-encoding' => '????',
+        'input-encoding' => 'utf8',
         'output-encoding' => 'utf8',
         'hide-comments' => true,
     ];
@@ -183,10 +183,7 @@ class Readability implements LoggerAwareInterface
         $this->loadHtml();
     }
 
-    /**
+    public function setLogger(LoggerInterface $logger): void
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger)
     {
         $this->logger = $logger;
     }

tests/ReadabilityTest.php

@@ -17,6 +17,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase
     public function testConstructDefault()
     {
         $readability = $this->getReadability('');
+        $this->assertSame('utf8', $readability->tidy_config['input-encoding']);
 
         $this->assertNull($readability->url);
         $this->assertInstanceOf(\DOMDocument::class, $readability->dom);