From ff7e99b986c7159799e0c2e64ddddf644d413d56 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 31 Jul 2022 09:42:00 +0300
Subject: [PATCH] readability: import fixed html5-php

---
 plugins/af_readability/composer.lock                        | 4 ++--
 .../af_readability/vendor/composer/InstalledVersions.php    | 6 +++---
 plugins/af_readability/vendor/composer/installed.json       | 4 ++--
 plugins/af_readability/vendor/composer/installed.php        | 6 +++---
 .../html5/src/HTML5/Parser/StringInputStream.php            | 3 +++
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/plugins/af_readability/composer.lock b/plugins/af_readability/composer.lock
index 32e78d79f..cbd60b592 100644
--- a/plugins/af_readability/composer.lock
+++ b/plugins/af_readability/composer.lock
@@ -242,7 +242,7 @@
             "source": {
                 "type": "git",
                 "url": "https://dev.tt-rss.org/fox/html5-php.git",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
+                "reference": "1e0033a694ce576deba7c59c1da56c76e9e42109"
             },
             "require": {
                 "ext-ctype": "*",
@@ -298,7 +298,7 @@
                 "serializer",
                 "xml"
             ],
-            "time": "2021-07-01T14:25:37+00:00"
+            "time": "2022-07-31T06:41:22+00:00"
         },
         {
             "name": "psr/http-factory",
diff --git a/plugins/af_readability/vendor/composer/InstalledVersions.php b/plugins/af_readability/vendor/composer/InstalledVersions.php
index dff9a52c6..8b617d5ba 100644
--- a/plugins/af_readability/vendor/composer/InstalledVersions.php
+++ b/plugins/af_readability/vendor/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '4aefbd628e9a0e1eac58523904ad887b0635cda3',
+    'reference' => 'a8b0bce008e23f9c47bf1f4de4d8e6886435071e',
     'name' => '__root__',
   ),
   'versions' => 
@@ -42,7 +42,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '4aefbd628e9a0e1eac58523904ad887b0635cda3',
+      'reference' => 'a8b0bce008e23f9c47bf1f4de4d8e6886435071e',
     ),
     'fivefilters/readability.php' => 
     array (
@@ -80,7 +80,7 @@ class InstalledVersions
       array (
         0 => '2.7.x-dev',
       ),
-      'reference' => 'f640ac1bdddff06ea333a920c95bbad8872429ab',
+      'reference' => '1e0033a694ce576deba7c59c1da56c76e9e42109',
     ),
     'psr/http-factory' => 
     array (
diff --git a/plugins/af_readability/vendor/composer/installed.json b/plugins/af_readability/vendor/composer/installed.json
index 48dd76515..9ce492622 100644
--- a/plugins/af_readability/vendor/composer/installed.json
+++ b/plugins/af_readability/vendor/composer/installed.json
@@ -246,7 +246,7 @@
             "source": {
                 "type": "git",
                 "url": "https://dev.tt-rss.org/fox/html5-php.git",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
+                "reference": "1e0033a694ce576deba7c59c1da56c76e9e42109"
             },
             "require": {
                 "ext-ctype": "*",
@@ -257,7 +257,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
             },
-            "time": "2021-07-01T14:25:37+00:00",
+            "time": "2022-07-31T06:41:22+00:00",
             "default-branch": true,
             "type": "library",
             "extra": {
diff --git a/plugins/af_readability/vendor/composer/installed.php b/plugins/af_readability/vendor/composer/installed.php
index f5d8aae68..48ffae0d7 100644
--- a/plugins/af_readability/vendor/composer/installed.php
+++ b/plugins/af_readability/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '4aefbd628e9a0e1eac58523904ad887b0635cda3',
+    'reference' => 'a8b0bce008e23f9c47bf1f4de4d8e6886435071e',
     'name' => '__root__',
   ),
   'versions' => 
@@ -18,7 +18,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '4aefbd628e9a0e1eac58523904ad887b0635cda3',
+      'reference' => 'a8b0bce008e23f9c47bf1f4de4d8e6886435071e',
     ),
     'fivefilters/readability.php' => 
     array (
@@ -56,7 +56,7 @@
       array (
         0 => '2.7.x-dev',
       ),
-      'reference' => 'f640ac1bdddff06ea333a920c95bbad8872429ab',
+      'reference' => '1e0033a694ce576deba7c59c1da56c76e9e42109',
     ),
     'psr/http-factory' => 
     array (
diff --git a/plugins/af_readability/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php b/plugins/af_readability/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
index 0c213feb6..bed9d6eab 100644
--- a/plugins/af_readability/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
+++ b/plugins/af_readability/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
@@ -192,6 +192,7 @@ class StringInputStream implements InputStream
      * Advance the pointer.
      * This is part of the Iterator interface.
      */
+	#[\ReturnTypeWillChange]
     public function next()
     {
         ++$this->char;
@@ -200,6 +201,7 @@ class StringInputStream implements InputStream
     /**
      * Rewind to the start of the string.
      */
+	#[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->char = 0;
@@ -210,6 +212,7 @@ class StringInputStream implements InputStream
      *
      * @return bool Whether the current pointer location is valid.
      */
+	#[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->char < $this->EOF;