468 files changed, 1684 insertions, 859 deletions

diff --git a/backend.php b/backend.php
index b2ff46dca..bd24416f6 100644
--- a/backend.php
+++ b/backend.php
@@ -161,6 +161,6 @@
 	}
 
 	header("Content-Type: text/json");
-	print Errors::to_json(Errors::E_UNKNOWN_METHOD, [ "info" => (isset($handler) ? get_class($handler) : "UNKNOWN:".$_REQUEST["op"]) . "->$method"]);
+	print Errors::to_json(Errors::E_UNKNOWN_METHOD, [ "info" => (isset($handler) ? get_class($handler) : "UNKNOWN:".$op) . "->$method"]);
 
 ?>
diff --git a/classes/api.php b/classes/api.php
index 5f825e551..033aa8654 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -307,6 +307,7 @@ class API extends Handler {
 		$article_ids = explode(',', clean($_REQUEST['article_id'] ?? ''));
 		$sanitize_content = self::_param_to_bool($_REQUEST['sanitize'] ?? true);
 
+		// @phpstan-ignore-next-line
 		if (count($article_ids)) {
 			$entries = ORM::for_table('ttrss_entries')
 				->table_alias('e')
@@ -369,7 +370,6 @@ class API extends Handler {
 			}
 
 			$this->_wrap(self::STATUS_OK, $articles);
-		// @phpstan-ignore-next-line
 		} else {
 			$this->_wrap(self::STATUS_ERR, ['error' => self::E_INCORRECT_USAGE]);
 		}
diff --git a/classes/config.php b/classes/config.php
index 4ae4a2407..be4ecde36 100644
--- a/classes/config.php
+++ b/classes/config.php
@@ -170,6 +170,9 @@ class Config {
 	const AUTH_MIN_INTERVAL = "AUTH_MIN_INTERVAL";
 	// minimum amount of seconds required between authentication attempts
 
+	const HTTP_USER_AGENT = "HTTP_USER_AGENT";
+	// http user agent (changing this is not recommended)
+
 	// default values for all of the above:
 	private const _DEFAULTS = [
 		Config::DB_TYPE => [ "pgsql", 									Config::T_STRING ],
@@ -224,6 +227,8 @@ class Config {
 		Config::CHECK_FOR_PLUGIN_UPDATES => [ "true",				Config::T_BOOL ],
 		Config::ENABLE_PLUGIN_INSTALLER => [ "true",					Config::T_BOOL ],
 		Config::AUTH_MIN_INTERVAL => [ 5,								Config::T_INT ],
+		Config::HTTP_USER_AGENT => [ 'Tiny Tiny RSS/%s (https://tt-rss.org/)',
+																					Config::T_STRING ],
 	];
 
 	private static $instance;
@@ -632,4 +637,8 @@ class Config {
 
 		return $rv;
 	}
+
+	static function get_user_agent() {
+		return sprintf(self::get(self::HTTP_USER_AGENT), self::get_version());
+	}
 }
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 18afeaa94..b4774941f 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -190,6 +190,7 @@ abstract class FeedItem_Common extends FeedItem {
 		}, $tmp);
 
 		// remove empty values
+		// @phpstan-ignore-next-line
 		$tmp = array_filter($tmp, 'strlen');
 
 		asort($tmp);
diff --git a/classes/feeds.php b/classes/feeds.php
index 42673ca95..ea9158949 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -230,17 +230,43 @@ class Feeds extends Handler_Protected {
 
 				$line["feed_title"] = $line["feed_title"] ?? "";
 
+				$button_doc = new DOMDocument();
+
 				$line["buttons_left"] = "";
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ARTICLE_LEFT_BUTTON,
-					function ($result) use (&$line) {
-						$line["buttons_left"] .= $result;
+					function ($result, $plugin) use (&$line, &$button_doc) {
+						if ($result && $button_doc->loadXML($result)) {
+
+							/** @var DOMElement|null */
+							$child = $button_doc->firstChild;
+
+							if ($child) {
+								do {
+									$child->setAttribute('data-plugin-name', get_class($plugin));
+								} while ($child = $child->nextSibling);
+
+								$line["buttons_left"] .= $button_doc->saveXML($button_doc->firstChild);
+							}
+						}
 					},
 					$line);
 
 				$line["buttons"] = "";
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ARTICLE_BUTTON,
-					function ($result) use (&$line) {
-						$line["buttons"] .= $result;
+					function ($result, $plugin) use (&$line, &$button_doc) {
+						if ($result && $button_doc->loadXML($result)) {
+
+							/** @var DOMElement|null */
+							$child = $button_doc->firstChild;
+
+							if ($child) {
+								do {
+									$child->setAttribute('data-plugin-name', get_class($plugin));
+								} while ($child = $child->nextSibling);
+
+								$line["buttons"] .= $button_doc->saveXML($button_doc->firstChild);
+							}
+						}
 					},
 					$line);
 
@@ -587,6 +613,23 @@ class Feeds extends Handler_Protected {
 		]);
 	}
 
+	function opensite() {
+		$feed = ORM::for_table('ttrss_feeds')
+			->find_one((int)$_REQUEST['feed_id']);
+
+		if ($feed) {
+			$site_url = UrlHelper::validate($feed->site_url);
+
+			if ($site_url) {
+				header("Location: $site_url");
+				return;
+			}
+		}
+
+		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+		print "Feed not found or has an empty site URL.";
+	}
+
 	function updatedebugger() {
 		header("Content-type: text/html");
 
@@ -996,6 +1039,13 @@ class Feeds extends Handler_Protected {
 
 		if (!$url) return ["code" => 2];
 
+		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_PRE_SUBSCRIBE,
+			/** @phpstan-ignore-next-line */
+			function ($result) use (&$url, &$auth_login, &$auth_pass) {
+				// arguments are updated inside the hook (if needed)
+			},
+			$url, $auth_login, $auth_pass);
+
 		$contents = UrlHelper::fetch($url, false, $auth_login, $auth_pass);
 
 		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_SUBSCRIBE_FEED,
@@ -1105,6 +1155,30 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
+	/** $owner_uid defaults to $_SESSION['uid] */
+	static function _find_by_title(string $title, bool $cat = false, int $owner_uid = 0) {
+
+		$res = false;
+
+		if ($cat) {
+			$res = ORM::for_table('ttrss_feed_categories')
+				->where('owner_uid', $owner_uid ? $owner_uid : $_SESSION['uid'])
+				->where('title', $title)
+				->find_one();
+		} else {
+			$res = ORM::for_table('ttrss_feeds')
+				->where('owner_uid', $owner_uid ? $owner_uid : $_SESSION['uid'])
+				->where('title', $title)
+				->find_one();
+		}
+
+		if ($res) {
+			return $res->id;
+		} else {
+			return false;
+		}
+	}
+
 	static function _get_title($id, bool $cat = false) {
 	    $pdo = Db::pdo();
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 4da32e90d..14474d0bb 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -53,6 +53,10 @@ class Handler_Public extends Handler {
 
 			if ($handler) {
 				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id((int)$feed), $params);
+			} else {
+				user_error("Failed to find handler for plugin feed ID: $feed", E_USER_ERROR);
+
+				return false;
 			}
 
 		} else {
@@ -448,7 +452,7 @@ class Handler_Public extends Handler {
 
 			if ($login) {
 				$user = ORM::for_table('ttrss_users')
-					->select('id', 'resetpass_token')
+					->select_many('id', 'resetpass_token')
 					->where_raw('LOWER(login) = LOWER(?)', [$login])
 					->find_one();
 
diff --git a/classes/opml.php b/classes/opml.php
index 2cfc890fa..e0dbebcda 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -48,9 +48,7 @@ class OPML extends Handler_Protected {
 
 	// Export
 
-	private function opml_export_category($owner_uid, $cat_id, $hide_private_feeds = false, $include_settings = true) {
-
-		$cat_id = (int) $cat_id;
+	private function opml_export_category(int $owner_uid, int $cat_id, bool $hide_private_feeds = false, bool $include_settings = true) {
 
 		if ($hide_private_feeds)
 			$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
@@ -126,7 +124,7 @@ class OPML extends Handler_Protected {
 		return $out;
 	}
 
-	function opml_export($filename, $owner_uid, $hide_private_feeds = false, $include_settings = true, $file_output = false) {
+	function opml_export(string $filename, int $owner_uid, bool $hide_private_feeds = false, bool $include_settings = true, bool $file_output = false) {
 		if (!$owner_uid) return;
 
 		if (!$file_output)
@@ -189,7 +187,7 @@ class OPML extends Handler_Protected {
 				WHERE owner_uid = ? ORDER BY id");
 			$sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
+			while ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
 				$line["rules"] = array();
 				$line["actions"] = array();
 
@@ -204,36 +202,36 @@ class OPML extends Handler_Protected {
 					$cat_filter = $tmp_line["cat_filter"];
 
 					if (!$tmp_line["match_on"]) {
-                        if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
-                            $tmp_line["feed"] = Feeds::_get_title(
-                                $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
-                                $cat_filter);
-                        } else {
-                            $tmp_line["feed"] = "";
-                        }
-                    } else {
-					    $match = [];
-					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
-
-                            if (strpos($feed_id, "CAT:") === 0) {
-                                $feed_id = (int)substr($feed_id, 4);
-                                if ($feed_id) {
-                                    array_push($match, [Feeds::_get_cat_title($feed_id), true, false]);
-                                } else {
-                                    array_push($match, [0, true, true]);
-                                }
-                            } else {
-                                if ($feed_id) {
-                                    array_push($match, [Feeds::_get_title((int)$feed_id), false, false]);
-                                } else {
-                                    array_push($match, [0, false, true]);
-                                }
-                            }
-                        }
-
-                        $tmp_line["match"] = $match;
-					    unset($tmp_line["match_on"]);
-                    }
+						if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
+							$tmp_line["feed"] = Feeds::_get_title(
+								$cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
+								$cat_filter);
+						} else {
+							$tmp_line["feed"] = "";
+						}
+					} else {
+						$match = [];
+						foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
+
+							if (strpos($feed_id, "CAT:") === 0) {
+								$feed_id = (int)substr($feed_id, 4);
+								if ($feed_id) {
+									array_push($match, [Feeds::_get_cat_title($feed_id), true, false]);
+								} else {
+									array_push($match, [0, true, true]);
+								}
+							} else {
+								if ($feed_id) {
+									array_push($match, [Feeds::_get_title((int)$feed_id), false, false]);
+								} else {
+									array_push($match, [0, false, true]);
+								}
+							}
+						}
+
+						$tmp_line["match"] = $match;
+						unset($tmp_line["match_on"]);
+					}
 
 					unset($tmp_line["feed_id"]);
 					unset($tmp_line["cat_id"]);
@@ -298,7 +296,7 @@ class OPML extends Handler_Protected {
 
 	// Import
 
-	private function opml_import_feed($node, $cat_id, $owner_uid) {
+	private function opml_import_feed(DOMNode $node, int $cat_id, int $owner_uid, int $nest) {
 		$attrs = $node->attributes;
 
 		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
@@ -318,7 +316,7 @@ class OPML extends Handler_Protected {
 
 			if (!$sth->fetch()) {
 				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
-				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title), $nest);
 
 				if (!$cat_id) $cat_id = null;
 
@@ -338,12 +336,12 @@ class OPML extends Handler_Protected {
 				$sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url, $order_id, $update_interval, $purge_interval]);
 
 			} else {
-				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title), $nest);
 			}
 		}
 	}
 
-	private function opml_import_label($node, $owner_uid) {
+	private function opml_import_label(DOMNode $node, int $owner_uid, int $nest) {
 		$attrs = $node->attributes;
 		$label_name = $attrs->getNamedItem('label-name')->nodeValue;
 
@@ -351,16 +349,16 @@ class OPML extends Handler_Protected {
 			$fg_color = $attrs->getNamedItem('label-fg-color')->nodeValue;
 			$bg_color = $attrs->getNamedItem('label-bg-color')->nodeValue;
 
-			if (!Labels::find_id($label_name, $_SESSION['uid'])) {
-				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
+			if (!Labels::find_id($label_name, $owner_uid)) {
+				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)), $nest);
 				Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
 			} else {
-				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
+				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)), $nest);
 			}
 		}
 	}
 
-	private function opml_import_preference($node) {
+	private function opml_import_preference(DOMNode $node, int $owner_uid, int $nest) {
 		$attrs = $node->attributes;
 		$pref_name = $attrs->getNamedItem('pref-name')->nodeValue;
 
@@ -368,13 +366,13 @@ class OPML extends Handler_Protected {
 			$pref_value = $attrs->getNamedItem('value')->nodeValue;
 
 			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
-				$pref_name, $pref_value));
+				$pref_name, $pref_value), $nest);
 
-			set_pref($pref_name, $pref_value);
+			set_pref($pref_name, $pref_value, $owner_uid);
 		}
 	}
 
-	private function opml_import_filter($node) {
+	private function opml_import_filter(DOMNode $node, int $owner_uid, int $nest) {
 		$attrs = $node->attributes;
 
 		$filter_type = $attrs->getNamedItem('filter-type')->nodeValue;
@@ -393,47 +391,58 @@ class OPML extends Handler_Protected {
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
 					VALUES (?, ?, ?, ?, ?)");
 
-				$sth->execute([$match_any_rule, $enabled, $inverse, $title, $_SESSION['uid']]);
+				$sth->execute([$match_any_rule, $enabled, $inverse, $title, $owner_uid]);
 
 				$sth = $this->pdo->prepare("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ?");
-				$sth->execute([$_SESSION['uid']]);
+				$sth->execute([$owner_uid]);
 
 				$row = $sth->fetch();
 				$filter_id = $row['id'];
 
 				if ($filter_id) {
-					$this->opml_notice(T_sprintf("Adding filter %s...", $title));
+					$this->opml_notice(T_sprintf("Adding filter %s...", $title), $nest);
+					//$this->opml_notice(json_encode($filter));
 
 					foreach ($filter["rules"] as $rule) {
 						$feed_id = null;
 						$cat_id = null;
 
-						if ($rule["match"]) {
+						if ($rule["match"] ?? false) {
+
+							$match_on = [];
 
-                            $match_on = [];
+							foreach ($rule["match"] as $match) {
+								list ($name, $is_cat, $is_id) = $match;
 
-						    foreach ($rule["match"] as $match) {
-						        list ($name, $is_cat, $is_id) = $match;
+								if ($is_id) {
+									array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+								} else {
 
-						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
-                                } else {
+									$match_id = Feeds::_find_by_title($name, $is_cat, $owner_uid);
 
-                                    if (!$is_cat) {
-                                        $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
-                                    		WHERE title = ? AND owner_uid = ?");
+									if ($match_id) {
+										if ($is_cat) {
+											array_push($match_on, "CAT:$match_id");
+										} else {
+											array_push($match_on, $match_id);
+										}
+									}
 
-                                        $tsth->execute([$name, $_SESSION['uid']]);
+									/*if (!$is_cat) {
+										$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+											WHERE title = ? AND owner_uid = ?");
 
-                                        if ($row = $tsth->fetch()) {
-                                            $match_id = $row['id'];
+										$tsth->execute([$name, $_SESSION['uid']]);
+
+										if ($row = $tsth->fetch()) {
+											$match_id = $row['id'];
 
 											array_push($match_on, $match_id);
-                                        }
-                                    } else {
-                                        $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
-                                    		WHERE title = ? AND owner_uid = ?");
+										}
+									} else {
+										$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+											WHERE title = ? AND owner_uid = ?");
 										$tsth->execute([$name, $_SESSION['uid']]);
 
 										if ($row = $tsth->fetch()) {
@@ -441,54 +450,64 @@ class OPML extends Handler_Protected {
 
 											array_push($match_on, "CAT:$match_id");
 										}
-                                    }
-                                }
-                            }
+									} */
+								}
+							}
 
-                            $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
-                            $inverse = bool_to_sql_bool($rule["inverse"]);
-                            $match_on = json_encode($match_on);
+							$reg_exp = $rule["reg_exp"];
+							$filter_type = (int)$rule["filter_type"];
+							$inverse = bool_to_sql_bool($rule["inverse"]);
+							$match_on = json_encode($match_on);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
+							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
 								(feed_id,cat_id,match_on,filter_id,filter_type,reg_exp,cat_filter,inverse)
-                                VALUES
-                                (NULL, NULL, ?, ?, ?, ?, false, ?)");
-                            $usth->execute([$match_on, $filter_id, $filter_type, $reg_exp, $inverse]);
+								VALUES
+								(NULL, NULL, ?, ?, ?, ?, false, ?)");
+							$usth->execute([$match_on, $filter_id, $filter_type, $reg_exp, $inverse]);
 
-                        } else {
+						} else {
 
-                            if (!$rule["cat_filter"]) {
-                                $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
-                                    WHERE title = ? AND owner_uid = ?");
+							$match_id = Feeds::_find_by_title($rule['feed'] ?? "", $rule['cat_filter'], $owner_uid);
 
-                                $tsth->execute([$rule['feed'], $_SESSION['uid']]);
+							if ($match_id) {
+								if ($rule['cat_filter']) {
+									$cat_id = $match_id;
+								} else {
+									$feed_id = $match_id;
+								}
+							}
 
-                                if ($row = $tsth->fetch()) {
-                                    $feed_id = $row['id'];
-                                }
-                            } else {
+							/*if (!$rule["cat_filter"]) {
+								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+									WHERE title = ? AND owner_uid = ?");
+
+								$tsth->execute([$rule['feed'], $_SESSION['uid']]);
+
+								if ($row = $tsth->fetch()) {
+									$feed_id = $row['id'];
+								}
+							} else {
 								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
-                                    WHERE title = ? AND owner_uid = ?");
+									WHERE title = ? AND owner_uid = ?");
 
 								$tsth->execute([$rule['feed'], $_SESSION['uid']]);
 
 								if ($row = $tsth->fetch()) {
 									$feed_id = $row['id'];
 								}
-                            }
+							} */
 
-                            $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
-                            $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
-                            $inverse = bool_to_sql_bool($rule["inverse"]);
+							$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
+							$reg_exp = $rule["reg_exp"];
+							$filter_type = (int)$rule["filter_type"];
+							$inverse = bool_to_sql_bool($rule["inverse"]);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
+							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
 								(feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter,inverse)
-                                VALUES
-                                (?, ?, ?, ?, ?, ?, ?)");
-                            $usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
-                        }
+								VALUES
+								(?, ?, ?, ?, ?, ?, ?)");
+							$usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
+						}
 					}
 
 					foreach ($filter["actions"] as $action) {
@@ -507,8 +526,8 @@ class OPML extends Handler_Protected {
 		}
 	}
 
-	private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
-		$default_cat_id = (int) $this->get_feed_category('Imported feeds', false);
+	private function opml_import_category(DOMDocument $doc, ?DOMNode $root_node, int $owner_uid, int $parent_id, int $nest) {
+		$default_cat_id = (int) $this->get_feed_category('Imported feeds', $owner_uid, 0);
 
 		if ($root_node) {
 			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
@@ -517,13 +536,13 @@ class OPML extends Handler_Protected {
 				$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
-				$cat_id = $this->get_feed_category($cat_title, $parent_id);
+				$cat_id = $this->get_feed_category($cat_title, $owner_uid, $parent_id);
 
-				if ($cat_id === false) {
+				if ($cat_id === 0) {
 					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
 
-					Feeds::_add_cat($cat_title, $_SESSION['uid'], $parent_id ? $parent_id : null, (int)$order_id);
-					$cat_id = $this->get_feed_category($cat_title, $parent_id);
+					Feeds::_add_cat($cat_title, $owner_uid, $parent_id ? $parent_id : null, (int)$order_id);
+					$cat_id = $this->get_feed_category($cat_title, $owner_uid, $parent_id);
 				}
 
 			} else {
@@ -540,21 +559,21 @@ class OPML extends Handler_Protected {
 			$cat_title = false;
 		}
 
-		#$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
-		$this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
+		//$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
+		$this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")), $nest);
 
 		foreach ($outlines as $node) {
 			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
 				$attrs = $node->attributes;
-				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
+				$node_cat_title = $attrs->getNamedItem('text') ? $attrs->getNamedItem('text')->nodeValue : false;
 
 				if (!$node_cat_title)
-					$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+					$node_cat_title = $attrs->getNamedItem('title') ? $attrs->getNamedItem('title')->nodeValue : false;
 
-				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
+				$node_feed_url = $attrs->getNamedItem('xmlUrl') ? $attrs->getNamedItem('xmlUrl')->nodeValue : false;
 
 				if ($node_cat_title && !$node_feed_url) {
-					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
+					$this->opml_import_category($doc, $node, $owner_uid, $cat_id, $nest+1);
 				} else {
 
 					if (!$cat_id) {
@@ -565,91 +584,112 @@ class OPML extends Handler_Protected {
 
 					switch ($cat_title) {
 					case "tt-rss-prefs":
-						$this->opml_import_preference($node);
+						$this->opml_import_preference($node, $owner_uid, $nest+1);
 						break;
 					case "tt-rss-labels":
-						$this->opml_import_label($node, $owner_uid);
+						$this->opml_import_label($node, $owner_uid, $nest+1);
 						break;
 					case "tt-rss-filters":
-						$this->opml_import_filter($node);
+						$this->opml_import_filter($node, $owner_uid, $nest+1);
 						break;
 					default:
-						$this->opml_import_feed($node, $dst_cat_id, $owner_uid);
+						$this->opml_import_feed($node, $dst_cat_id, $owner_uid, $nest+1);
 					}
 				}
 			}
 		}
 	}
 
-	function opml_import($owner_uid) {
+	/** $filename is optional; assumes HTTP upload with $_FILES otherwise */
+	function opml_import(int $owner_uid, string $filename = "") {
 		if (!$owner_uid) return;
 
 		$doc = false;
 
-		if ($_FILES['opml_file']['error'] != 0) {
-			print_error(T_sprintf("Upload failed with error code %d",
-				$_FILES['opml_file']['error']));
-			return;
-		}
+		if (!$filename) {
+			if ($_FILES['opml_file']['error'] != 0) {
+				print_error(T_sprintf("Upload failed with error code %d",
+					$_FILES['opml_file']['error']));
+				return false;
+			}
 
-		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = (string)tempnam(Config::get(Config::CACHE_DIR) . '/upload', 'opml');
+			if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
+				$tmp_file = (string)tempnam(Config::get(Config::CACHE_DIR) . '/upload', 'opml');
 
-			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
-				$tmp_file);
+				$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
+					$tmp_file);
 
-			if (!$result) {
-				print_error(__("Unable to move uploaded file."));
-				return;
+				if (!$result) {
+					print_error(__("Unable to move uploaded file."));
+					return false;
+				}
+			} else {
+				print_error(__('Error: please upload OPML file.'));
+				return false;
 			}
 		} else {
-			print_error(__('Error: please upload OPML file.'));
-			return;
+			$tmp_file = $filename;
+		}
+
+		if (!is_readable($tmp_file)) {
+			$this->opml_notice(T_sprintf("Error: file is not readable: %s", $filename));
+			return false;
 		}
 
 		$loaded = false;
 
-		if (is_file($tmp_file)) {
-			$doc = new DOMDocument();
+		$doc = new DOMDocument();
+
+		if (version_compare(PHP_VERSION, '8.0.0', '<')) {
 			libxml_disable_entity_loader(false);
-			$loaded = $doc->load($tmp_file);
+		}
+
+		$loaded = $doc->load($tmp_file);
+
+		if (version_compare(PHP_VERSION, '8.0.0', '<')) {
 			libxml_disable_entity_loader(true);
-			unlink($tmp_file);
-		} else if (empty($doc)) {
-			print_error(__('Error: unable to find moved OPML file.'));
-			return;
 		}
 
+		// only remove temporary i.e. HTTP uploaded files
+		if (!$filename)
+			unlink($tmp_file);
+
 		if ($loaded) {
-			$this->pdo->beginTransaction();
-			$this->opml_import_category($doc, false, $owner_uid, false);
-			$this->pdo->commit();
+			// we're using ORM while importing so we can't transaction-lock things anymore
+			//$this->pdo->beginTransaction();
+			$this->opml_import_category($doc, null, $owner_uid, 0, 0);
+			//$this->pdo->commit();
 		} else {
-			print_error(__('Error while parsing document.'));
+			$this->opml_notice(__('Error while parsing document.'));
+			return false;
 		}
-	}
 
-	private function opml_notice($msg) {
-		print "$msg<br/>";
+		return true;
 	}
 
-	function get_feed_category($feed_cat, $parent_cat_id = false) {
+	private function opml_notice(string $msg, int $prefix_length = 0) {
+		if (php_sapi_name() == "cli") {
+			Debug::log(str_repeat("   ", $prefix_length) . $msg);
+		} else {
+			// TODO: use better separator i.e. CSS-defined span of certain width or something
+			print str_repeat("&nbsp;&nbsp;&nbsp;", $prefix_length) . $msg . "<br/>";
+		}
+	}
 
-		$parent_cat_id = (int) $parent_cat_id;
+	function get_feed_category(string $feed_cat, int $owner_uid, int $parent_cat_id) : int {
 
 		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
 			WHERE title = :title
 			AND (parent_cat = :parent OR (:parent = 0 AND parent_cat IS NULL))
 			AND owner_uid = :uid");
 
-		$sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $_SESSION['uid']]);
+		$sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $owner_uid]);
 
 		if ($row = $sth->fetch()) {
 			return $row['id'];
 		} else {
-			return false;
+			return 0;
 		}
 	}
 
-
 }
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index ee4107ae7..f067543bb 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -23,56 +23,153 @@ class PluginHost {
 	// Hooks marked with *1 are run in global context and available
 	// to plugins loaded in config.php only
 
-	const HOOK_ARTICLE_BUTTON = "hook_article_button";											// hook_article_button($line)
-	const HOOK_ARTICLE_FILTER = "hook_article_filter";											// hook_article_filter($article)
-	const HOOK_PREFS_TAB = "hook_prefs_tab";														// hook_prefs_tab($tab)
-	const HOOK_PREFS_TAB_SECTION = "hook_prefs_tab_section";									// hook_prefs_tab_section($section)
-	const HOOK_PREFS_TABS = "hook_prefs_tabs";													// hook_prefs_tabs()
-	const HOOK_FEED_PARSED = "hook_feed_parsed";													// hook_feed_parsed($parser, $feed_id)
-	const HOOK_UPDATE_TASK = "hook_update_task"; //*1											// GLOBAL: hook_update_task($cli_options)
-	const HOOK_AUTH_USER = "hook_auth_user";														// hook_auth_user($login, $password, $service) (byref)
-	const HOOK_HOTKEY_MAP = "hook_hotkey_map";													// hook_hotkey_map($hotkeys) (byref)
-	const HOOK_RENDER_ARTICLE = "hook_render_article";											//	hook_render_article($article)
-	const HOOK_RENDER_ARTICLE_CDM = "hook_render_article_cdm";								// hook_render_article_cdm($article)
-	const HOOK_FEED_FETCHED = "hook_feed_fetched";												// hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed) (byref)
-	const HOOK_SANITIZE = "hook_sanitize";															//	hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id) (byref)
-	const HOOK_RENDER_ARTICLE_API = "hook_render_article_api";								// hook_render_article_api($params)
-	const HOOK_TOOLBAR_BUTTON = "hook_toolbar_button";											// hook_toolbar_button()
-	const HOOK_ACTION_ITEM = "hook_action_item";													// hook_action_item()
-	const HOOK_HEADLINE_TOOLBAR_BUTTON = "hook_headline_toolbar_button";					// hook_headline_toolbar_button($feed_id, $is_cat)
-	const HOOK_HOTKEY_INFO = "hook_hotkey_info";													// hook_hotkey_info($hotkeys) (byref)
-	const HOOK_ARTICLE_LEFT_BUTTON = "hook_article_left_button";							// hook_article_left_button($row)
-	const HOOK_PREFS_EDIT_FEED = "hook_prefs_edit_feed";										// hook_prefs_edit_feed($feed_id)
-	const HOOK_PREFS_SAVE_FEED = "hook_prefs_save_feed";										// hook_prefs_save_feed($feed_id)
-	const HOOK_FETCH_FEED = "hook_fetch_feed";													// hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) (byref)
-	const HOOK_QUERY_HEADLINES = "hook_query_headlines";										// hook_query_headlines($row) (byref)
-	const HOOK_HOUSE_KEEPING = "hook_house_keeping"; //*1										// GLOBAL: hook_house_keeping()
-	const HOOK_SEARCH = "hook_search";																// hook_search($query)
-	const HOOK_FORMAT_ENCLOSURES = "hook_format_enclosures";									// hook__format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images) (byref)
-	const HOOK_SUBSCRIBE_FEED = "hook_subscribe_feed";											// hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) (byref)
-	const HOOK_HEADLINES_BEFORE = "hook_headlines_before";									// hook_headlines_before($feed, $is_cat, $qfh_ret)
-	const HOOK_RENDER_ENCLOSURE = "hook_render_enclosure";									// hook_render_enclosure($entry, $id, $rv)
-	const HOOK_ARTICLE_FILTER_ACTION = "hook_article_filter_action";						// hook_article_filter_action($article, $action)
-	const HOOK_ARTICLE_EXPORT_FEED = "hook_article_export_feed";							// hook_article_export_feed($line, $feed, $is_cat, $owner_uid) (byref)
-	const HOOK_MAIN_TOOLBAR_BUTTON = "hook_main_toolbar_button";							// hook_main_toolbar_button()
-	const HOOK_ENCLOSURE_ENTRY = "hook_enclosure_entry";										// hook_enclosure_entry($entry, $id, $rv) (byref)
-	const HOOK_FORMAT_ARTICLE = "hook_format_article";											// hook_format_article($html, $row)
-	const HOOK_FORMAT_ARTICLE_CDM = "hook_format_article_cdm"; /* RIP */
-	const HOOK_FEED_BASIC_INFO = "hook_feed_basic_info";										// hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed_id, $auth_login, $auth_pass) (byref)
-	const HOOK_SEND_LOCAL_FILE = "hook_send_local_file";										// hook_send_local_file($filename)
-	const HOOK_UNSUBSCRIBE_FEED = "hook_unsubscribe_feed";									// hook_unsubscribe_feed($feed_id, $owner_uid)
-	const HOOK_SEND_MAIL = "hook_send_mail";														// hook_send_mail(Mailer $mailer, $params)
-	const HOOK_FILTER_TRIGGERED = "hook_filter_triggered";									// hook_filter_triggered($feed_id, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters)
-	const HOOK_GET_FULL_TEXT = "hook_get_full_text";											// hook_get_full_text($url)
-	const HOOK_ARTICLE_IMAGE = "hook_article_image";											// hook_article_image($enclosures, $content, $site_url)
-	const HOOK_FEED_TREE = "hook_feed_tree";														// hook_feed_tree()
-	const HOOK_IFRAME_WHITELISTED = "hook_iframe_whitelisted";								// hook_iframe_whitelisted($url)
-	const HOOK_ENCLOSURE_IMPORTED = "hook_enclosure_imported";								// hook_enclosure_imported($enclosure, $feed)
-	const HOOK_HEADLINES_CUSTOM_SORT_MAP = "hook_headlines_custom_sort_map";			// hook_headlines_custom_sort_map()
+	/** hook_article_button($line) */
+	const HOOK_ARTICLE_BUTTON = "hook_article_button";
+
+	/** hook_article_filter($article) */
+	const HOOK_ARTICLE_FILTER = "hook_article_filter";
+
+	/** hook_prefs_tab($tab) */
+	const HOOK_PREFS_TAB = "hook_prefs_tab";
+
+	/** hook_prefs_tab_section($section) */
+	const HOOK_PREFS_TAB_SECTION = "hook_prefs_tab_section";
+
+	/** hook_prefs_tabs() */
+	const HOOK_PREFS_TABS = "hook_prefs_tabs";
+
+	/** hook_feed_parsed($parser, $feed_id) */
+	const HOOK_FEED_PARSED = "hook_feed_parsed";
+
+	/** GLOBAL: hook_update_task($cli_options) */
+	const HOOK_UPDATE_TASK = "hook_update_task"; //*1
+
+	/** hook_auth_user($login, $password, $service) (byref) */
+	const HOOK_AUTH_USER = "hook_auth_user";
+
+	/** hook_hotkey_map($hotkeys) (byref) */
+	const HOOK_HOTKEY_MAP = "hook_hotkey_map";
+
+	/** hook_render_article($article) */
+	const HOOK_RENDER_ARTICLE = "hook_render_article";
+
+	/** hook_render_article_cdm($article) */
+	const HOOK_RENDER_ARTICLE_CDM = "hook_render_article_cdm";
+
+	/** hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed) (byref) */
+	const HOOK_FEED_FETCHED = "hook_feed_fetched";
+
+	/** hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id) (byref) */
+	const HOOK_SANITIZE = "hook_sanitize";
+
+	/** hook_render_article_api($params) */
+	const HOOK_RENDER_ARTICLE_API = "hook_render_article_api";
+
+	/** hook_toolbar_button() */
+	const HOOK_TOOLBAR_BUTTON = "hook_toolbar_button";
+
+	/** hook_action_item() */
+	const HOOK_ACTION_ITEM = "hook_action_item";
+
+	/** hook_headline_toolbar_button($feed_id, $is_cat) */
+	const HOOK_HEADLINE_TOOLBAR_BUTTON = "hook_headline_toolbar_button";
+
+	/** hook_hotkey_info($hotkeys) (byref) */
+	const HOOK_HOTKEY_INFO = "hook_hotkey_info";
+
+	/** hook_article_left_button($row) */
+	const HOOK_ARTICLE_LEFT_BUTTON = "hook_article_left_button";
+
+	/** hook_prefs_edit_feed($feed_id) */
+	const HOOK_PREFS_EDIT_FEED = "hook_prefs_edit_feed";
+
+	/** hook_prefs_save_feed($feed_id) */
+	const HOOK_PREFS_SAVE_FEED = "hook_prefs_save_feed";
+
+	/** hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) (byref) */
+	const HOOK_FETCH_FEED = "hook_fetch_feed";
+
+	/** hook_query_headlines($row) (byref) */
+	const HOOK_QUERY_HEADLINES = "hook_query_headlines";
+
+	/** GLOBAL: hook_house_keeping() */
+	const HOOK_HOUSE_KEEPING = "hook_house_keeping"; //*1
+
+	/** hook_search($query) */
+	const HOOK_SEARCH = "hook_search";
+
+	/** hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images) (byref) */
+	const HOOK_FORMAT_ENCLOSURES = "hook_format_enclosures";
+
+	/** hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) (byref) */
+	const HOOK_SUBSCRIBE_FEED = "hook_subscribe_feed";
+
+	/** hook_headlines_before($feed, $is_cat, $qfh_ret) */
+	const HOOK_HEADLINES_BEFORE = "hook_headlines_before";
+
+	/** hook_render_enclosure($entry, $id, $rv) */
+	const HOOK_RENDER_ENCLOSURE = "hook_render_enclosure";
+
+	/** hook_article_filter_action($article, $action) */
+	const HOOK_ARTICLE_FILTER_ACTION = "hook_article_filter_action";
+
+	/** hook_article_export_feed($line, $feed, $is_cat, $owner_uid) (byref) */
+	const HOOK_ARTICLE_EXPORT_FEED = "hook_article_export_feed";
+
+	/** hook_main_toolbar_button() */
+	const HOOK_MAIN_TOOLBAR_BUTTON = "hook_main_toolbar_button";
+
+	/** hook_enclosure_entry($entry, $id, $rv) (byref) */
+	const HOOK_ENCLOSURE_ENTRY = "hook_enclosure_entry";
+
+	/** hook_format_article($html, $row) */
+	const HOOK_FORMAT_ARTICLE = "hook_format_article";
+
+	/** @deprecated removed, do not use */
+	const HOOK_FORMAT_ARTICLE_CDM = "hook_format_article_cdm";
+
+	/** hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed_id, $auth_login, $auth_pass) (byref) */
+	const HOOK_FEED_BASIC_INFO = "hook_feed_basic_info";
+
+	/** hook_send_local_file($filename) */
+	const HOOK_SEND_LOCAL_FILE = "hook_send_local_file";
+
+	/** hook_unsubscribe_feed($feed_id, $owner_uid) */
+	const HOOK_UNSUBSCRIBE_FEED = "hook_unsubscribe_feed";
+
+	/** hook_send_mail(Mailer $mailer, $params) */
+	const HOOK_SEND_MAIL = "hook_send_mail";
+
+	/** hook_filter_triggered($feed_id, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters) */
+	const HOOK_FILTER_TRIGGERED = "hook_filter_triggered";
+
+	/** hook_get_full_text($url) */
+	const HOOK_GET_FULL_TEXT = "hook_get_full_text";
+
+	/** hook_article_image($enclosures, $content, $site_url) */
+	const HOOK_ARTICLE_IMAGE = "hook_article_image";
+
+	/** hook_feed_tree() */
+	const HOOK_FEED_TREE = "hook_feed_tree";
+
+	/** hook_iframe_whitelisted($url) */
+	const HOOK_IFRAME_WHITELISTED = "hook_iframe_whitelisted";
+
+	/** hook_enclosure_imported($enclosure, $feed) */
+	const HOOK_ENCLOSURE_IMPORTED = "hook_enclosure_imported";
+
+	/** hook_headlines_custom_sort_map() */
+	const HOOK_HEADLINES_CUSTOM_SORT_MAP = "hook_headlines_custom_sort_map";
+
+	/** hook_headlines_custom_sort_override($order) */
 	const HOOK_HEADLINES_CUSTOM_SORT_OVERRIDE = "hook_headlines_custom_sort_override";
-																												// hook_headlines_custom_sort_override($order)
+
+	/** hook_headline_toolbar_select_menu_item($feed_id, $is_cat) */
 	const HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM = "hook_headline_toolbar_select_menu_item";
-																												// hook_headline_toolbar_select_menu_item($feed_id, $is_cat)
+
+
+	/** hook_pre_subscribe($url, $auth_login, $auth_pass) (byref) */
+	const HOOK_PRE_SUBSCRIBE = "hook_pre_subscribe";
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
@@ -103,12 +200,12 @@ class PluginHost {
 		$this->plugins[$name] = $plugin;
 	}
 
-	// needed for compatibility with API 1
+	/** needed for compatibility with API 1 */
 	function get_link() {
 		return false;
 	}
 
-	// needed for compatibility with API 2 (?)
+	/** needed for compatibility with API 2 (?) */
 	function get_dbh() {
 		return false;
 	}
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 5f7635736..95bbcd190 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -12,19 +12,12 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	public static function get_ts_languages() {
-		$rv = [];
-
-		if (Config::get(Config::DB_TYPE) == "pgsql") {
-			$dbh = Db::pdo();
-
-			$res = $dbh->query("SELECT cfgname FROM pg_ts_config");
-
-			while ($row = $res->fetch()) {
-				array_push($rv, ucfirst($row['cfgname']));
-			}
+		if (Config::get(Config::DB_TYPE) == 'pgsql') {
+			return array_map('ucfirst',
+				array_column(ORM::for_table('pg_ts_config')->select('cfgname')->find_array(), 'cfgname'));
 		}
 
-		return $rv;
+		return [];
 	}
 
 	function renameCat() {
@@ -51,61 +44,60 @@ class Pref_Feeds extends Handler_Protected {
 		$show_empty_cats = clean($_REQUEST['force_show_empty'] ?? false) ||
 			(clean($_REQUEST['mode'] ?? 0) != 2 && !$search);
 
-		$items = array();
-
-		$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
-				WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title");
-		$sth->execute([$_SESSION['uid'], $cat_id]);
-
-		while ($line = $sth->fetch()) {
-
-			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
-			$cat['name'] = $line['title'];
-			$cat['items'] = array();
-			$cat['checkbox'] = false;
-			$cat['type'] = 'category';
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-			$cat['auxcounter'] = -1;
-			$cat['parent_id'] = $cat_id;
-
-			$cat['items'] = $this->get_category_items($line['id']);
+		$items = [];
+
+		$feed_categories = ORM::for_table('ttrss_feed_categories')
+			->select_many('id', 'title')
+			->where(['owner_uid' => $_SESSION['uid'], 'parent_cat' => $cat_id])
+			->order_by_asc('order_id')
+			->order_by_asc('title')
+			->find_many();
+
+		foreach ($feed_categories as $feed_category) {
+			$cat = [
+				'id' => 'CAT:' . $feed_category->id,
+				'bare_id' => (int)$feed_category->id,
+				'name' => $feed_category->title,
+				'items' => $this->get_category_items($feed_category->id),
+				'checkbox' => false,
+				'type' => 'category',
+				'unread' => -1,
+				'child_unread' => -1,
+				'auxcounter' => -1,
+				'parent_id' => $cat_id,
+			];
 
 			$num_children = $this->calculate_children_count($cat);
 			$cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 			if ($num_children > 0 || $show_empty_cats)
 				array_push($items, $cat);
+		}
+
+		$feeds_obj = ORM::for_table('ttrss_feeds')
+			->select_many('id', 'title', 'last_error', 'update_interval')
+			->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated')
+			->where(['cat_id' => $cat_id, 'owner_uid' => $_SESSION['uid']])
+			->order_by_asc('order_id')
+			->order_by_asc('title');
 
+		if ($search) {
+			$feeds_obj->where_raw('(LOWER(title) LIKE ? OR LOWER(feed_url) LIKE LOWER(?))', ["%$search%", "%$search%"]);
 		}
 
-		$fsth = $this->pdo->prepare("SELECT id, title, last_error,
-			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
-			FROM ttrss_feeds
-			WHERE cat_id = :cat AND
-			owner_uid = :uid AND
-			(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
-			ORDER BY order_id, title");
-
-		$fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-		while ($feed_line = $fsth->fetch()) {
-			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
-			$feed['auxcounter'] = -1;
-			$feed['name'] = $feed_line['title'];
-			$feed['checkbox'] = false;
-			$feed['unread'] = -1;
-			$feed['error'] = $feed_line['last_error'];
-			$feed['icon'] = Feeds::_get_icon($feed_line['id']);
-			$feed['param'] = TimeHelper::make_local_datetime(
-				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-			array_push($items, $feed);
+		foreach ($feeds_obj->find_many() as $feed) {
+			array_push($items, [
+				'id' => 'FEED:' . $feed->id,
+				'bare_id' => (int) $feed->id,
+				'auxcounter' => -1,
+				'name' => $feed->title,
+				'checkbox' => false,
+				'unread' => -1,
+				'error' => $feed->last_error,
+				'icon' => Feeds::_get_icon($feed->id),
+				'param' => TimeHelper::make_local_datetime($feed->last_updated, true),
+				'updates_disabled' => (int)($feed->update_interval < 0),
+			]);
 		}
 
 		return $items;
@@ -181,24 +173,23 @@ class Pref_Feeds extends Handler_Protected {
 			if (get_pref(Prefs::ENABLE_FEED_CATS)) {
 				$cat = $this->feedlist_init_cat(-2);
 			} else {
-				$cat['items'] = array();
+				$cat['items'] = [];
 			}
 
-			$num_labels = 0;
-			while ($line = $sth->fetch()) {
-				++$num_labels;
-
-				$label_id = Labels::label_to_feed_id($line['id']);
-
-				$feed = $this->feedlist_init_feed($label_id, false, 0);
-
-				$feed['fg_color'] = $line['fg_color'];
-				$feed['bg_color'] = $line['bg_color'];
-
-				array_push($cat['items'], $feed);
-			}
+			$labels = ORM::for_table('ttrss_labels2')
+				->where('owner_uid', $_SESSION['uid'])
+				->order_by_asc('caption')
+				->find_many();
+
+			if (count($labels)) {
+				foreach ($labels as $label) {
+					$label_id = Labels::label_to_feed_id($label->id);
+					$feed = $this->feedlist_init_feed($label_id, false, 0);
+					$feed['fg_color'] = $label->fg_color;
+					$feed['bg_color'] = $label->bg_color;
+					array_push($cat['items'], $feed);
+				}
 
-			if ($num_labels) {
 				if ($enable_cats) {
 					array_push($root['items'], $cat);
 				} else {
@@ -211,23 +202,26 @@ class Pref_Feeds extends Handler_Protected {
 			$show_empty_cats = clean($_REQUEST['force_show_empty'] ?? false) ||
 				(clean($_REQUEST['mode'] ?? 0) != 2 && !$search);
 
-			$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
-				WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title");
-			$sth->execute([$_SESSION['uid']]);
-
-			while ($line = $sth->fetch()) {
-				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
-				$cat['auxcounter'] = -1;
-				$cat['name'] = $line['title'];
-				$cat['items'] = array();
-				$cat['checkbox'] = false;
-				$cat['type'] = 'category';
-				$cat['unread'] = -1;
-				$cat['child_unread'] = -1;
-
-				$cat['items'] = $this->get_category_items($line['id']);
+			$feed_categories = ORM::for_table('ttrss_feed_categories')
+				->select_many('id', 'title')
+				->where('owner_uid', $_SESSION['uid'])
+				->where_null('parent_cat')
+				->order_by_asc('order_id')
+				->order_by_asc('title')
+				->find_many();
+
+			foreach ($feed_categories as $feed_category) {
+				$cat = [
+					'id' => 'CAT:' . $feed_category->id,
+					'bare_id' => (int) $feed_category->id,
+					'auxcounter' => -1,
+					'name' => $feed_category->title,
+					'items' => $this->get_category_items($feed_category->id),
+					'checkbox' => false,
+					'type' => 'category',
+					'unread' => -1,
+					'child_unread' => -1,
+				];
 
 				$num_children = $this->calculate_children_count($cat);
 				$cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
@@ -235,47 +229,48 @@ class Pref_Feeds extends Handler_Protected {
 				if ($num_children > 0 || $show_empty_cats)
 					array_push($root['items'], $cat);
 
-				$root['param'] += count($cat['items']);
+				//$root['param'] += count($cat['items']);
 			}
 
 			/* Uncategorized is a special case */
+			$cat = [
+				'id' => 'CAT:0',
+				'bare_id' => 0,
+				'auxcounter' => -1,
+				'name' => __('Uncategorized'),
+				'items' => [],
+				'type' => 'category',
+				'checkbox' => false,
+				'unread' => -1,
+				'child_unread' => -1,
+			];
+
+			$feeds_obj = ORM::for_table('ttrss_feeds')
+				->select_many('id', 'title', 'last_error', 'update_interval')
+				->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated')
+				->where('owner_uid', $_SESSION['uid'])
+				->where_null('cat_id')
+				->order_by_asc('order_id')
+				->order_by_asc('title');
 
-			$cat = array();
-			$cat['id'] = 'CAT:0';
-			$cat['bare_id'] = 0;
-			$cat['auxcounter'] = -1;
-			$cat['name'] = __("Uncategorized");
-			$cat['items'] = array();
-			$cat['type'] = 'category';
-			$cat['checkbox'] = false;
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-
-			$fsth = $this->pdo->prepare("SELECT id, title,last_error,
-				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
-				FROM ttrss_feeds
-				WHERE cat_id IS NULL AND
-				owner_uid = :uid AND
-				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
-				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::_get_icon($feed_line['id']);
-				$feed['param'] = TimeHelper::make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($cat['items'], $feed);
+			if ($search) {
+				$feeds_obj->where_raw('(LOWER(title) LIKE ? OR LOWER(feed_url) LIKE LOWER(?))', ["%$search%", "%$search%"]);
+			}
+
+			foreach ($feeds_obj->find_many() as $feed) {
+				array_push($cat['items'], [
+					'id' => 'FEED:' . $feed->id,
+					'bare_id' => (int) $feed->id,
+					'auxcounter' => -1,
+					'name' => $feed->title,
+					'checkbox' => false,
+					'error' => $feed->last_error,
+					'icon' => Feeds::_get_icon($feed->id),
+					'param' => TimeHelper::make_local_datetime($feed->last_updated, true),
+					'unread' => -1,
+					'type' => 'feed',
+					'updates_disabled' => (int)($feed->update_interval < 0),
+				]);
 			}
 
 			$cat['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
@@ -287,46 +282,41 @@ class Pref_Feeds extends Handler_Protected {
 			$root['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 		} else {
-			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
-				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
-				FROM ttrss_feeds
-				WHERE owner_uid = :uid AND
-				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
-				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::_get_icon($feed_line['id']);
-				$feed['param'] = TimeHelper::make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($root['items'], $feed);
-			}
+			$feeds_obj = ORM::for_table('ttrss_feeds')
+				->select_many('id', 'title', 'last_error', 'update_interval')
+				->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated')
+				->where('owner_uid', $_SESSION['uid'])
+				->order_by_asc('order_id')
+				->order_by_asc('title');
 
-			$root['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
-		}
+			if ($search) {
+				$feeds_obj->where_raw('(LOWER(title) LIKE ? OR LOWER(feed_url) LIKE LOWER(?))', ["%$search%", "%$search%"]);
+			}
 
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
+			foreach ($feeds_obj->find_many() as $feed) {
+				array_push($root['items'], [
+					'id' => 'FEED:' . $feed->id,
+					'bare_id' => (int) $feed->id,
+					'auxcounter' => -1,
+					'name' => $feed->title,
+					'checkbox' => false,
+					'error' => $feed->last_error,
+					'icon' => Feeds::_get_icon($feed->id),
+					'param' => TimeHelper::make_local_datetime($feed->last_updated, true),
+					'unread' => -1,
+					'type' => 'feed',
+					'updates_disabled' => (int)($feed->update_interval < 0),
+				]);
+			}
 
-		if (clean($_REQUEST['mode'] ?? 0) != 2) {
-			$fl['items'] = array($root);
-		} else {
-			$fl['items'] = $root['items'];
+			$root['param'] = sprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
 		}
 
-		return $fl;
+		return [
+			'identifier' => 'id',
+			'label' => 'name',
+			'items' => clean($_REQUEST['mode'] ?? 0) != 2 ? [$root] : $root['items'],
+		];
 	}
 
 	function catsortreset() {
@@ -359,10 +349,14 @@ class Pref_Feeds extends Handler_Protected {
 				$parent_qpart = null;
 			}
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
-				SET parent_cat = ? WHERE id = ? AND
-				owner_uid = ?");
-			$sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
+			$feed_category = ORM::for_table('ttrss_feed_categories')
+				->where('owner_uid', $_SESSION['uid'])
+				->find_one($bare_item_id);
+
+			if ($feed_category) {
+				$feed_category->parent_cat = $parent_qpart;
+				$feed_category->save();
+			}
 		}
 
 		$order_id = 1;
@@ -380,22 +374,27 @@ class Pref_Feeds extends Handler_Protected {
 
 					if (strpos($id, "FEED") === 0) {
 
-						$cat_id = ($item_id != "root") ? $bare_item_id : null;
-
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds
-							SET order_id = ?, cat_id = ?
-							WHERE id = ? AND owner_uid = ?");
-
-						$sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
+						$feed = ORM::for_table('ttrss_feeds')
+							->where('owner_uid', $_SESSION['uid'])
+							->find_one($bare_id);
 
+						if ($feed) {
+							$feed->order_id = $order_id;
+							$feed->cat_id = ($item_id != "root" && $bare_item_id) ? $bare_item_id : null;
+							$feed->save();
+						}
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
 							$nest_level+1);
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
-								SET order_id = ? WHERE id = ? AND
-								owner_uid = ?");
-						$sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
+						$feed_category = ORM::for_table('ttrss_feed_categories')
+							->where('owner_uid', $_SESSION['uid'])
+							->find_one($bare_id);
+
+						if ($feed_category) {
+							$feed_category->order_id = $order_id;
+							$feed_category->save();
+						}
 					}
 				}
 
@@ -1120,41 +1119,38 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
-		  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
-			FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
-				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
-					ttrss_entries.id = ref_id AND
-						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart
-			AND ttrss_feeds.owner_uid = ? AND
-				ttrss_user_entries.feed_id = ttrss_feeds.id AND
-				ttrss_entries.id = ref_id
-			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
-			ORDER BY last_article");
-		$sth->execute([$_SESSION['uid']]);
-
-		$rv = [];
-
-		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$row['last_article'] = TimeHelper::make_local_datetime($row['last_article'], false);
-			array_push($rv, $row);
+		$inactive_feeds = ORM::for_table('ttrss_feeds')
+			->table_alias('f')
+			->select_many('f.id', 'f.title', 'f.site_url', 'f.feed_url')
+			->select_expr('MAX(e.updated)', 'last_article')
+			->join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue')
+			->join('ttrss_entries', ['e.id', '=', 'ue.ref_id'], 'e')
+			->where('f.owner_uid', $_SESSION['uid'])
+			->where_raw(
+				"(SELECT MAX(ttrss_entries.updated)
+				FROM ttrss_entries
+				JOIN ttrss_user_entries ON ttrss_entries.id = ttrss_user_entries.ref_id
+				WHERE ttrss_user_entries.feed_id = f.id) < $interval_qpart")
+			->group_by('f.title')
+			->group_by('f.id')
+			->group_by('f.site_url')
+			->group_by('f.feed_url')
+			->order_by_asc('last_article')
+			->find_array();
+
+		foreach ($inactive_feeds as $inactive_feed) {
+			$inactive_feed['last_article'] = TimeHelper::make_local_datetime($inactive_feed['last_article'], false);
 		}
 
-		print json_encode($rv);
+		print json_encode($inactive_feeds);
 	}
 
 	function feedsWithErrors() {
-		$sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
-			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		$rv = [];
-
-		while ($row = $sth->fetch()) {
-			array_push($rv, $row);
-		}
-
-		print json_encode($rv);
+		print json_encode(ORM::for_table('ttrss_feeds')
+			->select_many('id', 'title', 'feed_url', 'last_error', 'site_url')
+			->where_not_equal('last_error', '')
+			->where('owner_uid', $_SESSION['uid'])
+			->find_array());
 	}
 
 	static function remove_feed($id, $owner_uid) {
@@ -1272,7 +1268,7 @@ class Pref_Feeds extends Handler_Protected {
 		$c = 0;
 
 		foreach ($cat['items'] ?? [] as $child) {
-			if ($child['type'] ?? '' == 'category') {
+			if (($child['type'] ?? '') == 'category') {
 				$c += $this->calculate_children_count($child);
 			} else {
 				$c += 1;
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 29d309dbb..c4017e4ec 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -203,7 +203,7 @@ class Pref_Filters extends Handler_Protected {
             } else {
 
                 $where = $line["cat_filter"] ?
-                    Feeds::_get_cat_title($line["cat_id"]) :
+                    Feeds::_get_cat_title($line["cat_id"] ?? 0) :
                     ($line["feed_id"] ?
                         Feeds::_get_title($line["feed_id"]) : __("All feeds"));
             }
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 2cdb919ce..0eb88ea36 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -160,7 +160,7 @@ class Pref_Labels extends Handler_Protected {
 
 	function add() {
 		$caption = clean($_REQUEST["caption"]);
-		$output = clean($_REQUEST["output"]);
+		$output = clean($_REQUEST["output"] ?? false);
 
 		if ($caption) {
 			if (Labels::create($caption)) {
diff --git a/classes/rpc.php b/classes/rpc.php
index 23a45d951..b6c4a5fc9 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -522,6 +522,7 @@ class RPC extends Handler_Protected {
 			WHERE
 				errno NOT IN (".E_USER_NOTICE.", ".E_USER_DEPRECATED.") AND
 				$log_interval AND
+				errstr NOT LIKE '%Returning bool from comparison function is deprecated%' AND
 				errstr NOT LIKE '%imagecreatefromstring(): Data is not in a recognized format%'");
 			$sth->execute();
 
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 216792a0e..87e52ba42 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -646,7 +646,7 @@ class RSSUtils {
 
 				$entry_title = strip_tags($item->get_title());
 
-				$entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
+				$entry_link = UrlHelper::rewrite_relative($site_url, clean($item->get_link()), "a", "href");
 
 				$entry_language = mb_substr(trim($item->get_language()), 0, 2);
 
diff --git a/classes/sanitizer.php b/classes/sanitizer.php
index 0a444a296..3f6e9504e 100644
--- a/classes/sanitizer.php
+++ b/classes/sanitizer.php
@@ -68,7 +68,7 @@ class Sanitizer {
 		// $rewrite_base_url = $site_url ? $site_url : Config::get_self_url();
 		$rewrite_base_url = $site_url ? $site_url : "http://domain.invalid/";
 
-		$entries = $xpath->query('(//a[@href]|//img[@src]|//source[@srcset|@src])');
+		$entries = $xpath->query('(//a[@href]|//img[@src]|//source[@srcset|@src]|//video[@poster])');
 
 		foreach ($entries as $entry) {
 
@@ -100,6 +100,11 @@ class Sanitizer {
 				$entry->setAttribute("srcset", RSSUtils::encode_srcset($matches));
 			}
 
+			if ($entry->hasAttribute('poster')) {
+				$entry->setAttribute('poster',
+					UrlHelper::rewrite_relative($rewrite_base_url, $entry->getAttribute('poster'), $entry->tagName, "poster"));
+			}
+
 			if ($entry->hasAttribute('src') &&
 					($owner && get_pref(Prefs::STRIP_IMAGES, $owner)) || $force_remove_images || ($_SESSION["bw_limit"] ?? false)) {
 
diff --git a/classes/urlhelper.php b/classes/urlhelper.php
index b2c1331b6..0e4834b72 100644
--- a/classes/urlhelper.php
+++ b/classes/urlhelper.php
@@ -52,7 +52,7 @@ class UrlHelper {
 				$owner_attribute == "href") {
 			return $rel_url;
 		// allow limited subset of inline base64-encoded images for IMG elements
-		} else if ($rel_parts["scheme"] ?? "" == "data" &&
+		} else if (($rel_parts["scheme"] ?? "") == "data" &&
 				preg_match('%^image/(webp|gif|jpg|png|svg);base64,%', $rel_parts["path"]) &&
 				$owner_element == "img" &&
 				$owner_attribute == "src") {
@@ -281,8 +281,7 @@ class UrlHelper {
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_HEADER, true);
 			curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-				SELF_USER_AGENT);
+			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : Config::get_user_agent());
 			curl_setopt($ch, CURLOPT_ENCODING, "");
 
 			if  ($http_referrer)
diff --git a/composer.json b/composer.json
index 0c9ec0926..a1729917d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,5 +4,8 @@
         "chillerlan/php-qrcode": "^3.3",
         "mervick/material-design-icons": "^2.2",
         "j4mie/idiorm": "^1.5"
+    },
+    "require-dev": {
+        "phpstan/phpstan": "^0.12.99"
     }
 }
diff --git a/composer.lock b/composer.lock
index 40f171ada..616b75b74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e7f23b092328c903b06c8ae31bf13781",
+    "content-hash": "76e40cf59f811ee42d14ac41159c570a",
     "packages": [
         {
             "name": "beberlei/assert",
@@ -592,7 +592,72 @@
             "time": "2020-10-28T17:51:34+00:00"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "phpstan/phpstan",
+            "version": "0.12.99",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-09-12T20:09:55+00:00"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/include/errorhandler.php b/include/errorhandler.php
index 2ad0be062..3211599ba 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -8,7 +8,7 @@ function format_backtrace($trace) {
 			if (isset($e["file"]) && isset($e["line"])) {
 				$fmt_args = [];
 
-				if (is_array($e["args"])) {
+				if (is_array($e["args"] ?? false)) {
 					foreach ($e["args"] as $a) {
 						if (is_object($a)) {
 							array_push($fmt_args, "{" . get_class($a) . "}");
diff --git a/include/functions.php b/include/functions.php
index 922d3765c..36519fd44 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -157,8 +157,7 @@
 	require_once 'controls.php';
 	require_once 'controls_compat.php';
 
-	define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . Config::get_version() . ' (http://tt-rss.org/)');
-	ini_set('user_agent', SELF_USER_AGENT);
+	ini_set('user_agent', Config::get_user_agent());
 
 	/* compat shims */
 
diff --git a/include/sessions.php b/include/sessions.php
index 7f61f6dbe..52ab80b71 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -19,6 +19,16 @@
 	ini_set("session.gc_maxlifetime", $session_expire);
 	ini_set("session.cookie_lifetime", "0");
 
+	// prolong PHP session cookie
+	if (isset($_COOKIE[$session_name]))
+		setcookie($session_name,
+			$_COOKIE[$session_name],
+			time() + $session_expire,
+			ini_get("session.cookie_path"),
+			ini_get("session.cookie_domain"),
+			ini_get("session.cookie_secure"),
+			ini_get("session.cookie_httponly"));
+
 	function validate_session() {
 		if (\Config::get(\Config::SINGLE_USER_MODE)) return true;
 
diff --git a/index.php b/index.php
index b602042bd..538346549 100644
--- a/index.php
+++ b/index.php
@@ -159,74 +159,81 @@
         <div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
             <div id="toolbar" dojoType="fox.Toolbar">
 
-            <i class="material-icons net-alert" style="display : none"
+			 	<!-- order 0, default -->
+
+				<?php
+					PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON, function ($result) {
+						echo $result;
+					});
+				?>
+
+				<!-- order 5: alert icons -->
+
+            <i class="material-icons net-alert" style="display : none; order : 5"
                 title="<?= __("Communication problem with server.") ?>">error_outline</i>
 
-            <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
+            <i class="material-icons log-alert" style="display : none; order : 5" onclick="App.openPreferences('system')"
                  title="<?= __("Recent entries found in event log.") ?>">warning</i>
 
-            <i id="updates-available" class="material-icons icon-new-version" style="display : none"
+            <i id="updates-available" class="material-icons icon-new-version" style="display : none; order: 5"
                title="<?= __('Updates are available from Git.') ?>">new_releases</i>
 
-            <?php
-
-            PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON, function ($result) {
-                echo $result;
-				});
-            ?>
+				<!-- order 10: headlines toolbar -->
 
-            <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10">
+            <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10"> </div>
 
-            </div>
+				<!-- order 20: main toolbar contents (dropdowns) -->
 
             <form id="toolbar-main" dojoType="dijit.form.Form" action="" style="order : 20" onsubmit="return false">
 
-            <select name="view_mode" title="<?= __('Show articles') ?>"
-                onchange="Feeds.onViewModeChanged()"
-                dojoType="fox.form.Select">
-                <option selected="selected" value="adaptive"><?= __('Adaptive') ?></option>
-                <option value="all_articles"><?= __('All Articles') ?></option>
-                <option value="marked"><?= __('Starred') ?></option>
-                <option value="published"><?= __('Published') ?></option>
-                <option value="unread"><?= __('Unread') ?></option>
-                <option value="has_note"><?= __('With Note') ?></option>
-            </select>
-
-			<select title="<?= __('Sort articles') ?>"
-                onchange="Feeds.onViewModeChanged()"
-                dojoType="fox.form.Select" name="order_by">
-
-				<option selected="selected" value="default"><?= __('Default') ?></option>
-                <option value="feed_dates"><?= __('Newest first') ?></option>
-                <option value="date_reverse"><?= __('Oldest first') ?></option>
-                <option value="title"><?= __('Title') ?></option>
-
-				<?php
-					PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_HEADLINES_CUSTOM_SORT_MAP, function ($result) {
-						foreach ($result as $sort_value => $sort_title) {
-							print "<option value=\"" . htmlspecialchars($sort_value) . "\">$sort_title</option>";
-						}
-					});
-				?>
-            </select>
-
-            <div class="catchup-button" dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()">
-                <span><?= __('Mark as read') ?></span>
-                <div dojoType="dijit.DropDownMenu">
-                    <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
-                        <?= __('Older than one day') ?>
-                    </div>
-                    <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
-                        <?= __('Older than one week') ?>
-                    </div>
-                    <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
-                        <?= __('Older than two weeks') ?>
-                    </div>
-                </div>
-            </div>
+					<select name="view_mode" title="<?= __('Show articles') ?>"
+						onchange="Feeds.onViewModeChanged()"
+						dojoType="fox.form.Select">
+						<option selected="selected" value="adaptive"><?= __('Adaptive') ?></option>
+						<option value="all_articles"><?= __('All Articles') ?></option>
+						<option value="marked"><?= __('Starred') ?></option>
+						<option value="published"><?= __('Published') ?></option>
+						<option value="unread"><?= __('Unread') ?></option>
+						<option value="has_note"><?= __('With Note') ?></option>
+					</select>
+
+					<select title="<?= __('Sort articles') ?>"
+							onchange="Feeds.onViewModeChanged()"
+							dojoType="fox.form.Select" name="order_by">
+
+						<option selected="selected" value="default"><?= __('Default') ?></option>
+							<option value="feed_dates"><?= __('Newest first') ?></option>
+							<option value="date_reverse"><?= __('Oldest first') ?></option>
+							<option value="title"><?= __('Title') ?></option>
+
+						<?php
+							PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_HEADLINES_CUSTOM_SORT_MAP, function ($result) {
+								foreach ($result as $sort_value => $sort_title) {
+									print "<option value=\"" . htmlspecialchars($sort_value) . "\">$sort_title</option>";
+								}
+							});
+						?>
+	            </select>
+
+					<div class="catchup-button" dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()">
+						<span><?= __('Mark as read') ?></span>
+						<div dojoType="dijit.DropDownMenu">
+							<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
+									<?= __('Older than one day') ?>
+							</div>
+							<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
+									<?= __('Older than one week') ?>
+							</div>
+							<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
+									<?= __('Older than two weeks') ?>
+							</div>
+						</div>
+					</div>
 
             </form>
 
+				<!-- toolbar actions dropdown: order 30 -->
+
             <div class="action-chooser" style="order : 30">
 
                 <?php
@@ -235,7 +242,7 @@
 						});
                 ?>
 
-                <div dojoType="fox.form.DropDownButton" class="action-button" title="<?= __('Actions...') ?>">
+               <div dojoType="fox.form.DropDownButton" class="action-button" title="<?= __('Actions...') ?>">
 					<span><i class="material-icons">menu</i></span>
                     <div dojoType="dijit.Menu" style="display: none">
                         <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?= __('Preferences...') ?></div>
diff --git a/js/FeedTree.js b/js/FeedTree.js
index e0c44e2b5..f6c44a71e 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -102,6 +102,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
 						}}));
 
 					menu.addChild(new dijit.MenuItem({
+						label: __("Open site"),
+						onClick: function() {
+							App.postOpenWindow("backend.php", {op: "feeds", method: "opensite",
+								feed_id: this.getParent().row_id, csrf_token: __csrf_token});
+						}}));
+
+					menu.addChild(new dijit.MenuSeparator());
+
+					menu.addChild(new dijit.MenuItem({
 						label: __("Debug feed"),
 						onClick: function() {
 							/* global __csrf_token */
diff --git a/js/Headlines.js b/js/Headlines.js
index d01993838..f9ec21c18 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -490,6 +490,7 @@ const Headlines = {
 						id="RROW-${hl.id}"
 						data-article-id="${hl.id}"
 						data-orig-feed-id="${hl.feed_id}"
+						data-orig-feed-title="${App.escapeHtml(hl.feed_title)}"
 						data-is-packed="1"
 						data-content="${App.escapeHtml(hl.content)}"
 						data-rendered-enclosures="${App.escapeHtml(Article.renderEnclosures(hl.enclosures))}"
@@ -514,7 +515,7 @@ const Headlines = {
 								${hl.cdm_excerpt ? hl.cdm_excerpt : ""}
 							</span>
 
-							<div class="feed">
+							<div class="feed vfeedMenuAttach" data-feed-id="${hl.feed_id}">
 								<a href="#" style="background-color: ${hl.feed_bg_color}"
 									onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a>
 							</div>
@@ -566,6 +567,7 @@ const Headlines = {
 			row = `<div class="hl ${row_class} ${Article.getScoreClass(hl.score)}"
 				id="RROW-${hl.id}"
 				data-orig-feed-id="${hl.feed_id}"
+				data-orig-feed-title="${App.escapeHtml(hl.feed_title)}"
 				data-article-id="${hl.id}"
 				data-score="${hl.score}"
 				data-article-title="${App.escapeHtml(hl.title)}"
@@ -584,9 +586,9 @@ const Headlines = {
 					${Article.renderLabels(hl.id, hl.labels)}
 				</span>
 			</div>
-					<span class="feed">
-					<a style="background : ${hl.feed_bg_color}" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a>
-					</span>
+			<span class="feed vfeedMenuAttach" data-feed-id="${hl.feed_id}">
+				<a style="background : ${hl.feed_bg_color}" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a>
+			</span>
 			<div title="${hl.imported}">
 				<span class="updated">${hl.updated}</span>
 			</div>
@@ -1501,6 +1503,48 @@ const Headlines = {
 			menu.startup();
 		}
 
+		/* vfeed menu */
+
+		if (!dijit.byId("vfeedMenu")) {
+
+			const menu = new dijit.Menu({
+				id: "vfeedMenu",
+				targetNodeIds: ["headlines-frame"],
+				selector: ".vfeedMenuAttach"
+			});
+
+			menu.addChild(new dijit.MenuItem({
+				label: __("Mark as read"),
+				onClick: function() {
+					Feeds.catchupFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
+				}}));
+
+			menu.addChild(new dijit.MenuItem({
+				label: __("Edit feed"),
+				onClick: function() {
+					CommonDialogs.editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"), false);
+				}}));
+
+			menu.addChild(new dijit.MenuItem({
+				label: __("Open site"),
+				onClick: function() {
+					App.postOpenWindow("backend.php", {op: "feeds", method: "opensite",
+						feed_id: this.getParent().currentTarget.getAttribute("data-feed-id"), csrf_token: __csrf_token});
+				}}));
+
+			menu.addChild(new dijit.MenuSeparator());
+
+			menu.addChild(new dijit.MenuItem({
+				label: __("Debug feed"),
+				onClick: function() {
+					/* global __csrf_token */
+					App.postOpenWindow("backend.php", {op: "feeds", method: "updatedebugger",
+						feed_id: this.getParent().currentTarget.getAttribute("data-feed-id"), csrf_token: __csrf_token});
+				}}));
+
+			menu.startup();
+		}
+
 		/* vgroup feed title menu */
 
 		if (!dijit.byId("headlinesFeedTitleMenu")) {
diff --git a/phpstan.neon b/phpstan.neon
index 818f99577..7fe02b07e 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,6 @@
 parameters:
    level: 5
    ignoreErrors:
-#      - '#Constant.*not found#'
       - '#Constant.*\b(SUBSTRING_FOR_DATE|SCHEMA_VERSION|SELF_USER_AGENT|LABEL_BASE_INDEX|PLUGIN_FEED_BASE_INDEX)\b.*not found#'
       - '#Comparison operation ">" between int<1, max> and 0 is always true.#'
       - '#Access to an undefined property DOMNode::\$tagName.#'
diff --git a/plugins/af_comics/filter_base.php b/plugins/af_comics/filter_base.php
index d6a697bb4..5c82bc870 100644
--- a/plugins/af_comics/filter_base.php
+++ b/plugins/af_comics/filter_base.php
@@ -3,6 +3,10 @@ abstract class Af_ComicFilter {
 	public abstract function supported();
 	public abstract function process(&$article);
 
+	public function __construct(/*PluginHost $host*/) {
+
+	}
+
 	public function on_subscribe($url) {
 		return false;
 	}
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index 8aba1416b..19b1be859 100755
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -34,7 +34,7 @@ class Af_Comics extends Plugin {
 
 				array_push($names, $filter_name);
 
-				$filter = new $filter_name();
+				$filter = new $filter_name($host);
 
 				if (is_subclass_of($filter, "Af_ComicFilter")) {
 					array_push($this->filters, $filter);
diff --git a/plugins/af_readability/composer.json b/plugins/af_readability/composer.json
index 71acf9b0f..f23f50db9 100644
--- a/plugins/af_readability/composer.json
+++ b/plugins/af_readability/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "andreskrey/readability.php": "^2.1"
+        "fivefilters/readability.php": "^2.1"
     }
 }
diff --git a/plugins/af_readability/composer.lock b/plugins/af_readability/composer.lock
index f8e1237c5..8001f054e 100644
--- a/plugins/af_readability/composer.lock
+++ b/plugins/af_readability/composer.lock
@@ -4,19 +4,19 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2a37019b27f1590966011df3bf6e135b",
+    "content-hash": "985d4bb2caa672420e280a0b2bbb4715",
     "packages": [
         {
-            "name": "andreskrey/readability.php",
+            "name": "fivefilters/readability.php",
             "version": "v2.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/andreskrey/readability.php.git",
+                "url": "https://github.com/fivefilters/readability.php.git",
                 "reference": "7617a912b6c527909168f5d41d263792f171c42a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/andreskrey/readability.php/zipball/7617a912b6c527909168f5d41d263792f171c42a",
+                "url": "https://api.github.com/repos/fivefilters/readability.php/zipball/7617a912b6c527909168f5d41d263792f171c42a",
                 "reference": "7617a912b6c527909168f5d41d263792f171c42a",
                 "shasum": ""
             },
@@ -58,23 +58,22 @@
                 "readability"
             ],
             "support": {
-                "issues": "https://github.com/andreskrey/readability.php/issues",
-                "source": "https://github.com/andreskrey/readability.php/tree/v2.1.0"
+                "source": "https://github.com/fivefilters/readability.php/tree/v2.1.0"
             },
             "time": "2019-07-22T21:42:25+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -98,7 +97,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -109,9 +108,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/plugins/af_readability/vendor/composer/ClassLoader.php b/plugins/af_readability/vendor/composer/ClassLoader.php
index 247294d66..4d989a212 100644
--- a/plugins/af_readability/vendor/composer/ClassLoader.php
+++ b/plugins/af_readability/vendor/composer/ClassLoader.php
@@ -311,10 +311,8 @@ class ClassLoader
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
 
         if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
+            //no-op
+        } elseif ($prepend) {
             self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
         } else {
             unset(self::$registeredLoaders[$this->vendorDir]);
diff --git a/plugins/af_readability/vendor/composer/InstalledVersions.php b/plugins/af_readability/vendor/composer/InstalledVersions.php
index 5fe76426f..eb57e7a7e 100644
--- a/plugins/af_readability/vendor/composer/InstalledVersions.php
+++ b/plugins/af_readability/vendor/composer/InstalledVersions.php
@@ -1,301 +1,301 @@
 <?php
 
-
-
-
-
-
-
-
-
-
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <[email protected]>
+ *     Jordi Boggiano <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Composer;
 
 use Composer\Autoload\ClassLoader;
 use Composer\Semver\VersionParser;
 
-
-
-
-
-
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * To require it's presence, you can require `composer-runtime-api ^2.0`
+ */
 class InstalledVersions
 {
-private static $installed = array (
-  'root' => 
+    private static $installed = array (
+  'root' =>
   array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
-    'aliases' => 
+    'aliases' =>
     array (
     ),
-    'reference' => '1baf8c521785ab4dc8f474fdd772280737c7e254',
+    'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     'name' => '__root__',
   ),
-  'versions' => 
+  'versions' =>
   array (
-    '__root__' => 
+    '__root__' =>
     array (
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
-      'aliases' => 
+      'aliases' =>
       array (
       ),
-      'reference' => '1baf8c521785ab4dc8f474fdd772280737c7e254',
+      'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     ),
-    'andreskrey/readability.php' => 
+    'fivefilters/readability.php' =>
     array (
       'pretty_version' => 'v2.1.0',
       'version' => '2.1.0.0',
-      'aliases' => 
+      'aliases' =>
       array (
       ),
       'reference' => '7617a912b6c527909168f5d41d263792f171c42a',
     ),
-    'psr/log' => 
+    'psr/log' =>
     array (
-      'pretty_version' => '1.1.3',
-      'version' => '1.1.3.0',
-      'aliases' => 
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
+      'aliases' =>
       array (
       ),
-      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
   ),
 );
-private static $canGetVendors;
-private static $installedByVendor = array();
-
-
-
-
-
-
-
-public static function getInstalledPackages()
-{
-$packages = array();
-foreach (self::getInstalled() as $installed) {
-$packages[] = array_keys($installed['versions']);
-}
-
-
-if (1 === \count($packages)) {
-return $packages[0];
-}
-
-return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-}
-
-
-
-
-
-
-
-
-
-public static function isInstalled($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (isset($installed['versions'][$packageName])) {
-return true;
-}
-}
-
-return false;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function satisfies(VersionParser $parser, $packageName, $constraint)
-{
-$constraint = $parser->parseConstraints($constraint);
-$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-return $provided->matches($constraint);
-}
-
-
-
-
-
-
-
-
-
-
-public static function getVersionRanges($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-$ranges = array();
-if (isset($installed['versions'][$packageName]['pretty_version'])) {
-$ranges[] = $installed['versions'][$packageName]['pretty_version'];
-}
-if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-}
-if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-}
-if (array_key_exists('provided', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-}
-
-return implode(' || ', $ranges);
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getVersion($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['version'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['version'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getPrettyVersion($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['pretty_version'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getReference($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['reference'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['reference'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getRootPackage()
-{
-$installed = self::getInstalled();
-
-return $installed[0]['root'];
-}
-
-
-
-
-
-
-
-public static function getRawData()
-{
-return self::$installed;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function reload($data)
-{
-self::$installed = $data;
-self::$installedByVendor = array();
-}
-
-
-
-
-private static function getInstalled()
-{
-if (null === self::$canGetVendors) {
-self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-}
-
-$installed = array();
-
-if (self::$canGetVendors) {
-foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-if (isset(self::$installedByVendor[$vendorDir])) {
-$installed[] = self::$installedByVendor[$vendorDir];
-} elseif (is_file($vendorDir.'/composer/installed.php')) {
-$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-}
-}
-}
-
-$installed[] = self::$installed;
-
-return $installed;
-}
+    private static $canGetVendors;
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @return bool
+     */
+    public static function isInstalled($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param string        $packageName
+     * @param string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     *
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints($constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[]}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @return array[]
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[]}, versions: list<string, array{pretty_version: ?string, version: ?string, aliases: ?string[], reference: ?string, replaced: ?string[], provided: ?string[]}>}
+     */
+    public static function getRawData()
+    {
+        return self::$installed;
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[]}, versions: list<string, array{pretty_version: ?string, version: ?string, aliases: ?string[], reference: ?string, replaced: ?string[], provided: ?string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                }
+            }
+        }
+
+        $installed[] = self::$installed;
+
+        return $installed;
+    }
 }
diff --git a/plugins/af_readability/vendor/composer/LICENSE b/plugins/af_readability/vendor/composer/LICENSE
index f27399a04..62ecfd8d0 100644
--- a/plugins/af_readability/vendor/composer/LICENSE
+++ b/plugins/af_readability/vendor/composer/LICENSE
@@ -1,4 +1,3 @@
-
 Copyright (c) Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/plugins/af_readability/vendor/composer/autoload_psr4.php b/plugins/af_readability/vendor/composer/autoload_psr4.php
index ea111d957..3efe88013 100644
--- a/plugins/af_readability/vendor/composer/autoload_psr4.php
+++ b/plugins/af_readability/vendor/composer/autoload_psr4.php
@@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'andreskrey\\Readability\\' => array($vendorDir . '/andreskrey/readability.php/src'),
+    'andreskrey\\Readability\\' => array($vendorDir . '/fivefilters/readability.php/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
 );
diff --git a/plugins/af_readability/vendor/composer/autoload_static.php b/plugins/af_readability/vendor/composer/autoload_static.php
index 3c6721045..0f4e7a4b9 100644
--- a/plugins/af_readability/vendor/composer/autoload_static.php
+++ b/plugins/af_readability/vendor/composer/autoload_static.php
@@ -20,7 +20,7 @@ class ComposerStaticInitb44cc79a0eaef9cd9c2f2ac697cbe9c0
     public static $prefixDirsPsr4 = array (
         'andreskrey\\Readability\\' => 
         array (
-            0 => __DIR__ . '/..' . '/andreskrey/readability.php/src',
+            0 => __DIR__ . '/..' . '/fivefilters/readability.php/src',
         ),
         'Psr\\Log\\' => 
         array (
diff --git a/plugins/af_readability/vendor/composer/installed.json b/plugins/af_readability/vendor/composer/installed.json
index 32d088d27..916a0b1d9 100644
--- a/plugins/af_readability/vendor/composer/installed.json
+++ b/plugins/af_readability/vendor/composer/installed.json
@@ -1,17 +1,17 @@
 {
     "packages": [
         {
-            "name": "andreskrey/readability.php",
+            "name": "fivefilters/readability.php",
             "version": "v2.1.0",
             "version_normalized": "2.1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/andreskrey/readability.php.git",
+                "url": "https://github.com/fivefilters/readability.php.git",
                 "reference": "7617a912b6c527909168f5d41d263792f171c42a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/andreskrey/readability.php/zipball/7617a912b6c527909168f5d41d263792f171c42a",
+                "url": "https://api.github.com/repos/fivefilters/readability.php/zipball/7617a912b6c527909168f5d41d263792f171c42a",
                 "reference": "7617a912b6c527909168f5d41d263792f171c42a",
                 "shasum": ""
             },
@@ -55,30 +55,29 @@
                 "readability"
             ],
             "support": {
-                "issues": "https://github.com/andreskrey/readability.php/issues",
-                "source": "https://github.com/andreskrey/readability.php/tree/v2.1.0"
+                "source": "https://github.com/fivefilters/readability.php/tree/v2.1.0"
             },
-            "install-path": "../andreskrey/readability.php"
+            "install-path": "../fivefilters/readability.php"
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
-            "version_normalized": "1.1.3.0",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2020-03-23T09:12:05+00:00",
+            "time": "2021-05-03T11:20:27+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -98,7 +97,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -109,7 +108,7 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
             "install-path": "../psr/log"
         }
diff --git a/plugins/af_readability/vendor/composer/installed.php b/plugins/af_readability/vendor/composer/installed.php
index 4e25c896e..64d46147e 100644
--- a/plugins/af_readability/vendor/composer/installed.php
+++ b/plugins/af_readability/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '1baf8c521785ab4dc8f474fdd772280737c7e254',
+    'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     'name' => '__root__',
   ),
   'versions' => 
@@ -18,9 +18,9 @@
       'aliases' => 
       array (
       ),
-      'reference' => '1baf8c521785ab4dc8f474fdd772280737c7e254',
+      'reference' => 'a73e3bec45c5523910c711cf882976b71781ac9e',
     ),
-    'andreskrey/readability.php' => 
+    'fivefilters/readability.php' => 
     array (
       'pretty_version' => 'v2.1.0',
       'version' => '2.1.0.0',
@@ -31,12 +31,12 @@
     ),
     'psr/log' => 
     array (
-      'pretty_version' => '1.1.3',
-      'version' => '1.1.3.0',
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
   ),
 );
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/.coveralls.yml b/plugins/af_readability/vendor/fivefilters/readability.php/.coveralls.yml
index 18e6b2054..18e6b2054 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/.coveralls.yml
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/.coveralls.yml
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/.gitattributes b/plugins/af_readability/vendor/fivefilters/readability.php/.gitattributes
index ea4dd8899..ea4dd8899 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/.gitattributes
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/.gitattributes
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/.gitignore b/plugins/af_readability/vendor/fivefilters/readability.php/.gitignore
index 5608600f8..5608600f8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/.gitignore
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/.gitignore
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/.styleci.yml b/plugins/af_readability/vendor/fivefilters/readability.php/.styleci.yml
index f5ddf3ed9..f5ddf3ed9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/.styleci.yml
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/.styleci.yml
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/.travis.yml b/plugins/af_readability/vendor/fivefilters/readability.php/.travis.yml
index 5c3bdd198..5c3bdd198 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/.travis.yml
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/.travis.yml
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/AUTHORS.md b/plugins/af_readability/vendor/fivefilters/readability.php/AUTHORS.md
index cc420e3a8..cc420e3a8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/AUTHORS.md
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/AUTHORS.md
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/CHANGELOG.md b/plugins/af_readability/vendor/fivefilters/readability.php/CHANGELOG.md
index 20aef9e3a..20aef9e3a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/CHANGELOG.md
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/CHANGELOG.md
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/CONTRIBUTING.md b/plugins/af_readability/vendor/fivefilters/readability.php/CONTRIBUTING.md
index 345f71565..345f71565 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/CONTRIBUTING.md
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/CONTRIBUTING.md
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/LICENSE b/plugins/af_readability/vendor/fivefilters/readability.php/LICENSE
index 261eeb9e9..261eeb9e9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/LICENSE
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/LICENSE
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/Makefile b/plugins/af_readability/vendor/fivefilters/readability.php/Makefile
index b3bf15040..b3bf15040 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/Makefile
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/Makefile
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/README.md b/plugins/af_readability/vendor/fivefilters/readability.php/README.md
index b6b1e2922..b6b1e2922 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/README.md
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/README.md
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/composer.json b/plugins/af_readability/vendor/fivefilters/readability.php/composer.json
index bf515682c..bf515682c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/composer.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/composer.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/docker-compose.yml b/plugins/af_readability/vendor/fivefilters/readability.php/docker-compose.yml
index e58b1b0bf..e58b1b0bf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/docker-compose.yml
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/docker-compose.yml
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/docker/php/Dockerfile b/plugins/af_readability/vendor/fivefilters/readability.php/docker/php/Dockerfile
index 8971d1f1b..8971d1f1b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/docker/php/Dockerfile
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/docker/php/Dockerfile
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/phpunit.xml b/plugins/af_readability/vendor/fivefilters/readability.php/phpunit.xml
index 291085a71..291085a71 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/phpunit.xml
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/phpunit.xml
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Configuration.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Configuration.php
index 0632399c6..0632399c6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Configuration.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Configuration.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMAttr.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMAttr.php
index 91729f3b1..91729f3b1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMAttr.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMAttr.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMCdataSection.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMCdataSection.php
index 4535e4e99..4535e4e99 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMCdataSection.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMCdataSection.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMCharacterData.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMCharacterData.php
index e4db11a06..e4db11a06 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMCharacterData.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMCharacterData.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMComment.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMComment.php
index 13b004aff..13b004aff 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMComment.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMComment.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocument.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocument.php
index 81e9c7de6..81e9c7de6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocument.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocument.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocumentFragment.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocumentFragment.php
index bcb89468d..bcb89468d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocumentFragment.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocumentFragment.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocumentType.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocumentType.php
index 18705a7a7..18705a7a7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMDocumentType.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMDocumentType.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMElement.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMElement.php
index c07670bf7..c07670bf7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMElement.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMElement.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMEntity.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMEntity.php
index 8493e7319..8493e7319 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMEntity.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMEntity.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMEntityReference.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMEntityReference.php
index 32cecb75c..32cecb75c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMEntityReference.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMEntityReference.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNode.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNode.php
index 7c3c4f3a2..7c3c4f3a2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNode.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNode.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNodeList.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNodeList.php
index 5149c0b98..5149c0b98 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNodeList.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNodeList.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNotation.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNotation.php
index 2e888ce00..2e888ce00 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMNotation.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMNotation.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMProcessingInstruction.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMProcessingInstruction.php
index 9dd4c5c70..9dd4c5c70 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMProcessingInstruction.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMProcessingInstruction.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMText.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMText.php
index 42c575b49..42c575b49 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/DOM/DOMText.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/DOM/DOMText.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/NodeTrait.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/NodeTrait.php
index 5198bbb5f..5198bbb5f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/NodeTrait.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/NodeTrait.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/NodeUtility.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/NodeUtility.php
index cbf78bae0..cbf78bae0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Nodes/NodeUtility.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Nodes/NodeUtility.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/ParseException.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/ParseException.php
index 646c04a37..646c04a37 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/ParseException.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/ParseException.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/src/Readability.php b/plugins/af_readability/vendor/fivefilters/readability.php/src/Readability.php
index 332c96288..6bcbf78d7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/src/Readability.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/src/Readability.php
@@ -195,7 +195,7 @@ class Readability
 
                     // No luck after removing flags, just return the longest text we found during the different loops
                     usort($this->attempts, function ($a, $b) {
-                        return $b['textLength'] - $a['textLength'];
+                        return $a['textLength'] < $b['textLength'];
                     });
 
                     // But first check if we actually have something
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/ConfigurationTest.php b/plugins/af_readability/vendor/fivefilters/readability.php/test/ConfigurationTest.php
index b3810ed73..b3810ed73 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/ConfigurationTest.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/ConfigurationTest.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/ReadabilityTest.php b/plugins/af_readability/vendor/fivefilters/readability.php/test/ReadabilityTest.php
index ca208e894..ca208e894 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/ReadabilityTest.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/ReadabilityTest.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/TestPage.php b/plugins/af_readability/vendor/fivefilters/readability.php/test/TestPage.php
index ed6f92e7c..ed6f92e7c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/TestPage.php
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/TestPage.php
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected-images.json
index 5bed34dc9..5bed34dc9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected-metadata.json
index 52dafa149..52dafa149 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected.html
index e05810ff7..e05810ff7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/source.html
index 951e8745d..951e8745d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/001/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/001/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected-metadata.json
index 74c3859ed..74c3859ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected.html
index 0525100d6..0525100d6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/source.html
index 48befba5d..48befba5d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/002/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/002/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected-metadata.json
index 7c31c2296..7c31c2296 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected.html
index 6b03dd384..6b03dd384 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/source.html
index c7275b3b2..c7275b3b2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/003-metadata-preferred/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/003-metadata-preferred/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-images.json
index 3a4190bfc..3a4190bfc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json
index a30d0971b..a30d0971b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected.html
index 6b03dd384..6b03dd384 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/source.html
index dd9dc87b6..dd9dc87b6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/004-metadata-space-separated-properties/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/004-metadata-space-separated-properties/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected-images.json
index 5a24660bb..5a24660bb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected-metadata.json
index 9b2070388..9b2070388 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected.html
index 15801438e..15801438e 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/source.html
index d8e99bbb1..d8e99bbb1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/aclu/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/aclu/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected-images.json
index b55555167..b55555167 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected-metadata.json
index 0594bf203..0594bf203 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected.html
index 0aecf6e9f..0aecf6e9f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/source.html
index cd6aed112..cd6aed112 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ars-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ars-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected-images.json
index 5e3fa4120..5e3fa4120 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected-metadata.json
index e58519c37..e58519c37 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected.html
index 14d23f672..14d23f672 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/source.html
index bb0f7df01..bb0f7df01 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element-relative/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element-relative/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected-images.json
index c4a597eea..c4a597eea 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected-metadata.json
index e7a86a752..e7a86a752 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected.html
index 5037eb265..5037eb265 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/source.html
index 4b3c63c8e..4b3c63c8e 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url-base-element/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url-base-element/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected-images.json
index 1c28ae60c..1c28ae60c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected-metadata.json
index 291ff94bc..291ff94bc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected.html
index 36981e1e7..36981e1e7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/source.html
index 748b8be7d..748b8be7d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/base-url/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/base-url/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected-metadata.json
index a31ae0ba7..a31ae0ba7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected.html
index c66b95c70..c66b95c70 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/source.html
index d00f4cc27..d00f4cc27 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/basic-tags-cleaning/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/basic-tags-cleaning/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected-images.json
index 44bca8dce..44bca8dce 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected-metadata.json
index 6af682f84..6af682f84 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected.html
index ca646fe80..ca646fe80 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/source.html
index 876c893f6..876c893f6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bbc-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bbc-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected-images.json
index 1b254aaf2..1b254aaf2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected-metadata.json
index a081c8829..a081c8829 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected.html
index ec3a02a43..ec3a02a43 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/source.html
index 0c23844f6..0c23844f6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/blogger/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/blogger/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected-images.json
index 77ab1dbc1..77ab1dbc1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected-metadata.json
index f04451323..f04451323 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected.html
index e2f04c74b..e2f04c74b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/source.html
index 61ae0aa91..61ae0aa91 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/breitbart/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/breitbart/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected-images.json
index 7da4a8f99..7da4a8f99 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected-metadata.json
index b2b0d8659..b2b0d8659 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected.html
index c281eef90..c281eef90 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/source.html
index 08840dc24..08840dc24 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/bug-1255978/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/bug-1255978/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected-images.json
index f44cbe4a1..f44cbe4a1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected-metadata.json
index c332ef4f0..c332ef4f0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected.html
index 46a3f3212..46a3f3212 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/source.html
index f51556a34..f51556a34 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/buzzfeed-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/buzzfeed-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected-images.json
index c9eb0acac..c9eb0acac 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected-metadata.json
index 363110945..363110945 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected.html
index 195bdd271..195bdd271 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/source.html
index b6f0267e8..b6f0267e8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/challenges/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/challenges/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected-images.json
index be86a5838..be86a5838 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected-metadata.json
index c5166f58c..c5166f58c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected.html
index 8c1b8b121..8c1b8b121 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/source.html
index 775023e7c..775023e7c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/clean-links/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/clean-links/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected-images.json
index f83aea18c..f83aea18c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected-metadata.json
index be68e3164..be68e3164 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected.html
index 1b6351245..1b6351245 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/source.html
index c71419fe9..c71419fe9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet-svg-classes/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet-svg-classes/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected-images.json
index e8bdae4fb..e8bdae4fb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected-metadata.json
index 773cbb9f0..773cbb9f0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected.html
index 4f401dad0..4f401dad0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/source.html
index 410bf3cc8..410bf3cc8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnet/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnet/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected-images.json
index 93a8c3360..93a8c3360 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected-metadata.json
index 46a71fa8d..46a71fa8d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected.html
index 552455fe8..552455fe8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/source.html
index a4950a147..a4950a147 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/cnn/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/cnn/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected-metadata.json
index b1c1035b5..b1c1035b5 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected.html
index 57c50c6f3..57c50c6f3 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/source.html
index 59b7a02ca..59b7a02ca 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/comment-inside-script-parsing/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/comment-inside-script-parsing/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected-images.json
index 888aa8524..888aa8524 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected-metadata.json
index 1dbda03bd..1dbda03bd 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected.html
index 6c3f15447..6c3f15447 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/source.html
index c68f39009..c68f39009 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/daringfireball-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/daringfireball-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected-images.json
index 12cfc8c63..12cfc8c63 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected-metadata.json
index c442d503c..c442d503c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected.html
index 93f4c92fe..93f4c92fe 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/source.html
index 8727af66d..8727af66d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/different-sources-for-images/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/different-sources-for-images/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/config.json
index 4bb89904f..4bb89904f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected-images.json
index d0e64966f..d0e64966f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected-metadata.json
index 4de144894..4de144894 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected.html
index 397322e20..397322e20 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/source.html
index f5c9afe19..f5c9afe19 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected-images.json
index a6dcad5dc..a6dcad5dc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected-metadata.json
index 756b8c1b7..756b8c1b7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected.html
index ea7d138e1..ea7d138e1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/source.html
index 6976de340..6976de340 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ehow-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ehow-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected-metadata.json
index e0e885940..e0e885940 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected.html
index 327e6503c..327e6503c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/source.html
index ff43acfa3..ff43acfa3 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/embedded-videos/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/embedded-videos/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected-images.json
index f3993407b..f3993407b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected-metadata.json
index 3eb49bef2..3eb49bef2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected.html
index 44a2afe0d..44a2afe0d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/source.html
index 2bed80809..2bed80809 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/engadget/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/engadget/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected-images.json
index 5f0cd4927..5f0cd4927 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected-metadata.json
index 8405f6763..8405f6763 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected.html
index 5dc679145..5dc679145 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/source.html
index af8f61a2b..af8f61a2b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/fortressofsolitude/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/fortressofsolitude/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected-images.json
index 79181b26b..79181b26b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected-metadata.json
index 65cd6ab1b..65cd6ab1b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected.html
index 1b69754ff..1b69754ff 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/source.html
index 048d101c3..048d101c3 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/gmw/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/gmw/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected-images.json
index 07cba8ba0..07cba8ba0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected-metadata.json
index bb8e4c47f..bb8e4c47f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected.html
index 95ab304b5..95ab304b5 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/source.html
index 5ac581f07..5ac581f07 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/heise/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/heise/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected-images.json
index a26021c34..a26021c34 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected-metadata.json
index 102413240..102413240 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected.html
index 6896eedab..6896eedab 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/source.html
index 050bed449..050bed449 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/herald-sun-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/herald-sun-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected-metadata.json
index 332533a12..332533a12 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected.html
index 431532997..431532997 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/source.html
index e0699a003..e0699a003 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hidden-nodes/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hidden-nodes/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected-images.json
index 88d2990ee..88d2990ee 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected-metadata.json
index b16149a42..b16149a42 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected.html
index defbcc10c..defbcc10c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/source.html
index 7cbaacd6f..7cbaacd6f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/hukumusume/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/hukumusume/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected-images.json
index f548bd9b2..f548bd9b2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected-metadata.json
index a8d6766bd..a8d6766bd 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected.html
index dd4faf3b4..dd4faf3b4 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/source.html
index a8c36b957..a8c36b957 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/iab-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/iab-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected-metadata.json
index ddf0094b9..ddf0094b9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected.html
index ff46f7a1d..ff46f7a1d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/source.html
index ded744e77..ded744e77 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/ietf-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/ietf-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected-images.json
index 785f18284..785f18284 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected-metadata.json
index b6d25979e..b6d25979e 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected.html
index e575c7beb..e575c7beb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/source.html
index 8d6832e6f..8d6832e6f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/infobae/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/infobae/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected-images.json
index d5b5affb7..d5b5affb7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected-metadata.json
index 3b705f98a..3b705f98a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected.html
index d3696f7d1..d3696f7d1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/source.html
index 6d2b2821c..6d2b2821c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/keep-images/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/keep-images/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected-images.json
index 1ff254f29..1ff254f29 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected-metadata.json
index d2e56b0f8..d2e56b0f8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected.html
index 5640699c1..5640699c1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/source.html
index 2c0a8c72a..2c0a8c72a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/la-nacion/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/la-nacion/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected-images.json
index e32833b65..e32833b65 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected-metadata.json
index a45fcaf97..a45fcaf97 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected.html
index dd91ed502..dd91ed502 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/source.html
index 093b02e52..093b02e52 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected-images.json
index 8492ce450..8492ce450 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected-metadata.json
index c402d3e27..c402d3e27 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected.html
index af69efe32..af69efe32 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/source.html
index b47799962..b47799962 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lemonde-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lemonde-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected-images.json
index 4b8e9a8b4..4b8e9a8b4 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected-metadata.json
index 5f2b7b5ee..5f2b7b5ee 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected.html
index 889c2b928..889c2b928 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/source.html
index 609df40d6..609df40d6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/liberation-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/liberation-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected-images.json
index b46843d47..b46843d47 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected-metadata.json
index fa13f9e3b..fa13f9e3b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected.html
index 2f862a91c..2f862a91c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/source.html
index fb7f522f6..fb7f522f6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-post-comment-load/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-post-comment-load/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected-images.json
index b46843d47..b46843d47 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected-metadata.json
index fa13f9e3b..fa13f9e3b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected.html
index 2f862a91c..2f862a91c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/source.html
index 9256059f8..9256059f8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lifehacker-working/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lifehacker-working/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected-images.json
index c4caaa1ed..c4caaa1ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected-metadata.json
index d6b1330af..d6b1330af 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected.html
index 05e072336..05e072336 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/source.html
index b9ca816ee..b9ca816ee 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/links-in-tables/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/links-in-tables/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/config.json
index 0ac6816ed..0ac6816ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected-images.json
index 3f6b61062..3f6b61062 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected-metadata.json
index 584887a46..584887a46 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected.html
index 358f95655..358f95655 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/source.html
index 85eea11d8..85eea11d8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/lwn-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/lwn-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/config.json
index 958972e20..958972e20 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected-images.json
index cfe75d030..cfe75d030 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected-metadata.json
index 94f36a271..94f36a271 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected.html
index bd81ab3d7..bd81ab3d7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/source.html
index 080f03dd8..080f03dd8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/marketwatch/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/marketwatch/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected-images.json
index 9a2422037..9a2422037 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected-metadata.json
index a974b4361..a974b4361 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected.html
index 679d8b75b..679d8b75b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/source.html
index 63be92077..63be92077 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected-images.json
index e52ea6ff1..e52ea6ff1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected-metadata.json
index 71804a0dc..71804a0dc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected.html
index 222b09dbc..222b09dbc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/source.html
index da62885b7..da62885b7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected-images.json
index 54ac86669..54ac86669 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected-metadata.json
index 59ef2043d..59ef2043d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected.html
index f1c311e75..f1c311e75 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/source.html
index 37c246419..37c246419 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/medium-3/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/medium-3/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected-metadata.json
index b0ef9465b..b0ef9465b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected.html
index 39e027e47..39e027e47 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/source.html
index f5f8ca6c2..f5f8ca6c2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/missing-paragraphs/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/missing-paragraphs/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected-images.json
index 8ee13b8e5..8ee13b8e5 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected-metadata.json
index 1b17f9b16..1b17f9b16 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected.html
index ba1896ea7..ba1896ea7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/source.html
index b8ff3df17..b8ff3df17 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected-images.json
index 365d4c229..365d4c229 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected-metadata.json
index 7336ada27..7336ada27 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected.html
index 8ce4c0703..8ce4c0703 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/source.html
index 31f30a6b6..31f30a6b6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/mozilla-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/mozilla-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected-images.json
index 176afee89..176afee89 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected-metadata.json
index 673d99512..673d99512 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected.html
index 3ed4d696c..3ed4d696c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/source.html
index be55bf3fa..be55bf3fa 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/msn/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/msn/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected-images.json
index c89c43ca2..c89c43ca2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected-metadata.json
index 36da83868..36da83868 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected.html
index 60f7148bc..60f7148bc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/source.html
index d8d12436b..d8d12436b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected-images.json
index e4b49d00e..e4b49d00e 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected-metadata.json
index 7fbcf29ee..7fbcf29ee 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected.html
index 1584ca437..1584ca437 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/source.html
index 07dd7484d..07dd7484d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/nytimes-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/nytimes-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected-images.json
index d36dedeb1..d36dedeb1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected-metadata.json
index dafb56b44..dafb56b44 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected.html
index ffa81c794..ffa81c794 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/source.html
index e1849a93d..e1849a93d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/pixnet/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/pixnet/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected-metadata.json
index 9a7e3d102..9a7e3d102 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected.html
index e064a49ee..e064a49ee 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/source.html
index ac6ffc793..ac6ffc793 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-brs/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-brs/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected-metadata.json
index 2e6f722f5..2e6f722f5 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected.html
index a7c631809..a7c631809 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/source.html
index 339d84b3f..339d84b3f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-extra-paragraphs/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-extra-paragraphs/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected-metadata.json
index 13cd351c7..13cd351c7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected.html
index 769cc0629..769cc0629 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/source.html
index cacb3df7a..cacb3df7a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/remove-script-tags/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/remove-script-tags/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected-metadata.json
index 4878f5da1..4878f5da1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected.html
index 4a46dd585..4a46dd585 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/source.html
index d081a9436..d081a9436 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/reordering-paragraphs/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/reordering-paragraphs/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected-metadata.json
index 2f31b060c..2f31b060c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected.html
index 56e36a4bc..56e36a4bc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/source.html
index 2283d6542..2283d6542 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-brs/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-brs/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected-metadata.json
index 18f46ddb8..18f46ddb8 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected.html
index a36b1a252..a36b1a252 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/source.html
index 5789e5676..5789e5676 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/replace-font-tags/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/replace-font-tags/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected-metadata.json
index f9613b2bf..f9613b2bf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected.html
index eba1686e9..eba1686e9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/source.html
index 597c427ac..597c427ac 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected-metadata.json
index f9613b2bf..f9613b2bf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected.html
index eba1686e9..eba1686e9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/source.html
index c888309eb..c888309eb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected-metadata.json
index f9613b2bf..f9613b2bf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected.html
index 75448882b..75448882b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/source.html
index ac68451c7..ac68451c7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-3/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-3/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected-metadata.json
index c8358d561..c8358d561 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected.html
index 14724e72d..14724e72d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/source.html
index 677bca906..677bca906 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/rtl-4/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/rtl-4/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected-images.json
index f2c796a72..f2c796a72 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected-metadata.json
index 63cf935cf..63cf935cf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected.html
index d1cb60ef1..d1cb60ef1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/source.html
index 3bfa3fe31..3bfa3fe31 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/salon-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/salon-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected-images.json
index 469dde59f..469dde59f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected-metadata.json
index b024aa854..b024aa854 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected.html
index 55b74a98c..55b74a98c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/source.html
index f2e26ac95..f2e26ac95 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/simplyfound-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/simplyfound-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected-metadata.json
index 7a80654bf..7a80654bf 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected.html
index 6d135be2c..6d135be2c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/source.html
index ee9d660c5..ee9d660c5 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/social-buttons/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/social-buttons/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected-metadata.json
index 47039a9a9..47039a9a9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected.html
index d3a8806b4..d3a8806b4 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/source.html
index 687ca39be..687ca39be 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/style-tags-removal/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/style-tags-removal/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected-metadata.json
index 321414f8b..321414f8b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected.html
index 1cc45591b..1cc45591b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/source.html
index e4fb905f1..e4fb905f1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/svg-parsing/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/svg-parsing/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected-images.json
index c2a1ea915..c2a1ea915 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected-metadata.json
index cdb8fc396..cdb8fc396 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected.html
index 77c083b21..77c083b21 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/source.html
index 0e20275b6..0e20275b6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/table-style-attributes/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/table-style-attributes/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected-images.json
index c52fd8c66..c52fd8c66 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected-metadata.json
index be19af16d..be19af16d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected.html
index 23a2a74ed..23a2a74ed 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/source.html
index 3aad2a179..3aad2a179 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/telegraph/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/telegraph/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected-images.json
index 0637a088a..0637a088a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected-metadata.json
index 07338d0a7..07338d0a7 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected.html
index e4fa77ae9..e4fa77ae9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/source.html
index d91b65844..d91b65844 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/title-and-h1-discrepancy/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/title-and-h1-discrepancy/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected-images.json
index fa74f0b81..fa74f0b81 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected-metadata.json
index 63d67965b..63d67965b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected.html
index 6eb48b97d..6eb48b97d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/source.html
index c2b19f0e0..c2b19f0e0 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tmz-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tmz-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected-images.json
index bce09c696..bce09c696 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected-metadata.json
index 225236c98..225236c98 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected.html
index 56df59658..56df59658 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/source.html
index 14069d241..14069d241 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/tumblr/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/tumblr/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-images.json
index c2be6de58..c2be6de58 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-metadata.json
index 416d55e4c..416d55e4c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected.html
index 21644834f..21644834f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/source.html
index e4b2d4ac9..e4b2d4ac9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/uses-getfirstelementchild-function/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/uses-getfirstelementchild-function/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected-images.json
index cc41335ab..cc41335ab 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected-metadata.json
index d3aad6507..d3aad6507 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected.html
index ed051e882..ed051e882 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/source.html
index 047505981..047505981 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected-images.json
index a8602d503..a8602d503 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected-metadata.json
index 57f81c1dc..57f81c1dc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected.html
index cb2a8ceda..cb2a8ceda 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/source.html
index 1d4dd7bdb..1d4dd7bdb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wapo-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wapo-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/config.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/config.json
index 4bb89904f..4bb89904f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/config.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/config.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected-images.json
index 2b266e478..2b266e478 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected-metadata.json
index 2a7bced70..2a7bced70 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected.html
index ddbe3d84c..ddbe3d84c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/source.html
index 0b50ccc54..0b50ccc54 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected-images.json
index 2b266e478..2b266e478 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected-metadata.json
index 9fee7bc3c..9fee7bc3c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected.html
index d9e181691..d9e181691 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/source.html
index d7b374b7c..d7b374b7c 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/webmd-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/webmd-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected-images.json
index 2ad255671..2ad255671 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected-metadata.json
index ec9aa476f..ec9aa476f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected.html
index de18ee3f3..de18ee3f3 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/source.html
index aa1d77164..aa1d77164 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikia/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikia/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected-images.json
index 81d1c9d4d..81d1c9d4d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected-metadata.json
index b6e3d76fd..b6e3d76fd 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected.html
index 8de3ffabc..8de3ffabc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/source.html
index 1a1338dfb..1a1338dfb 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wikipedia/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wikipedia/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected-images.json
index e0c78e6ce..e0c78e6ce 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected-metadata.json
index 9154ef04d..9154ef04d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected.html
index 1f47d8fe1..1f47d8fe1 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/source.html
index f5984508e..f5984508e 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/wordpress/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/wordpress/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected-images.json
index 4c0fc4c25..4c0fc4c25 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected-metadata.json
index cfd3a6943..cfd3a6943 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected.html
index deea6c82f..deea6c82f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/source.html
index b13bd1d8d..b13bd1d8d 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-1/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-1/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected-images.json
index 6ece996a2..6ece996a2 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected-metadata.json
index 8ca33da76..8ca33da76 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected.html
index 9bc5f6f5f..9bc5f6f5f 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/source.html
index 2ab343fc9..2ab343fc9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-2/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-2/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected-images.json
index 36f5f0612..36f5f0612 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected-metadata.json
index 8af68c02b..8af68c02b 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected.html
index c5d7e33dc..c5d7e33dc 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/source.html
index caf60e4e9..caf60e4e9 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-3/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-3/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected-images.json
index 36a35281a..36a35281a 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected-metadata.json
index c8459ad79..c8459ad79 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected.html
index db7694ab3..db7694ab3 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/source.html
index 8d3510886..8d3510886 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/yahoo-4/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/yahoo-4/source.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected-images.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected-images.json
index 72627e0ec..72627e0ec 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected-images.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected-images.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected-metadata.json b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected-metadata.json
index f84c6ecd6..f84c6ecd6 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected-metadata.json
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected-metadata.json
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected.html
index f4ae9daac..f4ae9daac 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/expected.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/expected.html
diff --git a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/source.html b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/source.html
index 22a3bb571..22a3bb571 100644
--- a/plugins/af_readability/vendor/andreskrey/readability.php/test/test-pages/youth/source.html
+++ b/plugins/af_readability/vendor/fivefilters/readability.php/test/test-pages/youth/source.html
diff --git a/plugins/af_readability/vendor/psr/log/Psr/Log/AbstractLogger.php b/plugins/af_readability/vendor/psr/log/Psr/Log/AbstractLogger.php
index 90e721af2..e02f9daf3 100644
--- a/plugins/af_readability/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/plugins/af_readability/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -30,8 +30,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -45,8 +45,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -59,8 +59,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -75,8 +75,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -88,8 +88,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Normal but significant events.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -116,8 +116,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Detailed debug information.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
diff --git a/plugins/af_readability/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/plugins/af_readability/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index 639f79bda..82bf45c89 100644
--- a/plugins/af_readability/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/plugins/af_readability/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
      * The logger instance.
      *
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 
diff --git a/plugins/af_readability/vendor/psr/log/composer.json b/plugins/af_readability/vendor/psr/log/composer.json
index 3f6d4eea4..ca0569537 100644
--- a/plugins/af_readability/vendor/psr/log/composer.json
+++ b/plugins/af_readability/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 3b4094b1b..dd8fbf651 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -28,11 +28,24 @@ class Af_RedditImgur extends Plugin {
 		$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
 		$host->add_hook($host::HOOK_RENDER_ARTICLE_CDM, $this);
 		$host->add_hook($host::HOOK_RENDER_ARTICLE_API, $this);
+
+		$host->add_hook($host::HOOK_PRE_SUBSCRIBE, $this);
+	}
+
+	function hook_pre_subscribe(&$url, $auth_login, $auth_pass) {
+		$reddit_to_teddit = $this->host->get($this, "reddit_to_teddit");
+
+		if ($reddit_to_teddit) {
+			$url = $this->rewrite_to_reddit($url);
+
+			return true;
+		}
+
+		return false;
 	}
 
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
-
 			$enable_readability = $this->host->get($this, "enable_readability");
 			$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
 			$reddit_to_teddit = $this->host->get($this, "reddit_to_teddit");
@@ -468,6 +481,7 @@ class Af_RedditImgur extends Plugin {
 					if (@$cdoc->loadHTML($content)) {
 						$cxpath = new DOMXPath($cdoc);
 
+						/** @var ?DOMElement $rel_image */
 						$rel_image = $cxpath->query("//link[@rel='image_src']")->item(0);
 
 						if ($rel_image) {
@@ -514,7 +528,10 @@ class Af_RedditImgur extends Plugin {
 					if (@$cdoc->loadHTML($content)) {
 						$cxpath = new DOMXPath($cdoc);
 
+						/** @var ?DOMElement $og_image */
 						$og_image = $cxpath->query("//meta[@property='og:image']")->item(0);
+
+						/** @var ?DOMElement $og_video */
 						$og_video = $cxpath->query("//meta[@property='og:video']")->item(0);
 
 						if ($og_video) {
@@ -577,6 +594,7 @@ class Af_RedditImgur extends Plugin {
 			if (@$doc->loadHTML($article["content"])) {
 				$xpath = new DOMXPath($doc);
 
+				/** @var ?DOMElement $content_link */
 				$content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
 
 				if ($this->host->get($this, "enable_content_dupcheck")) {
@@ -785,7 +803,8 @@ class Af_RedditImgur extends Plugin {
 
 	}
 
-	private function get_header($url, $header, $useragent = SELF_USER_AGENT) {
+	/** $useragent defaults to Config::get_user_agent() */
+	private function get_header($url, $header, $useragent = false) {
 		$ret = false;
 
 		if (function_exists("curl_init")) {
@@ -795,7 +814,7 @@ class Af_RedditImgur extends Plugin {
 			curl_setopt($ch, CURLOPT_HEADER, true);
 			curl_setopt($ch, CURLOPT_NOBODY, true);
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
-			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
+			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : Config::get_user_agent());
 
 			@curl_exec($ch);
 			$ret = curl_getinfo($ch, $header);
@@ -804,11 +823,11 @@ class Af_RedditImgur extends Plugin {
 		return $ret;
 	}
 
-	private function get_content_type($url, $useragent = SELF_USER_AGENT) {
+	private function get_content_type($url, $useragent = false) {
 		return $this->get_header($url, CURLINFO_CONTENT_TYPE, $useragent);
 	}
 
-	private function get_location($url, $useragent = SELF_USER_AGENT) {
+	private function get_location($url, $useragent = false) {
 		return $this->get_header($url, CURLINFO_EFFECTIVE_URL, $useragent);
 	}
 
@@ -868,6 +887,18 @@ class Af_RedditImgur extends Plugin {
 		return $str;
 	}
 
+	private function rewrite_to_reddit($str) {
+		if (strpos($str, "teddit.net") !== false) {
+			$str = preg_replace("/https?:\/\/teddit.net/", "https://reddit.com", $str);
+
+			if (strpos($str, "/.rss") === false)
+				$str .= "/.rss";
+		}
+
+		return $str;
+	}
+
+
 	function hook_render_article_cdm($article) {
 		if ($this->host->get($this, "reddit_to_teddit")) {
 			$need_saving = false;
diff --git a/themes/compact.css b/themes/compact.css
index fc63f5f77..687175499 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -43,6 +43,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1302,9 +1303,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #777;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 3fd4d2e43..df0ec8363 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -43,6 +43,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1302,9 +1303,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #999;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css
index 7ff872a59..25322b2a4 100644
--- a/themes/light-high-contrast.css
+++ b/themes/light-high-contrast.css
@@ -43,6 +43,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1302,9 +1303,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #777;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/themes/light.css b/themes/light.css
index f983f4d80..cc9f48488 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -43,6 +43,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1302,9 +1303,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #777;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/themes/light/cdm.less b/themes/light/cdm.less
index 5641a0380..71288b023 100644
--- a/themes/light/cdm.less
+++ b/themes/light/cdm.less
@@ -98,8 +98,23 @@
 			color : @color-icon;
 		}
 
+		.left, .right {
+			display : flex;
+			align-items : center;
+		}
+
 		.left {
 			flex-grow : 2;
+
+			> * {
+				margin-right : 4px;
+			}
+		}
+
+		.right {
+			> * {
+				margin-left : 4px;
+			}
 		}
 	}
 
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 0e85d53fb..db286ee5f 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -22,6 +22,7 @@ body.ttrss_main {
 
 			.left, .right {
 				display : flex;
+				align-items : center;
 			}
 
 			.row {
diff --git a/themes/night.css b/themes/night.css
index 19e3182bc..4294f2568 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -44,6 +44,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1303,9 +1304,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #999;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 94bec2181..648bb175b 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -44,6 +44,7 @@ body.ttrss_main .post .header {
 body.ttrss_main .post .header .left,
 body.ttrss_main .post .header .right {
   display: flex;
+  align-items: center;
 }
 body.ttrss_main .post .header .row {
   display: flex;
@@ -1303,9 +1304,20 @@ body.ttrss_utility hr {
 .cdm .footer i.material-icons {
   color: #999;
 }
+.cdm .footer .left,
+.cdm .footer .right {
+  display: flex;
+  align-items: center;
+}
 .cdm .footer .left {
   flex-grow: 2;
 }
+.cdm .footer .left > * {
+  margin-right: 4px;
+}
+.cdm .footer .right > * {
+  margin-left: 4px;
+}
 .cdm .content-inner {
   margin: 10px;
   line-height: 1.5;
diff --git a/update.php b/update.php
index 079069a3b..2ad4c963c 100755
--- a/update.php
+++ b/update.php
@@ -30,36 +30,31 @@
 		$days = (int) $days;
 
 		if (Config::get(Config::DB_TYPE) == "pgsql") {
-			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
+			$interval_query = "e.date_updated < NOW() - INTERVAL '$days days'";
 		} else /*if (Config::get(Config::DB_TYPE) == "mysql") */ {
-			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
+			$interval_query = "e.date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
 		$tags_deleted = 0;
-
-		$pdo = Db::pdo();
+		$limit_part = 500;
 
 		while ($limit > 0) {
-			$limit_part = 500;
-
-			$sth = $pdo->prepare("SELECT ttrss_tags.id AS id
-						FROM ttrss_tags, ttrss_user_entries, ttrss_entries
-						WHERE post_int_id = int_id AND $interval_query AND
-						ref_id = ttrss_entries.id AND tag_cache != '' LIMIT ?");
-			$sth->bindValue(1, $limit_part, PDO::PARAM_INT);
-			$sth->execute();
-
-			$ids = array();
-
-			while ($line = $sth->fetch()) {
-				array_push($ids, $line['id']);
-			}
-
-			if (count($ids) > 0) {
-				$ids = join(",", $ids);
-
-				$usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted = $usth->rowCount();
+			$tags = ORM::for_table('ttrss_tags')
+				->table_alias('t')
+				->select('t.id')
+				->join('ttrss_user_entries', ['ue.int_id', '=', 't.post_int_id'], 'ue')
+				->join('ttrss_entries', ['e.id', '=', 'ue.ref_id'], 'e')
+				->where_not_equal('ue.tag_cache', '')
+				->where_raw($interval_query)
+				->limit($limit_part)
+				->find_many();
+
+			if (count($tags)) {
+				ORM::for_table('ttrss_tags')
+					->where_id_in(array_column($tags->as_array(), 'id'))
+					->delete_many();
+
+				$tags_deleted += ORM::get_last_statement()->rowCount();
 			} else {
 				break;
 			}
@@ -91,9 +86,10 @@
 		"gen-search-idx" => "generate basic PostgreSQL fulltext search index",
 		"plugins-list" => "list installed plugins",
 		"debug-feed:" => ["N", "update specified feed with debug output enabled"],
-		"debug-force-refetch" => "debug update: force refetch feed data",
-		"debug-force-rehash" => "debug update: force rehash articles",
+		"force-refetch" => "debug update: force refetch feed data",
+		"force-rehash" => "debug update: force rehash articles",
 		"opml-export:" => ["USER:FILE", "export OPML of USER to FILE"],
+		"opml-import:" => ["USER:FILE", "import OPML for USER from FILE"],
 		"user-list" => "list all users",
 #		"user-add:" => ["USER[:PASSWORD]", "add USER, optionally without prompting for PASSWORD"],
 #		"user-remove:" => ["USERNAME", "remove specified user"],
@@ -290,29 +286,29 @@
 	if (isset($options["gen-search-idx"])) {
 		echo "Generating search index (stemming set to English)...\n";
 
-		$res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
-		$row = $res->fetch();
-		$count = $row['count'];
-
-		print "Articles to process: $count.\n";
+		$count = ORM::for_table('ttrss_entries')
+			->where_null('tsvector_combined')
+			->count();
 
 		$limit = 500;
 		$processed = 0;
 
-		$sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
-          tsvector_combined IS NULL ORDER BY id LIMIT ?");
-		$sth->execute([$limit]);
+		print "Articles to process: $count (will limit to $limit).\n";
+
+		$entries = ORM::for_table('ttrss_entries')
+			->select_many('id', 'title', 'content')
+			->where_null('tsvector_combined')
+			->order_by_asc('id')
+			->limit($limit)
+			->find_many();
 
 		$usth = $pdo->prepare("UPDATE ttrss_entries
           SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
 
 		while (true) {
-
-			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
-
-				$usth->execute([$tsvector_combined, $line['id']]);
-
+			foreach ($entries as $entry) {
+				$tsvector_combined = mb_substr(strip_tags($entry->title . " " . $entry->content), 0, 1000000);
+				$usth->execute([$tsvector_combined, $entry->id]);
 				$processed++;
 			}
 
@@ -366,7 +362,7 @@
 
 	if (isset($options["user-list"])) {
 		$users = ORM::for_table('ttrss_users')
-			->order_by_expr('id')
+			->order_by_asc('id')
 			->find_many();
 
 		foreach ($users as $user) {
@@ -389,6 +385,22 @@
 		} else {
 			Debug::log("User not found: $user");
 		}
+	}
+
+	if (isset($options["opml-import"])) {
+		list ($user, $filename) = explode(":", $options["opml-import"], 2);
+
+		Debug::log("Importing feeds of user $user from OPML file $filename...");
+
+		if ($owner_uid = UserHelper::find_user_by_login($user)) {
+			$opml = new OPML("");
+
+			$rc = $opml->opml_import($owner_uid, $filename);
+
+			Debug::log($rc ? "Success." : "Failed.");
+		} else {
+			Debug::log("User not found: $user");
+		}
 
 	}
 
diff --git a/vendor/bin/phpstan b/vendor/bin/phpstan
new file mode 120000
index 000000000..959384f7f
--- /dev/null
+++ b/vendor/bin/phpstan
@@ -0,0 +1 @@
+../phpstan/phpstan/phpstan
\ No newline at end of file
diff --git a/vendor/bin/phpstan.phar b/vendor/bin/phpstan.phar
new file mode 120000
index 000000000..502769bef
--- /dev/null
+++ b/vendor/bin/phpstan.phar
@@ -0,0 +1 @@
+../phpstan/phpstan/phpstan.phar
\ No newline at end of file
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index e17d3b0a7..7aa64aca4 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ private static $installed = array (
     'aliases' => 
     array (
     ),
-    'reference' => 'f96abd2b52b9de5eac3651594ca32c6a4023c3e3',
+    'reference' => '2a5c2be6cdd9ba9217a0661805b62aeec1de90c3',
     'dev-requirement' => true,
     'name' => '__root__',
   ),
@@ -43,7 +43,7 @@ private static $installed = array (
       'aliases' => 
       array (
       ),
-      'reference' => 'f96abd2b52b9de5eac3651594ca32c6a4023c3e3',
+      'reference' => '2a5c2be6cdd9ba9217a0661805b62aeec1de90c3',
       'dev-requirement' => false,
     ),
     'beberlei/assert' => 
@@ -106,6 +106,16 @@ private static $installed = array (
       'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c',
       'dev-requirement' => false,
     ),
+    'phpstan/phpstan' => 
+    array (
+      'pretty_version' => '0.12.99',
+      'version' => '0.12.99.0',
+      'aliases' => 
+      array (
+      ),
+      'reference' => 'b4d40f1d759942f523be267a1bab6884f46ca3f7',
+      'dev-requirement' => true,
+    ),
     'spomky-labs/otphp' => 
     array (
       'pretty_version' => 'v10.0.1',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index a2686669c..636fe7c0f 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    '9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
     'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir . '/beberlei/assert/lib/Assert/functions.php',
     '51fcf4e06c07cc00c920b44bcd900e7a' => $vendorDir . '/thecodingmachine/safe/deprecated/apc.php',
     '47f619d9197b36cf5ab70738d7743fe2' => $vendorDir . '/thecodingmachine/safe/deprecated/libevent.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 6f1c238b1..d1b8ceed0 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -7,6 +7,7 @@ namespace Composer\Autoload;
 class ComposerStaticInit19fc2ff1c0f9a92279c7979386bb2056
 {
     public static $files = array (
+        '9b38cf48e83f5d8f60375221cd213eee' => __DIR__ . '/..' . '/phpstan/phpstan/bootstrap.php',
         'a4ecaeafb8cfb009ad0e052c90355e98' => __DIR__ . '/..' . '/beberlei/assert/lib/Assert/functions.php',
         '51fcf4e06c07cc00c920b44bcd900e7a' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/apc.php',
         '47f619d9197b36cf5ab70738d7743fe2' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/libevent.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 7de696894..e06a40433 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -390,6 +390,73 @@
             "install-path": "../paragonie/constant_time_encoding"
         },
         {
+            "name": "phpstan/phpstan",
+            "version": "0.12.99",
+            "version_normalized": "0.12.99.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "time": "2021-09-12T20:09:55+00:00",
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../phpstan/phpstan"
+        },
+        {
             "name": "spomky-labs/otphp",
             "version": "v10.0.1",
             "version_normalized": "10.0.1.0",
@@ -611,5 +678,7 @@
         }
     ],
     "dev": true,
-    "dev-package-names": []
+    "dev-package-names": [
+        "phpstan/phpstan"
+    ]
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 59d40508a..17ae71708 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => 'f96abd2b52b9de5eac3651594ca32c6a4023c3e3',
+    'reference' => '2a5c2be6cdd9ba9217a0661805b62aeec1de90c3',
     'dev-requirement' => true,
     'name' => '__root__',
   ),
@@ -19,7 +19,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => 'f96abd2b52b9de5eac3651594ca32c6a4023c3e3',
+      'reference' => '2a5c2be6cdd9ba9217a0661805b62aeec1de90c3',
       'dev-requirement' => false,
     ),
     'beberlei/assert' => 
@@ -82,6 +82,16 @@
       'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c',
       'dev-requirement' => false,
     ),
+    'phpstan/phpstan' => 
+    array (
+      'pretty_version' => '0.12.99',
+      'version' => '0.12.99.0',
+      'aliases' => 
+      array (
+      ),
+      'reference' => 'b4d40f1d759942f523be267a1bab6884f46ca3f7',
+      'dev-requirement' => true,
+    ),
     'spomky-labs/otphp' => 
     array (
       'pretty_version' => 'v10.0.1',
diff --git a/vendor/phpstan/phpstan/.gitattributes b/vendor/phpstan/phpstan/.gitattributes
new file mode 100644
index 000000000..658b92eeb
--- /dev/null
+++ b/vendor/phpstan/phpstan/.gitattributes
@@ -0,0 +1,11 @@
+/.github export-ignore
+/BACKERS.md export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/docker export-ignore
+/e2e export-ignore
+/issue-bot export-ignore
+/playground-api export-ignore
+/playground-runner export-ignore
+/.travis.yml export-ignore
+/website export-ignore
+website/* linguist-vendored
diff --git a/vendor/phpstan/phpstan/.gitignore b/vendor/phpstan/phpstan/.gitignore
new file mode 100644
index 000000000..020e4b465
--- /dev/null
+++ b/vendor/phpstan/phpstan/.gitignore
@@ -0,0 +1,9 @@
+/build/phpstan-generated.neon
+/composer.lock
+/conf/config.local.yml
+/e2e/composer.lock
+/e2e/vendor
+/vendor
+/.idea
+/tests/tmp
+/tests/.phpunit.result.cache
diff --git a/vendor/phpstan/phpstan/LICENSE b/vendor/phpstan/phpstan/LICENSE
new file mode 100644
index 000000000..7c0f2b7b6
--- /dev/null
+++ b/vendor/phpstan/phpstan/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Ondřej Mirtes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/phpstan/phpstan/README.md b/vendor/phpstan/phpstan/README.md
new file mode 100644
index 000000000..b31560d28
--- /dev/null
+++ b/vendor/phpstan/phpstan/README.md
@@ -0,0 +1,91 @@
+<h1 align="center">PHPStan - PHP Static Analysis Tool</h1>
+
+<p align="center">
+	<img src="https://i.imgur.com/WaRKPlC.png" alt="PHPStan" width="300" height="300">
+</p>
+
+<p align="center">
+	<a href="https://github.com/phpstan/phpstan/actions"><img src="https://github.com/phpstan/phpstan/workflows/Build/badge.svg" alt="Build Status"></a>
+	<a href="https://packagist.org/packages/phpstan/phpstan"><img src="https://poser.pugx.org/phpstan/phpstan/v/stable" alt="Latest Stable Version"></a>
+	<a href="https://packagist.org/packages/phpstan/phpstan/stats"><img src="https://poser.pugx.org/phpstan/phpstan/downloads" alt="Total Downloads"></a>
+	<a href="https://choosealicense.com/licenses/mit/"><img src="https://poser.pugx.org/phpstan/phpstan/license" alt="License"></a>
+	<a href="https://phpstan.org/"><img src="https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat" alt="PHPStan Enabled"></a>
+</p>
+
+------
+
+PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs
+even before you write tests for the code. It moves PHP closer to compiled languages in the sense that the correctness of each line of the code
+can be checked before you run the actual line.
+
+**[Read more about PHPStan in an introductory article »](https://phpstan.org/blog/find-bugs-in-your-code-without-writing-tests)**
+
+**[Try out PHPStan on the on-line playground! »](https://phpstan.org/)**
+
+## Sponsors
+
+<a href="https://coders.thecodingmachine.com/phpstan"><img src="https://i.imgur.com/kQhNOTP.png" alt="TheCodingMachine" width="247" height="64"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://packagist.com/?utm_source=phpstan&utm_medium=readme&utm_campaign=sponsorlogo"><img src="https://i.imgur.com/PmMC45f.png" alt="Private Packagist" width="326" height="64"></a>
+<br>
+<a href="https://musement.recruiterbox.com/jobs/f661d5d5676e4c578d289bcf2fb40b02"><img src="https://i.imgur.com/uw5rAlR.png" alt="Musement" width="247" height="49"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://blackfire.io/docs/introduction?utm_source=phpstan&utm_medium=github_readme&utm_campaign=logo"><img src="https://i.imgur.com/zR8rsqk.png" alt="Blackfire.io" width="254" height="64"></a>
+<br>
+<a href="https://www.intracto.com/"><img src="https://i.imgur.com/XRCDGZi.png" alt="Intracto" width="254" height="65"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://jobs.ticketswap.com/"><img src="https://i.imgur.com/lhzcutK.png" alt="TicketSwap" width="269" height="64"></a>
+<br>
+<a href="https://www.startupjobs.cz/startup/shipmonk"><img src="https://i.imgur.com/bAC47za.jpg" alt="ShipMonk" width="290" height="64"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://togetter.com/"><img src="https://i.imgur.com/x9n5cj3.png" alt="Togetter" width="283" height="64"></a>
+<br>
+<a href="https://join.rightcapital.com/?utm_source=phpstan&utm_medium=github&utm_campaign=sponsorship"><img src="https://i.imgur.com/EuIgI08.png" alt="RightCapital" width="283" height="64"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://www.contentkingapp.com/?ref=php-developer&utm_source=phpstan&utm_medium=referral&utm_campaign=sponsorship"><img src="https://i.imgur.com/0blm7ki.png" alt="ContentKing" width="283" height="64"></a>
+<br>
+<a href="https://zol.fr?utm_source=phpstan"><img src="https://i.imgur.com/dzDgd4s.png" alt="ZOL" width="283" height="64"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://kocourek.uk/"><img src="https://i.imgur.com/EX29z98.png" alt="Stepan Kocourek" width="294" height="64"></a>
+<br>
+<a href="https://www.shopware.com/en/"><img src="https://i.imgur.com/L4X5w9s.png" alt="Shopware" width="284" height="64"></a>
+&nbsp;&nbsp;&nbsp;
+<a href="https://craftcms.com/"><img src="https://i.imgur.com/xJWThke.png" alt="Craft CMS" width="283" height="64"></a>
+
+[**You can now sponsor my open-source work on PHPStan through GitHub Sponsors.**](https://github.com/sponsors/ondrejmirtes)
+
+Does GitHub already have your 💳? Do you use PHPStan to find 🐛 before they reach production? [Send a couple of 💸 a month my way too.](https://github.com/sponsors/ondrejmirtes) Thank you!
+
+One-time donations [through PayPal](https://paypal.me/phpstan) are also accepted. To request an invoice, [contact me](mailto:[email protected]) through e-mail.
+
+## Documentation
+
+All the documentation lives on the [phpstan.org website](https://phpstan.org/):
+
+* [Getting Started & User Guide](https://phpstan.org/user-guide/getting-started)
+* [Config Reference](https://phpstan.org/config-reference)
+* [PHPDocs Basics](https://phpstan.org/writing-php-code/phpdocs-basics) & [PHPDoc Types](https://phpstan.org/writing-php-code/phpdoc-types)
+* [Extension Library](https://phpstan.org/user-guide/extension-library)
+* [Developing Extensions](https://phpstan.org/developing-extensions/extension-types)
+
+## PHPStan Pro
+
+PHPStan Pro is a paid add-on on top of open-source PHPStan Static Analysis Tool with these premium features:
+
+* Web UI for browsing found errors, you can click and open your editor of choice on the offending line.
+* Continuous analysis (watch mode): scans changed files in the background, refreshes the UI automatically.
+* Interactive fixer: lets you choose the right fix for found errors :blush:
+
+Try it on PHPStan 0.12.45 or later by running it with the `--pro` option. You can create an account either by following the on-screen instructions, or by visiting [account.phpstan.com](https://account.phpstan.com/).
+
+After 30-day free trial period it costs 7 EUR for individuals monthly, 70 EUR for teams (up to 25 members). By paying for PHPStan Pro, you're supporting the development of open-source PHPStan.
+
+You can read more about it on [PHPStan's website](https://phpstan.org/blog/introducing-phpstan-pro).
+
+## Code of Conduct
+
+This project adheres to a [Contributor Code of Conduct](https://github.com/phpstan/phpstan/blob/master/CODE_OF_CONDUCT.md). By participating in this project and its community, you are expected to uphold this code.
+
+## Contributing
+
+Any contributions are welcome. PHPStan's source code open to pull requests lives at [`phpstan/phpstan-src`](https://github.com/phpstan/phpstan-src).
diff --git a/vendor/phpstan/phpstan/bootstrap.php b/vendor/phpstan/phpstan/bootstrap.php
new file mode 100644
index 000000000..e8b943167
--- /dev/null
+++ b/vendor/phpstan/phpstan/bootstrap.php
@@ -0,0 +1,60 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan;
+
+use Composer\Autoload\ClassLoader;
+
+final class PharAutoloader
+{
+	/** @var ClassLoader */
+	private static $composerAutoloader;
+
+	final public static function loadClass(string $class): void {
+		if (!extension_loaded('phar') || defined('__PHPSTAN_RUNNING__')) {
+			return;
+		}
+
+		if (strpos($class, '_PHPStan_') === 0) {
+			if (!in_array('phar', stream_get_wrappers(), true)) {
+				throw new \Exception('Phar wrapper is not registered. Please review your php.ini settings.');
+			}
+
+			if (self::$composerAutoloader === null) {
+				self::$composerAutoloader = require 'phar://' . __DIR__ . '/phpstan.phar/vendor/autoload.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/clue/block-react/src/functions_include.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise-stream/src/functions_include.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise-timer/src/functions_include.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise/src/functions_include.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/ringcentral/psr7/src/functions_include.php';
+			}
+			self::$composerAutoloader->loadClass($class);
+
+			return;
+		}
+		if (strpos($class, 'PHPStan\\') !== 0 || strpos($class, 'PHPStan\\PhpDocParser\\') === 0) {
+			return;
+		}
+
+		if (!in_array('phar', stream_get_wrappers(), true)) {
+			throw new \Exception('Phar wrapper is not registered. Please review your php.ini settings.');
+		}
+
+		$filename = str_replace('\\', DIRECTORY_SEPARATOR, $class);
+		if (strpos($class, 'PHPStan\\BetterReflection\\') === 0) {
+			$filename = substr($filename, strlen('PHPStan\\BetterReflection\\'));
+			$filepath = 'phar://' . __DIR__ . '/phpstan.phar/vendor/ondrejmirtes/better-reflection/src/' . $filename . '.php';
+		} else {
+			$filename = substr($filename, strlen('PHPStan\\'));
+			$filepath = 'phar://' . __DIR__ . '/phpstan.phar/src/' . $filename . '.php';
+		}
+
+		if (!file_exists($filepath)) {
+			return;
+		}
+
+		require $filepath;
+	}
+}
+
+spl_autoload_register([PharAutoloader::class, 'loadClass']);
diff --git a/vendor/phpstan/phpstan/composer.json b/vendor/phpstan/phpstan/composer.json
new file mode 100644
index 000000000..2e1182949
--- /dev/null
+++ b/vendor/phpstan/phpstan/composer.json
@@ -0,0 +1,23 @@
+{
+	"name": "phpstan/phpstan",
+	"description": "PHPStan - PHP Static Analysis Tool",
+	"license": ["MIT"],
+	"require": {
+		"php": "^7.1|^8.0"
+	},
+	"conflict": {
+		"phpstan/phpstan-shim": "*"
+	},
+	"bin": [
+		"phpstan",
+		"phpstan.phar"
+	],
+	"extra": {
+		"branch-alias": {
+			"dev-master": "0.12-dev"
+		}
+	},
+	"autoload": {
+		"files": ["bootstrap.php"]
+	}
+}
diff --git a/vendor/phpstan/phpstan/conf/bleedingEdge.neon b/vendor/phpstan/phpstan/conf/bleedingEdge.neon
new file mode 100644
index 000000000..01fee972d
--- /dev/null
+++ b/vendor/phpstan/phpstan/conf/bleedingEdge.neon
@@ -0,0 +1,2 @@
+includes:
+	- phar://phpstan.phar/conf/bleedingEdge.neon
diff --git a/vendor/phpstan/phpstan/phpstan b/vendor/phpstan/phpstan/phpstan
new file mode 100644
index 000000000..7a08ef485
--- /dev/null
+++ b/vendor/phpstan/phpstan/phpstan
@@ -0,0 +1,8 @@
+#!/usr/bin/env php
+<?php
+
+declare (strict_types=1);
+
+Phar::loadPhar(__DIR__ . '/phpstan.phar', 'phpstan.phar');
+
+require 'phar://phpstan.phar/bin/phpstan';
diff --git a/vendor/phpstan/phpstan/phpstan.phar b/vendor/phpstan/phpstan/phpstan.phar
new file mode 100644
index 000000000..43ca4e4b5
--- /dev/null
+++ b/vendor/phpstan/phpstan/phpstan.phar
diff --git a/vendor/phpstan/phpstan/phpstan.phar.asc b/vendor/phpstan/phpstan/phpstan.phar.asc
new file mode 100644
index 000000000..f1191c8bb
--- /dev/null
+++ b/vendor/phpstan/phpstan/phpstan.phar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmE+XpIACgkQzxoQjQ56
+5yDsLg/+Nv1uIaCuKfAlpBv+GmszF/jj7P91VYNpf5Zts9lj0tm91MRu+vVc46q7
+v68dIYZoOJE69n+Nvg0BuXA+ZuuMR0A/vMot3CqxqAPAslwaE6c9tg1OpktFoYQp
+t7IqU/ftz4OlCEkeBigEtmYe585ppBkWwZNakl81xA5K+DqXEJqCFCdROVRJfa5K
+36ck/iIAs2EOtQCwvIQttqev1fTVQAfTicH1B7wnqsg9zQ1a9l1/V2JlhxtzpCsc
+1T27yoiUOewpfyVSu3kBUPsXtppFe9X2UjRaOIpUiguXxEsWRW/eUMWFOnUG2tv0
+m1S8Q3roY92eYq94LtHs5mj11YPIkRbzwTwoZv4F5g1pS5jSVhQklCTdrOb6XXfh
+aiFe8aiwjFdOs4y5eDGpttDOMOtgDxogGphXiXpzAILn/4mfoP6Cgcd1sOReXaLV
+V/eMQvZG3Np93lYf/ezR++Rk4ZM1UAz7fkYw5lTZN3epShpsdsrPGj5MdJoahTFr
++ITm4TVWpuiPIQqV/2TeIm3m0tdXaTGGgOv+qMdOFbEcMqSFg5WnfdWjSzj35R7n
+wsjnhyN5MIkMWvWFO4wail3gUUpzKZGyd0Gbo3fVi67piUG38CcjxWUiYZ2EShwp
+A88kgsC7m+Ye6Pcjs70VhqHbW+HyW5bwBOuVdVqpkeqgLDM7tuo=
+=KGGY
+-----END PGP SIGNATURE-----